diff --git a/AlgoTecture.Libraries.Reservations.Tests/AlgoTecture.Libraries.Reservations.Tests.csproj b/AlgoTecture.Libraries.Reservations.Tests/AlgoTecture.Libraries.Reservations.Tests.csproj
index 074de13..375e28f 100644
--- a/AlgoTecture.Libraries.Reservations.Tests/AlgoTecture.Libraries.Reservations.Tests.csproj
+++ b/AlgoTecture.Libraries.Reservations.Tests/AlgoTecture.Libraries.Reservations.Tests.csproj
@@ -8,7 +8,6 @@
 
     <ItemGroup>
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-      <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="NUnit" Version="3.13.3" />
       <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     </ItemGroup>
@@ -16,7 +15,6 @@
     <ItemGroup>
       <ProjectReference Include="..\AlgoTecture.Data.Persistence\AlgoTecture.Data.Persistence.csproj" />
       <ProjectReference Include="..\AlgoTecture.Libraries.Reservations\AlgoTecture.Libraries.Reservations.csproj" />
-      <ProjectReference Include="..\AlgoTecture.Libraries.Spaces\AlgoTecture.Libraries.Spaces.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/AlgoTecture.Libraries.Spaces.Tests/AlgoTecture.Libraries.Spaces.Tests.csproj b/AlgoTecture.Libraries.Spaces.Tests/AlgoTecture.Libraries.Spaces.Tests.csproj
new file mode 100644
index 0000000..a5c1cc5
--- /dev/null
+++ b/AlgoTecture.Libraries.Spaces.Tests/AlgoTecture.Libraries.Spaces.Tests.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="NUnit" Version="3.13.3" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\AlgoTecture.Libraries.Spaces\AlgoTecture.Libraries.Spaces.csproj" />
+    </ItemGroup>
+    
+</Project>
diff --git a/AlgoTecture.Libraries.Reservations.Tests/Serialization/ClassToJsonSerializationTests.cs b/AlgoTecture.Libraries.Spaces.Tests/Serialization/ClassToJsonSerializationTests.cs
similarity index 96%
rename from AlgoTecture.Libraries.Reservations.Tests/Serialization/ClassToJsonSerializationTests.cs
rename to AlgoTecture.Libraries.Spaces.Tests/Serialization/ClassToJsonSerializationTests.cs
index 3b7074b..6ba63ea 100644
--- a/AlgoTecture.Libraries.Reservations.Tests/Serialization/ClassToJsonSerializationTests.cs
+++ b/AlgoTecture.Libraries.Spaces.Tests/Serialization/ClassToJsonSerializationTests.cs
@@ -3,7 +3,7 @@
 using Newtonsoft.Json;
 using NUnit.Framework;
 
-namespace AlgoTecture.Libraries.Reservations.Tests.Serialization;
+namespace AlgoTecture.Libraries.Spaces.Tests.Serialization;
 
 public class ClassToJsonSerializationTests
 {
diff --git a/AlgoTecture.sln b/AlgoTecture.sln
index e67dcfd..d7ca135 100644
--- a/AlgoTecture.sln
+++ b/AlgoTecture.sln
@@ -44,6 +44,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlgoTecture.Common", "AlgoT
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlgoTecture.WebApi.QrCode", "AlgoTecture.WebApi.QrCode\AlgoTecture.WebApi.QrCode.csproj", "{7D6C8FF7-A8C4-48BE-BB41-AEBD3D30406C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlgoTecture.Libraries.Spaces.Tests", "AlgoTecture.Libraries.Spaces.Tests\AlgoTecture.Libraries.Spaces.Tests.csproj", "{998D3762-0AF4-4ABF-807A-ED210BB6D1DF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -122,6 +124,10 @@ Global
 		{7D6C8FF7-A8C4-48BE-BB41-AEBD3D30406C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7D6C8FF7-A8C4-48BE-BB41-AEBD3D30406C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7D6C8FF7-A8C4-48BE-BB41-AEBD3D30406C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{998D3762-0AF4-4ABF-807A-ED210BB6D1DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{998D3762-0AF4-4ABF-807A-ED210BB6D1DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{998D3762-0AF4-4ABF-807A-ED210BB6D1DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{998D3762-0AF4-4ABF-807A-ED210BB6D1DF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{FF969273-58F3-4C80-9C93-FB5C456C9BC2} = {680AD23C-CA3D-45C9-8EDC-27DBA0813A05}
@@ -137,5 +143,6 @@ Global
 		{6ECA29B2-5C36-4B88-99D7-21B0B0D9B3FA} = {680AD23C-CA3D-45C9-8EDC-27DBA0813A05}
 		{E362C37C-9C24-46B5-BEA0-1EAD2F3A8535} = {680AD23C-CA3D-45C9-8EDC-27DBA0813A05}
 		{1EC8134E-12A2-4EEB-83F7-A128164E15E7} = {DE18D2EC-8796-45EC-84C3-EA8D7A0E27C4}
+		{998D3762-0AF4-4ABF-807A-ED210BB6D1DF} = {DE18D2EC-8796-45EC-84C3-EA8D7A0E27C4}
 	EndGlobalSection
 EndGlobal
diff --git a/AlgoTecture.sln.DotSettings.user b/AlgoTecture.sln.DotSettings.user
index 0ea2a79..b695f2b 100644
--- a/AlgoTecture.sln.DotSettings.user
+++ b/AlgoTecture.sln.DotSettings.user
@@ -3,6 +3,7 @@
   &lt;TestAncestor&gt;&#xD;
     &lt;TestId&gt;NUnit3x::1EC8134E-12A2-4EEB-83F7-A128164E15E7::net6.0::AlgoTecture.Libraries.Reservations.Tests.ReservationTests&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;NUnit3x::1EC8134E-12A2-4EEB-83F7-A128164E15E7::net6.0::AlgoTecture.Libraries.Reservations.Tests.Serialization.ClassToJsonSerializationTests.ConversationClassToJsonSimpleTest&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;NUnit3x::998D3762-0AF4-4ABF-807A-ED210BB6D1DF::net6.0::AlgoTecture.Libraries.Spaces.Tests.Serialization.ClassToJsonSerializationTests.ConversationClassToJsonSimpleTest&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String>