diff --git a/Sustainsys.Saml2.sln b/Sustainsys.Saml2.sln
index 323fc573b..1f88eb199 100644
--- a/Sustainsys.Saml2.sln
+++ b/Sustainsys.Saml2.sln
@@ -5,8 +5,6 @@ VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{92934DC3-A1E1-48D0-BBBF-8499A94EB9DC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sustainsys.Saml2.Tests.Helpers", "src\Tests\Sustainsys.Saml2.Tests.Helpers\Sustainsys.Saml2.Tests.Helpers.csproj", "{073997A4-7572-4C62-9C53-8DD17A62888D}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docs", "docs\Docs.csproj", "{4C2AFA12-245B-4ACD-AB92-60EA2317C485}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{67939779-582A-4972-9393-280BB0A6678B}"
@@ -30,10 +28,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{073997A4-7572-4C62-9C53-8DD17A62888D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{073997A4-7572-4C62-9C53-8DD17A62888D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{073997A4-7572-4C62-9C53-8DD17A62888D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{073997A4-7572-4C62-9C53-8DD17A62888D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4C2AFA12-245B-4ACD-AB92-60EA2317C485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4C2AFA12-245B-4ACD-AB92-60EA2317C485}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4C2AFA12-245B-4ACD-AB92-60EA2317C485}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -55,7 +49,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{073997A4-7572-4C62-9C53-8DD17A62888D} = {92934DC3-A1E1-48D0-BBBF-8499A94EB9DC}
 		{A03937C8-9CBA-4B60-8116-4EFF2531DF0A} = {92934DC3-A1E1-48D0-BBBF-8499A94EB9DC}
 		{F4B928E9-9E1D-4760-BA36-91BA46C2AA33} = {92934DC3-A1E1-48D0-BBBF-8499A94EB9DC}
 	EndGlobalSection
diff --git a/src/Tests/Sustainsys.Saml2.Tests.Helpers/Sustainsys.Saml2.Tests.Helpers.csproj b/src/Tests/Sustainsys.Saml2.Tests.Helpers/Sustainsys.Saml2.Tests.Helpers.csproj
index 9ffea2e9d..2f8c5a18f 100644
--- a/src/Tests/Sustainsys.Saml2.Tests.Helpers/Sustainsys.Saml2.Tests.Helpers.csproj
+++ b/src/Tests/Sustainsys.Saml2.Tests.Helpers/Sustainsys.Saml2.Tests.Helpers.csproj
@@ -20,13 +20,4 @@
 	  <ProjectReference Include="..\..\Sustainsys.Saml2\Sustainsys.Saml2.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<None Update="Sustainsys.Saml2.Tests.pfx">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-		<None Update="Sustainsys.Saml2.Tests2.pfx">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</None>
-	</ItemGroup>
-
 </Project>
diff --git a/src/Tests/Sustainsys.Saml2.Tests.Helpers/ExceptionAssertionsExtensions.cs b/src/Tests/Sustainsys.Saml2.Tests/Helpers/ExceptionAssertionsExtensions.cs
similarity index 100%
rename from src/Tests/Sustainsys.Saml2.Tests.Helpers/ExceptionAssertionsExtensions.cs
rename to src/Tests/Sustainsys.Saml2.Tests/Helpers/ExceptionAssertionsExtensions.cs
diff --git a/src/Tests/Sustainsys.Saml2.Tests.Helpers/TestData.cs b/src/Tests/Sustainsys.Saml2.Tests/Helpers/TestData.cs
similarity index 100%
rename from src/Tests/Sustainsys.Saml2.Tests.Helpers/TestData.cs
rename to src/Tests/Sustainsys.Saml2.Tests/Helpers/TestData.cs
diff --git a/src/Tests/Sustainsys.Saml2.Tests.Helpers/XmlExtensions.cs b/src/Tests/Sustainsys.Saml2.Tests/Helpers/XmlExtensions.cs
similarity index 100%
rename from src/Tests/Sustainsys.Saml2.Tests.Helpers/XmlExtensions.cs
rename to src/Tests/Sustainsys.Saml2.Tests/Helpers/XmlExtensions.cs
diff --git a/src/Tests/Sustainsys.Saml2.Tests/NameIdTests.cs b/src/Tests/Sustainsys.Saml2.Tests/Saml/NameIdTests.cs
similarity index 97%
rename from src/Tests/Sustainsys.Saml2.Tests/NameIdTests.cs
rename to src/Tests/Sustainsys.Saml2.Tests/Saml/NameIdTests.cs
index ef5578af0..b122c26f1 100644
--- a/src/Tests/Sustainsys.Saml2.Tests/NameIdTests.cs
+++ b/src/Tests/Sustainsys.Saml2.Tests/Saml/NameIdTests.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Sustainsys.Saml2.Tests;
+namespace Sustainsys.Saml2.Tests.Saml;
 public class NameIdTests
 {
     private const string Value = "https://idp.example.com";
diff --git a/src/Tests/Sustainsys.Saml2.Tests/Sustainsys.Saml2.Tests.csproj b/src/Tests/Sustainsys.Saml2.Tests/Sustainsys.Saml2.Tests.csproj
index 962ad4869..9a1bc3a2d 100644
--- a/src/Tests/Sustainsys.Saml2.Tests/Sustainsys.Saml2.Tests.csproj
+++ b/src/Tests/Sustainsys.Saml2.Tests/Sustainsys.Saml2.Tests.csproj
@@ -29,8 +29,8 @@
 
 	<ItemGroup>
 		<ProjectReference Include="..\..\Sustainsys.Saml2\Sustainsys.Saml2.csproj" />
-		<ProjectReference Include="..\Sustainsys.Saml2.Tests.Helpers\Sustainsys.Saml2.Tests.Helpers.csproj" />
-		<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.1.0"/>
+		<PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="8.1.0" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -41,6 +41,12 @@
 		<None Update="stubidp.sustainsys.com.cer">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
+		<None Update="Sustainsys.Saml2.Tests.pfx">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
+		<None Update="Sustainsys.Saml2.Tests2.pfx">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 	</ItemGroup>
 
 </Project>
diff --git a/src/Tests/Sustainsys.Saml2.Tests.Helpers/Sustainsys.Saml2.Tests.pfx b/src/Tests/Sustainsys.Saml2.Tests/Sustainsys.Saml2.Tests.pfx
similarity index 100%
rename from src/Tests/Sustainsys.Saml2.Tests.Helpers/Sustainsys.Saml2.Tests.pfx
rename to src/Tests/Sustainsys.Saml2.Tests/Sustainsys.Saml2.Tests.pfx
diff --git a/src/Tests/Sustainsys.Saml2.Tests.Helpers/Sustainsys.Saml2.Tests2.pfx b/src/Tests/Sustainsys.Saml2.Tests/Sustainsys.Saml2.Tests2.pfx
similarity index 100%
rename from src/Tests/Sustainsys.Saml2.Tests.Helpers/Sustainsys.Saml2.Tests2.pfx
rename to src/Tests/Sustainsys.Saml2.Tests/Sustainsys.Saml2.Tests2.pfx