diff --git a/src/Services/e-sender/O2NextGen.ESender.Api.sln b/src/Services/e-sender/O2NextGen.ESender.Api.sln
index 4ee6100b..538d0175 100644
--- a/src/Services/e-sender/O2NextGen.ESender.Api.sln
+++ b/src/Services/e-sender/O2NextGen.ESender.Api.sln
@@ -15,17 +15,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{4D4C70FE
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.O2NextGen.ESender.Api", "Tests\IntegrationTests.O2NextGen.ESender.Api\IntegrationTests.O2NextGen.ESender.Api.csproj", "{0CA484B4-E79A-43E1-ABAC-30C661DD637D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.O2NextGen.ESender.Api", "Tests\UnitTests.O2NextGen.ESender.Api\UnitTests.O2NextGen.ESender.Api.csproj", "{0AD9CB1F-539F-4D06-9E19-C724C0350488}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.ESender.Api", "Tests\Tests.O2NextGen.ESender.Api\Tests.O2NextGen.ESender.Api.csproj", "{0AD9CB1F-539F-4D06-9E19-C724C0350488}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.O2NextGen.ESender.Business", "Tests\UnitTests.O2NextGen.ESender.Business\UnitTests.O2NextGen.ESender.Business.csproj", "{313FF018-98BB-4229-A2E6-525F1ACA13D9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.ESender.Business", "Tests\Tests.O2NextGen.ESender.Business\Tests.O2NextGen.ESender.Business.csproj", "{313FF018-98BB-4229-A2E6-525F1ACA13D9}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.O2NextGen.ESender.Business", "Tests\IntegrationTests.O2NextGen.ESender.Business\IntegrationTests.O2NextGen.ESender.Business.csproj", "{C6455931-5324-40B0-B101-0B68A119C1C3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.O2NextGen.ESender.Data", "Tests\IntegrationTests.O2NextGen.ESender.Data\IntegrationTests.O2NextGen.ESender.Data.csproj", "{FC4C87E2-DD4B-46E0-92EB-62482631A16C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.O2NextGen.ESender.Data", "Tests\UnitTests.O2NextGen.ESender.Data\UnitTests.O2NextGen.ESender.Data.csproj", "{EA85C970-EF8B-4860-B6F2-0C6FDCAD5BCD}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.ESender.Data", "Tests\Tests.O2NextGen.ESender.Data\Tests.O2NextGen.ESender.Data.csproj", "{EA85C970-EF8B-4860-B6F2-0C6FDCAD5BCD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.O2NextGen.ESender.Impl", "Tests\UnitTests.O2NextGen.ESender.Impl\UnitTests.O2NextGen.ESender.Impl.csproj", "{0A589BE0-F0F3-4E52-BAC3-87F12D31E8CA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.O2NextGen.ESender.Impl", "Tests\Tests.O2NextGen.ESender.Impl\Tests.O2NextGen.ESender.Impl.csproj", "{0A589BE0-F0F3-4E52-BAC3-87F12D31E8CA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegrationTests.O2NextGen.ESender.Impl", "Tests\IntegrationTests.O2NextGen.ESender.Impl\IntegrationTests.O2NextGen.ESender.Impl.csproj", "{534D8645-6FA7-4F66-A90F-4C99FD5DED4D}"
 EndProject
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappings.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/BaseMappings.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappings.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/BaseMappings.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappingsTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/BaseMappingsTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/BaseMappingsTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/BaseMappingsTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/EmailRequestMappingsTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeModel.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/FakeModel.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeModel.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/FakeModel.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeViewModel.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/FakeViewModel.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/FakeViewModel.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/FakeViewModel.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTests.O2NextGen.ESender.Api.csproj b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/Tests.O2NextGen.ESender.Api.csproj
similarity index 87%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTests.O2NextGen.ESender.Api.csproj
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/Tests.O2NextGen.ESender.Api.csproj
index b5beca2d..325e3ba4 100644
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Api/UnitTests.O2NextGen.ESender.Api.csproj
+++ b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Api/Tests.O2NextGen.ESender.Api.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <RootNamespace>UnitTests.O2NextGen.ESender.Api</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseHelper.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/BaseHelper.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseHelper.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/BaseHelper.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseModelTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/BaseModelTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseModelTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/BaseModelTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/BaseTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/BaseTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/BaseTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestModelTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/EmailRequestModelTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestModelTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/EmailRequestModelTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/EmailRequestTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/Models/EmailRequestTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Models/EmailRequestTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTests.O2NextGen.ESender.Business.csproj b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Tests.O2NextGen.ESender.Business.csproj
similarity index 85%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTests.O2NextGen.ESender.Business.csproj
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Tests.O2NextGen.ESender.Business.csproj
index 1099c4ee..aaeacff9 100644
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Business/UnitTests.O2NextGen.ESender.Business.csproj
+++ b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Business/Tests.O2NextGen.ESender.Business.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <RootNamespace>UnitTests.O2NextGen.ESender.Business</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseEntityTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Entities/BaseEntityTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseEntityTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Entities/BaseEntityTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseHelper.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Entities/BaseHelper.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseHelper.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Entities/BaseHelper.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Entities/BaseTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/BaseTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Entities/BaseTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/MailRequestEntityTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Entities/MailRequestEntityTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/Entities/MailRequestEntityTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Entities/MailRequestEntityTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTests.O2NextGen.ESender.Data.csproj b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Tests.O2NextGen.ESender.Data.csproj
similarity index 86%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTests.O2NextGen.ESender.Data.csproj
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Tests.O2NextGen.ESender.Data.csproj
index da9e9810..8d8ea0e4 100644
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Data/UnitTests.O2NextGen.ESender.Data.csproj
+++ b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Data/Tests.O2NextGen.ESender.Data.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <RootNamespace>UnitTests.O2NextGen.ESender.Data</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs
similarity index 100%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Impl/EmailRequestMappingsTests.cs
diff --git a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTests.O2NextGen.ESender.Impl.csproj b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Impl/Tests.O2NextGen.ESender.Impl.csproj
similarity index 89%
rename from src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTests.O2NextGen.ESender.Impl.csproj
rename to src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Impl/Tests.O2NextGen.ESender.Impl.csproj
index a7d0d793..1c016a24 100644
--- a/src/Services/e-sender/Tests/UnitTests.O2NextGen.ESender.Impl/UnitTests.O2NextGen.ESender.Impl.csproj
+++ b/src/Services/e-sender/Tests/Tests.O2NextGen.ESender.Impl/Tests.O2NextGen.ESender.Impl.csproj
@@ -4,6 +4,8 @@
     <TargetFramework>netcoreapp2.2</TargetFramework>
 
     <IsPackable>false</IsPackable>
+
+    <RootNamespace>UnitTests.O2NextGen.ESender.Impl</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>