diff --git a/DamageAssesmentApi/DamageAssesment.Api.Surveys.Test/DamageAssesment.Api.Surveys.Test.csproj b/DamageAssesmentApi/DamageAssesment.Api.Surveys.Test/DamageAssesment.Api.Surveys.Test.csproj
new file mode 100644
index 0000000..22a4563
--- /dev/null
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys.Test/DamageAssesment.Api.Surveys.Test.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageReference Include="Moq" Version="4.18.4" />
+    <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.2.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\DamageAssesment.Api.Surveys\DamageAssesment.Api.Surveys.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/DamageAssesmentApi/DamageAssesment.sln b/DamageAssesmentApi/DamageAssesment.sln
index cc813c7..4a8abfb 100644
--- a/DamageAssesmentApi/DamageAssesment.sln
+++ b/DamageAssesmentApi/DamageAssesment.sln
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.SurveyR
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Questions.Test", "DamageAssesment.Api.QuestionsTest\DamageAssesment.Api.Questions.Test.csproj", "{35CD9231-034D-4999-BCFC-1786DD007ED2}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Survey.Test", "DamageAssesment.Api.Surveys.Test\DamageAssesment.Api.Survey.Test.csproj", "{ADFB79E3-83C9-454F-A070-49D167BD28CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Surveys.Test", "DamageAssesment.Api.Surveys.Test\DamageAssesment.Api.Surveys.Test.csproj", "{ADFB79E3-83C9-454F-A070-49D167BD28CC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.SurveyResponses.Test", "DamageAssesment.SurveyResponses.Test\DamageAssesment.Api.SurveyResponses.Test.csproj", "{6F4B9C9D-CE5D-421A-876F-57D0FEDF8049}"
 EndProject
diff --git a/DamageAssesmentApi/docker-compose.override.yml b/DamageAssesmentApi/docker-compose.override.yml
index 5eb11fa..c205327 100644
--- a/DamageAssesmentApi/docker-compose.override.yml
+++ b/DamageAssesmentApi/docker-compose.override.yml
@@ -1,86 +1,41 @@
 version: '3.4'
 
 services:
-  #nginx:
-  #  container_name: my-nginx
-  #  image: nginx:latest
-  #  restart: always
-  #  ports:
-  #    - "80:80"
-  #  volumes:
-  #    - ./default.conf:/etc/nginx/conf.d/default.conf
 
   damageassesment.api.answers:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-<<<<<<< HEAD
-=======
-    networks:
-      nginx-network:
-        ipv4_address: 172.18.0.150
->>>>>>> origin/server-branch
+
     ports:
       - "6001:80"
    
-
   damageassesment.api.attachments:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-<<<<<<< HEAD
-=======
-    networks:
-      nginx-network:
-        ipv4_address: 172.18.0.151        
->>>>>>> origin/server-branch
     ports:
       - "6002:80"
    
-
   damageassesment.api.employees:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-<<<<<<< HEAD
-=======
-    networks:
-      nginx-network:
-        ipv4_address: 172.18.0.152
->>>>>>> origin/server-branch
     ports:
       - "6003:80"
    
   damageassesment.api.locations:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-<<<<<<< HEAD
-=======
-    networks:
-      nginx-network:
-        ipv4_address: 172.18.0.153
->>>>>>> origin/server-branch
     ports:
       - "6004:80"
    
   damageassesment.api.questions:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-<<<<<<< HEAD
-=======
-    networks:
-      nginx-network:
-        ipv4_address: 172.18.0.154
->>>>>>> origin/server-branch
     ports:
       - "6005:80"
    
   damageassesment.api.survey:
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
-<<<<<<< HEAD
-=======
-    networks:
-      nginx-network:
-        ipv4_address: 172.18.0.155
->>>>>>> origin/server-branch
     ports:
       - "6006:80"
    
@@ -93,14 +48,5 @@ services:
       - services__Employees=http://damageassesment.api.employees:80
       - services__Attachments=http://damageassesment.api.attachments:80
       - services__Surveys=http://damageassesment.api.survey:80
-<<<<<<< HEAD
     ports:
       - "6007:80"
-   
-=======
-    networks:
-      nginx-network:
-        ipv4_address: 172.18.0.156
-    ports:
-      - "6007:80"
->>>>>>> origin/server-branch