diff --git a/recipe.cake b/recipe.cake
index a9e7c2dd6e..3fae97c74c 100644
--- a/recipe.cake
+++ b/recipe.cake
@@ -1,329 +1,325 @@
-#load nuget:?package=Chocolatey.Cake.Recipe&version=0.18.0
-
-///////////////////////////////////////////////////////////////////////////////
-// TOOLS
-///////////////////////////////////////////////////////////////////////////////
-
-// This is needed in order to allow NUnit v2 tested to be executed by the NUnit
-// v3 Test Runner
-#tool nuget:?package=NUnit.Extension.NUnitV2Driver&version=3.9.0
-
-///////////////////////////////////////////////////////////////////////////////
-// SCRIPT
-///////////////////////////////////////////////////////////////////////////////
-
-Func<List<ILMergeConfig>> getILMergeConfigs = () =>
-{
-    var mergeConfigs = new List<ILMergeConfig>();
-
-    var targetPlatform = "v4,C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0";
-    var assembliesToILMerge = GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco/*.{exe|dll}")
-                            - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco/choco.exe")
-                            - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco/System.Management.Automation.dll");
-
-    Information("The following assemblies have been selected to be ILMerged for choco.exe...");
-    foreach (var assemblyToILMerge in assembliesToILMerge)
-    {
-        Information(assemblyToILMerge.FullPath);
-    }
-
-    mergeConfigs.Add(new ILMergeConfig() {
-        KeyFile = BuildParameters.StrongNameKeyPath,
-        LogFile = BuildParameters.Paths.Directories.Build + "/ilmerge-chocoexe.log",
-        TargetPlatform = targetPlatform,
-        Target = "exe",
-        Internalize = BuildParameters.RootDirectoryPath + "/src/chocolatey.console/ilmerge.internalize.ignore.txt",
-        Output = BuildParameters.Paths.Directories.PublishedApplications + "/choco_merged/choco.exe",
-        PrimaryAssemblyName = BuildParameters.Paths.Directories.PublishedApplications + "/choco/choco.exe",
-        AssemblyPaths = assembliesToILMerge });
-
-    assembliesToILMerge = GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/*.{exe|dll}")
-                            - GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/choco.exe")
-                            - GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/chocolatey.dll")
-                            - GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/log4net.dll")
-                            - GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/System.Management.Automation.dll");
-
-    Information("The following assemblies have been selected to be ILMerged for chocolatey.dll...");
-    foreach (var assemblyToILMerge in assembliesToILMerge)
-    {
-        Information(assemblyToILMerge.FullPath);
-    }
-
-    mergeConfigs.Add(new ILMergeConfig() {
-        KeyFile = BuildParameters.StrongNameKeyPath,
-        LogFile = BuildParameters.Paths.Directories.Build + "/ilmerge-chocolateydll.log",
-        TargetPlatform = targetPlatform,
-        Target = "dll",
-        Internalize = BuildParameters.RootDirectoryPath + "/src/chocolatey/ilmerge.internalize.ignore.dll.txt",
-        Output = BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey_merged/chocolatey.dll",
-        PrimaryAssemblyName = BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/chocolatey.dll",
-        AssemblyPaths = assembliesToILMerge });
-
-    if (DirectoryExists(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/"))
-    {
-        var no7zAssembliesToILMerge = GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/*.{exe|dll}")
-                                - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/choco.exe")
-                                - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/System.Management.Automation.dll")
-                                - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/chocolatey.tests*.dll")
-                                - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/{Moq|nunit.framework|Should}.dll");
-
-        Information("The following assemblies have been selected to be ILMerged for choco.exe No7zip Version...");
-        foreach (var assemblyToILMerge in no7zAssembliesToILMerge)
-        {
-            Information(assemblyToILMerge.FullPath);
-        }
-
-        mergeConfigs.Add(new ILMergeConfig() {
-            KeyFile = BuildParameters.StrongNameKeyPath,
-            LogFile = BuildParameters.Paths.Directories.Build + "/ilmerge-chocono7zipexe.log",
-            TargetPlatform = targetPlatform,
-            Target = "exe",
-            Internalize = BuildParameters.RootDirectoryPath + "/src/chocolatey.console/ilmerge.internalize.ignore.txt",
-            Output = BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip_merged/choco.exe",
-            PrimaryAssemblyName = BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/choco.exe",
-            AssemblyPaths = no7zAssembliesToILMerge });
-    }
-
-    return mergeConfigs;
-};
-
-Func<FilePathCollection> getScriptsToSign = () =>
-{
-    var scriptsToSign = GetFiles(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/**/*.{ps1|psm1}") +
-                        GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/**/*.{ps1|psm1}");
-
-    if (DirectoryExists(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip"))
-    {
-        scriptsToSign += GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/**/*.{ps1|psm1}");
-    }
-
-    Information("The following PowerShell scripts have been selected to be signed...");
-    foreach (var scriptToSign in scriptsToSign)
-    {
-        Information(scriptToSign.FullPath);
-    }
-
-    return scriptsToSign;
-};
-
-Func<FilePathCollection> getFilesToSign = () =>
-{
-    var filesToSign = GetFiles(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/chocolatey.dll")
-                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/choco.exe")
-                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/tools/{checksum|shimgen}.exe")
-                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/redirects/*.exe");
-
-    if (DirectoryExists(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip"))
-    {
-        filesToSign += GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/choco.exe")
-                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/tools/{checksum|shimgen}.exe")
-                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/redirects/*.exe");
-    }
-
-    Information("The following assemblies have been selected to be signed...");
-    foreach (var fileToSign in filesToSign)
-    {
-        Information(fileToSign.FullPath);
-    }
-
-    return filesToSign;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// CUSTOM TASKS
-///////////////////////////////////////////////////////////////////////////////
-
-Task("Prepare-Chocolatey-Packages")
-    .IsDependeeOf("Create-Chocolatey-Packages")
-    .IsDependeeOf("Sign-PowerShellScripts")
-    .IsDependeeOf("Sign-Assemblies")
-    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
-    .WithCriteria(() => BuildParameters.ShouldRunChocolatey, "Skipping because execution of Chocolatey has been disabled")
-    .Does(() =>
-{
-    // Copy legal documents
-    CopyFile(BuildParameters.RootDirectoryPath + "/docs/legal/CREDITS.md", BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/CREDITS.txt");
-
-    // Run Chocolatey Unpackself
-    CopyFile(BuildParameters.Paths.Directories.PublishedApplications + "/choco_merged/choco.exe", BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/choco.exe");
-
-    StartProcess(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/choco.exe", new ProcessSettings{ Arguments = "unpackself -f -y --allow-unofficial-build" });
-
-    // Tidy up logs and config folder which are not required
-    var logsDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/logs";
-    var configDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/config";
-
-    if (DirectoryExists(logsDirectory))
-    {
-        DeleteDirectory(logsDirectory, new DeleteDirectorySettings {
-            Recursive = true,
-            Force = true
-        });
-    }
-
-    if (DirectoryExists(configDirectory))
-    {
-        DeleteDirectory(configDirectory, new DeleteDirectorySettings {
-            Recursive = true,
-            Force = true
-        });
-    }
-});
-
-Task("Build-ChocolateyNo7zip")
-    .WithCriteria(() => BuildParameters.Configuration == "ReleaseOfficial", "Skipping No7zip because this isn't an official release")
-    .IsDependentOn("Build")
-    .IsDependentOn("Test")
-    .IsDependeeOf("Run-ILMerge")
-    .Does<BuildData>(data => RequireTool(ToolSettings.MSBuildExtensionPackTool, () =>
-{
-    Information("Building {0} with No7zip", BuildParameters.SolutionFilePath);
-
-    CleanDirectory(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/");
-
-    var no7zLogPath = BuildParameters.Paths.Files.BuildLogFilePath.ToString().Replace("\\.(\\S+)$", "-no7zip.${1}");
-
-    if (BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows)
-    {
-        var msbuildSettings = new MSBuildSettings()
-            .SetPlatformTarget(ToolSettings.BuildPlatformTarget)
-            .UseToolVersion(ToolSettings.BuildMSBuildToolVersion)
-            .WithProperty("OutputPath", MakeAbsolute(new DirectoryPath(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/")).FullPath)
-            .WithProperty("TreatWarningsAsErrors", BuildParameters.TreatWarningsAsErrors.ToString())
-            .WithTarget("Build")
-            .SetMaxCpuCount(ToolSettings.MaxCpuCount)
-            .SetConfiguration("ReleaseOfficialNo7zip")
-            .WithLogger(
-                Context.Tools.Resolve("MSBuild.ExtensionPack.Loggers.dll").FullPath,
-                "XmlFileLogger",
-                string.Format(
-                    "logfile=\"{0}\";invalidCharReplacement=_;verbosity=Detailed;encoding=UTF-8",
-                    no7zLogPath
-                )
-            );
-
-        MSBuild(BuildParameters.SolutionFilePath, msbuildSettings);
-    }
-
-    if (FileExists(no7zLogPath))
-    {
-        BuildParameters.BuildProvider.UploadArtifact(no7zLogPath);
-    }
-}));
-
-Task("Prepare-ChocolateyNo7zip-Package")
-    .WithCriteria(() => BuildParameters.Configuration == "ReleaseOfficial", "Skipping No7zip because this isn't an official release")
-    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
-    .WithCriteria(() => BuildParameters.ShouldRunChocolatey, "Skipping because execution of Chocolatey has been disabled")
-    .IsDependentOn("Build-ChocolateyNo7zip")
-    .IsDependeeOf("Sign-Assemblies")
-    .IsDependeeOf("Sign-PowerShellScripts")
-    .IsDependeeOf("Create-ChocolateyNo7zip-Package")
-    .Does(() =>
-{
-    var nuspecDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip";
-    // Copy the Nuget/Chocolatey directory from Root Folder to temp/nuspec/chocolatey-no7zip
-    EnsureDirectoryExists(nuspecDirectory);
-    CopyFiles(GetFiles("./nuspec/chocolatey/**/*"), nuspecDirectory, true);
-
-    // Copy legal documents
-    CopyFile(BuildParameters.RootDirectoryPath + "/docs/legal/CREDITS.md", nuspecDirectory + "/tools/chocolateyInstall/CREDITS.txt");
-
-    // Run Chocolatey Unpackself
-    CopyFile(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip_merged/choco.exe", nuspecDirectory + "/tools/chocolateyInstall/choco.exe");
-
-    StartProcess(nuspecDirectory + "/tools/chocolateyInstall/choco.exe", new ProcessSettings{ Arguments = "unpackself -f -y --allow-unofficial-build" });
-
-    // Tidy up logs and config folder which are not required
-    var logsDirectory = nuspecDirectory + "/tools/chocolateyInstall/logs";
-    var configDirectory = nuspecDirectory + "/tools/chocolateyInstall/config";
-
-    if (DirectoryExists(logsDirectory))
-    {
-        DeleteDirectory(logsDirectory, new DeleteDirectorySettings {
-            Recursive = true,
-            Force = true
-        });
-    }
-
-    if (DirectoryExists(configDirectory))
-    {
-        DeleteDirectory(configDirectory, new DeleteDirectorySettings {
-            Recursive = true,
-            Force = true
-        });
-    }
-});
-
-Task("Create-ChocolateyNo7zip-Package")
-    .WithCriteria(() => BuildParameters.Configuration == "ReleaseOfficial", "Skipping No7zip because this isn't an official release")
-    .WithCriteria(() => BuildParameters.ShouldRunChocolatey, "Skipping because execution of Chocolatey has been disabled")
-    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
-    .IsDependentOn("Prepare-ChocolateyNo7zip-Package")
-    .IsDependeeOf("Package")
-    .Does(() =>
-{
-    var nuspecDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/";
-    var nuspecFile = nuspecDirectory + "chocolatey.nuspec";
-
-    ChocolateyPack(nuspecFile, new ChocolateyPackSettings {
-        AllowUnofficial = true,
-        Version = BuildParameters.Version.PackageVersion,
-        OutputDirectory = nuspecDirectory,
-        WorkingDirectory = BuildParameters.Paths.Directories.PublishedApplications
-    });
-
-    MoveFile(
-        nuspecDirectory + "chocolatey." + BuildParameters.Version.PackageVersion + ".nupkg",
-        BuildParameters.Paths.Directories.ChocolateyPackages + "/chocolatey-no7zip." + BuildParameters.Version.PackageVersion + ".nupkg"
-    );
-});
-
-Task("Prepare-NuGet-Packages")
-    .WithCriteria(() => BuildParameters.ShouldRunNuGet, "Skipping because execution of NuGet has been disabled")
-    .IsDependeeOf("Create-NuGet-Packages")
-    .IsDependeeOf("Sign-PowerShellScripts")
-    .IsDependeeOf("Sign-Assemblies")
-    .Does(() =>
-{
-    // Copy legal documents
-    CleanDirectory(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib");
-    CopyFile(BuildParameters.RootDirectoryPath + "/docs/legal/CREDITS.md", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/CREDITS.txt");
-
-    CopyFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey_merged/*", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib");
-    CopyFile(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/chocolatey.xml", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/chocolatey.xml");
-});
-
-///////////////////////////////////////////////////////////////////////////////
-// RECIPE SCRIPT
-///////////////////////////////////////////////////////////////////////////////
-
-Environment.SetVariableNames();
-
-BuildParameters.SetParameters(context: Context,
-                            buildSystem: BuildSystem,
-                            sourceDirectoryPath: "./src",
-                            solutionFilePath: "./src/chocolatey.sln",
-                            solutionDirectoryPath: "./src/chocolatey",
-                            resharperSettingsFileName: "chocolatey.sln.DotSettings",
-                            title: "Chocolatey",
-                            repositoryOwner: "chocolatey",
-                            repositoryName: "choco",
-                            productName: "Chocolatey",
-                            productDescription: "chocolatey is a product of Chocolatey Software, Inc. - All Rights Reserved.",
-                            productCopyright: string.Format("Copyright © 2017 - {0} Chocolatey Software, Inc. Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved.", DateTime.Now.Year),
-                            shouldStrongNameSignDependentAssemblies: false,
-                            treatWarningsAsErrors: false,
-                            getScriptsToSign: getScriptsToSign,
-                            getFilesToSign: getFilesToSign,
-                            getILMergeConfigs: getILMergeConfigs,
-                            preferDotNetGlobalToolUsage: !IsRunningOnWindows(),
-                            shouldRunNuGet: IsRunningOnWindows(),
-                            shouldPublishAwsLambdas: false);
-
-ToolSettings.SetToolSettings(context: Context,
-                            buildMSBuildToolVersion: MSBuildToolVersion.NET40);
-
-BuildParameters.PrintParameters(Context);
-
+#load nuget:?package=Chocolatey.Cake.Recipe&version=0.18.0
+
+///////////////////////////////////////////////////////////////////////////////
+// TOOLS
+///////////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+// SCRIPT
+///////////////////////////////////////////////////////////////////////////////
+
+Func<List<ILMergeConfig>> getILMergeConfigs = () =>
+{
+    var mergeConfigs = new List<ILMergeConfig>();
+
+    var targetPlatform = "v4,C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.0";
+    var assembliesToILMerge = GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco/*.{exe|dll}")
+                            - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco/choco.exe")
+                            - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco/System.Management.Automation.dll");
+
+    Information("The following assemblies have been selected to be ILMerged for choco.exe...");
+    foreach (var assemblyToILMerge in assembliesToILMerge)
+    {
+        Information(assemblyToILMerge.FullPath);
+    }
+
+    mergeConfigs.Add(new ILMergeConfig() {
+        KeyFile = BuildParameters.StrongNameKeyPath,
+        LogFile = BuildParameters.Paths.Directories.Build + "/ilmerge-chocoexe.log",
+        TargetPlatform = targetPlatform,
+        Target = "exe",
+        Internalize = BuildParameters.RootDirectoryPath + "/src/chocolatey.console/ilmerge.internalize.ignore.txt",
+        Output = BuildParameters.Paths.Directories.PublishedApplications + "/choco_merged/choco.exe",
+        PrimaryAssemblyName = BuildParameters.Paths.Directories.PublishedApplications + "/choco/choco.exe",
+        AssemblyPaths = assembliesToILMerge });
+
+    assembliesToILMerge = GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/*.{exe|dll}")
+                            - GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/choco.exe")
+                            - GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/chocolatey.dll")
+                            - GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/log4net.dll")
+                            - GetFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/System.Management.Automation.dll");
+
+    Information("The following assemblies have been selected to be ILMerged for chocolatey.dll...");
+    foreach (var assemblyToILMerge in assembliesToILMerge)
+    {
+        Information(assemblyToILMerge.FullPath);
+    }
+
+    mergeConfigs.Add(new ILMergeConfig() {
+        KeyFile = BuildParameters.StrongNameKeyPath,
+        LogFile = BuildParameters.Paths.Directories.Build + "/ilmerge-chocolateydll.log",
+        TargetPlatform = targetPlatform,
+        Target = "dll",
+        Internalize = BuildParameters.RootDirectoryPath + "/src/chocolatey/ilmerge.internalize.ignore.dll.txt",
+        Output = BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey_merged/chocolatey.dll",
+        PrimaryAssemblyName = BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/chocolatey.dll",
+        AssemblyPaths = assembliesToILMerge });
+
+    if (DirectoryExists(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/"))
+    {
+        var no7zAssembliesToILMerge = GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/*.{exe|dll}")
+                                - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/choco.exe")
+                                - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/System.Management.Automation.dll")
+                                - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/chocolatey.tests*.dll")
+                                - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/{Moq|nunit.framework|Should}.dll");
+
+        Information("The following assemblies have been selected to be ILMerged for choco.exe No7zip Version...");
+        foreach (var assemblyToILMerge in no7zAssembliesToILMerge)
+        {
+            Information(assemblyToILMerge.FullPath);
+        }
+
+        mergeConfigs.Add(new ILMergeConfig() {
+            KeyFile = BuildParameters.StrongNameKeyPath,
+            LogFile = BuildParameters.Paths.Directories.Build + "/ilmerge-chocono7zipexe.log",
+            TargetPlatform = targetPlatform,
+            Target = "exe",
+            Internalize = BuildParameters.RootDirectoryPath + "/src/chocolatey.console/ilmerge.internalize.ignore.txt",
+            Output = BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip_merged/choco.exe",
+            PrimaryAssemblyName = BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/choco.exe",
+            AssemblyPaths = no7zAssembliesToILMerge });
+    }
+
+    return mergeConfigs;
+};
+
+Func<FilePathCollection> getScriptsToSign = () =>
+{
+    var scriptsToSign = GetFiles(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/**/*.{ps1|psm1}") +
+                        GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/**/*.{ps1|psm1}");
+
+    if (DirectoryExists(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip"))
+    {
+        scriptsToSign += GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/**/*.{ps1|psm1}");
+    }
+
+    Information("The following PowerShell scripts have been selected to be signed...");
+    foreach (var scriptToSign in scriptsToSign)
+    {
+        Information(scriptToSign.FullPath);
+    }
+
+    return scriptsToSign;
+};
+
+Func<FilePathCollection> getFilesToSign = () =>
+{
+    var filesToSign = GetFiles(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/chocolatey.dll")
+                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/choco.exe")
+                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/tools/{checksum|shimgen}.exe")
+                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/redirects/*.exe");
+
+    if (DirectoryExists(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip"))
+    {
+        filesToSign += GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/choco.exe")
+                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/tools/{checksum|shimgen}.exe")
+                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/redirects/*.exe");
+    }
+
+    Information("The following assemblies have been selected to be signed...");
+    foreach (var fileToSign in filesToSign)
+    {
+        Information(fileToSign.FullPath);
+    }
+
+    return filesToSign;
+};
+
+///////////////////////////////////////////////////////////////////////////////
+// CUSTOM TASKS
+///////////////////////////////////////////////////////////////////////////////
+
+Task("Prepare-Chocolatey-Packages")
+    .IsDependeeOf("Create-Chocolatey-Packages")
+    .IsDependeeOf("Sign-PowerShellScripts")
+    .IsDependeeOf("Sign-Assemblies")
+    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
+    .WithCriteria(() => BuildParameters.ShouldRunChocolatey, "Skipping because execution of Chocolatey has been disabled")
+    .Does(() =>
+{
+    // Copy legal documents
+    CopyFile(BuildParameters.RootDirectoryPath + "/docs/legal/CREDITS.md", BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/CREDITS.txt");
+
+    // Run Chocolatey Unpackself
+    CopyFile(BuildParameters.Paths.Directories.PublishedApplications + "/choco_merged/choco.exe", BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/choco.exe");
+
+    StartProcess(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/choco.exe", new ProcessSettings{ Arguments = "unpackself -f -y --allow-unofficial-build" });
+
+    // Tidy up logs and config folder which are not required
+    var logsDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/logs";
+    var configDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/config";
+
+    if (DirectoryExists(logsDirectory))
+    {
+        DeleteDirectory(logsDirectory, new DeleteDirectorySettings {
+            Recursive = true,
+            Force = true
+        });
+    }
+
+    if (DirectoryExists(configDirectory))
+    {
+        DeleteDirectory(configDirectory, new DeleteDirectorySettings {
+            Recursive = true,
+            Force = true
+        });
+    }
+});
+
+Task("Build-ChocolateyNo7zip")
+    .WithCriteria(() => BuildParameters.Configuration == "ReleaseOfficial", "Skipping No7zip because this isn't an official release")
+    .IsDependentOn("Build")
+    .IsDependentOn("Test")
+    .IsDependeeOf("Run-ILMerge")
+    .Does<BuildData>(data => RequireTool(ToolSettings.MSBuildExtensionPackTool, () =>
+{
+    Information("Building {0} with No7zip", BuildParameters.SolutionFilePath);
+
+    CleanDirectory(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/");
+
+    var no7zLogPath = BuildParameters.Paths.Files.BuildLogFilePath.ToString().Replace("\\.(\\S+)$", "-no7zip.${1}");
+
+    if (BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows)
+    {
+        var msbuildSettings = new MSBuildSettings()
+            .SetPlatformTarget(ToolSettings.BuildPlatformTarget)
+            .UseToolVersion(ToolSettings.BuildMSBuildToolVersion)
+            .WithProperty("OutputPath", MakeAbsolute(new DirectoryPath(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/")).FullPath)
+            .WithProperty("TreatWarningsAsErrors", BuildParameters.TreatWarningsAsErrors.ToString())
+            .WithTarget("Build")
+            .SetMaxCpuCount(ToolSettings.MaxCpuCount)
+            .SetConfiguration("ReleaseOfficialNo7zip")
+            .WithLogger(
+                Context.Tools.Resolve("MSBuild.ExtensionPack.Loggers.dll").FullPath,
+                "XmlFileLogger",
+                string.Format(
+                    "logfile=\"{0}\";invalidCharReplacement=_;verbosity=Detailed;encoding=UTF-8",
+                    no7zLogPath
+                )
+            );
+
+        MSBuild(BuildParameters.SolutionFilePath, msbuildSettings);
+    }
+
+    if (FileExists(no7zLogPath))
+    {
+        BuildParameters.BuildProvider.UploadArtifact(no7zLogPath);
+    }
+}));
+
+Task("Prepare-ChocolateyNo7zip-Package")
+    .WithCriteria(() => BuildParameters.Configuration == "ReleaseOfficial", "Skipping No7zip because this isn't an official release")
+    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
+    .WithCriteria(() => BuildParameters.ShouldRunChocolatey, "Skipping because execution of Chocolatey has been disabled")
+    .IsDependentOn("Build-ChocolateyNo7zip")
+    .IsDependeeOf("Sign-Assemblies")
+    .IsDependeeOf("Sign-PowerShellScripts")
+    .IsDependeeOf("Create-ChocolateyNo7zip-Package")
+    .Does(() =>
+{
+    var nuspecDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip";
+    // Copy the Nuget/Chocolatey directory from Root Folder to temp/nuspec/chocolatey-no7zip
+    EnsureDirectoryExists(nuspecDirectory);
+    CopyFiles(GetFiles("./nuspec/chocolatey/**/*"), nuspecDirectory, true);
+
+    // Copy legal documents
+    CopyFile(BuildParameters.RootDirectoryPath + "/docs/legal/CREDITS.md", nuspecDirectory + "/tools/chocolateyInstall/CREDITS.txt");
+
+    // Run Chocolatey Unpackself
+    CopyFile(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip_merged/choco.exe", nuspecDirectory + "/tools/chocolateyInstall/choco.exe");
+
+    StartProcess(nuspecDirectory + "/tools/chocolateyInstall/choco.exe", new ProcessSettings{ Arguments = "unpackself -f -y --allow-unofficial-build" });
+
+    // Tidy up logs and config folder which are not required
+    var logsDirectory = nuspecDirectory + "/tools/chocolateyInstall/logs";
+    var configDirectory = nuspecDirectory + "/tools/chocolateyInstall/config";
+
+    if (DirectoryExists(logsDirectory))
+    {
+        DeleteDirectory(logsDirectory, new DeleteDirectorySettings {
+            Recursive = true,
+            Force = true
+        });
+    }
+
+    if (DirectoryExists(configDirectory))
+    {
+        DeleteDirectory(configDirectory, new DeleteDirectorySettings {
+            Recursive = true,
+            Force = true
+        });
+    }
+});
+
+Task("Create-ChocolateyNo7zip-Package")
+    .WithCriteria(() => BuildParameters.Configuration == "ReleaseOfficial", "Skipping No7zip because this isn't an official release")
+    .WithCriteria(() => BuildParameters.ShouldRunChocolatey, "Skipping because execution of Chocolatey has been disabled")
+    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
+    .IsDependentOn("Prepare-ChocolateyNo7zip-Package")
+    .IsDependeeOf("Package")
+    .Does(() =>
+{
+    var nuspecDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/";
+    var nuspecFile = nuspecDirectory + "chocolatey.nuspec";
+
+    ChocolateyPack(nuspecFile, new ChocolateyPackSettings {
+        AllowUnofficial = true,
+        Version = BuildParameters.Version.PackageVersion,
+        OutputDirectory = nuspecDirectory,
+        WorkingDirectory = BuildParameters.Paths.Directories.PublishedApplications
+    });
+
+    MoveFile(
+        nuspecDirectory + "chocolatey." + BuildParameters.Version.PackageVersion + ".nupkg",
+        BuildParameters.Paths.Directories.ChocolateyPackages + "/chocolatey-no7zip." + BuildParameters.Version.PackageVersion + ".nupkg"
+    );
+});
+
+Task("Prepare-NuGet-Packages")
+    .WithCriteria(() => BuildParameters.ShouldRunNuGet, "Skipping because execution of NuGet has been disabled")
+    .IsDependeeOf("Create-NuGet-Packages")
+    .IsDependeeOf("Sign-PowerShellScripts")
+    .IsDependeeOf("Sign-Assemblies")
+    .Does(() =>
+{
+    // Copy legal documents
+    CleanDirectory(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib");
+    CopyFile(BuildParameters.RootDirectoryPath + "/docs/legal/CREDITS.md", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/CREDITS.txt");
+
+    CopyFiles(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey_merged/*", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib");
+    CopyFile(BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/chocolatey.xml", BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/lib/chocolatey.xml");
+});
+
+///////////////////////////////////////////////////////////////////////////////
+// RECIPE SCRIPT
+///////////////////////////////////////////////////////////////////////////////
+
+Environment.SetVariableNames();
+
+BuildParameters.SetParameters(context: Context,
+                            buildSystem: BuildSystem,
+                            sourceDirectoryPath: "./src",
+                            solutionFilePath: "./src/chocolatey.sln",
+                            solutionDirectoryPath: "./src/chocolatey",
+                            resharperSettingsFileName: "chocolatey.sln.DotSettings",
+                            title: "Chocolatey",
+                            repositoryOwner: "chocolatey",
+                            repositoryName: "choco",
+                            productName: "Chocolatey",
+                            productDescription: "chocolatey is a product of Chocolatey Software, Inc. - All Rights Reserved.",
+                            productCopyright: string.Format("Copyright © 2017 - {0} Chocolatey Software, Inc. Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved.", DateTime.Now.Year),
+                            shouldStrongNameSignDependentAssemblies: false,
+                            treatWarningsAsErrors: false,
+                            getScriptsToSign: getScriptsToSign,
+                            getFilesToSign: getFilesToSign,
+                            getILMergeConfigs: getILMergeConfigs,
+                            preferDotNetGlobalToolUsage: !IsRunningOnWindows(),
+                            shouldRunNuGet: IsRunningOnWindows(),
+                            shouldPublishAwsLambdas: false);
+
+ToolSettings.SetToolSettings(context: Context,
+                            buildMSBuildToolVersion: MSBuildToolVersion.NET40);
+
+BuildParameters.PrintParameters(Context);
+
 Build.Run();
\ No newline at end of file
diff --git a/src/chocolatey.tests.integration/Properties/AssemblyInfo.cs b/src/chocolatey.tests.integration/Properties/AssemblyInfo.cs
index 0ba5adf632..53adfe93e6 100644
--- a/src/chocolatey.tests.integration/Properties/AssemblyInfo.cs
+++ b/src/chocolatey.tests.integration/Properties/AssemblyInfo.cs
@@ -53,3 +53,7 @@
 
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+
+// Because we use a static variable for collecting log message
+// we can not run tests in parallel.
+[assembly: NUnit.Framework.NonParallelizable]
\ No newline at end of file
diff --git a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj
index 912e8a56e1..8414939e00 100644
--- a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj
+++ b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,6 +16,8 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <OverwriteReadOnlyFiles>true</OverwriteReadOnlyFiles>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -73,12 +77,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20220901\lib\net4\NuGet.Core.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.13.3\lib\net40\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="Should, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Should.1.1.12.0\lib\Should.dll</HintPath>
+      <HintPath>..\packages\Should.1.1.20\lib\Should.dll</HintPath>
     </Reference>
     <Reference Include="SimpleInjector, Version=2.8.3.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <HintPath>..\packages\SimpleInjector.2.8.3\lib\net40-client\SimpleInjector.dll</HintPath>
@@ -715,6 +718,13 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.3\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/chocolatey.tests.integration/infrastructure.app/services/FilesServiceSpecs.cs b/src/chocolatey.tests.integration/infrastructure.app/services/FilesServiceSpecs.cs
index d648d7e5d3..936bf7d6ef 100644
--- a/src/chocolatey.tests.integration/infrastructure.app/services/FilesServiceSpecs.cs
+++ b/src/chocolatey.tests.integration/infrastructure.app/services/FilesServiceSpecs.cs
@@ -69,6 +69,7 @@ public override void AfterObservations()
             {
                 base.AfterObservations();
                 _fileStream.Close();
+                _fileStream.Dispose();
             }
 
             public override void Because()
@@ -93,13 +94,7 @@ public void should_log_a_warning()
             [Platform(Exclude = "Mono")]
             public void should_log_a_warning_about_locked_files()
             {
-                bool lockedFiles = false;
-                foreach (var message in MockLogger.MessagesFor(LogLevel.Warn).or_empty_list_if_null())
-                {
-                    if (message.Contains("The process cannot access the file")) lockedFiles = true;
-                }
-
-                lockedFiles.ShouldBeTrue();
+                MockLogger.Verify(l => l.Warn(It.Is<string>(s => s.StartsWith("The process cannot access the file"))), Times.Once);
             }
 
             [Fact]
diff --git a/src/chocolatey.tests.integration/packages.config b/src/chocolatey.tests.integration/packages.config
index 1088cda952..383451b693 100644
--- a/src/chocolatey.tests.integration/packages.config
+++ b/src/chocolatey.tests.integration/packages.config
@@ -3,11 +3,11 @@
   <package id="log4net" version="2.0.12" targetFramework="net40" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net40" />
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
-  <package id="NUnitTestAdapter" version="2.3.0" targetFramework="net40" />
+  <package id="NUnit" version="3.13.3" targetFramework="net40" />
+  <package id="NUnit3TestAdapter" version="4.3.0" targetFramework="net40" />
   <package id="Rx-Core" version="2.1.30214.0" targetFramework="net40" />
   <package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net40" />
   <package id="Rx-Linq" version="2.1.30214.0" targetFramework="net40" />
-  <package id="Should" version="1.1.12.0" />
+  <package id="Should" version="1.1.20" targetFramework="net40" />
   <package id="SimpleInjector" version="2.8.3" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs b/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs
index 4d14d58ef5..d1b40b76c2 100644
--- a/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs
+++ b/src/chocolatey.tests.integration/scenarios/InstallScenarios.cs
@@ -754,6 +754,7 @@ public override void AfterObservations()
             {
                 base.AfterObservations();
                 fileStream.Close();
+                fileStream.Dispose();
             }
 
             public override void Because()
@@ -765,7 +766,7 @@ public override void Because()
             [Fact]
             public void should_install_where_install_location_reports()
             {
-                Directory.Exists(packageResult.InstallLocation).ShouldBeTrue();
+                DirectoryAssert.Exists(packageResult.InstallLocation);
             }
 
             [Fact]
@@ -773,7 +774,7 @@ public void should_reinstall_the_package_in_the_lib_directory()
             {
                 var packageDir = Path.Combine(Scenario.get_top_level(), "lib", Configuration.PackageNames);
 
-                Directory.Exists(packageDir).ShouldBeTrue();
+                DirectoryAssert.Exists(packageDir);
             }
 
             [Fact]
@@ -789,7 +790,7 @@ public void should_not_be_able_delete_the_rollback()
             {
                 var packageDir = Path.Combine(Scenario.get_top_level(), "lib-bkp", Configuration.PackageNames);
 
-                Directory.Exists(packageDir).ShouldBeTrue();
+                DirectoryAssert.Exists(packageDir);
             }
 
             [Fact]
@@ -855,6 +856,7 @@ public override void AfterObservations()
             {
                 base.AfterObservations();
                 fileStream.Close();
+                fileStream.Dispose();
             }
 
             public override void Because()
diff --git a/src/chocolatey.tests.integration/scenarios/PackScenarios.cs b/src/chocolatey.tests.integration/scenarios/PackScenarios.cs
index e535fe3f28..bf7a767d81 100644
--- a/src/chocolatey.tests.integration/scenarios/PackScenarios.cs
+++ b/src/chocolatey.tests.integration/scenarios/PackScenarios.cs
@@ -21,6 +21,9 @@ namespace chocolatey.tests.integration.scenarios
     using chocolatey.infrastructure.app.commands;
     using chocolatey.infrastructure.app.configuration;
     using chocolatey.infrastructure.app.services;
+
+    using NUnit.Framework;
+
     using Should;
 
     public class PackScenarios
@@ -67,7 +70,7 @@ public void generated_package_should_be_in_current_directory()
                 infos[0].ShouldEqual("Attempting to build package from 'myPackage.nuspec'.");
                 infos[1].ShouldEqual(string.Concat("Successfully created package '", package_path, "'"));
 
-                File.Exists(package_path).ShouldBeTrue();
+                FileAssert.Exists(package_path);
             }
 
             [Fact]
@@ -102,7 +105,7 @@ public void generated_package_should_be_in_specified_output_directory()
                 infos[0].ShouldEqual("Attempting to build package from 'myPackage.nuspec'.");
                 infos[1].ShouldEqual(string.Concat("Successfully created package '", package_path, "'"));
 
-                File.Exists(package_path).ShouldBeTrue();
+                FileAssert.Exists(package_path);
             }
 
             [Fact]
@@ -146,7 +149,7 @@ public void generated_package_should_be_in_current_directory()
                 infos[0].ShouldEqual("Attempting to build package from 'myPackage.nuspec'.");
                 infos[1].ShouldEqual(string.Concat("Successfully created package '", package_path, "'"));
 
-                File.Exists(package_path).ShouldBeTrue();
+                FileAssert.Exists(package_path);
             }
 
             [Fact]
@@ -154,8 +157,8 @@ public void property_settings_should_be_logged_as_debug_messages()
             {
                 var messages = MockLogger.MessagesFor(LogLevel.Debug);
                 messages.Count.ShouldEqual(2);
-                messages.Contains("Setting property 'commitId': 1234abcd");
-                messages.Contains("Setting property 'version': 0.1.0");
+                messages.ShouldContain("Setting property 'commitId': 1234abcd");
+                messages.ShouldContain("Setting property 'version': 0.1.0");
             }
         }
 
diff --git a/src/chocolatey.tests.integration/scenarios/PinScenarios.cs b/src/chocolatey.tests.integration/scenarios/PinScenarios.cs
index 600dfd834a..4d1f8da4c7 100644
--- a/src/chocolatey.tests.integration/scenarios/PinScenarios.cs
+++ b/src/chocolatey.tests.integration/scenarios/PinScenarios.cs
@@ -27,6 +27,9 @@ namespace chocolatey.tests.integration.scenarios
     using chocolatey.infrastructure.commands;
     using chocolatey.infrastructure.results;
     using NuGet;
+
+    using NUnit.Framework;
+
     using Should;
 
     public class PinScenarios
@@ -217,11 +220,12 @@ public override void Because()
                 MockLogger.reset();
             }
 
-            [ExpectedException(typeof(ApplicationException), ExpectedMessage = "Unable to find package named 'whatisthis' to pin. Please check to ensure it is installed.")]
             [Fact]
             public void should_throw_an_error_about_not_finding_the_package()
             {
-                Service.run(Configuration);
+                Assert.That(() => Service.run(Configuration),
+                    Throws.TypeOf<ApplicationException>()
+                    .And.Message.EqualTo("Unable to find package named 'whatisthis' to pin. Please check to ensure it is installed."));
             }
         }
 
@@ -286,11 +290,12 @@ public override void Because()
                 MockLogger.reset();
             }
 
-            [ExpectedException(typeof(ApplicationException), ExpectedMessage = "Unable to find package named 'whatisthis' to pin. Please check to ensure it is installed.")]
             [Fact]
             public void should_throw_an_error_about_not_finding_the_package()
             {
-                Service.run(Configuration);
+                Assert.That(() => Service.run(Configuration),
+                    Throws.TypeOf<ApplicationException>()
+                    .And.Message.EqualTo("Unable to find package named 'whatisthis' to pin. Please check to ensure it is installed."));
             }
         }
     }
diff --git a/src/chocolatey.tests.integration/scenarios/UninstallScenarios.cs b/src/chocolatey.tests.integration/scenarios/UninstallScenarios.cs
index cfc4b07868..9666ba4a31 100644
--- a/src/chocolatey.tests.integration/scenarios/UninstallScenarios.cs
+++ b/src/chocolatey.tests.integration/scenarios/UninstallScenarios.cs
@@ -341,10 +341,11 @@ public override void Because()
             }
 
             [Fact]
-            [ExpectedException(typeof(ApplicationException))]
             public void should_throw_an_error_that_it_is_not_allowed()
             {
-                Results = Service.uninstall_run(Configuration);
+                Action m = () => Service.uninstall_run(Configuration);
+
+                m.ShouldThrow<ApplicationException>();
             }
         }
 
@@ -434,6 +435,7 @@ public override void AfterObservations()
             {
                 base.AfterObservations();
                 fileStream.Close();
+                fileStream.Dispose();
             }
 
             public override void Because()
@@ -455,7 +457,7 @@ public void should_not_be_able_delete_the_rollback()
             {
                 var packageDir = Path.Combine(Scenario.get_top_level(), "lib-bkp", Configuration.PackageNames);
 
-                Directory.Exists(packageDir).ShouldBeTrue();
+                DirectoryAssert.Exists(packageDir);
             }
 
             [Fact]
@@ -508,6 +510,7 @@ public override void AfterObservations()
             {
                 base.AfterObservations();
                 fileStream.Close();
+                fileStream.Dispose();
             }
 
             public override void Because()
diff --git a/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs b/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs
index b3bdc20c7d..e80b8f4a81 100644
--- a/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs
+++ b/src/chocolatey.tests.integration/scenarios/UpgradeScenarios.cs
@@ -1216,10 +1216,11 @@ public override void Because()
             }
 
             [Fact]
-            [ExpectedException(typeof(ApplicationException))]
             public void should_throw_an_error_that_it_is_not_allowed()
             {
-                Results = Service.upgrade_run(Configuration);
+                Action m = () => Service.upgrade_run(Configuration);
+
+                m.ShouldThrow<ApplicationException>();
             }
         }
 
@@ -1343,6 +1344,7 @@ public override void AfterObservations()
             {
                 base.AfterObservations();
                 fileStream.Close();
+                fileStream.Dispose();
             }
 
             public override void Because()
@@ -1378,7 +1380,7 @@ public void should_not_be_able_delete_the_rollback()
             {
                 var packageDir = Path.Combine(Scenario.get_top_level(), "lib-bkp", Configuration.PackageNames);
 
-                Directory.Exists(packageDir).ShouldBeTrue();
+                DirectoryAssert.Exists(packageDir);
             }
 
             [Fact]
@@ -1451,6 +1453,7 @@ public override void AfterObservations()
             {
                 base.AfterObservations();
                 fileStream.Close();
+                fileStream.Dispose();
             }
 
             public override void Because()
diff --git a/src/chocolatey.tests/Properties/AssemblyInfo.cs b/src/chocolatey.tests/Properties/AssemblyInfo.cs
index fba1bb22c9..a3fd19a78c 100644
--- a/src/chocolatey.tests/Properties/AssemblyInfo.cs
+++ b/src/chocolatey.tests/Properties/AssemblyInfo.cs
@@ -51,3 +51,7 @@
 
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+
+// Because we use a static variable for collecting log message
+// we can not run tests in parallel.
+[assembly: NUnit.Framework.NonParallelizable]
\ No newline at end of file
diff --git a/src/chocolatey.tests/TinySpec.cs b/src/chocolatey.tests/TinySpec.cs
index b4a527e92b..967f4d0581 100644
--- a/src/chocolatey.tests/TinySpec.cs
+++ b/src/chocolatey.tests/TinySpec.cs
@@ -22,6 +22,7 @@ namespace chocolatey.tests
     using NUnit.Framework;
     using chocolatey.infrastructure.app;
     using chocolatey.infrastructure.logging;
+    using System.IO;
 
     // ReSharper disable InconsistentNaming
 
@@ -32,7 +33,7 @@ public class NUnitSetup
 
         private static readonly string InstallLocationVariable = Environment.GetEnvironmentVariable(ApplicationParameters.ChocolateyInstallEnvironmentVariableName);
 
-        [SetUp]
+        [OneTimeSetUp]
         public virtual void BeforeEverything()
         {
             Environment.SetEnvironmentVariable(ApplicationParameters.ChocolateyInstallEnvironmentVariableName, string.Empty);
@@ -40,13 +41,14 @@ public virtual void BeforeEverything()
             Log.InitializeWith(MockLogger);
             // do not log trace messages
             ILogExtensions.LogTraceMessages = false;
+            Directory.SetCurrentDirectory(AppDomain.CurrentDomain.BaseDirectory);
         }
 
         public virtual void before_everything()
         {
         }
 
-        [TearDown]
+        [OneTimeTearDown]
         public void AfterEverything()
         {
             Environment.SetEnvironmentVariable(ApplicationParameters.ChocolateyInstallEnvironmentVariableName, InstallLocationVariable);
@@ -61,7 +63,7 @@ public MockLogger MockLogger
             get { return NUnitSetup.MockLogger; }
         }
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void Setup()
         {
             if (MockLogger != null) MockLogger.reset();
@@ -94,7 +96,7 @@ public virtual void AfterEachSpec()
         {
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TearDown()
         {
             AfterObservations();
@@ -167,14 +169,5 @@ public IntegrationAttribute()
         }
     }
 
-    public class ExpectedExceptionAttribute : NUnit.Framework.ExpectedExceptionAttribute
-    {
-        public ExpectedExceptionAttribute(Type exceptionType) : base(exceptionType)
-        {}
-
-        public ExpectedExceptionAttribute(string exceptionName) : base(exceptionName)
-        {}
-    }
-
     // ReSharper restore InconsistentNaming
 }
diff --git a/src/chocolatey.tests/chocolatey.tests.csproj b/src/chocolatey.tests/chocolatey.tests.csproj
index 80236c608f..af87aa62c0 100644
--- a/src/chocolatey.tests/chocolatey.tests.csproj
+++ b/src/chocolatey.tests/chocolatey.tests.csproj
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props')" />
+  <Import Project="..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -13,6 +15,8 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -72,12 +76,11 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Chocolatey-NuGet.Core.2.11.0.20220901\lib\net4\NuGet.Core.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.13.3\lib\net40\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="Should, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Should.1.1.12.0\lib\Should.dll</HintPath>
+      <HintPath>..\packages\Should.1.1.20\lib\Should.dll</HintPath>
     </Reference>
     <Reference Include="SimpleInjector, Version=2.8.3.0, Culture=neutral, PublicKeyToken=984cb50dea722e99, processorArchitecture=MSIL">
       <HintPath>..\packages\SimpleInjector.2.8.3\lib\net40-client\SimpleInjector.dll</HintPath>
@@ -160,6 +163,13 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.3\build\NUnit.props'))" />
+    <Error Condition="!Exists('..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.4.3.0\build\net35\NUnit3TestAdapter.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/chocolatey.tests/infrastructure/filesystem/DotNetFileSystemSpecs.cs b/src/chocolatey.tests/infrastructure/filesystem/DotNetFileSystemSpecs.cs
index 210516fb0e..8eae702d01 100644
--- a/src/chocolatey.tests/infrastructure/filesystem/DotNetFileSystemSpecs.cs
+++ b/src/chocolatey.tests/infrastructure/filesystem/DotNetFileSystemSpecs.cs
@@ -120,10 +120,11 @@ public void Combine_should_combine_when_paths_start_with_forwardslashes_in_subpa
             }
 
             [Fact]
-            [ExpectedException(typeof(ApplicationException), MatchType = MessageMatch.StartsWith, ExpectedMessage = "Cannot combine a path with")]
             public void Combine_should_error_if_any_path_but_the_primary_contains_colon()
             {
-                FileSystem.combine_paths("C:\\temp", "C:");
+                Assert.That(() => FileSystem.combine_paths("C:\\temp", "C:"),
+                    Throws.TypeOf<ApplicationException>()
+                          .And.Message.StartsWith("Cannot combine a path with"));
             }
         }
 
diff --git a/src/chocolatey.tests/infrastructure/tolerance/FaultToleranceSpecs.cs b/src/chocolatey.tests/infrastructure/tolerance/FaultToleranceSpecs.cs
index cfb6cef6ca..e02b8c9e73 100644
--- a/src/chocolatey.tests/infrastructure/tolerance/FaultToleranceSpecs.cs
+++ b/src/chocolatey.tests/infrastructure/tolerance/FaultToleranceSpecs.cs
@@ -42,25 +42,27 @@ public override void Because()
             }
 
             [Fact]
-            [ExpectedException(typeof(ApplicationException))]
             public void should_not_allow_the_number_of_retries_to_be_zero()
             {
                 reset();
 
-                FaultTolerance.retry(
+                Action m = () => FaultTolerance.retry(
                     0,
                     () =>
                     {
                     });
+
+                m.ShouldThrow<ApplicationException>();
             }
 
             [Fact]
-            [ExpectedException(typeof(Exception))]
             public void should_throw_an_error_if_retries_are_reached()
             {
                 reset();
 
-                FaultTolerance.retry(2, () => { throw new Exception("YIKES"); }, waitDurationMilliseconds: 0);
+                Action m = () => FaultTolerance.retry(2, () => { throw new Exception("YIKES"); }, waitDurationMilliseconds: 0);
+
+                m.ShouldThrow<Exception>();
             }
 
             [Fact]
@@ -166,30 +168,32 @@ public void should_log_a_warning_message_when_set_to_warn()
             }
 
             [Fact]
-            [ExpectedException(typeof(Exception))]
             public void should_throw_an_error_if_throwError_set_to_true()
             {
                 reset();
 
-                FaultTolerance.try_catch_with_logging_exception(
+                Action m = () => FaultTolerance.try_catch_with_logging_exception(
                     () => { throw new Exception("This is the message"); },
                     "You have an error",
                     throwError: true
                 );
+
+                m.ShouldThrow<Exception>();
             }
 
             [Fact]
-            [ExpectedException(typeof(Exception))]
             public void should_still_throw_an_error_when_warn_is_set_if_throwError_set_to_true()
             {
                 reset();
 
-                FaultTolerance.try_catch_with_logging_exception(
+                Action m = () => FaultTolerance.try_catch_with_logging_exception(
                     () => { throw new Exception("This is the message"); },
                     "You have an error",
                     logWarningInsteadOfError: true,
                     throwError: true
                 );
+
+                m.ShouldThrow<Exception>();
             }
         }
     }
diff --git a/src/chocolatey.tests/packages.config b/src/chocolatey.tests/packages.config
index 81ae8aa55c..b239cafa3e 100644
--- a/src/chocolatey.tests/packages.config
+++ b/src/chocolatey.tests/packages.config
@@ -3,9 +3,8 @@
   <package id="log4net" version="2.0.12" targetFramework="net40" />
   <package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net40" />
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
-  <package id="NUnitTestAdapter" version="2.3.0" targetFramework="net40" />
-  <package id="Should" version="1.1.12.0" />
+  <package id="NUnit" version="3.13.3" targetFramework="net40" />
+  <package id="NUnit3TestAdapter" version="4.3.0" targetFramework="net40" />
+  <package id="Should" version="1.1.20" targetFramework="net40" />
   <package id="SimpleInjector" version="2.8.3" targetFramework="net40" />
-  <package id="TinySpec.NUnit" version="0.9.5" />
 </packages>
\ No newline at end of file