diff --git a/FilterLists.sln b/FilterLists.sln
index 41e26970c..9c4c9dd7a 100644
--- a/FilterLists.sln
+++ b/FilterLists.sln
@@ -8,14 +8,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Data", "src\Fil
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Services", "src\FilterLists.Services\FilterLists.Services.csproj", "{9F296ECF-97C9-47E6-A794-5AD900ECFE6C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Services.Tests", "test\FilterLists.Services.Tests\FilterLists.Services.Tests.csproj", "{39072BBE-268D-408D-878F-1416F9C400A2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FilterLists.Data.Tests", "test\FilterLists.Data.Tests\FilterLists.Data.Tests.csproj", "{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{E7590A2B-621D-47EA-B026-315793F0FE50}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{2AD4EEF3-8372-4AE9-8B1C-25359EC87435}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deploy", "deploy", "{6EF78534-FCFD-4918-91AA-316D8AA951AA}"
 	ProjectSection(SolutionItems) = preProject
 		.travis.yml = .travis.yml
@@ -47,14 +41,6 @@ Global
 		{9F296ECF-97C9-47E6-A794-5AD900ECFE6C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9F296ECF-97C9-47E6-A794-5AD900ECFE6C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9F296ECF-97C9-47E6-A794-5AD900ECFE6C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39072BBE-268D-408D-878F-1416F9C400A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39072BBE-268D-408D-878F-1416F9C400A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39072BBE-268D-408D-878F-1416F9C400A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39072BBE-268D-408D-878F-1416F9C400A2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B507EE76-B035-45D7-9D26-DF38A5013BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B507EE76-B035-45D7-9D26-DF38A5013BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B507EE76-B035-45D7-9D26-DF38A5013BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -67,8 +53,6 @@ Global
 		{57E4CE18-41F3-48F6-B142-12947FFBA86C} = {E7590A2B-621D-47EA-B026-315793F0FE50}
 		{944ADE8F-18E3-4DB8-9098-6A55E026EAC1} = {E7590A2B-621D-47EA-B026-315793F0FE50}
 		{9F296ECF-97C9-47E6-A794-5AD900ECFE6C} = {E7590A2B-621D-47EA-B026-315793F0FE50}
-		{39072BBE-268D-408D-878F-1416F9C400A2} = {2AD4EEF3-8372-4AE9-8B1C-25359EC87435}
-		{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC} = {2AD4EEF3-8372-4AE9-8B1C-25359EC87435}
 		{E2F4C0A9-CA4D-4A11-8B10-899513E777F8} = {6EF78534-FCFD-4918-91AA-316D8AA951AA}
 		{B507EE76-B035-45D7-9D26-DF38A5013BC3} = {E7590A2B-621D-47EA-B026-315793F0FE50}
 	EndGlobalSection
diff --git a/scripts/build.sh b/scripts/build.sh
index ad6b54855..ba7193f5e 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 dotnet restore
-dotnet test /test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
-dotnet test /test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
 dotnet publish -c release -r ubuntu.16.04-x64
\ No newline at end of file
diff --git a/src/FilterLists.Services/FilterLists.Services.csproj b/src/FilterLists.Services/FilterLists.Services.csproj
index 6be1f0254..c780c1f37 100644
--- a/src/FilterLists.Services/FilterLists.Services.csproj
+++ b/src/FilterLists.Services/FilterLists.Services.csproj
@@ -6,6 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="CsvHelper" Version="2.16.3" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.1" />
   </ItemGroup>
 
diff --git a/test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj b/test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
deleted file mode 100644
index d3ca3c050..000000000
--- a/test/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>    
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <RuntimeIdentifiers>ubuntu.16.04-x64</RuntimeIdentifiers>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
-</Project>
diff --git a/test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj b/test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
deleted file mode 100644
index d3ca3c050..000000000
--- a/test/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>    
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <RuntimeIdentifiers>ubuntu.16.04-x64</RuntimeIdentifiers>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-    <PackageReference Include="xunit" Version="2.2.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
-</Project>