diff --git a/Directory.Packages.props b/Directory.Packages.props
index c9da2489..289705ee 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -74,6 +74,8 @@
     <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="xunit.v3" Version="3.2.2" />
-    <PackageVersion Include="YamlDotNet" Version="18.0.0" />
+    <PackageVersion Include="xunit.v3.common" Version="3.2.2" />
+    <PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
+   <PackageVersion Include="YamlDotNet" Version="18.0.0" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/yavscTests/NonRegression/PostItViewModelTests.cs b/src/PostIt.Tests/PostItViewModelTests.cs
similarity index 98%
rename from test/yavscTests/NonRegression/PostItViewModelTests.cs
rename to src/PostIt.Tests/PostItViewModelTests.cs
index f64ab00b..a5632ef7 100644
--- a/test/yavscTests/NonRegression/PostItViewModelTests.cs
+++ b/src/PostIt.Tests/PostItViewModelTests.cs
@@ -11,7 +11,7 @@ using PostIt.Services;
 using PostIt.ViewModels;
 using Xunit;
 
-namespace Yavsc.Tests.NonRegression;
+namespace PostIt;
 
 public class PostItViewModelTests
 {
diff --git a/test/yavscTests/DumpHtml.cs b/src/Yavsc.Org.Tests/DumpHtml.cs
similarity index 100%
rename from test/yavscTests/DumpHtml.cs
rename to src/Yavsc.Org.Tests/DumpHtml.cs
diff --git a/test/yavscTests/FirstUIStript.cs b/src/Yavsc.Org.Tests/FirstUIStript.cs
similarity index 98%
rename from test/yavscTests/FirstUIStript.cs
rename to src/Yavsc.Org.Tests/FirstUIStript.cs
index c3b26da1..9163791c 100644
--- a/test/yavscTests/FirstUIStript.cs
+++ b/src/Yavsc.Org.Tests/FirstUIStript.cs
@@ -2,7 +2,6 @@
 using OpenQA.Selenium;
 using OpenQA.Selenium.Chrome;
 using OpenQA.Selenium.Firefox;
-using Xunit.Abstractions;
 
 namespace yavscTests.ServerFixtures;
 
diff --git a/test/yavscTests/Mandatory/BatchTests.cs b/src/Yavsc.Org.Tests/Mandatory/BatchTests.cs
similarity index 98%
rename from test/yavscTests/Mandatory/BatchTests.cs
rename to src/Yavsc.Org.Tests/Mandatory/BatchTests.cs
index b5571612..5d36c4a5 100644
--- a/test/yavscTests/Mandatory/BatchTests.cs
+++ b/src/Yavsc.Org.Tests/Mandatory/BatchTests.cs
@@ -1,7 +1,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Yavsc.Models;
-using Xunit.Abstractions;
 using Yavsc.Server.Models.IT.SourceCode;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/test/yavscTests/Mandatory/Remoting.cs b/src/Yavsc.Org.Tests/Mandatory/Remoting.cs
similarity index 99%
rename from test/yavscTests/Mandatory/Remoting.cs
rename to src/Yavsc.Org.Tests/Mandatory/Remoting.cs
index e6b1b1e7..84509ef1 100644
--- a/test/yavscTests/Mandatory/Remoting.cs
+++ b/src/Yavsc.Org.Tests/Mandatory/Remoting.cs
@@ -1,9 +1,6 @@
 using System.Security.Cryptography.X509Certificates;
 using System.Net.Security;
-
 using yavscTests.ServerFixtures;
-
-using Xunit.Abstractions;
 using IdentityModel.Client;
 
 namespace yavscTests
diff --git a/test/yavscTests/Mandatory/Resources.cs b/src/Yavsc.Org.Tests/Mandatory/Resources.cs
similarity index 100%
rename from test/yavscTests/Mandatory/Resources.cs
rename to src/Yavsc.Org.Tests/Mandatory/Resources.cs
diff --git a/test/yavscTests/Mandatory/Services.cs b/src/Yavsc.Org.Tests/Mandatory/Services.cs
similarity index 92%
rename from test/yavscTests/Mandatory/Services.cs
rename to src/Yavsc.Org.Tests/Mandatory/Services.cs
index 3451e313..a7977c3f 100644
--- a/test/yavscTests/Mandatory/Services.cs
+++ b/src/Yavsc.Org.Tests/Mandatory/Services.cs
@@ -1,7 +1,6 @@
 
 using yavscTests.ServerFixtures;
 
-using Xunit.Abstractions;
 
 namespace yavscTests.Mandatory;
 
diff --git a/test/yavscTests/NonRegression/AbstractTests.cs b/src/Yavsc.Org.Tests/NonRegression/AbstractTests.cs
similarity index 92%
rename from test/yavscTests/NonRegression/AbstractTests.cs
rename to src/Yavsc.Org.Tests/NonRegression/AbstractTests.cs
index a5955bd1..662ad02b 100644
--- a/test/yavscTests/NonRegression/AbstractTests.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/AbstractTests.cs
@@ -1,7 +1,4 @@
-using System;
-using Xunit;
-using Xunit.Abstractions;
-using Yavsc.Helpers;
+
 using Yavsc.Server.Helpers;
 
 namespace yavscTests
diff --git a/test/yavscTests/NonRegression/BillingServiceTests.cs b/src/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs
similarity index 100%
rename from test/yavscTests/NonRegression/BillingServiceTests.cs
rename to src/Yavsc.Org.Tests/NonRegression/BillingServiceTests.cs
diff --git a/test/yavscTests/NonRegression/Database.cs b/src/Yavsc.Org.Tests/NonRegression/Database.cs
similarity index 97%
rename from test/yavscTests/NonRegression/Database.cs
rename to src/Yavsc.Org.Tests/NonRegression/Database.cs
index 87451551..5473e57a 100644
--- a/test/yavscTests/NonRegression/Database.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/Database.cs
@@ -1,7 +1,6 @@
 
 using yavscTests.ServerFixtures;
 
-using Xunit.Abstractions;
 
 namespace yavscTests.Mandatory
 {
diff --git a/test/yavscTests/NonRegression/EMailling.cs b/src/Yavsc.Org.Tests/NonRegression/EMailling.cs
similarity index 97%
rename from test/yavscTests/NonRegression/EMailling.cs
rename to src/Yavsc.Org.Tests/NonRegression/EMailling.cs
index 5289d8de..4870435c 100644
--- a/test/yavscTests/NonRegression/EMailling.cs
+++ b/src/Yavsc.Org.Tests/NonRegression/EMailling.cs
@@ -3,7 +3,6 @@ using yavscTests.ServerFixtures;
 
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Xunit.Abstractions;
 using Yavsc.Interface;
 
 namespace yavscTests
diff --git a/test/yavscTests/Resources/Test.TestResources.resx b/src/Yavsc.Org.Tests/Resources/Test.TestResources.resx
similarity index 100%
rename from test/yavscTests/Resources/Test.TestResources.resx
rename to src/Yavsc.Org.Tests/Resources/Test.TestResources.resx
diff --git a/test/yavscTests/WebServerFixture.cs b/src/Yavsc.Org.Tests/WebServerFixture.cs
similarity index 100%
rename from test/yavscTests/WebServerFixture.cs
rename to src/Yavsc.Org.Tests/WebServerFixture.cs
diff --git a/test/yavscTests/yavscTests.csproj b/src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj
similarity index 77%
rename from test/yavscTests/yavscTests.csproj
rename to src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj
index c0e12e10..c363e553 100644
--- a/test/yavscTests/yavscTests.csproj
+++ b/src/Yavsc.Org.Tests/Yavsc.Org.Tests.csproj
@@ -7,6 +7,7 @@
     <RootNamespace>Yavsc.Tests</RootNamespace>
     <UserSecretsId>78a4efec-68dc-4745-ba06-d8545ef9ee91</UserSecretsId>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <OutputType>exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="coverlet.collector" />
@@ -22,6 +23,9 @@
     <PackageReference Include="Microsoft.Extensions.Options" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
     <PackageReference Include="xunit.v3" />
+    <PackageReference Include="xunit.v3.common" />
+    <PackageReference Include="xunit.v3.extensibility.core" />
+    
     <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
   <ItemGroup>
@@ -35,10 +39,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Yavsc.Org\Yavsc.Org.csproj" />
-    <ProjectReference Include="..\..\src\Yavsc.Abstract\Yavsc.Abstract.csproj" />
-    <ProjectReference Include="..\..\src\Yavsc.Server\Yavsc.Server.csproj" />
-    <ProjectReference Include="..\..\src\PostIt\PostIt\PostIt.csproj" />
+    <ProjectReference Include="..\Yavsc.Org\Yavsc.Org.csproj" />
+    <ProjectReference Include="..\Yavsc.Abstract\Yavsc.Abstract.csproj" />
+    <ProjectReference Include="..\Yavsc.Server\Yavsc.Server.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Using Include="Xunit" />
@@ -47,6 +50,6 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
   </ItemGroup>
   <Target Name="CopyStaticWebAssetsManifest" AfterTargets="Build">
-    <Copy SourceFiles="$(OutDir)Yavsc.Org.staticwebassets.endpoints.json" DestinationFiles="$(OutDir)testhost.staticwebassets.endpoints.json" SkipUnchangedFiles="true" Condition="Exists('$(OutDir)Yavsc.Org.staticwebassets.endpoints.json')" />
+    <Copy SourceFiles="$(OutDir)Yavsc.Org.staticwebassets.endpoints.json" DestinationFiles="$(OutDir)$(MSBuildProjectName).staticwebassets.endpoints.json" SkipUnchangedFiles="true" Condition="Exists('$(OutDir)Yavsc.Org.staticwebassets.endpoints.json')" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/yavscTests/appsettings.json b/src/Yavsc.Org.Tests/appsettings.json
similarity index 100%
rename from test/yavscTests/appsettings.json
rename to src/Yavsc.Org.Tests/appsettings.json
diff --git a/test/yavscTests/xunit.runner.json b/src/Yavsc.Org.Tests/xunit.runner.json
similarity index 100%
rename from test/yavscTests/xunit.runner.json
rename to src/Yavsc.Org.Tests/xunit.runner.json
diff --git a/yavsc.sln b/yavsc.sln
index 19563b13..edcee938 100644
--- a/yavsc.sln
+++ b/yavsc.sln
@@ -19,7 +19,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cli", "src\cli\cli.csproj",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{76A7FBA6-B7EC-4864-85C0-1F470794BA0F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "yavscTests", "test\yavscTests\yavscTests.csproj", "{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Org.Tests", "src\Yavsc.Org.Tests\Yavsc.Org.Tests.csproj", "{CDCF676A-2037-472E-8C8B-67C5E4FDFEA1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Blogs", "src\Yavsc.Blogs\Yavsc.Blogs.csproj", "{5D9E161F-3CB3-4854-9D07-3DF6882EA66C}"
 EndProject