diff --git a/NanoRabbit.sln b/NanoRabbit.sln
index 1d57266..7e5e1e6 100644
--- a/NanoRabbit.sln
+++ b/NanoRabbit.sln
@@ -28,8 +28,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.NLog", "Example\Exa
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.ProducerInConsumer", "Example\Example.ProducerInConsumer\Example.ProducerInConsumer.csproj", "{9D6AD55F-2615-4FA9-B01D-697EEFE19B41}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{324E2D97-6266-4F03-8A62-2E8A31313A59}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.ReadSettings", "Example\Example.ReadSettings\Example.ReadSettings.csproj", "{149851D0-29D1-4F47-BD43-0D7DE729BC63}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.RabbitAsyncConsumer", "Example\Example.RabbitAsyncConsumer\Example.RabbitAsyncConsumer.csproj", "{52F7EB29-ADE0-43D4-ADA8-74735BE76D19}"
@@ -38,9 +36,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exmaple.ServiceInConsumer",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exmaple.TaskInMessageHandler", "Example\Exmaple.TaskInMessageHandler\Exmaple.TaskInMessageHandler.csproj", "{C98D8769-5CB8-47EC-83B7-287550F769BE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Logger", "Tests\Test.Logger\Test.Logger.csproj", "{0F12CA12-6649-45F2-BFAB-3F2521FB01D7}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{DE278D07-341E-425C-B687-BB3CD9F9757D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.Logger", "Test\Test.Logger\Test.Logger.csproj", "{25D1ECC8-3A50-43A7-B7D5-78068222254E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.SpecifyMessagesProperties", "Tests\Test.SpecifyMessagesProperties\Test.SpecifyMessagesProperties.csproj", "{9C846F9B-E2B0-4844-944D-883B66278497}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.SpecifyMessagesProperties", "Test\Test.SpecifyMessagesProperties\Test.SpecifyMessagesProperties.csproj", "{012ACF78-7FA0-4754-A271-97D57D01D324}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -92,14 +92,14 @@ Global
 		{C98D8769-5CB8-47EC-83B7-287550F769BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C98D8769-5CB8-47EC-83B7-287550F769BE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C98D8769-5CB8-47EC-83B7-287550F769BE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0F12CA12-6649-45F2-BFAB-3F2521FB01D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0F12CA12-6649-45F2-BFAB-3F2521FB01D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0F12CA12-6649-45F2-BFAB-3F2521FB01D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0F12CA12-6649-45F2-BFAB-3F2521FB01D7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9C846F9B-E2B0-4844-944D-883B66278497}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9C846F9B-E2B0-4844-944D-883B66278497}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9C846F9B-E2B0-4844-944D-883B66278497}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9C846F9B-E2B0-4844-944D-883B66278497}.Release|Any CPU.Build.0 = Release|Any CPU
+		{25D1ECC8-3A50-43A7-B7D5-78068222254E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{25D1ECC8-3A50-43A7-B7D5-78068222254E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{25D1ECC8-3A50-43A7-B7D5-78068222254E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{25D1ECC8-3A50-43A7-B7D5-78068222254E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{012ACF78-7FA0-4754-A271-97D57D01D324}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{012ACF78-7FA0-4754-A271-97D57D01D324}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{012ACF78-7FA0-4754-A271-97D57D01D324}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{012ACF78-7FA0-4754-A271-97D57D01D324}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -114,13 +114,13 @@ Global
 		{9999306F-A81E-4C69-B7A0-21EA155AB93E} = {D187C758-604D-4325-9FEF-912DB32D6131}
 		{8C957828-D46E-45FA-89DB-ADD3856F405B} = {D187C758-604D-4325-9FEF-912DB32D6131}
 		{9D6AD55F-2615-4FA9-B01D-697EEFE19B41} = {D187C758-604D-4325-9FEF-912DB32D6131}
-		{324E2D97-6266-4F03-8A62-2E8A31313A59} = {C0037375-1E5C-4070-9AFD-806B44C6D247}
 		{149851D0-29D1-4F47-BD43-0D7DE729BC63} = {D187C758-604D-4325-9FEF-912DB32D6131}
 		{52F7EB29-ADE0-43D4-ADA8-74735BE76D19} = {D187C758-604D-4325-9FEF-912DB32D6131}
 		{DE4C1826-A072-4087-A4B1-272C8FD9DF56} = {D187C758-604D-4325-9FEF-912DB32D6131}
 		{C98D8769-5CB8-47EC-83B7-287550F769BE} = {D187C758-604D-4325-9FEF-912DB32D6131}
-		{0F12CA12-6649-45F2-BFAB-3F2521FB01D7} = {324E2D97-6266-4F03-8A62-2E8A31313A59}
-		{9C846F9B-E2B0-4844-944D-883B66278497} = {324E2D97-6266-4F03-8A62-2E8A31313A59}
+		{DE278D07-341E-425C-B687-BB3CD9F9757D} = {C0037375-1E5C-4070-9AFD-806B44C6D247}
+		{25D1ECC8-3A50-43A7-B7D5-78068222254E} = {DE278D07-341E-425C-B687-BB3CD9F9757D}
+		{012ACF78-7FA0-4754-A271-97D57D01D324} = {DE278D07-341E-425C-B687-BB3CD9F9757D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6EE19DFD-83A9-4A48-B245-5A1344E7865A}
diff --git a/Tests/Test.Logger/NormalLoggerTest.cs b/Test/Test.Logger/NormalLoggerTest.cs
similarity index 100%
rename from Tests/Test.Logger/NormalLoggerTest.cs
rename to Test/Test.Logger/NormalLoggerTest.cs
diff --git a/Tests/Test.Logger/NullLoggerTest.cs b/Test/Test.Logger/NullLoggerTest.cs
similarity index 100%
rename from Tests/Test.Logger/NullLoggerTest.cs
rename to Test/Test.Logger/NullLoggerTest.cs
diff --git a/Tests/Test.Logger/Test.Logger.csproj b/Test/Test.Logger/Test.Logger.csproj
similarity index 100%
rename from Tests/Test.Logger/Test.Logger.csproj
rename to Test/Test.Logger/Test.Logger.csproj
diff --git a/Tests/Test.SpecifyMessagesProperties/CustomBasicPropertiesTest.cs b/Test/Test.SpecifyMessagesProperties/CustomBasicPropertiesTest.cs
similarity index 100%
rename from Tests/Test.SpecifyMessagesProperties/CustomBasicPropertiesTest.cs
rename to Test/Test.SpecifyMessagesProperties/CustomBasicPropertiesTest.cs
diff --git a/Tests/Test.SpecifyMessagesProperties/Test.SpecifyMessagesProperties.csproj b/Test/Test.SpecifyMessagesProperties/Test.SpecifyMessagesProperties.csproj
similarity index 100%
rename from Tests/Test.SpecifyMessagesProperties/Test.SpecifyMessagesProperties.csproj
rename to Test/Test.SpecifyMessagesProperties/Test.SpecifyMessagesProperties.csproj
diff --git a/Tests/Test.SpecifyMessagesProperties/Usings.cs b/Test/Test.SpecifyMessagesProperties/Usings.cs
similarity index 100%
rename from Tests/Test.SpecifyMessagesProperties/Usings.cs
rename to Test/Test.SpecifyMessagesProperties/Usings.cs