diff --git a/build.cake b/build.cake
index 832287508..6ff80135a 100644
--- a/build.cake
+++ b/build.cake
@@ -1,6 +1,5 @@
 #tool "dotnet:?package=GitVersion.Tool&version=5.8.1"
 #tool "dotnet:?package=coveralls.net&version=4.0.1"
-#addin nuget:?package=Cake.Json&version=4.0.0
 #addin nuget:?package=Newtonsoft.Json
 #addin nuget:?package=System.Text.Encodings.Web&version=4.7.1
 #tool "nuget:?package=ReportGenerator"
@@ -178,7 +177,7 @@ Task("RunUnitTests")
 	.IsDependentOn("Compile")
 	.Does(() =>
 	{
-		var testSettings = new DotNetCoreTestSettings
+		var testSettings = new DotNetTestSettings
 		{
 			Configuration = compileConfig,
 			ResultsDirectory = artifactsForUnitTestsDir,
@@ -188,7 +187,7 @@ Task("RunUnitTests")
 		};
 
 		EnsureDirectoryExists(artifactsForUnitTestsDir);
-		DotNetCoreTest(unitTestAssemblies, testSettings);
+		DotNetTest(unitTestAssemblies, testSettings);
 
 		var coverageSummaryFile = GetSubDirectories(artifactsForUnitTestsDir).First().CombineWithFilePath(File("coverage.cobertura.xml"));
 		Information(coverageSummaryFile);
@@ -233,7 +232,7 @@ Task("RunAcceptanceTests")
 	.IsDependentOn("Compile")
 	.Does(() =>
 	{
-		var settings = new DotNetCoreTestSettings
+		var settings = new DotNetTestSettings
 		{
 			Configuration = compileConfig,
 			ArgumentCustomization = args => args
@@ -242,14 +241,14 @@ Task("RunAcceptanceTests")
 		};
 
 		EnsureDirectoryExists(artifactsForAcceptanceTestsDir);
-		DotNetCoreTest(acceptanceTestAssemblies, settings);
+		DotNetTest(acceptanceTestAssemblies, settings);
 	});
 
 Task("RunIntegrationTests")
 	.IsDependentOn("Compile")
 	.Does(() =>
 	{
-		var settings = new DotNetCoreTestSettings
+		var settings = new DotNetTestSettings
 		{
 			Configuration = compileConfig,
 			ArgumentCustomization = args => args
@@ -258,7 +257,7 @@ Task("RunIntegrationTests")
 		};
 
 		EnsureDirectoryExists(artifactsForIntegrationTestsDir);
-		DotNetCoreTest(integrationTestAssemblies, settings);
+		DotNetTest(integrationTestAssemblies, settings);
 	});
 
 Task("CreateArtifacts")