diff --git a/api/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj b/api/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
new file mode 100644
index 000000000..f03259659
--- /dev/null
+++ b/api/FilterLists.Data.Tests/FilterLists.Data.Tests.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>    
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+  </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>
+
+</Project>
diff --git a/api/FilterLists.Data.Tests/UnitTest1.cs b/api/FilterLists.Data.Tests/UnitTest1.cs
new file mode 100644
index 000000000..96fb47ab0
--- /dev/null
+++ b/api/FilterLists.Data.Tests/UnitTest1.cs
@@ -0,0 +1,12 @@
+using Xunit;
+
+namespace FilterLists.Data.Tests
+{
+    public class UnitTest1
+    {
+        [Fact]
+        public void Test1()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/api/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj b/api/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
new file mode 100644
index 000000000..f03259659
--- /dev/null
+++ b/api/FilterLists.Services.Tests/FilterLists.Services.Tests.csproj
@@ -0,0 +1,13 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>    
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+  </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>
+
+</Project>
diff --git a/api/FilterLists.Services.Tests/UnitTest1.cs b/api/FilterLists.Services.Tests/UnitTest1.cs
new file mode 100644
index 000000000..c3e88d290
--- /dev/null
+++ b/api/FilterLists.Services.Tests/UnitTest1.cs
@@ -0,0 +1,12 @@
+using Xunit;
+
+namespace FilterLists.Services.Tests
+{
+    public class UnitTest1
+    {
+        [Fact]
+        public void Test1()
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/api/FilterLists.sln b/api/FilterLists.sln
index 0ec17ca4c..e14e4b761 100644
--- a/api/FilterLists.sln
+++ b/api/FilterLists.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26403.0
+VisualStudioVersion = 15.0.26403.3
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Api", "FilterLists.API\FilterLists.Api.csproj", "{57E4CE18-41F3-48F6-B142-12947FFBA86C}"
 EndProject
@@ -13,6 +13,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Contracts"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services", "FilterLists.Services\FilterLists.Services.csproj", "{9F296ECF-97C9-47E6-A794-5AD900ECFE6C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Services.Tests", "FilterLists.Services.Tests\FilterLists.Services.Tests.csproj", "{39072BBE-268D-408D-878F-1416F9C400A2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilterLists.Data.Tests", "FilterLists.Data.Tests\FilterLists.Data.Tests.csproj", "{AE4E5758-92F3-4BFA-B71E-6A05F5E71FAC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -39,6 +43,14 @@ 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE