diff --git a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.DeepInheritance_GeneratesMetadataForAllLevels.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.DeepInheritance_GeneratesMetadataForAllLevels.verified.txt
deleted file mode 100644
index 7b28dd257e..0000000000
--- a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.DeepInheritance_GeneratesMetadataForAllLevels.verified.txt
+++ /dev/null
@@ -1,321 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericInitializerPropertyTests_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerPropertyTests), new PropertyInjectionSource_61ab58e());
-    }
-}
-
-internal sealed class PropertyInjectionSource_61ab58e : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericInitializerPropertyTests);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Fixture>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests> GetFixtureBackingField(TUnit.TestProject.GenericInitializerPropertyTests instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Fixture",
-            PropertyType = typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>),
-            ContainingType = typeof(TUnit.TestProject.GenericInitializerPropertyTests),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.GenericInitializerFixture<TUnit.TestProject.GenericInitializerPropertyTests>>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericInitializerPropertyTests)instance;
-#if NET8_0_OR_GREATER
-                GetFixtureBackingField((TUnit.TestProject.GenericInitializerPropertyTests)typedInstance) = (global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericInitializerPropertyTests).GetField("<Fixture>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_GenericPropertyInjectionTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>), new PropertyInjectionSource_Generic_7a6c8287());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_7a6c8287 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_MultipleGenericInstantiationTests_OtherProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>), new PropertyInjectionSource_Generic_64877686());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_64877686 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_IntermediateBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_344bd53a());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_344bd53a : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_48a5b53f());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_48a5b53f : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using TUnit.Core.Discovery;
-
-namespace TUnit.Generated;
-
-internal static class TUnit_TestProject_GenericInitializerFixture_TUnit_TestProject_GenericInitializerPropertyTests__Generic_InitializerPropertiesInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        InitializerPropertyRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>), new InitializerPropertyInfo[]
-        {
-            new InitializerPropertyInfo
-            {
-                PropertyName = "Database",
-                PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-                GetValue = static obj => ((global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)obj).Database
-            },
-        });
-    }
-}
diff --git a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.Diagnostic_ShowGeneratedFiles.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.Diagnostic_ShowGeneratedFiles.verified.txt
deleted file mode 100644
index dbf061f85e..0000000000
--- a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.Diagnostic_ShowGeneratedFiles.verified.txt
+++ /dev/null
@@ -1,321 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericInitializerPropertyTests_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerPropertyTests), new PropertyInjectionSource_1a6cab1c());
-    }
-}
-
-internal sealed class PropertyInjectionSource_1a6cab1c : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericInitializerPropertyTests);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Fixture>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests> GetFixtureBackingField(TUnit.TestProject.GenericInitializerPropertyTests instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Fixture",
-            PropertyType = typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>),
-            ContainingType = typeof(TUnit.TestProject.GenericInitializerPropertyTests),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.GenericInitializerFixture<TUnit.TestProject.GenericInitializerPropertyTests>>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericInitializerPropertyTests)instance;
-#if NET8_0_OR_GREATER
-                GetFixtureBackingField((TUnit.TestProject.GenericInitializerPropertyTests)typedInstance) = (global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericInitializerPropertyTests).GetField("<Fixture>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_GenericPropertyInjectionTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>), new PropertyInjectionSource_Generic_1fe2b02e());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_1fe2b02e : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_MultipleGenericInstantiationTests_OtherProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>), new PropertyInjectionSource_Generic_3db19b9d());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_3db19b9d : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_IntermediateBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_738479fe());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_738479fe : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_112df024());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_112df024 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using TUnit.Core.Discovery;
-
-namespace TUnit.Generated;
-
-internal static class TUnit_TestProject_GenericInitializerFixture_TUnit_TestProject_GenericInitializerPropertyTests__Generic_InitializerPropertiesInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        InitializerPropertyRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>), new InitializerPropertyInfo[]
-        {
-            new InitializerPropertyInfo
-            {
-                PropertyName = "Database",
-                PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-                GetValue = static obj => ((global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)obj).Database
-            },
-        });
-    }
-}
diff --git a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.GenericBaseClass_WithDataSourceProperty_GeneratesMetadata.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.GenericBaseClass_WithDataSourceProperty_GeneratesMetadata.verified.txt
deleted file mode 100644
index 5095c30023..0000000000
--- a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.GenericBaseClass_WithDataSourceProperty_GeneratesMetadata.verified.txt
+++ /dev/null
@@ -1,1149 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericInitializerPropertyTests_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerPropertyTests), new PropertyInjectionSource_3cd38317());
-    }
-}
-
-internal sealed class PropertyInjectionSource_3cd38317 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericInitializerPropertyTests);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Fixture>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests> GetFixtureBackingField(TUnit.TestProject.GenericInitializerPropertyTests instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Fixture",
-            PropertyType = typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>),
-            ContainingType = typeof(TUnit.TestProject.GenericInitializerPropertyTests),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.GenericInitializerFixture<TUnit.TestProject.GenericInitializerPropertyTests>>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericInitializerPropertyTests)instance;
-#if NET8_0_OR_GREATER
-                GetFixtureBackingField((TUnit.TestProject.GenericInitializerPropertyTests)typedInstance) = (global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericInitializerPropertyTests).GetField("<Fixture>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_MixedGenericAndDerivedPropertiesTests_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.MixedGenericAndDerivedPropertiesTests), new PropertyInjectionSource_4017f480());
-    }
-}
-
-internal sealed class PropertyInjectionSource_4017f480 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.MixedGenericAndDerivedPropertiesTests);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<DerivedDatabase>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.SecondaryDatabase GetDerivedDatabaseBackingField(TUnit.TestProject.MixedGenericAndDerivedPropertiesTests instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "DerivedDatabase",
-            PropertyType = typeof(global::TUnit.TestProject.SecondaryDatabase),
-            ContainingType = typeof(TUnit.TestProject.MixedGenericAndDerivedPropertiesTests),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.SecondaryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.MixedGenericAndDerivedPropertiesTests)instance;
-#if NET8_0_OR_GREATER
-                GetDerivedDatabaseBackingField((TUnit.TestProject.MixedGenericAndDerivedPropertiesTests)typedInstance) = (global::TUnit.TestProject.SecondaryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.MixedGenericAndDerivedPropertiesTests).GetField("<DerivedDatabase>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericInitializerWithNestedPropertyTests_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerWithNestedPropertyTests), new PropertyInjectionSource_e5cd3ee());
-    }
-}
-
-internal sealed class PropertyInjectionSource_e5cd3ee : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericInitializerWithNestedPropertyTests);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Fixture>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerWithNestedPropertyTests> GetFixtureBackingField(TUnit.TestProject.GenericInitializerWithNestedPropertyTests instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Fixture",
-            PropertyType = typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerWithNestedPropertyTests>),
-            ContainingType = typeof(TUnit.TestProject.GenericInitializerWithNestedPropertyTests),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.GenericInitializerFixture<TUnit.TestProject.GenericInitializerWithNestedPropertyTests>>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericInitializerWithNestedPropertyTests)instance;
-#if NET8_0_OR_GREATER
-                GetFixtureBackingField((TUnit.TestProject.GenericInitializerWithNestedPropertyTests)typedInstance) = (global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerWithNestedPropertyTests>)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericInitializerWithNestedPropertyTests).GetField("<Fixture>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_Issue4431_WebApplicationFactoryScenarioTests_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests), new PropertyInjectionSource_686a4b57());
-    }
-}
-
-internal sealed class PropertyInjectionSource_686a4b57 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Factory>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram> GetFactoryBackingField(TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Factory",
-            PropertyType = typeof(global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>),
-            ContainingType = typeof(TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.CustomWebApplicationFactory<TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests)instance;
-#if NET8_0_OR_GREATER
-                GetFactoryBackingField((TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests)typedInstance) = (global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>)value;
-#else
-                var backingField = typeof(TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests).GetField("<Factory>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_Issue4431_ParentTestScenario_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.Issue4431_ParentTestScenario), new PropertyInjectionSource_2e994dce());
-    }
-}
-
-internal sealed class PropertyInjectionSource_2e994dce : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.Issue4431_ParentTestScenario);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.Issue4431_ParentTestScenario instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.Issue4431_ParentTestScenario),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.Issue4431_ParentTestScenario)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.Issue4431_ParentTestScenario)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.Issue4431_ParentTestScenario).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_GenericPropertyInjectionTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>), new PropertyInjectionSource_Generic_326cb647());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_326cb647 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_MultipleGenericInstantiationTests_OtherProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>), new PropertyInjectionSource_Generic_548e1200());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_548e1200 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_IntermediateBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_55f0de4());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_55f0de4 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_551b4117());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_551b4117 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using TUnit.Core.Discovery;
-
-namespace TUnit.Generated;
-
-internal static class TUnit_TestProject_GenericInitializerFixture_TUnit_TestProject_GenericInitializerPropertyTests__Generic_InitializerPropertiesInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        InitializerPropertyRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>), new InitializerPropertyInfo[]
-        {
-            new InitializerPropertyInfo
-            {
-                PropertyName = "Database",
-                PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-                GetValue = static obj => ((global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)obj).Database
-            },
-        });
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_MultiPropertyGenericBase_TUnit_TestProject_MultiplePropertiesGenericTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.MultiPropertyGenericBase<global::TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>), new PropertyInjectionSource_Generic_467f7427());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_467f7427 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.MultiPropertyGenericBase<global::TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<FirstDb>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetFirstDbBackingField(TUnit.TestProject.MultiPropertyGenericBase<TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram> instance);
-#endif
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<SecondDb>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.SecondaryDatabase GetSecondDbBackingField(TUnit.TestProject.MultiPropertyGenericBase<TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "FirstDb",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.MultiPropertyGenericBase<TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.MultiPropertyGenericBase<global::TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetFirstDbBackingField((TUnit.TestProject.MultiPropertyGenericBase<TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.MultiPropertyGenericBase<TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>).GetField("<FirstDb>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "SecondDb",
-            PropertyType = typeof(global::TUnit.TestProject.SecondaryDatabase),
-            ContainingType = typeof(TUnit.TestProject.MultiPropertyGenericBase<TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.SecondaryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.MultiPropertyGenericBase<global::TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetSecondDbBackingField((TUnit.TestProject.MultiPropertyGenericBase<TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.SecondaryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.MultiPropertyGenericBase<TUnit.TestProject.MultiplePropertiesGenericTests.TestProgram>).GetField("<SecondDb>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_MultiTypeParamBase_TUnit_TestProject_MultiTypeParameterTests_Program1_TUnit_TestProject_MultiTypeParameterTests_Program2__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.MultiTypeParamBase<global::TUnit.TestProject.MultiTypeParameterTests.Program1, global::TUnit.TestProject.MultiTypeParameterTests.Program2>), new PropertyInjectionSource_Generic_2513d22());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_2513d22 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.MultiTypeParamBase<global::TUnit.TestProject.MultiTypeParameterTests.Program1, global::TUnit.TestProject.MultiTypeParameterTests.Program2>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Database>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetDatabaseBackingField(TUnit.TestProject.MultiTypeParamBase<TUnit.TestProject.MultiTypeParameterTests.Program1, TUnit.TestProject.MultiTypeParameterTests.Program2> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Database",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.MultiTypeParamBase<TUnit.TestProject.MultiTypeParameterTests.Program1, TUnit.TestProject.MultiTypeParameterTests.Program2>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.MultiTypeParamBase<global::TUnit.TestProject.MultiTypeParameterTests.Program1, global::TUnit.TestProject.MultiTypeParameterTests.Program2>)instance;
-#if NET8_0_OR_GREATER
-                GetDatabaseBackingField((TUnit.TestProject.MultiTypeParamBase<TUnit.TestProject.MultiTypeParameterTests.Program1, TUnit.TestProject.MultiTypeParameterTests.Program2>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.MultiTypeParamBase<TUnit.TestProject.MultiTypeParameterTests.Program1, TUnit.TestProject.MultiTypeParameterTests.Program2>).GetField("<Database>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_ParentBase_TUnit_TestProject_DeepInheritanceMultiLevelPropertyTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.ParentBase<global::TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>), new PropertyInjectionSource_Generic_2bdc3e0a());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_2bdc3e0a : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.ParentBase<global::TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<ParentDb>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.SecondaryDatabase GetParentDbBackingField(TUnit.TestProject.ParentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram> instance);
-#endif
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<GrandparentDb>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetGrandparentDbBackingField(TUnit.TestProject.GrandparentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "ParentDb",
-            PropertyType = typeof(global::TUnit.TestProject.SecondaryDatabase),
-            ContainingType = typeof(TUnit.TestProject.ParentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.SecondaryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.ParentBase<global::TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetParentDbBackingField((TUnit.TestProject.ParentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.SecondaryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.ParentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>).GetField("<ParentDb>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "GrandparentDb",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GrandparentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.ParentBase<global::TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetGrandparentDbBackingField((TUnit.TestProject.GrandparentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GrandparentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>).GetField("<GrandparentDb>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GrandparentBase_TUnit_TestProject_DeepInheritanceMultiLevelPropertyTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GrandparentBase<global::TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>), new PropertyInjectionSource_Generic_72e68a44());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_72e68a44 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GrandparentBase<global::TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<GrandparentDb>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetGrandparentDbBackingField(TUnit.TestProject.GrandparentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "GrandparentDb",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GrandparentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GrandparentBase<global::TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetGrandparentDbBackingField((TUnit.TestProject.GrandparentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GrandparentBase<TUnit.TestProject.DeepInheritanceMultiLevelPropertyTests.TestProgram>).GetField("<GrandparentDb>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_MixedGenericAndDerivedPropertiesTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MixedGenericAndDerivedPropertiesTests.TestProgram>), new PropertyInjectionSource_Generic_23bcede5());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_23bcede5 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MixedGenericAndDerivedPropertiesTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MixedGenericAndDerivedPropertiesTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MixedGenericAndDerivedPropertiesTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MixedGenericAndDerivedPropertiesTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MixedGenericAndDerivedPropertiesTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MixedGenericAndDerivedPropertiesTests.TestProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_System_Collections_Generic_List_string___Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::System.Collections.Generic.List<string>>), new PropertyInjectionSource_Generic_48d518d8());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_48d518d8 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::System.Collections.Generic.List<string>>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<System.Collections.Generic.List<string>> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<System.Collections.Generic.List<string>>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::System.Collections.Generic.List<string>>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<System.Collections.Generic.List<string>>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<System.Collections.Generic.List<string>>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using TUnit.Core.Discovery;
-
-namespace TUnit.Generated;
-
-internal static class TUnit_TestProject_GenericInitializerFixture_TUnit_TestProject_GenericInitializerWithNestedPropertyTests__Generic_InitializerPropertiesInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        InitializerPropertyRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerWithNestedPropertyTests>), new InitializerPropertyInfo[]
-        {
-            new InitializerPropertyInfo
-            {
-                PropertyName = "Database",
-                PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-                GetValue = static obj => ((global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerWithNestedPropertyTests>)obj).Database
-            },
-        });
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_CustomWebApplicationFactory_TUnit_TestProject_Issue4431_WebApplicationFactoryScenarioTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>), new PropertyInjectionSource_Generic_39565e8e());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_39565e8e : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<TestDatabase>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetTestDatabaseBackingField(TUnit.TestProject.CustomWebApplicationFactory<TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "TestDatabase",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.CustomWebApplicationFactory<TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetTestDatabaseBackingField((TUnit.TestProject.CustomWebApplicationFactory<TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.CustomWebApplicationFactory<TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>).GetField("<TestDatabase>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using TUnit.Core.Discovery;
-
-namespace TUnit.Generated;
-
-internal static class TUnit_TestProject_CustomWebApplicationFactory_TUnit_TestProject_Issue4431_WebApplicationFactoryScenarioTests_TestProgram__Generic_InitializerPropertiesInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        InitializerPropertyRegistry.Register(typeof(global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>), new InitializerPropertyInfo[]
-        {
-            new InitializerPropertyInfo
-            {
-                PropertyName = "TestDatabase",
-                PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-                GetValue = static obj => ((global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_WebApplicationFactoryScenarioTests.TestProgram>)obj).TestDatabase
-            },
-        });
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_WebAppFactoryBase_TUnit_TestProject_CustomWebApplicationFactory_TUnit_TestProject_Issue4431_ComplexGenericInheritanceTests_MyProgram__TUnit_TestProject_Issue4431_ComplexGenericInheritanceTests_MyProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.WebAppFactoryBase<global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>, global::TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>), new PropertyInjectionSource_Generic_3c089123());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_3c089123 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.WebAppFactoryBase<global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>, global::TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<SharedDatabase>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetSharedDatabaseBackingField(TUnit.TestProject.WebAppFactoryBase<TUnit.TestProject.CustomWebApplicationFactory<TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>, TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "SharedDatabase",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.WebAppFactoryBase<TUnit.TestProject.CustomWebApplicationFactory<TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>, TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.WebAppFactoryBase<global::TUnit.TestProject.CustomWebApplicationFactory<global::TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>, global::TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetSharedDatabaseBackingField((TUnit.TestProject.WebAppFactoryBase<TUnit.TestProject.CustomWebApplicationFactory<TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>, TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.WebAppFactoryBase<TUnit.TestProject.CustomWebApplicationFactory<TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>, TUnit.TestProject.Issue4431_ComplexGenericInheritanceTests.MyProgram>).GetField("<SharedDatabase>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
diff --git a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.GenericClassDataSource_WithInitializerProperties_GeneratesMetadata.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.GenericClassDataSource_WithInitializerProperties_GeneratesMetadata.verified.txt
deleted file mode 100644
index 7b28dd257e..0000000000
--- a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.GenericClassDataSource_WithInitializerProperties_GeneratesMetadata.verified.txt
+++ /dev/null
@@ -1,321 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericInitializerPropertyTests_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerPropertyTests), new PropertyInjectionSource_61ab58e());
-    }
-}
-
-internal sealed class PropertyInjectionSource_61ab58e : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericInitializerPropertyTests);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Fixture>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests> GetFixtureBackingField(TUnit.TestProject.GenericInitializerPropertyTests instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Fixture",
-            PropertyType = typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>),
-            ContainingType = typeof(TUnit.TestProject.GenericInitializerPropertyTests),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.GenericInitializerFixture<TUnit.TestProject.GenericInitializerPropertyTests>>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericInitializerPropertyTests)instance;
-#if NET8_0_OR_GREATER
-                GetFixtureBackingField((TUnit.TestProject.GenericInitializerPropertyTests)typedInstance) = (global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericInitializerPropertyTests).GetField("<Fixture>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_GenericPropertyInjectionTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>), new PropertyInjectionSource_Generic_7a6c8287());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_7a6c8287 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_MultipleGenericInstantiationTests_OtherProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>), new PropertyInjectionSource_Generic_64877686());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_64877686 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_IntermediateBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_344bd53a());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_344bd53a : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_48a5b53f());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_48a5b53f : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using TUnit.Core.Discovery;
-
-namespace TUnit.Generated;
-
-internal static class TUnit_TestProject_GenericInitializerFixture_TUnit_TestProject_GenericInitializerPropertyTests__Generic_InitializerPropertiesInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        InitializerPropertyRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>), new InitializerPropertyInfo[]
-        {
-            new InitializerPropertyInfo
-            {
-                PropertyName = "Database",
-                PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-                GetValue = static obj => ((global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)obj).Database
-            },
-        });
-    }
-}
diff --git a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.MultipleInstantiations_EachGenerateMetadata.verified.txt b/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.MultipleInstantiations_EachGenerateMetadata.verified.txt
deleted file mode 100644
index 7b28dd257e..0000000000
--- a/TUnit.Core.SourceGenerator.Tests/GenericPropertyInjectionTests.MultipleInstantiations_EachGenerateMetadata.verified.txt
+++ /dev/null
@@ -1,321 +0,0 @@
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericInitializerPropertyTests_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerPropertyTests), new PropertyInjectionSource_61ab58e());
-    }
-}
-
-internal sealed class PropertyInjectionSource_61ab58e : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericInitializerPropertyTests);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Fixture>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests> GetFixtureBackingField(TUnit.TestProject.GenericInitializerPropertyTests instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Fixture",
-            PropertyType = typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>),
-            ContainingType = typeof(TUnit.TestProject.GenericInitializerPropertyTests),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.GenericInitializerFixture<TUnit.TestProject.GenericInitializerPropertyTests>>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericInitializerPropertyTests)instance;
-#if NET8_0_OR_GREATER
-                GetFixtureBackingField((TUnit.TestProject.GenericInitializerPropertyTests)typedInstance) = (global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericInitializerPropertyTests).GetField("<Fixture>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_GenericPropertyInjectionTests_TestProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>), new PropertyInjectionSource_Generic_7a6c8287());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_7a6c8287 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.GenericPropertyInjectionTests.TestProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_MultipleGenericInstantiationTests_OtherProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>), new PropertyInjectionSource_Generic_64877686());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_64877686 : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.MultipleGenericInstantiationTests.OtherProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_IntermediateBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_344bd53a());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_344bd53a : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.IntermediateBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using System.Collections.Generic;
-using TUnit.Core;
-using TUnit.Core.Interfaces.SourceGenerator;
-using TUnit.Core.Enums;
-using System.Linq;
-
-namespace TUnit.Core;
-
-internal static class TUnit_TestProject_GenericFixtureBase_TUnit_TestProject_DeepInheritanceGenericTests_DeepProgram__Generic_PropertyInjectionInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        global::TUnit.Core.PropertySourceRegistry.Register(typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>), new PropertyInjectionSource_Generic_48a5b53f());
-    }
-}
-
-internal sealed class PropertyInjectionSource_Generic_48a5b53f : IPropertySource
-{
-    public Type Type => typeof(global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>);
-    public bool ShouldInitialize => true;
-
-#if NET8_0_OR_GREATER
-    [global::System.Runtime.CompilerServices.UnsafeAccessor(global::System.Runtime.CompilerServices.UnsafeAccessorKind.Field, Name = "<Postgres>k__BackingField")]
-    private static extern ref global::TUnit.TestProject.InMemoryDatabase GetPostgresBackingField(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram> instance);
-#endif
-
-    public IEnumerable<PropertyInjectionMetadata> GetPropertyMetadata()
-    {
-        yield return new PropertyInjectionMetadata
-        {
-            PropertyName = "Postgres",
-            PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-            ContainingType = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>),
-            CreateDataSource = () =>
-            {
-                var dataSource = new TUnit.Core.ClassDataSourceAttribute<TUnit.TestProject.InMemoryDatabase>();
-                dataSource.Shared = (TUnit.Core.SharedType)3;
-                return dataSource;
-            },
-            SetProperty = (instance, value) =>
-            {
-                var typedInstance = (global::TUnit.TestProject.GenericFixtureBase<global::TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)instance;
-#if NET8_0_OR_GREATER
-                GetPostgresBackingField((TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>)typedInstance) = (global::TUnit.TestProject.InMemoryDatabase)value;
-#else
-                var backingField = typeof(TUnit.TestProject.GenericFixtureBase<TUnit.TestProject.DeepInheritanceGenericTests.DeepProgram>).GetField("<Postgres>k__BackingField",
-                    global::System.Reflection.BindingFlags.Instance | global::System.Reflection.BindingFlags.NonPublic);
-                backingField.SetValue(typedInstance, value);
-#endif
-            }
-        };
-
-    }
-}
-
-
-// ===== FILE SEPARATOR =====
-
-using System;
-using TUnit.Core.Discovery;
-
-namespace TUnit.Generated;
-
-internal static class TUnit_TestProject_GenericInitializerFixture_TUnit_TestProject_GenericInitializerPropertyTests__Generic_InitializerPropertiesInitializer
-{
-    [global::System.Runtime.CompilerServices.ModuleInitializer]
-    public static void Initialize()
-    {
-        InitializerPropertyRegistry.Register(typeof(global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>), new InitializerPropertyInfo[]
-        {
-            new InitializerPropertyInfo
-            {
-                PropertyName = "Database",
-                PropertyType = typeof(global::TUnit.TestProject.InMemoryDatabase),
-                GetValue = static obj => ((global::TUnit.TestProject.GenericInitializerFixture<global::TUnit.TestProject.GenericInitializerPropertyTests>)obj).Database
-            },
-        });
-    }
-}
diff --git a/TUnit.Core.SourceGenerator/Generators/PropertyInjectionSourceGenerator.cs b/TUnit.Core.SourceGenerator/Generators/PropertyInjectionSourceGenerator.cs
index 0ba602ca70..eaa06041be 100644
--- a/TUnit.Core.SourceGenerator/Generators/PropertyInjectionSourceGenerator.cs
+++ b/TUnit.Core.SourceGenerator/Generators/PropertyInjectionSourceGenerator.cs
@@ -678,6 +678,18 @@ private static void GeneratePropertyMetadata(StringBuilder sb, PropertyDataSourc
         sb.AppendLine("                return dataSource;");
         sb.AppendLine("            },");
 
+        // GetProperty delegate — direct strongly-typed read so the engine hot path
+        // doesn't fall back to Type.GetProperty reflection. Static instance-typed cast
+        // mirrors SetProperty and stays AOT-friendly.
+        if (prop.IsStatic)
+        {
+            sb.AppendLine($"            GetProperty = static _ => {prop.ContainingTypeFullyQualified}.{prop.PropertyName},");
+        }
+        else
+        {
+            sb.AppendLine($"            GetProperty = static instance => (({classTypeName})instance).{prop.PropertyName},");
+        }
+
         // SetProperty delegate
         sb.AppendLine("            SetProperty = (instance, value) =>");
         sb.AppendLine("            {");
diff --git a/TUnit.Core/Discovery/ObjectGraphDiscoverer.cs b/TUnit.Core/Discovery/ObjectGraphDiscoverer.cs
index 5d77386df0..129a0679b5 100644
--- a/TUnit.Core/Discovery/ObjectGraphDiscoverer.cs
+++ b/TUnit.Core/Discovery/ObjectGraphDiscoverer.cs
@@ -248,6 +248,7 @@ void Recurse(object value, int depth)
     public static void ClearCache()
     {
         PropertyCacheManager.ClearCache();
+        TypeHierarchyCache.Clear();
         ClearDiscoveryErrors();
     }
 
@@ -339,13 +340,17 @@ private static void TraverseSourceGeneratedProperties(
         foreach (var metadata in sourceGeneratedProperties)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            var property = metadata.ContainingType.GetProperty(metadata.PropertyName);
-            if (property == null || !property.CanRead)
+            // Use the compile-time-generated getter when the source generator emitted one,
+            // otherwise fall back to a cached reflection-based getter. Eliminates the
+            // per-test Type.GetProperty reflection lookup on the hot path.
+            // null getter => property is not readable; skip.
+            var getter = metadata.GetOrCreateGetter();
+            if (getter is null)
             {
                 continue;
             }
 
-            var value = property.GetValue(obj);
+            var value = getter(obj);
             if (value != null && tryAdd(value, currentDepth))
             {
                 recurse(value, currentDepth + 1);
@@ -604,26 +609,39 @@ private static void CollectRootObjects(
         }
     }
 
+    /// <summary>
+    /// Cache of type hierarchy sets keyed by <see cref="Type"/>. Per-type hierarchy is invariant,
+    /// and each invocation otherwise allocates a fresh <see cref="HashSet{T}"/> of strings.
+    /// Populated on first access per type and read-only thereafter. The stored
+    /// <see cref="HashSet{T}"/> instance is shared — callers MUST treat it as read-only.
+    /// (Not typed as <c>IReadOnlySet{T}</c> because netstandard2.0 lacks the interface and
+    /// the only consumer, <see cref="IsDirectProperty"/>, needs the concrete type for
+    /// <see cref="HashSet{T}.GetAlternateLookup"/> on newer TFMs.)
+    /// </summary>
+    private static readonly ConcurrentDictionary<Type, HashSet<string>> TypeHierarchyCache = new();
+
     /// <summary>
     /// Gets all types in the inheritance hierarchy from the given type up to (but not including) object.
+    /// The returned <see cref="HashSet{T}"/> is shared across callers and MUST NOT be mutated.
     /// </summary>
     private static HashSet<string> GetTypeHierarchy(Type type)
-    {
-        var result = new HashSet<string>();
-        var currentType = type;
-
-        while (currentType != null && currentType != typeof(object))
+        => TypeHierarchyCache.GetOrAdd(type, static t =>
         {
-            if (currentType.FullName != null)
+            var result = new HashSet<string>();
+            var currentType = t;
+
+            while (currentType != null && currentType != typeof(object))
             {
-                result.Add(currentType.FullName);
-            }
+                if (currentType.FullName != null)
+                {
+                    result.Add(currentType.FullName);
+                }
 
-            currentType = currentType.BaseType;
-        }
+                currentType = currentType.BaseType;
+            }
 
-        return result;
-    }
+            return result;
+        });
 
     /// <summary>
     /// Determines if a cache key represents a direct property (belonging to test class hierarchy)
diff --git a/TUnit.Core/ExecutableTest.cs b/TUnit.Core/ExecutableTest.cs
index 1199cf8414..4a3e736743 100644
--- a/TUnit.Core/ExecutableTest.cs
+++ b/TUnit.Core/ExecutableTest.cs
@@ -11,7 +11,7 @@ public sealed class ExecutableTest : AbstractExecutableTest
     private readonly Func<object, object?[], TestContext, CancellationToken, Task> _invokeTest;
 
     /// <summary>
-    /// Creates a UnifiedExecutableTest where all mode-specific behavior is encapsulated in the delegates.
+    /// Creates an ExecutableTest where mode-specific behavior is encapsulated in the delegates.
     /// Both AOT and reflection modes provide delegates with identical signatures.
     /// </summary>
     /// <param name="createInstance">Delegate that creates the test instance with all necessary initialization</param>
diff --git a/TUnit.Core/ExecutableTest`1.cs b/TUnit.Core/ExecutableTest`1.cs
new file mode 100644
index 0000000000..8b1c022281
--- /dev/null
+++ b/TUnit.Core/ExecutableTest`1.cs
@@ -0,0 +1,71 @@
+using System.Diagnostics.CodeAnalysis;
+using TUnit.Core.Helpers;
+
+namespace TUnit.Core;
+
+/// <summary>
+/// Strongly typed executable test that stores the per-test delegates from
+/// <see cref="TestMetadata{T}"/> as fields instead of capturing them in closures. This avoids the
+/// two closure allocations (<c>createInstance</c> and <c>invokeTest</c>) that the generic factory
+/// would otherwise allocate per test invocation — on a 1000-test run that is 2000 delegates saved.
+/// Inherits directly from <see cref="AbstractExecutableTest"/> so <see cref="ExecutableTest"/>
+/// can remain sealed (public API surface).
+/// </summary>
+/// <typeparam name="T">The test class type.</typeparam>
+internal sealed class ExecutableTest<
+    [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicConstructors | DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicMethods)]
+    T> : AbstractExecutableTest where T : class
+{
+    // Fields that the previous closures captured. ClassArguments and Arguments live on the
+    // base AbstractExecutableTest, so only the metadata reference plus the two ExecutableTestCreationContext
+    // values that aren't mirrored on the base need to be stored here.
+    private readonly TestMetadata<T> _metadata;
+    private readonly Func<Task<object>>? _testClassInstanceFactory;
+    private readonly Type[] _resolvedClassGenericArguments;
+
+    public ExecutableTest(
+        TestMetadata<T> metadata,
+        ExecutableTestCreationContext context)
+    {
+        _metadata = metadata;
+        _testClassInstanceFactory = context.TestClassInstanceFactory;
+        _resolvedClassGenericArguments = context.ResolvedClassGenericArguments;
+    }
+
+    public override async Task<object> CreateInstanceAsync()
+    {
+        if (_testClassInstanceFactory != null)
+        {
+            return await _testClassInstanceFactory();
+        }
+
+        var attributes = _metadata.GetOrCreateAttributes();
+        // TestSessionId defaults to string.Empty for allocation reasons — callers in the
+        // engine must overwrite it before reaching test-variant generation. This is the
+        // primary consumer, so upgrade from Debug.Assert to a release-mode guard: any caller
+        // reaching here without assigning a session id indicates an engine bug, and silently
+        // propagating an empty string into data-generation code would poison partition keys.
+        if (string.IsNullOrEmpty(_metadata.TestSessionId))
+        {
+            throw new InvalidOperationException(
+                $"TestSessionId was not assigned before creating a test instance for {_metadata.TestName}. This is a TUnit engine bug.");
+        }
+        var instance = await ClassConstructorHelper.TryCreateInstanceWithClassConstructor(
+            attributes,
+            _metadata.TestClassType,
+            _metadata.TestSessionId,
+            Context);
+
+        if (instance != null)
+        {
+            return instance;
+        }
+
+        return _metadata.InstanceFactory!(_resolvedClassGenericArguments, ClassArguments);
+    }
+
+    public override async Task InvokeTestAsync(object instance, CancellationToken cancellationToken)
+    {
+        await _metadata.InvokeTypedTest!((T)instance, Arguments, cancellationToken).ConfigureAwait(false);
+    }
+}
diff --git a/TUnit.Core/GenericTestMetadata.cs b/TUnit.Core/GenericTestMetadata.cs
index 5f7d1ae91e..7856927abb 100644
--- a/TUnit.Core/GenericTestMetadata.cs
+++ b/TUnit.Core/GenericTestMetadata.cs
@@ -1,3 +1,4 @@
+using System.Diagnostics;
 using TUnit.Core.Helpers;
 
 namespace TUnit.Core;
@@ -67,6 +68,10 @@ public override Func<ExecutableTestCreationContext, TestMetadata, AbstractExecut
                 {
                     // Try to create instance with ClassConstructor attribute
                     var attributes = metadata.GetOrCreateAttributes();
+                    // TestSessionId defaults to string.Empty for allocation reasons — the
+                    // engine must assign a real session id before reaching this point.
+                    Debug.Assert(!string.IsNullOrEmpty(metadata.TestSessionId),
+                        $"TestSessionId must be assigned before creating a generic test instance for {metadata.TestName}");
                     var classInstance = await ClassConstructorHelper.TryCreateInstanceWithClassConstructor(
                         attributes,
                         TestClassType,
diff --git a/TUnit.Core/Interfaces/SourceGenerator/PropertyInjectionMetadata.cs b/TUnit.Core/Interfaces/SourceGenerator/PropertyInjectionMetadata.cs
index bea4f11a9f..477c21b916 100644
--- a/TUnit.Core/Interfaces/SourceGenerator/PropertyInjectionMetadata.cs
+++ b/TUnit.Core/Interfaces/SourceGenerator/PropertyInjectionMetadata.cs
@@ -1,4 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
 
 namespace TUnit.Core.Interfaces.SourceGenerator;
 
@@ -7,6 +8,20 @@ namespace TUnit.Core.Interfaces.SourceGenerator;
 /// </summary>
 public sealed class PropertyInjectionMetadata
 {
+    // Sentinel indicating the property is not readable — distinct from "not yet computed"
+    // (null) so the memoized negative result does not keep re-running reflection.
+    private static readonly Func<object, object?> s_notReadableSentinel = static _ => null;
+
+    // Source-gen-supplied delegate (or null for hand-authored/reflection-only metadata).
+    // Kept separate from the lazy-init reflection fallback so the public GetProperty
+    // contract ("what the source generator emitted") is not polluted by internal caching.
+    private readonly Func<object, object?>? _sourceGenGetter;
+
+    // Lazily populated reflection-based fallback. volatile so a racing reader observes
+    // the completed delegate write without tearing on weakly-ordered architectures;
+    // Interlocked.CompareExchange makes the winning writer visible to everyone.
+    private volatile Func<object, object?>? _cachedGetter;
+
     /// <summary>
     /// Gets the name of the property that needs injection.
     /// </summary>
@@ -37,4 +52,52 @@ public sealed class PropertyInjectionMetadata
     /// Handles type casting and property setting (including init-only properties).
     /// </summary>
     public required Action<object, object?> SetProperty { get; init; }
+
+    /// <summary>
+    /// Optional compile-time-generated getter that returns the property value from an instance.
+    /// When not supplied (e.g. older source-gen output or hand-authored metadata) the callers
+    /// fall back to a cached <see cref="PropertyInfo.GetValue(object)"/> call. Supplying a
+    /// direct delegate removes a <see cref="Type.GetProperty(string)"/> reflection lookup from
+    /// the per-test hot path in both source-gen and reflection modes.
+    /// </summary>
+    public Func<object, object?>? GetProperty
+    {
+        get => _sourceGenGetter;
+        init => _sourceGenGetter = value;
+    }
+
+    /// <summary>
+    /// Returns a delegate that reads the property value from a given instance, or <c>null</c>
+    /// when the property is not readable (callers should skip such properties). Uses the
+    /// source-generated <see cref="GetProperty"/> delegate when available, otherwise compiles
+    /// a reflection-based getter once and caches it on the metadata instance.
+    /// </summary>
+    [UnconditionalSuppressMessage("Trimming", "IL2075",
+        Justification = "ContainingType is annotated to preserve properties; reflection fallback is only used when source-gen did not emit a delegate.")]
+    internal Func<object, object?>? GetOrCreateGetter()
+    {
+        // Fast path: source-gen supplied a delegate.
+        if (_sourceGenGetter != null)
+        {
+            return _sourceGenGetter;
+        }
+
+        // Fast path: reflection fallback already cached (volatile read).
+        var cached = _cachedGetter;
+        if (cached != null)
+        {
+            return ReferenceEquals(cached, s_notReadableSentinel) ? null : cached;
+        }
+
+        var property = ContainingType.GetProperty(PropertyName);
+        var computed = property is null || !property.CanRead
+            ? s_notReadableSentinel
+            : (Func<object, object?>)(obj => property.GetValue(obj));
+
+        // Benign race: both racers compute equivalent delegates; CompareExchange makes the
+        // winner visible to any subsequent reader without a lock.
+        Interlocked.CompareExchange(ref _cachedGetter, computed, null);
+        var winner = _cachedGetter!;
+        return ReferenceEquals(winner, s_notReadableSentinel) ? null : winner;
+    }
 }
diff --git a/TUnit.Core/PropertyInjection/PropertyInjectionPlanBuilder.cs b/TUnit.Core/PropertyInjection/PropertyInjectionPlanBuilder.cs
index e49ca472c0..2c7f70a138 100644
--- a/TUnit.Core/PropertyInjection/PropertyInjectionPlanBuilder.cs
+++ b/TUnit.Core/PropertyInjection/PropertyInjectionPlanBuilder.cs
@@ -224,6 +224,9 @@ public Task ForEachPropertyParallelAsync(
 
     /// <summary>
     /// Gets property values from an instance, abstracting source-gen vs reflection.
+    /// Uses the source-generated getter delegate on <see cref="PropertyInjectionMetadata"/>
+    /// when available and caches a reflection-based getter otherwise — no per-call
+    /// <c>Type.GetProperty</c> lookup on the hot path.
     /// </summary>
     public IEnumerable<object?> GetPropertyValues(object instance)
     {
@@ -231,10 +234,12 @@ public Task ForEachPropertyParallelAsync(
         {
             foreach (var metadata in SourceGeneratedProperties)
             {
-                var property = metadata.ContainingType.GetProperty(metadata.PropertyName);
-                if (property?.CanRead == true)
+                // Skip non-readable properties so the enumeration count matches the legacy
+                // reflection behavior (old code did not yield for properties without a getter).
+                var getter = metadata.GetOrCreateGetter();
+                if (getter is not null)
                 {
-                    yield return property.GetValue(instance);
+                    yield return getter(instance);
                 }
             }
         }
diff --git a/TUnit.Core/TestContext.Output.cs b/TUnit.Core/TestContext.Output.cs
index 92ff273b95..3931b237c4 100644
--- a/TUnit.Core/TestContext.Output.cs
+++ b/TUnit.Core/TestContext.Output.cs
@@ -101,7 +101,9 @@ public override string GetErrorOutput()
     internal string GetOutputError() => CombineOutputs(_buildTimeErrorOutput, base.GetErrorOutput());
 
     internal override bool HasCapturedOutput =>
-        base.HasCapturedOutput || _buildTimeOutput != null || _buildTimeErrorOutput != null;
+        base.HasCapturedOutput
+        || !string.IsNullOrEmpty(_buildTimeOutput)
+        || !string.IsNullOrEmpty(_buildTimeErrorOutput);
 
     private static string CombineOutputs(string? buildTimeOutput, string runtimeOutput)
     {
diff --git a/TUnit.Core/TestMetadata.cs b/TUnit.Core/TestMetadata.cs
index 1ef7e6c30e..80e6f0504f 100644
--- a/TUnit.Core/TestMetadata.cs
+++ b/TUnit.Core/TestMetadata.cs
@@ -70,9 +70,11 @@ internal Attribute[] GetOrCreateAttributes()
     public PropertyInjectionData[] PropertyInjections { get; init; } = [];
 
     /// <summary>
-    /// Test session ID used for data generation
+    /// Test session ID used for data generation. Callers must assign a real session id before
+    /// any data-generation code reads it; defaulting to an empty string avoids the per-instance
+    /// <see cref="Guid.NewGuid"/> allocation that every engine caller immediately overwrites.
     /// </summary>
-    public string TestSessionId { get; set; } = Guid.NewGuid().ToString();
+    public string TestSessionId { get; set; } = string.Empty;
 
     /// <summary>
     /// The depth of inheritance for this test method.
diff --git a/TUnit.Core/TestMetadata`1.cs b/TUnit.Core/TestMetadata`1.cs
index 923ec7df27..711a27d80e 100644
--- a/TUnit.Core/TestMetadata`1.cs
+++ b/TUnit.Core/TestMetadata`1.cs
@@ -1,6 +1,4 @@
-using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
-using TUnit.Core.Helpers;
 using TUnit.Core.Interfaces;
 
 namespace TUnit.Core;
@@ -61,67 +59,50 @@ public class TestMetadata<
 
     /// <summary>
     /// Factory delegate that creates an ExecutableTest for this metadata.
+    /// Uses a static factory method so the cached delegate is a pure method reference —
+    /// no closure, and per-test state is stored on the returned <see cref="ExecutableTest{T}"/>
+    /// instead of in captured lambdas.
     /// </summary>
     public override Func<ExecutableTestCreationContext, TestMetadata, AbstractExecutableTest> CreateExecutableTestFactory
     {
         get
         {
-            // Return cached factory if available
-            if (_cachedExecutableTestFactory != null)
+            // Volatile-equivalent read via Interlocked pattern mirrors TestEntry's cached-delegate
+            // idiom: first reader computes, subsequent racers lose the CompareExchange and fall
+            // through to re-read the now-published field. Keeps this allocation-free on the fast
+            // path while guaranteeing publication on weakly-ordered architectures.
+            var cached = _cachedExecutableTestFactory;
+            if (cached != null)
             {
-                return _cachedExecutableTestFactory;
+                return cached;
             }
 
             if (InstanceFactory != null && InvokeTypedTest != null)
             {
-                _cachedExecutableTestFactory = (context, metadata) =>
-                {
-                    var typedMetadata = (TestMetadata<T>)metadata;
-
-                    Func<TestContext, Task<object>> createInstance = async testContext =>
-                    {
-                        if (context.TestClassInstanceFactory != null)
-                        {
-                            return await context.TestClassInstanceFactory();
-                        }
-
-                        var attributes = metadata.GetOrCreateAttributes();
-                        var instance = await ClassConstructorHelper.TryCreateInstanceWithClassConstructor(
-                            attributes,
-                            TestClassType,
-                            metadata.TestSessionId,
-                            testContext);
-
-                        if (instance != null)
-                        {
-                            return instance;
-                        }
-
-                        return typedMetadata.InstanceFactory!(context.ResolvedClassGenericArguments, context.ClassArguments);
-                    };
-
-                    Func<object, object?[], TestContext, CancellationToken, Task> invokeTest = async (instance, args, testContext, cancellationToken) =>
-                    {
-                        await typedMetadata.InvokeTypedTest!((T)instance, args, cancellationToken).ConfigureAwait(false);
-                    };
-
-                    return new ExecutableTest(createInstance, invokeTest)
-                    {
-                        TestId = context.TestId,
-                        Metadata = metadata,
-                        Arguments = context.Arguments,
-                        ClassArguments = context.ClassArguments,
-                        Context = context.Context
-                    };
-                };
-
-                return _cachedExecutableTestFactory;
+                Interlocked.CompareExchange<Func<ExecutableTestCreationContext, TestMetadata, AbstractExecutableTest>?>(
+                    ref _cachedExecutableTestFactory, CreateTypedExecutableTest, null);
+                return _cachedExecutableTestFactory!;
             }
 
             throw new InvalidOperationException($"InstanceFactory and InvokeTypedTest must be set for {typeof(T).Name}");
         }
     }
 
+    private static AbstractExecutableTest CreateTypedExecutableTest(
+        ExecutableTestCreationContext context,
+        TestMetadata metadata)
+    {
+        var typedMetadata = (TestMetadata<T>)metadata;
+        return new ExecutableTest<T>(typedMetadata, context)
+        {
+            TestId = context.TestId,
+            Metadata = metadata,
+            Arguments = context.Arguments,
+            ClassArguments = context.ClassArguments,
+            Context = context.Context
+        };
+    }
+
     /// <summary>
     /// Sets up runtime data combination generation for this test by updating the TestSessionId
     /// </summary>
diff --git a/TUnit.Engine/Helpers/ValueTaskBridge.cs b/TUnit.Engine/Helpers/ValueTaskBridge.cs
new file mode 100644
index 0000000000..ce9f796577
--- /dev/null
+++ b/TUnit.Engine/Helpers/ValueTaskBridge.cs
@@ -0,0 +1,72 @@
+using System.Diagnostics.CodeAnalysis;
+using System.Reflection;
+
+namespace TUnit.Engine.Helpers;
+
+/// <summary>
+/// Bridges <see cref="ValueTask"/> and <see cref="ValueTask{TResult}"/> into <see cref="Task"/>,
+/// avoiding the state-machine overhead of <see cref="ValueTask.AsTask"/> when the
+/// <see cref="ValueTask"/> already completed synchronously. Invoked from dynamic test Expression
+/// trees built in <c>TestRegistry</c> so that the common sync-completion path returns
+/// <see cref="Task.CompletedTask"/> (non-generic) or <c>Task.FromResult</c> (generic) directly.
+/// Note: <see cref="Task.FromResult{TResult}"/> only caches <c>bool</c>/<c>null</c>; other types
+/// still allocate a fresh <see cref="Task{TResult}"/>, but that cost is smaller than the
+/// <see cref="ValueTask.AsTask"/> state-machine path.
+/// </summary>
+internal static class ValueTaskBridge
+{
+    public static Task ToTask(ValueTask valueTask)
+    {
+        if (valueTask.IsCompletedSuccessfully)
+        {
+            return Task.CompletedTask;
+        }
+
+        return valueTask.AsTask();
+    }
+
+    public static Task<T> ToTask<T>(ValueTask<T> valueTask)
+    {
+        if (valueTask.IsCompletedSuccessfully)
+        {
+            return Task.FromResult(valueTask.Result);
+        }
+
+        return valueTask.AsTask();
+    }
+
+    /// <summary>Pre-resolved <see cref="MethodInfo"/> for the non-generic <see cref="ToTask(ValueTask)"/>.</summary>
+    internal static readonly MethodInfo ToTaskNonGenericMethod =
+        typeof(ValueTaskBridge).GetMethod(nameof(ToTask), [typeof(ValueTask)])!;
+
+    /// <summary>
+    /// Pre-resolved generic method definition for <see cref="ToTask{T}(ValueTask{T})"/>.
+    /// Callers invoke <see cref="MethodInfo.MakeGenericMethod"/> on this instance per element type.
+    /// On .NET 8+ uses the typed <see cref="Type.GetMethod(string, int, BindingFlags, Binder?, Type[], ParameterModifier[]?)"/>
+    /// overload so a future <c>ToTask</c> overload cannot silently match; on netstandard2.0
+    /// (which lacks that overload and <see cref="Type.MakeGenericMethodParameter(int)"/>)
+    /// falls back to a name-scan that uses <see cref="Enumerable.Single{TSource}(IEnumerable{TSource}, Func{TSource, bool})"/>
+    /// so an accidental duplicate match throws instead of silently picking one.
+    /// </summary>
+    internal static readonly MethodInfo ToTaskGenericMethodDefinition = ResolveToTaskGenericMethodDefinition();
+
+#if NET8_0_OR_GREATER
+    [UnconditionalSuppressMessage("AOT", "IL3050",
+        Justification = "MakeGenericType is called on ValueTask<> with a generic method parameter placeholder at startup to find the MethodInfo for ToTask<T>; the shared generic-type vtable is always available, and the resolved MethodInfo is then instantiated per-element-type in the same expression tree paths that already require dynamic code (AOT paths use direct delegates).")]
+#endif
+    private static MethodInfo ResolveToTaskGenericMethodDefinition()
+    {
+#if NET8_0_OR_GREATER
+        return typeof(ValueTaskBridge).GetMethod(
+            name: nameof(ToTask),
+            genericParameterCount: 1,
+            bindingAttr: BindingFlags.Public | BindingFlags.Static,
+            binder: null,
+            types: [typeof(ValueTask<>).MakeGenericType(Type.MakeGenericMethodParameter(0))],
+            modifiers: null)!;
+#else
+        return typeof(ValueTaskBridge).GetMethods(BindingFlags.Public | BindingFlags.Static)
+            .Single(m => m.Name == nameof(ToTask) && m.IsGenericMethodDefinition);
+#endif
+    }
+}
diff --git a/TUnit.Engine/Services/TestExecution/TestCoordinator.cs b/TUnit.Engine/Services/TestExecution/TestCoordinator.cs
index a39f2fc516..8c74bad7a6 100644
--- a/TUnit.Engine/Services/TestExecution/TestCoordinator.cs
+++ b/TUnit.Engine/Services/TestExecution/TestCoordinator.cs
@@ -133,8 +133,12 @@ await RetryHelper.ExecuteWithRetry(test.Context,
         }
         finally
         {
-            // Flush console interceptors to ensure all buffered output is captured
-            // This is critical for output from Console.Write() without newline
+            // Flush console interceptors to ensure all buffered output is captured.
+            // This is critical for output from Console.Write() without newline. The flush
+            // is unconditional because `HasCapturedOutput` is a point-in-time check: a test
+            // that fires `Task.Run(() => Console.WriteLine(...))` without awaiting can land
+            // writes after the check, which would silently lose output. The interceptor's
+            // own FlushIfNonEmpty path is a cheap no-op when there is nothing buffered.
             try
             {
                 await Console.Out.FlushAsync().ConfigureAwait(false);
diff --git a/TUnit.Engine/Services/TestRegistry.cs b/TUnit.Engine/Services/TestRegistry.cs
index c5c63206e1..f6e3984684 100644
--- a/TUnit.Engine/Services/TestRegistry.cs
+++ b/TUnit.Engine/Services/TestRegistry.cs
@@ -165,6 +165,7 @@ public async Task<TestVariantInfo> CreateTestVariant(
     }
 
     [RequiresUnreferencedCode("Creating test variants requires reflection which is not supported in native AOT scenarios.")]
+    [RequiresDynamicCode("Creating test variants builds Expression trees and may instantiate generic helpers at runtime which is not supported in native AOT scenarios.")]
     private async Task<TestVariantInfo> CreateTestVariantInternal<[DynamicallyAccessedMembers(
         DynamicallyAccessedMemberTypes.PublicConstructors
         | DynamicallyAccessedMemberTypes.NonPublicConstructors
@@ -208,16 +209,18 @@ public async Task<TestVariantInfo> CreateTestVariant(
         }
         else if (methodInfo.ReturnType == typeof(ValueTask))
         {
-            // ValueTask.AsTask() converts to Task for proper awaiting
-            var asTaskMethod = typeof(ValueTask).GetMethod(nameof(ValueTask.AsTask))!;
-            body = Expression.Call(methodCall, asTaskMethod);
+            // Bridge through ValueTaskBridge so synchronously-completed ValueTasks avoid the
+            // Task allocation that .AsTask() would force.
+            body = Expression.Call(ValueTaskBridge.ToTaskNonGenericMethod, methodCall);
         }
         else if (methodInfo.ReturnType.IsGenericType &&
                  methodInfo.ReturnType.GetGenericTypeDefinition() == typeof(ValueTask<>))
         {
-            // ValueTask<T>.AsTask() returns Task<T>, then convert to Task
-            var asTaskMethod = methodInfo.ReturnType.GetMethod(nameof(ValueTask.AsTask))!;
-            body = Expression.Convert(Expression.Call(methodCall, asTaskMethod), typeof(Task));
+            // ValueTask<T> → Task via the generic helper. Helper returns Task.FromResult for sync
+            // completion (runtime caches common results) instead of allocating a new Task.
+            var toTaskGeneric = ValueTaskBridge.ToTaskGenericMethodDefinition
+                .MakeGenericMethod(methodInfo.ReturnType.GenericTypeArguments[0]);
+            body = Expression.Convert(Expression.Call(toTaskGeneric, methodCall), typeof(Task));
         }
         else
         {
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 e92385daa6..7cf82a3f02 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
@@ -2742,6 +2742,7 @@ namespace .
         [.(..None | ..PublicProperties | ..NonPublicProperties)]
         public required  ContainingType { get; init; }
         public required <.IDataSourceAttribute> CreateDataSource { get; init; }
+        public <object, object?>? GetProperty { get; init; }
         public required string PropertyName { get; init; }
         [.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..NonPublicConstructors | ..PublicProperties)]
         public required  PropertyType { get; init; }
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 d51c1804eb..6c1506df32 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
@@ -2742,6 +2742,7 @@ namespace .
         [.(..None | ..PublicProperties | ..NonPublicProperties)]
         public required  ContainingType { get; init; }
         public required <.IDataSourceAttribute> CreateDataSource { get; init; }
+        public <object, object?>? GetProperty { get; init; }
         public required string PropertyName { get; init; }
         [.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..NonPublicConstructors | ..PublicProperties)]
         public required  PropertyType { get; init; }
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 ee987aa6d1..0a3813cb57 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
@@ -2742,6 +2742,7 @@ namespace .
         [.(..None | ..PublicProperties | ..NonPublicProperties)]
         public required  ContainingType { get; init; }
         public required <.IDataSourceAttribute> CreateDataSource { get; init; }
+        public <object, object?>? GetProperty { get; init; }
         public required string PropertyName { get; init; }
         [.(..None | ..PublicParameterlessConstructor | ..PublicConstructors | ..NonPublicConstructors | ..PublicProperties)]
         public required  PropertyType { get; init; }
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 5d87472120..68b6a760e0 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
@@ -2665,6 +2665,7 @@ namespace .
         public PropertyInjectionMetadata() { }
         public required  ContainingType { get; init; }
         public required <.IDataSourceAttribute> CreateDataSource { get; init; }
+        public <object, object?>? GetProperty { get; init; }
         public required string PropertyName { get; init; }
         public required  PropertyType { get; init; }
         public required <object, object?> SetProperty { get; init; }