diff --git a/Continuity.sln b/Continuity.sln
index f9d16cb..8c3c940 100644
--- a/Continuity.sln
+++ b/Continuity.sln
@@ -2,6 +2,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server", "Server\Server.csproj", "{DDE63D00-4CC2-4397-B409-410D9F272F0F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Server.Tests", "Server.Tests\Server.Tests.csproj", "{5D09881E-E059-46F5-9064-66F192258C0C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -12,5 +14,9 @@ Global
 		{DDE63D00-4CC2-4397-B409-410D9F272F0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DDE63D00-4CC2-4397-B409-410D9F272F0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DDE63D00-4CC2-4397-B409-410D9F272F0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5D09881E-E059-46F5-9064-66F192258C0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5D09881E-E059-46F5-9064-66F192258C0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5D09881E-E059-46F5-9064-66F192258C0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5D09881E-E059-46F5-9064-66F192258C0C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/Server.Tests/Server.Tests.csproj b/Server.Tests/Server.Tests.csproj
new file mode 100644
index 0000000..a625158
--- /dev/null
+++ b/Server.Tests/Server.Tests.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="FluentAssertions" Version="6.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+        <PackageReference Include="xunit" Version="2.4.2" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+            <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>
+
+</Project>
diff --git a/Server.Tests/Usings.cs b/Server.Tests/Usings.cs
new file mode 100644
index 0000000..8c927eb
--- /dev/null
+++ b/Server.Tests/Usings.cs
@@ -0,0 +1 @@
+global using Xunit;
\ No newline at end of file