diff --git a/.idea/.idea.TUnit/.idea/workspace.xml b/.idea/.idea.TUnit/.idea/workspace.xml
index 80e9f39bf6..3cbd41152c 100644
--- a/.idea/.idea.TUnit/.idea/workspace.xml
+++ b/.idea/.idea.TUnit/.idea/workspace.xml
@@ -47,31 +47,177 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="9a6bf16e-d41b-4aed-865b-c5d6420c857b" name="Changes" comment="" />
+    <list default="true" id="9a6bf16e-d41b-4aed-865b-c5d6420c857b" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.TUnit/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.TUnit/.idea/workspace.xml" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="REBASE" />
+  </component>
+  <component name="GitHubPullRequestSearchHistory">{
+  &quot;lastFilter&quot;: {
+    &quot;state&quot;: &quot;OPEN&quot;,
+    &quot;assignee&quot;: &quot;thomhurst&quot;
+  }
+}</component>
+  <component name="GithubProjectSettings">
+    <option name="branchProtectionPatterns">
+      <list>
+        <option value="main" />
+      </list>
+    </option>
+  </component>
+  <component name="GithubPullRequestsUISettings">{
+  &quot;selectedUrlAndAccountId&quot;: {
+    &quot;url&quot;: &quot;https://github.com/thomhurst/TUnit.git&quot;,
+    &quot;accountId&quot;: &quot;dcaa655f-110f-4e75-a194-16234e7a7ff7&quot;
+  }
+}</component>
   <component name="HighlightingSettingsPerFile">
-    <setting file="file://$USER_HOME$/AppData/Local/Temp/SourceGeneratedDocuments/0CC7810EAB1F5E3E2B7BD713/TUnit.Assertions.SourceGenerator/TUnit.Assertions.SourceGenerator.Generators.AssertionMethodGenerator/CancellationTokenAssertionExtensions.g.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/9a53c2c7156f4e7193f32fcc340ad65e6710/72/87d31d7d/Transaction.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/2854ce6d56c18d0d837d3a3ef9c4f2c7c77691fa3528c8394986ac7ce7719/StackFrameIterator.cs" root0="FORCE_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/5d96a7a86ada1efba5ead3923ad2191c35df280a4dfc916a6b33294ff83a/Transaction.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/d5561f79efcdcb327a3e980623699d6a9c240ed13dc902d741aaae1447bf852/Transaction.cs" root0="FORCE_HIGHLIGHTING" />
-    <setting file="mock://C:/git/TUnit/TUnit.Engine/Services/TestExecution/TestCoordinator.cs" root0="SKIP_HIGHLIGHTING" />
-    <setting file="mock://C:/git/TUnit/TUnit.TestProject/Bugs/3219/ClassDataSourceRetryTests.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/git/TUnit/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/git/TUnit/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/git/TUnit/TUnit.Core/Attributes/TestData/ArgumentsAttribute.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/git/TUnit/TUnit.Engine/Building/TestBuilder.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/git/TUnit/TUnit.Engine/Building/TestBuilder.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/git/TUnit/TUnit.TestProject/DecimalArgumentTests.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/git/TUnit/TUnit.TestProject/DecimalArgumentTests.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock://C:/git/TUnit/TUnit.TestProject/DecimalArgumentTests.cs" root0="SKIP_HIGHLIGHTING" />
     <setting file="file://$PROJECT_DIR$/TUnit.TestProject/TransactionTest.cs" root0="FORCE_HIGHLIGHTING" />
   </component>
   <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="false" />
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;
-  }
+  <component name="ProjectColorInfo">{
+  &quot;customColor&quot;: &quot;&quot;,
+  &quot;associatedIndex&quot;: 3
 }</component>
+  <component name="ProjectId" id="33Z9did5Bpc6kHuhSvjTcOIeMT4" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "git-widget-placeholder": "#3275 on bug/2764-2",
+    "ignore.virus.scanning.warn.message": "true",
+    "node.js.detected.package.eslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "yarn",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
   <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="9a6bf16e-d41b-4aed-865b-c5d6420c857b" name="Changes" comment="" />
+      <created>1759513818191</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1759513818191</updated>
+      <workItem from="1759513819704" duration="6911000" />
+    </task>
+    <task id="LOCAL-00001" summary="Expose CurrentRetryAttempt on TestContext">
+      <option name="closed" value="true" />
+      <created>1759514002973</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1759514002973</updated>
+    </task>
+    <task id="LOCAL-00002" summary="feat: add CurrentRetryAttempt property to TestContext for enhanced retry tracking">
+      <option name="closed" value="true" />
+      <created>1759514107942</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1759514107942</updated>
+    </task>
+    <task id="LOCAL-00003" summary="fix: add decimal equality tests and enhance argument attribute handling">
+      <option name="closed" value="true" />
+      <created>1759517015671</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1759517015671</updated>
+    </task>
+    <task id="LOCAL-00004" summary="fix: skip decimal equality tests when source generation is disabled">
+      <option name="closed" value="true" />
+      <created>1759517640796</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1759517640796</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Allow skipping tests per-argument">
+      <option name="closed" value="true" />
+      <created>1759520379550</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1759520379550</updated>
+    </task>
+    <task id="LOCAL-00006" summary="fix: enhance DataSourceAttribute handling to exclude NoDataSource">
+      <option name="closed" value="true" />
+      <created>1759520604150</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1759520604150</updated>
+    </task>
+    <task id="LOCAL-00007" summary="fix: skip decimal equality tests when source generation is disabled and update project settings">
+      <option name="closed" value="true" />
+      <created>1759521214204</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1759521214204</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
   <component name="UnityCheckinConfiguration" checkUnsavedScenes="false" />
   <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="VcsManagerConfiguration">
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
+    <MESSAGE value="Expose CurrentRetryAttempt on TestContext" />
+    <MESSAGE value="feat: add CurrentRetryAttempt property to TestContext for enhanced retry tracking" />
+    <MESSAGE value="fix: add decimal equality tests and enhance argument attribute handling" />
+    <MESSAGE value="fix: skip decimal equality tests when source generation is disabled" />
+    <MESSAGE value="Allow skipping tests per-argument" />
+    <MESSAGE value="fix: enhance DataSourceAttribute handling to exclude NoDataSource" />
+    <MESSAGE value="fix: skip decimal equality tests when source generation is disabled and update project settings" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix: skip decimal equality tests when source generation is disabled and update project settings" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
+          <option name="timeStamp" value="1" />
+        </breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.Threading.Tasks.TaskCanceledException" breakIfHandledByOtherCode="false" displayValue="System.Threading.Tasks.TaskCanceledException" />
+          <option name="timeStamp" value="2" />
+        </breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
+          <option name="timeStamp" value="3" />
+        </breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
 </project>
\ No newline at end of file
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
index dafd68991a..7bee396621 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgsAsArrayTests.Test.verified.txt
@@ -15,8 +15,7 @@ internal sealed class ArgsAsArrayTests_Params_TestSource_GUID : global::TUnit.Co
             Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
             AttributeFactory = () =>
             [
-                new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3")
+                new global::TUnit.Core.TestAttribute()
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
             {
@@ -164,8 +163,7 @@ internal sealed class ArgsAsArrayTests_NonParams_TestSource_GUID : global::TUnit
             Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
             AttributeFactory = () =>
             [
-                new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3")
+                new global::TUnit.Core.TestAttribute()
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
             {
@@ -277,8 +275,7 @@ internal sealed class ArgsAsArrayTests_ParamsEnumerable_TestSource_GUID : global
             Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
             AttributeFactory = () =>
             [
-                new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3")
+                new global::TUnit.Core.TestAttribute()
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
             {
@@ -426,8 +423,7 @@ internal sealed class ArgsAsArrayTests_Enumerable_TestSource_GUID : global::TUni
             Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
             AttributeFactory = () =>
             [
-                new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("arg1", "arg2", "arg3")
+                new global::TUnit.Core.TestAttribute()
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
             {
@@ -539,8 +535,7 @@ internal sealed class ArgsAsArrayTests_Following_Non_Params_TestSource_GUID : gl
             Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
             AttributeFactory = () =>
             [
-                new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1, "arg1", "arg2", "arg3")
+                new global::TUnit.Core.TestAttribute()
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
             {
diff --git a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
index 7c34c38f6e..21f00af10f 100644
--- a/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ArgumentWithImplicitConverterTests.Test.verified.txt
@@ -16,9 +16,6 @@ internal sealed class ArgumentWithImplicitConverterTests_Explicit_TestSource_GUI
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -134,9 +131,6 @@ internal sealed class ArgumentWithImplicitConverterTests_Implicit_TestSource_GUI
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
index 5f56d0cfc9..35f44841f8 100644
--- a/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/AsyncMethodDataSourceDrivenTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class AsyncMethodDataSourceDrivenTests_AsyncMethodDataSource_Sin
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -149,7 +148,6 @@ internal sealed class AsyncMethodDataSourceDrivenTests_AsyncMethodDataSource_Tup
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithTuples"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -289,7 +287,6 @@ internal sealed class AsyncMethodDataSourceDrivenTests_AsyncMethodDataSource_Enu
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncEnumerableDataMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -422,7 +419,6 @@ internal sealed class AsyncMethodDataSourceDrivenTests_AsyncMethodDataSource_Fun
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncFuncDataMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -555,8 +551,6 @@ internal sealed class AsyncMethodDataSourceDrivenTests_AsyncMethodDataSource_Wit
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("AsyncDataMethodWithArgs")
-{Arguments = new object[]{5},},
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -689,7 +683,6 @@ internal sealed class AsyncMethodDataSourceDrivenTests_AsyncMethodDataSource_Ext
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.AsyncExternalDataSource), "GetData"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -822,7 +815,6 @@ internal sealed class AsyncMethodDataSourceDrivenTests_ValueTaskMethodDataSource
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("ValueTaskDataMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
index 1c762b648f..ed3be73b16 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassAndMethodArgumentsTests.Test.verified.txt
@@ -118,8 +118,6 @@ internal sealed class ClassAndMethodArgumentsTests_WithMethodLevel_TestSource_GU
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("3"),
-                new global::TUnit.Core.ArgumentsAttribute("4"),
                 new global::TUnit.Core.ArgumentsAttribute("1"),
                 new global::TUnit.Core.ArgumentsAttribute("2")
             ],
@@ -249,8 +247,6 @@ internal sealed class ClassAndMethodArgumentsTests_IgnoreParameters_TestSource_G
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("3"),
-                new global::TUnit.Core.ArgumentsAttribute("4"),
                 new global::TUnit.Core.ArgumentsAttribute("1"),
                 new global::TUnit.Core.ArgumentsAttribute("2")
             ],
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
index 89a64e9308..71a9fe04e8 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class ClassDataSourceDrivenTests_DataSource_Class_TestSource_GUI
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -130,7 +129,6 @@ internal sealed class ClassDataSourceDrivenTests_DataSource_Class_Generic_TestSo
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Library.Models.SomeAsyncDisposableClass>(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -244,7 +242,6 @@ internal sealed class ClassDataSourceDrivenTests_IsInitialized_With_1_ClassDataS
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ClassDataSourceAttribute<InitializableClass>(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -356,7 +353,6 @@ internal sealed class ClassDataSourceDrivenTests_IsInitialized_With_2_ClassDataS
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ClassDataSourceAttribute<InitializableClass, InitializableClass>(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -475,7 +471,6 @@ internal sealed class ClassDataSourceDrivenTests_IsInitialized_With_3_ClassDataS
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ClassDataSourceAttribute<InitializableClass, InitializableClass, InitializableClass>(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -601,7 +596,6 @@ internal sealed class ClassDataSourceDrivenTests_IsInitialized_With_4_ClassDataS
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ClassDataSourceAttribute<InitializableClass, InitializableClass, InitializableClass, InitializableClass>(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -734,7 +728,6 @@ internal sealed class ClassDataSourceDrivenTests_IsInitialized_With_5_ClassDataS
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ClassDataSourceAttribute<InitializableClass, InitializableClass, InitializableClass, InitializableClass, InitializableClass>(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
index b850a9b3bc..94e899eceb 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassDataSourceDrivenTestsSharedKeyed.Test.verified.txt
@@ -16,8 +16,6 @@ internal sealed class ClassDataSourceDrivenTestsSharedKeyed_DataSource_Class_Tes
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ClassDataSourceAttribute<SomeAsyncDisposableClass>()
-{Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -132,8 +130,6 @@ internal sealed class ClassDataSourceDrivenTestsSharedKeyed_DataSource_Class_Gen
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ClassDataSourceAttribute<SomeAsyncDisposableClass>()
-{Shared = global::TUnit.Core.SharedType.Keyed,Key = "🔑",},
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
index 888f0ad98e..89dc171c3a 100644
--- a/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ClassTupleDataSourceDrivenTests.Test.verified.txt
@@ -26,8 +26,6 @@ internal sealed class ClassTupleDataSourceDrivenTests_DataSource_TupleMethod_Tes
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod"),
-                new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod"),
                 new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod")
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
index b65fd08ba1..c1003259b8 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantArgumentsTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class ConstantArgumentsTests_String1_TestSource_GUID : global::T
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("123"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -128,7 +127,6 @@ internal sealed class ConstantArgumentsTests_Int_TestSource_GUID : global::TUnit
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(123),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -240,7 +238,6 @@ internal sealed class ConstantArgumentsTests_Double_TestSource_GUID : global::TU
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1.23d),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -352,7 +349,6 @@ internal sealed class ConstantArgumentsTests_Float_TestSource_GUID : global::TUn
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1.23000002f),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -464,7 +460,6 @@ internal sealed class ConstantArgumentsTests_Long_TestSource_GUID : global::TUni
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(123L),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -576,7 +571,6 @@ internal sealed class ConstantArgumentsTests_UInt_TestSource_GUID : global::TUni
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(123U),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -688,7 +682,6 @@ internal sealed class ConstantArgumentsTests_ULong_TestSource_GUID : global::TUn
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(123UL),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
index 470c136172..ef3e725cf2 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantInBaseClassTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class ConstantInBaseClassTests_SomeTest_TestSource_GUID : global
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("Value"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
index e75ddb5b67..d41d2a0f8f 100644
--- a/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ConstantsInInterpolatedStringsTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class ConstantsInInterpolatedStringsTests_SomeTest_TestSource_GU
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute($"{"Value"}1"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
index bcab9a30f4..19c4536dd1 100644
--- a/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/CustomDisplayNameTests.Test.verified.txt
@@ -214,8 +214,6 @@ internal sealed class CustomDisplayNameTests_Test3_TestSource_GUID : global::TUn
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("foo", 1, true),
-                new global::TUnit.Core.ArgumentsAttribute("bar", 2, false),
                 new global::TUnit.Core.DisplayNameAttribute("Test with: $value1 $value2 $value3!"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
@@ -356,7 +354,6 @@ internal sealed class CustomDisplayNameTests_MethodDataSourceTest_TestSource_GUI
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("Method"),
                 new global::TUnit.Core.DisplayNameAttribute("Test using MethodDataSource"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
@@ -494,9 +491,6 @@ internal sealed class CustomDisplayNameTests_TestParameterNamePrefixBug_TestSour
             [
                 new global::TUnit.Core.TestAttribute(),
                 new global::TUnit.Core.DisplayNameAttribute("Test this($someValue, $someValueType)"),
-                new global::TUnit.Core.ArgumentsAttribute(100, "Type1"),
-                new global::TUnit.Core.ArgumentsAttribute(200, "Type2"),
-                new global::TUnit.Core.ArgumentsAttribute(300, "Type1"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -630,7 +624,6 @@ internal sealed class CustomDisplayNameTests_PasswordTest_TestSource_GUID : glob
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.TestProject.CustomDisplayNameTests.MyGenerator(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
index 72998c2175..bd6694251a 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataDrivenTests.Test.verified.txt
@@ -16,9 +16,6 @@ internal sealed class DataDrivenTests_DataSource_Method_TestSource_GUID : global
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -134,9 +131,6 @@ internal sealed class DataDrivenTests_DataSource_Method_TestSource_GUID : global
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1, "String"),
-                new global::TUnit.Core.ArgumentsAttribute(2, "String2"),
-                new global::TUnit.Core.ArgumentsAttribute(3, "String3"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -259,9 +253,6 @@ internal sealed class DataDrivenTests_EnumValue_TestSource_GUID : global::TUnit.
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.One),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.TestEnum.Two),
-                new global::TUnit.Core.ArgumentsAttribute(-1),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -377,7 +368,6 @@ internal sealed class DataDrivenTests_NullValue_TestSource_GUID : global::TUnit.
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(null),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -491,7 +481,6 @@ internal sealed class DataDrivenTests_EmptyString_TestSource_GUID : global::TUni
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(""),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -605,7 +594,6 @@ internal sealed class DataDrivenTests_NonEmptyString_TestSource_GUID : global::T
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("Foo bar!"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -719,9 +707,6 @@ internal sealed class DataDrivenTests_BooleanString_TestSource_GUID : global::TU
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -837,7 +822,6 @@ internal sealed class DataDrivenTests_Type_TestSource_GUID : global::TUnit.Core.
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(typeof(object)),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -951,7 +935,6 @@ internal sealed class DataDrivenTests_IntegerArray_TestSource_GUID : global::TUn
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(new[] { 1, 2, 3 }),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -1065,7 +1048,6 @@ internal sealed class DataDrivenTests_IntMaxValue_TestSource_GUID : global::TUni
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
index d186d12d00..f03636f42b 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceClassCombinedWithDataSourceMethodTests.Test.verified.txt
@@ -16,9 +16,6 @@ internal sealed class DataSourceClassCombinedWithDataSourceMethod_DataSourceClas
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One"),
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two"),
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Three"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "One"),
                 new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.CommonTestData), "Two"),
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
index 67e98e7342..faafce358f 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Typed.verified.txt
@@ -16,7 +16,6 @@ internal sealed class DataSourceGeneratorTests_GeneratedData_Method_TestSource_G
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int>(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
                 new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute()
@@ -162,7 +161,6 @@ internal sealed class DataSourceGeneratorTests_GeneratedData_Method2_TestSource_
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
                 new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute()
@@ -322,7 +320,6 @@ internal sealed class DataSourceGeneratorTests_GeneratedData_Method3_TestSource_
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute<int, string, bool>(),
                 new global::TUnit.TestProject.Attributes.AutoFixtureGeneratorAttribute()
diff --git a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
index f385bb3eb4..cf5c8366db 100644
--- a/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/DataSourceGeneratorTests.Untyped.verified.txt
@@ -15,7 +15,6 @@ internal sealed class AutoDataTests_Test1_TestSource_GUID : global::TUnit.Core.I
             Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
             AttributeFactory = () =>
             [
-                new global::TUnit.TestProject.Attributes.AutoDataAttribute(),
                 new global::TUnit.Core.TestAttribute()
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
index ad9794da47..4f9613f40a 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumMemberNamesTests.Test.verified.txt
@@ -16,9 +16,6 @@ internal sealed class EnumMemberNamesTests_SomeTest_TestSource_GUID : global::TU
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("A"),
-                new global::TUnit.Core.ArgumentsAttribute("B"),
-                new global::TUnit.Core.ArgumentsAttribute("C"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
index 8311bdc7d0..ae37999ebb 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableDataSourceDrivenTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class EnumerableDataSourceDrivenTests_DataSource_Method_TestSour
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -149,7 +148,6 @@ internal sealed class EnumerableDataSourceDrivenTests_DataSource_Method2_TestSou
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -282,7 +280,6 @@ internal sealed class EnumerableDataSourceDrivenTests_DataSource_WithBaseReturn_
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
index 2d06b8ce27..0884280fd2 100644
--- a/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/EnumerableTupleDataSourceDrivenTests.Test.verified.txt
@@ -16,8 +16,6 @@ internal sealed class EnumerableTupleDataSourceDrivenTests_DataSource_TupleMetho
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod"),
-                new global::TUnit.Core.MethodDataSourceAttribute("NamedTupleMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
index c79c5355f6..74085b70e9 100644
--- a/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/ExpectedArgumentTypeTests.Test.verified.txt
@@ -16,19 +16,6 @@ internal sealed class ExpectedArgumentTypeTests_TypedArguments_TestSource_GUID :
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(0d, typeof(double)),
-                new global::TUnit.Core.ArgumentsAttribute(0f, typeof(float)),
-                new global::TUnit.Core.ArgumentsAttribute((sbyte)0, typeof(sbyte)),
-                new global::TUnit.Core.ArgumentsAttribute((byte)0, typeof(byte)),
-                new global::TUnit.Core.ArgumentsAttribute((short)0, typeof(short)),
-                new global::TUnit.Core.ArgumentsAttribute((ushort)0, typeof(ushort)),
-                new global::TUnit.Core.ArgumentsAttribute(0, typeof(int)),
-                new global::TUnit.Core.ArgumentsAttribute((uint)0, typeof(uint)),
-                new global::TUnit.Core.ArgumentsAttribute(0u, typeof(uint)),
-                new global::TUnit.Core.ArgumentsAttribute((long)0, typeof(long)),
-                new global::TUnit.Core.ArgumentsAttribute(0L, typeof(long)),
-                new global::TUnit.Core.ArgumentsAttribute((ulong)0, typeof(ulong)),
-                new global::TUnit.Core.ArgumentsAttribute(0UL, typeof(ulong)),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -159,14 +146,6 @@ internal sealed class ExpectedArgumentTypeTests_EnumTypes_TestSource_GUID : glob
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.ByteEnum.Default, typeof(global::TUnit.TestProject.ByteEnum), typeof(byte)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.SByteEnum.Default, typeof(global::TUnit.TestProject.SByteEnum), typeof(sbyte)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int16Enum.Default, typeof(global::TUnit.TestProject.Int16Enum), typeof(short)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt16Enum.Default, typeof(global::TUnit.TestProject.UInt16Enum), typeof(ushort)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int32Enum.Default, typeof(global::TUnit.TestProject.Int32Enum), typeof(int)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt32Enum.Default, typeof(global::TUnit.TestProject.UInt32Enum), typeof(uint)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.Int64Enum.Default, typeof(global::TUnit.TestProject.Int64Enum), typeof(long)),
-                new global::TUnit.Core.ArgumentsAttribute(global::TUnit.TestProject.UInt64Enum.Default, typeof(global::TUnit.TestProject.UInt64Enum), typeof(ulong)),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
index 7fd4323872..464767efce 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritedTestsFromDifferentProjectTests.Test.verified.txt
@@ -105,7 +105,6 @@ internal sealed class InheritedTestsFromDifferentProjectTests_GenericMethodDataS
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute<global::TUnit.TestProject.TestData>("Foo"),
                 new global::TUnit.TestProject.Attributes.EngineTest(Pass),
                 new global::TUnit.Core.InheritsTestsAttribute(),
                 new global::TUnit.Core.CategoryAttribute("BaseCategoriesOnClass")
@@ -221,7 +220,6 @@ internal sealed class InheritedTestsFromDifferentProjectTests_NonGenericMethodDa
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.TestData), "Foo"),
                 new global::TUnit.TestProject.Attributes.EngineTest(Pass),
                 new global::TUnit.Core.InheritsTestsAttribute(),
                 new global::TUnit.Core.CategoryAttribute("BaseCategoriesOnClass")
@@ -705,7 +703,6 @@ internal sealed class InheritedTestsFromDifferentProjectTests_GenericMethodDataS
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute<global::TUnit.TestProject.TestData>("Foo"),
                 new global::TUnit.TestProject.Attributes.EngineTest(Pass),
                 new global::TUnit.Core.InheritsTestsAttribute(),
                 new global::TUnit.Core.CategoryAttribute("BaseCategoriesOnClass")
@@ -821,7 +818,6 @@ internal sealed class InheritedTestsFromDifferentProjectTests_NonGenericMethodDa
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute(typeof(global::TUnit.TestProject.TestData), "Foo"),
                 new global::TUnit.TestProject.Attributes.EngineTest(Pass),
                 new global::TUnit.Core.InheritsTestsAttribute(),
                 new global::TUnit.Core.CategoryAttribute("BaseCategoriesOnClass")
diff --git a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
index f8eb279c21..8e30925753 100644
--- a/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/InheritsTestsTests.Test.verified.txt
@@ -20,9 +20,6 @@ internal sealed class BaseClass_Test_TestSource_GUID : global::TUnit.Core.Interf
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
                 new global::TUnit.Core.RepeatAttribute(10),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
@@ -183,9 +180,6 @@ internal sealed class Tests_Test_TestSource_GUID : global::TUnit.Core.Interfaces
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
                 new global::TUnit.Core.RepeatAttribute(10),
                 new global::TUnit.Core.InheritsTestsAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
@@ -334,9 +328,6 @@ internal sealed class Tests2_Test_TestSource_GUID : global::TUnit.Core.Interface
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
                 new global::TUnit.Core.RepeatAttribute(10),
                 new global::TUnit.Core.InheritsTestsAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
@@ -485,9 +476,6 @@ internal sealed class Tests3_Test_TestSource_GUID : global::TUnit.Core.Interface
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
-                new global::TUnit.Core.ArgumentsAttribute(2),
-                new global::TUnit.Core.ArgumentsAttribute(3),
                 new global::TUnit.Core.RepeatAttribute(10),
                 new global::TUnit.Core.InheritsTestsAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
diff --git a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
index 1d219f9047..2d9962b5a1 100644
--- a/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MatrixTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class MatrixTests_MatrixTest_One_TestSource_GUID : global::TUnit
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -142,7 +141,6 @@ internal sealed class MatrixTests_MatrixTest_Two_TestSource_GUID : global::TUnit
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -275,7 +273,6 @@ internal sealed class MatrixTests_MatrixTest_Enum_TestSource_GUID : global::TUni
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -401,7 +398,6 @@ internal sealed class MatrixTests_AutoGenerateBools_TestSource_GUID : global::TU
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -520,7 +516,6 @@ internal sealed class MatrixTests_AutoGenerateBools2_TestSource_GUID : global::T
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -639,7 +634,6 @@ internal sealed class MatrixTests_ImplicitConversion_TestSource_GUID : global::T
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -758,7 +752,6 @@ internal sealed class MatrixTests_ExcludingAutoGeneratedMatrixValues_TestSource_
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -877,7 +870,6 @@ internal sealed class MatrixTests_Method1_TestSource_GUID : global::TUnit.Core.I
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -989,7 +981,6 @@ internal sealed class MatrixTests_Method2_TestSource_GUID : global::TUnit.Core.I
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -1101,7 +1092,6 @@ internal sealed class MatrixTests_Method3_TestSource_GUID : global::TUnit.Core.I
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -1213,7 +1203,6 @@ internal sealed class MatrixTests_Method4_TestSource_GUID : global::TUnit.Core.I
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -1325,7 +1314,6 @@ internal sealed class MatrixTests_Exclusion_TestSource_GUID : global::TUnit.Core
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.Core.MatrixExclusionAttribute(1, 1),
                 new global::TUnit.Core.MatrixExclusionAttribute(2, 2),
                 new global::TUnit.Core.MatrixExclusionAttribute(3, 3),
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
index e0a2af45d6..0a2f909478 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class MethodDataSourceDrivenTests_DataSource_Method_TestSource_G
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -141,7 +140,6 @@ internal sealed class MethodDataSourceDrivenTests_DataSource_Method2_TestSource_
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -266,7 +264,6 @@ internal sealed class MethodDataSourceDrivenTests_DataSource_Method_WithAction_T
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeAction"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -391,10 +388,6 @@ internal sealed class MethodDataSourceDrivenTests_DataSource_Method3_TestSource_
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-{Arguments = new object[]{5},},
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-{Arguments = new object[] { 5 },},
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -534,14 +527,6 @@ internal sealed class MethodDataSourceDrivenTests_DataSource_Method4_TestSource_
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-{Arguments = new object[]{"Hello World!",5,true},},
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-{Arguments = new object[] { "Hello World!", 6, true },},
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-{Arguments = new object[]{"Hello World!",7,true},},
-                new global::TUnit.Core.MethodDataSourceAttribute("SomeMethod")
-{Arguments = new object[] { "Hello World!", 8, true },},
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -708,7 +693,6 @@ internal sealed class MethodDataSourceDrivenTests_DataSource_WithBaseReturn_Test
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("MethodWithBaseReturn"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -833,7 +817,6 @@ internal sealed class MethodDataSourceDrivenTests_EnumerableFuncArrayTest_TestSo
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncArrayTestData"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
index 9f7c5ed9c2..89d8a5cbd9 100644
--- a/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/MethodDataSourceDrivenWithCancellationTokenTests.Test.verified.txt
@@ -16,12 +16,6 @@ internal sealed class MethodDataSourceDrivenWithCancellationTokenTests_MyTest_Te
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("T"),
-                new global::TUnit.Core.MethodDataSourceAttribute("FuncT"),
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableT"),
-                new global::TUnit.Core.MethodDataSourceAttribute("EnumerableFuncT"),
-                new global::TUnit.Core.MethodDataSourceAttribute("ArrayT"),
-                new global::TUnit.Core.MethodDataSourceAttribute("ArrayFuncT"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute("Usage", "TUnit0046:Return a `Func<T>` rather than a `<T>`")
             ],
diff --git a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
index b9f086e558..9e6c152647 100644
--- a/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NameOfArgumentTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class NameOfArgumentTests_TestName_TestSource_GUID : global::TUn
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("TestName"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
index 0d26317868..9378d83854 100644
--- a/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NullableByteArgumentTests.Test.verified.txt
@@ -16,8 +16,6 @@ internal sealed class NullableByteArgumentTests_Test_TestSource_GUID : global::T
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute((byte) 1),
-                new global::TUnit.Core.ArgumentsAttribute(null),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -132,8 +130,6 @@ internal sealed class NullableByteArgumentTests_Test2_TestSource_GUID : global::
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute((byte) 1, (byte) 1),
-                new global::TUnit.Core.ArgumentsAttribute((byte) 1, null),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
index 14507d190b..d0e118c78a 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class NumberArgumentTests_Int_TestSource_GUID : global::TUnit.Co
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -130,7 +129,6 @@ internal sealed class NumberArgumentTests_Double_TestSource_GUID : global::TUnit
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1.1),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -244,7 +242,6 @@ internal sealed class NumberArgumentTests_Float_TestSource_GUID : global::TUnit.
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1.1f),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -358,7 +355,6 @@ internal sealed class NumberArgumentTests_Long_TestSource_GUID : global::TUnit.C
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1L),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -472,7 +468,6 @@ internal sealed class NumberArgumentTests_ULong_TestSource_GUID : global::TUnit.
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1UL),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -586,7 +581,6 @@ internal sealed class NumberArgumentTests_UInt_TestSource_GUID : global::TUnit.C
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1U),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
index 14507d190b..d0e118c78a 100644
--- a/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/NumberArgumentTests.TestDE.verified.txt
@@ -16,7 +16,6 @@ internal sealed class NumberArgumentTests_Int_TestSource_GUID : global::TUnit.Co
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -130,7 +129,6 @@ internal sealed class NumberArgumentTests_Double_TestSource_GUID : global::TUnit
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1.1),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -244,7 +242,6 @@ internal sealed class NumberArgumentTests_Float_TestSource_GUID : global::TUnit.
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1.1f),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -358,7 +355,6 @@ internal sealed class NumberArgumentTests_Long_TestSource_GUID : global::TUnit.C
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1L),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -472,7 +468,6 @@ internal sealed class NumberArgumentTests_ULong_TestSource_GUID : global::TUnit.
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1UL),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -586,7 +581,6 @@ internal sealed class NumberArgumentTests_UInt_TestSource_GUID : global::TUnit.C
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1U),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
index c7e94f8b6f..b2ec37bb85 100644
--- a/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/StringArgumentTests.Test.verified.txt
@@ -16,18 +16,6 @@ internal sealed class StringArgumentTests_Normal_TestSource_GUID : global::TUnit
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(@"\"),
-                new global::TUnit.Core.ArgumentsAttribute(@"\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute(        """
-        Hello
-        World
-        """
-),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -152,14 +140,6 @@ internal sealed class StringArgumentTests_Nullable_TestSource_GUID : global::TUn
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(@"\"),
-                new global::TUnit.Core.ArgumentsAttribute(@"\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute("\\\\t"),
-                new global::TUnit.Core.ArgumentsAttribute(null),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
index 469f153f46..38860630b1 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests.Test.verified.txt
@@ -16,11 +16,6 @@ internal sealed class Tests_TryParse_InvalidString_ReturnsFailure_TestSource_GUI
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
-                new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(" "),
-                new global::TUnit.Core.ArgumentsAttribute(null),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -145,11 +140,6 @@ internal sealed class Tests_Parse_InvalidString_ThrowsException_TestSource_GUID
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("\"2c48c152-7cb7-4f51-8f01-704454f36e60\""),
-                new global::TUnit.Core.ArgumentsAttribute("invalidNotAGui"),
-                new global::TUnit.Core.ArgumentsAttribute(""),
-                new global::TUnit.Core.ArgumentsAttribute(" "),
-                new global::TUnit.Core.ArgumentsAttribute(null),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -265,8 +255,6 @@ internal sealed class Tests_TryParse_ValidString_ReturnsAccountId_TestSource_GUI
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute("2c48c152-7cb7-4f51-8f01-704454f36e60"),
-                new global::TUnit.Core.ArgumentsAttribute("00000000-0000-0000-0000-000000000000"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
index 0dec4e8656..3783d4bb34 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1538.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class Tests_Eight_Args_TestSource_GUID : global::TUnit.Core.Inte
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("EightItems"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -200,7 +199,6 @@ internal sealed class Tests_SixteenArgs_TestSource_GUID : global::TUnit.Core.Int
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("SixteenItems"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
index fbe83f4b20..14ed292e06 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1603.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class Tests_Casted_Integer_To_Short_Converts_TestSource_GUID : g
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute((short) -123),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -128,7 +127,6 @@ internal sealed class Tests_Integer_To_Short_Converts_TestSource_GUID : global::
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(-123),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
index a6b96c2f2a..8e90c3aaec 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1692.Test.verified.txt
@@ -16,8 +16,6 @@ internal sealed class Tests_NullTest_TestSource_GUID : global::TUnit.Core.Interf
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(null),
-                new global::TUnit.Core.ArgumentsAttribute(null),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
index cb204a3bdd..cc648fd9b3 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1821.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class Tests_MethodDataSource_TestSource_GUID : global::TUnit.Cor
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.InstanceMethodDataSourceAttribute("DataSource"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>()
             ],
@@ -144,7 +143,6 @@ internal sealed class Tests_MatrixDataSource_TestSource_GUID : global::TUnit.Cor
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.ClassDataSourceAttribute<global::TUnit.TestProject.Bugs._1821.MyData>()
             ],
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.DotNet8_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.DotNet8_0.verified.txt
index 8ec4749fbf..b0bd08ba83 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.DotNet8_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.DotNet8_0.verified.txt
@@ -104,7 +104,6 @@ internal sealed class DerivedTest_Test2_TestSource_GUID : global::TUnit.Core.Int
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.InheritsTestsAttribute()
             ],
@@ -219,8 +218,6 @@ internal sealed class DerivedTest_Test3_TestSource_GUID : global::TUnit.Core.Int
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.InheritsTestsAttribute()
             ],
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.DotNet9_0.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.DotNet9_0.verified.txt
index 8ec4749fbf..b0bd08ba83 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.DotNet9_0.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.DotNet9_0.verified.txt
@@ -104,7 +104,6 @@ internal sealed class DerivedTest_Test2_TestSource_GUID : global::TUnit.Core.Int
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.InheritsTestsAttribute()
             ],
@@ -219,8 +218,6 @@ internal sealed class DerivedTest_Test3_TestSource_GUID : global::TUnit.Core.Int
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.InheritsTestsAttribute()
             ],
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.Net4_7.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.Net4_7.verified.txt
index 3675e2a7e4..98f643b6e5 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.Net4_7.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests1889.Test.Net4_7.verified.txt
@@ -104,7 +104,6 @@ internal sealed class DerivedTest_Test2_TestSource_GUID : global::TUnit.Core.Int
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.InheritsTestsAttribute()
             ],
@@ -219,8 +218,6 @@ internal sealed class DerivedTest_Test3_TestSource_GUID : global::TUnit.Core.Int
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(false),
-                new global::TUnit.Core.ArgumentsAttribute(true),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass),
                 new global::TUnit.Core.InheritsTestsAttribute()
             ],
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
index fb37dd48b4..367b570fff 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2083.Test.verified.txt
@@ -16,12 +16,6 @@ internal sealed class Tests_MyTest_TestSource_GUID : global::TUnit.Core.Interfac
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(0),
-                new global::TUnit.Core.ArgumentsAttribute((byte)255),
-                new global::TUnit.Core.ArgumentsAttribute((short)32767),
-                new global::TUnit.Core.ArgumentsAttribute('\uffff'),
-                new global::TUnit.Core.ArgumentsAttribute(2147483647),
-                new global::TUnit.Core.ArgumentsAttribute(9223372036854775807L),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
index efd32c836e..4945406a04 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2085.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class Tests_Double_SpecialConsts_TestSource_GUID : global::TUnit
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -128,7 +127,6 @@ internal sealed class Tests_Float_SpecialConsts_TestSource_GUID : global::TUnit.
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
index d13078efaa..c863aae48f 100644
--- a/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/Tests2112.Test.verified.txt
@@ -16,8 +16,6 @@ internal sealed class Tests_Test_TestSource_GUID : global::TUnit.Core.Interfaces
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L),
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
@@ -175,8 +173,6 @@ internal sealed class Tests_Test2_TestSource_GUID : global::TUnit.Core.Interface
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
-                new global::TUnit.Core.ArgumentsAttribute(0, 1L, 2L, 3L),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
index 256426fce0..35aab20568 100644
--- a/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TimeoutCancellationTokenTests.Test.verified.txt
@@ -418,7 +418,6 @@ internal sealed class TimeoutCancellationTokenTests_DataTest_TestSource_GUID : g
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1),
                 new global::TUnit.Core.TimeoutAttribute(5_000),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Failure),
                 new global::TUnit.Core.MethodDataSourceAttribute("DataSource"),
@@ -577,7 +576,6 @@ internal sealed class TimeoutCancellationTokenTests_DataSourceTest_TestSource_GU
             Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
             AttributeFactory = () =>
             [
-                new global::TUnit.Core.MethodDataSourceAttribute("DataSource"),
                 new global::TUnit.Core.TimeoutAttribute(5_000),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Failure),
                 new global::TUnit.Core.TestAttribute(),
@@ -759,7 +757,6 @@ internal sealed class TimeoutCancellationTokenTests_MatrixTest_TestSource_GUID :
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MatrixDataSourceAttribute(),
                 new global::TUnit.Core.TimeoutAttribute(5_000),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Failure),
                 new global::TUnit.Core.CategoryAttribute("Blah"),
diff --git a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
index 34a2d34b28..5d7f6925e1 100644
--- a/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/TupleDataSourceDrivenTests.Test.verified.txt
@@ -16,7 +16,6 @@ internal sealed class TupleDataSourceDrivenTests_DataSource_TupleMethod_TestSour
             AttributeFactory = () =>
             [
                 new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.MethodDataSourceAttribute("TupleMethod"),
                 new global::TUnit.TestProject.Attributes.EngineTest(global::TUnit.TestProject.Attributes.ExpectedResult.Pass)
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
diff --git a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
index a056ee3ff7..19c576e293 100644
--- a/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
+++ b/TUnit.Core.SourceGenerator.Tests/UnifiedReflectionFreeTests.Test_AotSafeDataSourceFactories.verified.txt
@@ -15,9 +15,7 @@ internal sealed class AotDataSourceTest_TestWithDataSource_TestSource_GUID : glo
             Dependencies = global::System.Array.Empty<global::TUnit.Core.TestDependency>(),
             AttributeFactory = () =>
             [
-                new global::TUnit.Core.TestAttribute(),
-                new global::TUnit.Core.ArgumentsAttribute(1, 2, 3),
-                new global::TUnit.Core.ArgumentsAttribute(4, 5, 6)
+                new global::TUnit.Core.TestAttribute()
             ],
             DataSources = new global::TUnit.Core.IDataSourceAttribute[]
             {
diff --git a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
index 4a5b9f9415..8add641398 100644
--- a/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
+++ b/TUnit.Core.SourceGenerator/Generators/TestMetadataGenerator.cs
@@ -519,6 +519,7 @@ private static void GenerateMetadata(CodeWriter writer, Compilation compilation,
         writer.Indent();
 
         var attributes = methodSymbol.GetAttributes()
+            .Where(a => !DataSourceAttributeHelper.IsDataSourceAttribute(a.AttributeClass))
             .Concat(testMethod.TypeSymbol.GetAttributesIncludingBaseTypes())
             .Concat(testMethod.TypeSymbol.ContainingAssembly.GetAttributes())
             .ToImmutableArray();
diff --git a/TUnit.Core/Attributes/TestData/ArgumentsAttribute.cs b/TUnit.Core/Attributes/TestData/ArgumentsAttribute.cs
index 6974b8c03f..e5df57fcc5 100644
--- a/TUnit.Core/Attributes/TestData/ArgumentsAttribute.cs
+++ b/TUnit.Core/Attributes/TestData/ArgumentsAttribute.cs
@@ -1,10 +1,14 @@
+using TUnit.Core.Interfaces;
+
 namespace TUnit.Core;
 
 [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Property, AllowMultiple = true)]
-public sealed class ArgumentsAttribute : Attribute, IDataSourceAttribute
+public sealed class ArgumentsAttribute : Attribute, IDataSourceAttribute, ITestRegisteredEventReceiver
 {
     public object?[] Values { get; }
 
+    public string? Skip { get; set; }
+
     public ArgumentsAttribute(params object?[]? values)
     {
         if (values == null || values.Length == 0)
@@ -22,14 +26,42 @@ public ArgumentsAttribute(params object?[]? values)
         yield return () => Task.FromResult<object?[]?>(Values);
         await Task.CompletedTask;
     }
+
+    public ValueTask OnTestRegistered(TestRegisteredContext context)
+    {
+        if(!string.IsNullOrEmpty(Skip))
+        {
+            context.TestContext.SkipReason = Skip;
+            context.TestContext.TestDetails.ClassInstance = SkippedTestInstance.Instance;
+        }
+
+        return default;
+    }
+
+    public int Order => 0;
 }
 
 [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Property, AllowMultiple = true)]
-public sealed class ArgumentsAttribute<T>(T value) : TypedDataSourceAttribute<T>
+public sealed class ArgumentsAttribute<T>(T value) : TypedDataSourceAttribute<T>, ITestRegisteredEventReceiver
 {
+    public string? Skip { get; set; }
+
     public override async IAsyncEnumerable<Func<Task<T>>> GetTypedDataRowsAsync(DataGeneratorMetadata dataGeneratorMetadata)
     {
         yield return () => Task.FromResult(value);
         await default(ValueTask);
     }
+
+    public ValueTask OnTestRegistered(TestRegisteredContext context)
+    {
+        if(!string.IsNullOrEmpty(Skip))
+        {
+            context.TestContext.SkipReason = Skip;
+            context.TestContext.TestDetails.ClassInstance = SkippedTestInstance.Instance;
+        }
+
+        return default;
+    }
+
+    public int Order => 0;
 }
diff --git a/TUnit.Engine/Building/TestBuilder.cs b/TUnit.Engine/Building/TestBuilder.cs
index fbab7c4baa..0ef334970b 100644
--- a/TUnit.Engine/Building/TestBuilder.cs
+++ b/TUnit.Engine/Building/TestBuilder.cs
@@ -252,7 +252,8 @@ public async Task<IEnumerable<AbstractExecutableTest>> BuildTestsFromMetadataAsy
                                 {
                                     TestMetadata = metadata.MethodMetadata,
                                     Events = new TestContextEvents(),
-                                    ObjectBag = new Dictionary<string, object?>()
+                                    ObjectBag = new Dictionary<string, object?>(),
+                                    DataSourceAttribute = methodDataSource
                                 };
 
                                 classData = DataUnwrapper.Unwrap(await classDataFactory() ?? []);
@@ -703,6 +704,11 @@ private async ValueTask<TestContext> CreateTestContextAsync(string testId, TestM
         // Use attributes from context if available, or create new ones
         var attributes = testBuilderContext.InitializedAttributes ?? await InitializeAttributesAsync(metadata.AttributeFactory.Invoke());
 
+        if (testBuilderContext.DataSourceAttribute != null && testBuilderContext.DataSourceAttribute is not NoDataSource)
+        {
+            attributes = [..attributes, (Attribute)testBuilderContext.DataSourceAttribute];
+        }
+
         var testDetails = new TestDetails
         {
             TestId = testId,
diff --git a/TUnit.Engine/Services/DataSourceInitializer.cs b/TUnit.Engine/Services/DataSourceInitializer.cs
index f8f3d459c4..59481396a4 100644
--- a/TUnit.Engine/Services/DataSourceInitializer.cs
+++ b/TUnit.Engine/Services/DataSourceInitializer.cs
@@ -1,3 +1,4 @@
+using System.Collections.Concurrent;
 using TUnit.Core;
 using TUnit.Core.Interfaces;
 using TUnit.Core.PropertyInjection;
@@ -78,7 +79,11 @@ await _propertyInjectionService.InjectPropertiesIntoObjectAsync(
                     dataSource, objectBag, methodMetadata, events);
             }
 
-            // Step 2: IAsyncInitializer
+            // Step 2: Initialize nested property-injected objects (deepest first)
+            // This ensures that when the parent's IAsyncInitializer runs, all nested objects are already initialized
+            await InitializeNestedObjectsAsync(dataSource);
+
+            // Step 3: IAsyncInitializer on the data source itself
             if (dataSource is IAsyncInitializer asyncInitializer)
             {
                 await ObjectInitializer.InitializeAsync(asyncInitializer);
@@ -91,6 +96,110 @@ await _propertyInjectionService.InjectPropertiesIntoObjectAsync(
         }
     }
 
+    /// <summary>
+    /// Initializes all nested property-injected objects in depth-first order.
+    /// This ensures that when the parent's IAsyncInitializer runs, all nested dependencies are already initialized.
+    /// </summary>
+    private async Task InitializeNestedObjectsAsync(object rootObject)
+    {
+        var objectsByDepth = new Dictionary<int, HashSet<object>>();
+        var visitedObjects = new HashSet<object>();
+
+        // Collect all nested property-injected objects grouped by depth
+        CollectNestedObjects(rootObject, objectsByDepth, visitedObjects, currentDepth: 1);
+
+        // Initialize objects deepest-first (highest depth to lowest)
+        var depths = objectsByDepth.Keys.OrderByDescending(depth => depth);
+
+        foreach (var depth in depths)
+        {
+            var objectsAtDepth = objectsByDepth[depth];
+
+            // Initialize all objects at this depth in parallel
+            await Task.WhenAll(objectsAtDepth.Select(obj => ObjectInitializer.InitializeAsync(obj).AsTask()));
+        }
+    }
+
+    /// <summary>
+    /// Recursively collects all nested property-injected objects grouped by depth.
+    /// </summary>
+    private void CollectNestedObjects(
+        object obj,
+        Dictionary<int, HashSet<object>> objectsByDepth,
+        HashSet<object> visitedObjects,
+        int currentDepth)
+    {
+        var plan = PropertyInjectionCache.GetOrCreatePlan(obj.GetType());
+
+        if (!SourceRegistrar.IsEnabled)
+        {
+            // Reflection mode
+            foreach (var prop in plan.ReflectionProperties)
+            {
+                var value = prop.Property.GetValue(obj);
+
+                if (value == null || !visitedObjects.Add(value))
+                {
+                    continue;
+                }
+
+                // Add to the current depth level if it has injectable properties or implements IAsyncInitializer
+                if (PropertyInjectionCache.HasInjectableProperties(value.GetType()) || value is IAsyncInitializer)
+                {
+                    if (!objectsByDepth.ContainsKey(currentDepth))
+                    {
+                        objectsByDepth[currentDepth] = [];
+                    }
+
+                    objectsByDepth[currentDepth].Add(value);
+                }
+
+                // Recursively collect nested objects
+                if (PropertyInjectionCache.HasInjectableProperties(value.GetType()))
+                {
+                    CollectNestedObjects(value, objectsByDepth, visitedObjects, currentDepth + 1);
+                }
+            }
+        }
+        else
+        {
+            // Source-generated mode
+            foreach (var metadata in plan.SourceGeneratedProperties)
+            {
+                var property = metadata.ContainingType.GetProperty(metadata.PropertyName);
+
+                if (property == null || !property.CanRead)
+                {
+                    continue;
+                }
+
+                var value = property.GetValue(obj);
+
+                if (value == null || !visitedObjects.Add(value))
+                {
+                    continue;
+                }
+
+                // Add to the current depth level if it has injectable properties or implements IAsyncInitializer
+                if (PropertyInjectionCache.HasInjectableProperties(value.GetType()) || value is IAsyncInitializer)
+                {
+                    if (!objectsByDepth.ContainsKey(currentDepth))
+                    {
+                        objectsByDepth[currentDepth] = [];
+                    }
+
+                    objectsByDepth[currentDepth].Add(value);
+                }
+
+                // Recursively collect nested objects
+                if (PropertyInjectionCache.HasInjectableProperties(value.GetType()))
+                {
+                    CollectNestedObjects(value, objectsByDepth, visitedObjects, currentDepth + 1);
+                }
+            }
+        }
+    }
+
     /// <summary>
     /// Clears the initialization cache. Should be called at the end of test sessions.
     /// </summary>
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 3bb6cb75a7..aa144ab0bf 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
@@ -66,19 +66,25 @@ namespace
         public override .ArgumentDisplayFormatter Formatter { get; }
     }
     [(.Class | .Method | .Property, AllowMultiple=true)]
-    public sealed class ArgumentsAttribute : , .IDataSourceAttribute
+    public sealed class ArgumentsAttribute : , .IDataSourceAttribute, ., .
     {
         public ArgumentsAttribute(params object?[]? values) { }
+        public int Order { get; }
+        public string? Skip { get; set; }
         public object?[] Values { get; }
-        [.(typeof(.ArgumentsAttribute.<GetDataRowsAsync>d__4))]
+        [.(typeof(.ArgumentsAttribute.<GetDataRowsAsync>d__8))]
         public .<<.<object?[]?>>> GetDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { }
+        public . OnTestRegistered(.TestRegisteredContext context) { }
     }
     [(.Class | .Method | .Property, AllowMultiple=true)]
-    public sealed class ArgumentsAttribute<T> : .TypedDataSourceAttribute<T>
+    public sealed class ArgumentsAttribute<T> : .TypedDataSourceAttribute<T>, ., .
     {
         public ArgumentsAttribute(T value) { }
-        [.(typeof(.ArgumentsAttribute<T>.<GetTypedDataRowsAsync>d__2))]
+        public int Order { get; }
+        public string? Skip { get; set; }
+        [.(typeof(.ArgumentsAttribute<T>.<GetTypedDataRowsAsync>d__6))]
         public override .<<.<T>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { }
+        public . OnTestRegistered(.TestRegisteredContext context) { }
     }
     public class Artifact
     {
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 d37a28ce07..4624ef4330 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
@@ -66,19 +66,25 @@ namespace
         public override .ArgumentDisplayFormatter Formatter { get; }
     }
     [(.Class | .Method | .Property, AllowMultiple=true)]
-    public sealed class ArgumentsAttribute : , .IDataSourceAttribute
+    public sealed class ArgumentsAttribute : , .IDataSourceAttribute, ., .
     {
         public ArgumentsAttribute(params object?[]? values) { }
+        public int Order { get; }
+        public string? Skip { get; set; }
         public object?[] Values { get; }
-        [.(typeof(.ArgumentsAttribute.<GetDataRowsAsync>d__4))]
+        [.(typeof(.ArgumentsAttribute.<GetDataRowsAsync>d__8))]
         public .<<.<object?[]?>>> GetDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { }
+        public . OnTestRegistered(.TestRegisteredContext context) { }
     }
     [(.Class | .Method | .Property, AllowMultiple=true)]
-    public sealed class ArgumentsAttribute<T> : .TypedDataSourceAttribute<T>
+    public sealed class ArgumentsAttribute<T> : .TypedDataSourceAttribute<T>, ., .
     {
         public ArgumentsAttribute(T value) { }
-        [.(typeof(.ArgumentsAttribute<T>.<GetTypedDataRowsAsync>d__2))]
+        public int Order { get; }
+        public string? Skip { get; set; }
+        [.(typeof(.ArgumentsAttribute<T>.<GetTypedDataRowsAsync>d__6))]
         public override .<<.<T>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { }
+        public . OnTestRegistered(.TestRegisteredContext context) { }
     }
     public class Artifact
     {
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 099ef5697e..c50d5ed77e 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
@@ -66,19 +66,25 @@ namespace
         public override .ArgumentDisplayFormatter Formatter { get; }
     }
     [(.Class | .Method | .Property, AllowMultiple=true)]
-    public sealed class ArgumentsAttribute : , .IDataSourceAttribute
+    public sealed class ArgumentsAttribute : , .IDataSourceAttribute, ., .
     {
         public ArgumentsAttribute(params object?[]? values) { }
+        public int Order { get; }
+        public string? Skip { get; set; }
         public object?[] Values { get; }
-        [.(typeof(.ArgumentsAttribute.<GetDataRowsAsync>d__4))]
+        [.(typeof(.ArgumentsAttribute.<GetDataRowsAsync>d__8))]
         public .<<.<object?[]?>>> GetDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { }
+        public . OnTestRegistered(.TestRegisteredContext context) { }
     }
     [(.Class | .Method | .Property, AllowMultiple=true)]
-    public sealed class ArgumentsAttribute<T> : .TypedDataSourceAttribute<T>
+    public sealed class ArgumentsAttribute<T> : .TypedDataSourceAttribute<T>, ., .
     {
         public ArgumentsAttribute(T value) { }
-        [.(typeof(.ArgumentsAttribute<T>.<GetTypedDataRowsAsync>d__2))]
+        public int Order { get; }
+        public string? Skip { get; set; }
+        [.(typeof(.ArgumentsAttribute<T>.<GetTypedDataRowsAsync>d__6))]
         public override .<<.<T>>> GetTypedDataRowsAsync(.DataGeneratorMetadata dataGeneratorMetadata) { }
+        public . OnTestRegistered(.TestRegisteredContext context) { }
     }
     public class Artifact
     {
diff --git a/TUnit.TestProject/SkippableArgumentTests.cs b/TUnit.TestProject/SkippableArgumentTests.cs
new file mode 100644
index 0000000000..45c10825cc
--- /dev/null
+++ b/TUnit.TestProject/SkippableArgumentTests.cs
@@ -0,0 +1,16 @@
+using TUnit.TestProject.Attributes;
+
+namespace TUnit.TestProject;
+
+[EngineTest(ExpectedResult.Pass)]
+public class SkippableArgumentTests
+{
+    [Test]
+    [Arguments(1)]
+    [Arguments(2, Skip = "Skipping value 2")]
+    [Arguments(3)]
+    public async Task Test1(int value)
+    {
+        await Assert.That(value).IsEqualTo(1).Or.IsEqualTo(3);
+    }
+}