diff --git a/AdventOfCode/AOC.Test/AOC.Test.csproj b/AdventOfCode/AOC.Test/AOC.Test.csproj
new file mode 100644
index 0000000..33b6926
--- /dev/null
+++ b/AdventOfCode/AOC.Test/AOC.Test.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.3.0" />
+    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="Y2022\Data\" />
+    <Folder Include="Y2022\Tasks\" />
+  </ItemGroup>
+
+</Project>
diff --git a/AdventOfCode/AOC.Test/Usings.cs b/AdventOfCode/AOC.Test/Usings.cs
new file mode 100644
index 0000000..cefced4
--- /dev/null
+++ b/AdventOfCode/AOC.Test/Usings.cs
@@ -0,0 +1 @@
+global using NUnit.Framework;
\ No newline at end of file
diff --git a/AdventOfCode/AOC.Test/Y2022/Day01.cs b/AdventOfCode/AOC.Test/Y2022/Day01.cs
new file mode 100644
index 0000000..2687ce7
--- /dev/null
+++ b/AdventOfCode/AOC.Test/Y2022/Day01.cs
@@ -0,0 +1,16 @@
+namespace AOC.Test.Y2022
+{
+    public class Day01
+    {
+        [SetUp]
+        public void Setup()
+        {
+        }
+
+        [Test]
+        public void Test1()
+        {
+            Assert.Pass();
+        }
+    }
+}
\ No newline at end of file
diff --git a/AdventOfCode/AOC.Tests/AOC.Tests.csproj b/AdventOfCode/AOC.Tests/AOC.Tests.csproj
deleted file mode 100644
index 480587b..0000000
--- a/AdventOfCode/AOC.Tests/AOC.Tests.csproj
+++ /dev/null
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Data\" />
-  </ItemGroup>
-
-</Project>
diff --git a/AdventOfCode/AOC.Tests/Usings.cs b/AdventOfCode/AOC.Tests/Usings.cs
deleted file mode 100644
index 8c927eb..0000000
--- a/AdventOfCode/AOC.Tests/Usings.cs
+++ /dev/null
@@ -1 +0,0 @@
-global using Xunit;
\ No newline at end of file
diff --git a/AdventOfCode/AOC.Tests/Y2022/Day01.cs b/AdventOfCode/AOC.Tests/Y2022/Day01.cs
deleted file mode 100644
index b289141..0000000
--- a/AdventOfCode/AOC.Tests/Y2022/Day01.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-namespace AOC.Tests.Y2022
-{
-    public class Day01
-    {
-        [Fact]
-        public void Part1()
-        {
-
-        }
-
-        [Fact]
-        public void Part2()
-        {
-
-        }
-    }
-}
\ No newline at end of file
diff --git a/AdventOfCode/AdventOfCode.sln b/AdventOfCode/AdventOfCode.sln
index 93656ff..561427e 100644
--- a/AdventOfCode/AdventOfCode.sln
+++ b/AdventOfCode/AdventOfCode.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32922.545
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AOC.Tests", "AOC.Tests\AOC.Tests.csproj", "{A0CBFD3C-1673-4A13-B1F8-A275EE17AEB4}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AOC.Test", "AOC.Test\AOC.Test.csproj", "{707CAC4A-6193-41C9-B5D6-CFD869C9FF95}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,15 +11,15 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A0CBFD3C-1673-4A13-B1F8-A275EE17AEB4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A0CBFD3C-1673-4A13-B1F8-A275EE17AEB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A0CBFD3C-1673-4A13-B1F8-A275EE17AEB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A0CBFD3C-1673-4A13-B1F8-A275EE17AEB4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{707CAC4A-6193-41C9-B5D6-CFD869C9FF95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{707CAC4A-6193-41C9-B5D6-CFD869C9FF95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{707CAC4A-6193-41C9-B5D6-CFD869C9FF95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{707CAC4A-6193-41C9-B5D6-CFD869C9FF95}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E208FF57-9228-4724-B651-45C1FECB4E29}
+		SolutionGuid = {65F1D061-1249-4BFA-92B8-E0072972D0EF}
 	EndGlobalSection
 EndGlobal