diff --git a/Invoke-Tests.ps1 b/Invoke-Tests.ps1
index 91ef6510aa..4dbbbec82d 100644
--- a/Invoke-Tests.ps1
+++ b/Invoke-Tests.ps1
@@ -97,7 +97,7 @@ try {
     $PesterConfiguration = [PesterConfiguration]@{
         Run        = @{
             PassThru = $true
-            Path     = "$PSScriptRoot/tests/chocolatey-tests"
+            Path     = "$PSScriptRoot/tests/pester-tests"
         }
         TestResult = @{
             Enabled       = $true
diff --git a/tests/chocolatey-tests/BundledApplications.Tests.ps1 b/tests/pester-tests/BundledApplications.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/BundledApplications.Tests.ps1
rename to tests/pester-tests/BundledApplications.Tests.ps1
diff --git a/tests/chocolatey-tests/TestCertificate.pfx b/tests/pester-tests/TestCertificate.pfx
similarity index 100%
rename from tests/chocolatey-tests/TestCertificate.pfx
rename to tests/pester-tests/TestCertificate.pfx
diff --git a/tests/chocolatey-tests/chocolatey.Tests.ps1 b/tests/pester-tests/chocolatey.Tests.ps1
similarity index 97%
rename from tests/chocolatey-tests/chocolatey.Tests.ps1
rename to tests/pester-tests/chocolatey.Tests.ps1
index ee1a485d66..f35721189a 100644
--- a/tests/chocolatey-tests/chocolatey.Tests.ps1
+++ b/tests/pester-tests/chocolatey.Tests.ps1
@@ -83,7 +83,7 @@ Describe "Ensuring Chocolatey is correctly installed" -Tag Environment, Chocolat
         It "Outputs the version when run with --version" {
             $Output = Invoke-Choco --version
             $script:CurrentVersion = $Output.String
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
             $LastExitCode | Should -Be 0
             ($Output.String -split '-' | Select-Object -First 1) -as [version] | Should -BeTrue
         }
@@ -345,7 +345,7 @@ exit $error.count
         }
 
         It 'should exit Success (0)' {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It 'should <removal> shim <_> on upgrade' -ForEach $RemovedShims {
@@ -369,7 +369,7 @@ exit $error.count
         }
 
         It 'Exits with Success (0)' {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It 'Should remove the invalid configuration file' {
diff --git a/tests/chocolatey-tests/chocolateyProfile.Tests.ps1 b/tests/pester-tests/chocolateyProfile.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/chocolateyProfile.Tests.ps1
rename to tests/pester-tests/chocolateyProfile.Tests.ps1
diff --git a/tests/chocolatey-tests/commands/choco-apikey.Tests.ps1 b/tests/pester-tests/commands/choco-apikey.Tests.ps1
similarity index 90%
rename from tests/chocolatey-tests/commands/choco-apikey.Tests.ps1
rename to tests/pester-tests/commands/choco-apikey.Tests.ps1
index c3e74a2219..5ed9daf81f 100644
--- a/tests/chocolatey-tests/commands/choco-apikey.Tests.ps1
+++ b/tests/pester-tests/commands/choco-apikey.Tests.ps1
@@ -27,7 +27,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Only displays chocolatey name with version" {
@@ -42,7 +42,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Only displays chocolatey name with version" {
@@ -57,7 +57,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Only displays chocolatey name with version" {
@@ -71,7 +71,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Only displays chocolatey name with version" {
@@ -104,7 +104,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -148,7 +148,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -195,7 +195,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -243,7 +243,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -275,7 +275,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -299,7 +299,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -317,7 +317,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -337,7 +337,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -358,7 +358,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, ApiKeyCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
diff --git a/tests/chocolatey-tests/commands/choco-config.Tests.ps1 b/tests/pester-tests/commands/choco-config.Tests.ps1
similarity index 91%
rename from tests/chocolatey-tests/commands/choco-config.Tests.ps1
rename to tests/pester-tests/commands/choco-config.Tests.ps1
index 59918886ea..92868b84a3 100644
--- a/tests/chocolatey-tests/commands/choco-config.Tests.ps1
+++ b/tests/pester-tests/commands/choco-config.Tests.ps1
@@ -62,7 +62,7 @@ Describe "choco config" -Tag Chocolatey, ConfigCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -104,7 +104,7 @@ Describe "choco config" -Tag Chocolatey, ConfigCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -122,7 +122,7 @@ Describe "choco config" -Tag Chocolatey, ConfigCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -140,7 +140,7 @@ Describe "choco config" -Tag Chocolatey, ConfigCommand {
         }
 
         It "Exits with failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Outputs an error indicating that there's no config by that name" {
@@ -157,7 +157,7 @@ Describe "choco config" -Tag Chocolatey, ConfigCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -184,7 +184,7 @@ Describe "choco config" -Tag Chocolatey, ConfigCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -211,7 +211,7 @@ Describe "choco config" -Tag Chocolatey, ConfigCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -241,7 +241,7 @@ Describe "choco config" -Tag Chocolatey, ConfigCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -268,7 +268,7 @@ Describe "choco config" -Tag Chocolatey, ConfigCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
diff --git a/tests/chocolatey-tests/commands/choco-export.Tests.ps1 b/tests/pester-tests/commands/choco-export.Tests.ps1
similarity index 93%
rename from tests/chocolatey-tests/commands/choco-export.Tests.ps1
rename to tests/pester-tests/commands/choco-export.Tests.ps1
index 97b7fa8a8b..7f78f1c7f6 100644
--- a/tests/chocolatey-tests/commands/choco-export.Tests.ps1
+++ b/tests/pester-tests/commands/choco-export.Tests.ps1
@@ -76,7 +76,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays description of command" {
@@ -133,7 +133,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         # NOTE: There is no output other than the header, and possibly the unofficial statement
@@ -184,7 +184,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         # NOTE: There is no output other than the header, and possibly the unofficial statement
@@ -226,7 +226,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         # NOTE: There is no output other than the header, and possibly the unofficial statement
@@ -277,7 +277,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         # NOTE: There is no output other than the header, and possibly the unofficial statement
@@ -319,7 +319,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         # NOTE: There is no output other than the header, and possibly the unofficial statement
@@ -387,7 +387,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         # NOTE: There is no output other than the header, and possibly the unofficial statement
@@ -415,7 +415,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Reports unable to export packages" {
@@ -439,7 +439,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Reports unable to export packages" {
@@ -459,7 +459,7 @@ Describe "choco export" -Tag Chocolatey, ExportCommand {
         }
 
         It "Exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays help page" {
diff --git a/tests/chocolatey-tests/commands/choco-feature.Tests.ps1 b/tests/pester-tests/commands/choco-feature.Tests.ps1
similarity index 93%
rename from tests/chocolatey-tests/commands/choco-feature.Tests.ps1
rename to tests/pester-tests/commands/choco-feature.Tests.ps1
index 8f56cd1439..21322d8b78 100644
--- a/tests/chocolatey-tests/commands/choco-feature.Tests.ps1
+++ b/tests/pester-tests/commands/choco-feature.Tests.ps1
@@ -37,7 +37,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, FeatureCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Lists available features" {
@@ -124,7 +124,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, FeatureCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Outputs a message indicating that it disabled the feature" {
@@ -148,7 +148,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, FeatureCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Outputs a message indicating that it enabled the feature" {
@@ -172,7 +172,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, FeatureCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Outputs a message indicating that it disabled the feature" {
@@ -192,7 +192,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, FeatureCommand {
         }
 
         It "Exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Outputs a message indicating it didn't find the feature in question" {
@@ -209,7 +209,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, FeatureCommand {
         }
 
         It "Exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Outputs a message indicating it didn't find the feature in question" {
diff --git a/tests/chocolatey-tests/commands/choco-help.Tests.ps1 b/tests/pester-tests/commands/choco-help.Tests.ps1
similarity index 91%
rename from tests/chocolatey-tests/commands/choco-help.Tests.ps1
rename to tests/pester-tests/commands/choco-help.Tests.ps1
index 68f854ec2f..fd147ff548 100644
--- a/tests/chocolatey-tests/commands/choco-help.Tests.ps1
+++ b/tests/pester-tests/commands/choco-help.Tests.ps1
@@ -43,7 +43,7 @@ Describe "choco help sections with option <_>" -ForEach $HelpOptions -Tag Chocol
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Outputs the Top-Level Help" {
@@ -68,7 +68,7 @@ Describe "choco help sections with option <_>" -ForEach $HelpOptions -Tag Chocol
         }
 
         It "'choco <_> $helpArgument' exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Outputs help for <_>" {
diff --git a/tests/chocolatey-tests/commands/choco-info.Tests.ps1 b/tests/pester-tests/commands/choco-info.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/choco-info.Tests.ps1
rename to tests/pester-tests/commands/choco-info.Tests.ps1
diff --git a/tests/chocolatey-tests/commands/choco-install.Tests.ps1 b/tests/pester-tests/commands/choco-install.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/choco-install.Tests.ps1
rename to tests/pester-tests/commands/choco-install.Tests.ps1
diff --git a/tests/chocolatey-tests/commands/choco-list.Tests.ps1 b/tests/pester-tests/commands/choco-list.Tests.ps1
similarity index 88%
rename from tests/chocolatey-tests/commands/choco-list.Tests.ps1
rename to tests/pester-tests/commands/choco-list.Tests.ps1
index d30e8465f4..32d7d3e8f7 100644
--- a/tests/chocolatey-tests/commands/choco-list.Tests.ps1
+++ b/tests/pester-tests/commands/choco-list.Tests.ps1
@@ -21,7 +21,7 @@ Describe "choco list" -Tag Chocolatey, ListCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Should contain packages and version with a space between them" {
@@ -43,7 +43,7 @@ Describe "choco list" -Tag Chocolatey, ListCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Should not contain packages and version with a space between them" {
@@ -65,7 +65,7 @@ Describe "choco list" -Tag Chocolatey, ListCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Should contain package name(s)" {
@@ -87,7 +87,7 @@ Describe "choco list" -Tag Chocolatey, ListCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Should contain package isexactversiondependency" {
@@ -105,7 +105,7 @@ Describe "choco list" -Tag Chocolatey, ListCommand {
         }
 
         It "Exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Should output expected error message" {
@@ -119,7 +119,7 @@ Describe "choco list" -Tag Chocolatey, ListCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Should not output the error message" {
diff --git a/tests/chocolatey-tests/commands/choco-new.Tests.ps1 b/tests/pester-tests/commands/choco-new.Tests.ps1
similarity index 92%
rename from tests/chocolatey-tests/commands/choco-new.Tests.ps1
rename to tests/pester-tests/commands/choco-new.Tests.ps1
index 9f3d0018f1..31e74d3776 100644
--- a/tests/chocolatey-tests/commands/choco-new.Tests.ps1
+++ b/tests/pester-tests/commands/choco-new.Tests.ps1
@@ -35,7 +35,7 @@ Describe "choco new" -Tag Chocolatey, NewCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -83,7 +83,7 @@ Describe "choco new" -Tag Chocolatey, NewCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -117,7 +117,7 @@ Describe "choco new" -Tag Chocolatey, NewCommand {
             }
 
             It "Exits with Success (0)" {
-                $Output.ExitCode | Should -Be 0
+                $Output.ExitCode | Should -Be 0 -Because $Output.String
             }
 
             It "Displays chocolatey name with version" {
@@ -151,7 +151,7 @@ Describe "choco new" -Tag Chocolatey, NewCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Creates the empty folders expected (<_>)" -ForEach $EmptyFolders {
diff --git a/tests/chocolatey-tests/commands/choco-outdated.Tests.ps1 b/tests/pester-tests/commands/choco-outdated.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/choco-outdated.Tests.ps1
rename to tests/pester-tests/commands/choco-outdated.Tests.ps1
diff --git a/tests/chocolatey-tests/commands/choco-pack.Tests.ps1 b/tests/pester-tests/commands/choco-pack.Tests.ps1
similarity index 94%
rename from tests/chocolatey-tests/commands/choco-pack.Tests.ps1
rename to tests/pester-tests/commands/choco-pack.Tests.ps1
index 7ddc606167..d863708fb7 100644
--- a/tests/chocolatey-tests/commands/choco-pack.Tests.ps1
+++ b/tests/pester-tests/commands/choco-pack.Tests.ps1
@@ -61,7 +61,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Outputs Error Message" {
@@ -85,7 +85,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -115,7 +115,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -146,7 +146,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -181,7 +181,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -216,7 +216,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays serialize error" {
@@ -248,7 +248,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -283,7 +283,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -323,7 +323,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -353,7 +353,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -383,7 +383,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -423,7 +423,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -460,7 +460,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It "'choco pack' exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays Chocolatey name with version" {
@@ -565,7 +565,7 @@ Describe "choco pack" -Tag Chocolatey, PackCommand {
         }
 
         It 'Fails to pack and exits with an error (1)' {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It 'Shows an error about the unsupported nuspec metadata element "<_>"' -TestCases $testCases {
diff --git a/tests/chocolatey-tests/commands/choco-pin.Tests.ps1 b/tests/pester-tests/commands/choco-pin.Tests.ps1
similarity index 87%
rename from tests/chocolatey-tests/commands/choco-pin.Tests.ps1
rename to tests/pester-tests/commands/choco-pin.Tests.ps1
index 8801b56474..465b434cf7 100644
--- a/tests/chocolatey-tests/commands/choco-pin.Tests.ps1
+++ b/tests/pester-tests/commands/choco-pin.Tests.ps1
@@ -30,7 +30,7 @@ Describe "choco pin" -Tag Chocolatey, PinCommand {
         }
 
         It "Exits with ExitCode 0" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Has no Pins listed" {
@@ -48,7 +48,7 @@ Describe "choco pin" -Tag Chocolatey, PinCommand {
         }
 
         It "Exits with ExitCode 0" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Lists the new Pin" {
@@ -67,7 +67,7 @@ Describe "choco pin" -Tag Chocolatey, PinCommand {
         }
 
         It "Exits with ExitCode 0" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Lists the Pins" {
@@ -85,7 +85,7 @@ Describe "choco pin" -Tag Chocolatey, PinCommand {
         }
 
         It "Exits with ExitCode 0" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Sets the Pin" {
@@ -105,7 +105,7 @@ Describe "choco pin" -Tag Chocolatey, PinCommand {
         }
 
         It "Exits with ExitCode 0" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Changes Nothing" {
@@ -123,7 +123,7 @@ Describe "choco pin" -Tag Chocolatey, PinCommand {
         }
 
         It "Exits with ExitCode 1" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Outputs a message indicating the failure" {
@@ -146,7 +146,7 @@ Describe "choco pin" -Tag Chocolatey, PinCommand {
         }
 
         It "Exits with ExitCode 0" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Removed the Pin" {
@@ -163,7 +163,7 @@ Describe "choco pin" -Tag Chocolatey, PinCommand {
         }
 
         It "Exits with ExitCode 0" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Changes Nothing" {
@@ -179,7 +179,7 @@ Describe "choco pin" -Tag Chocolatey, PinCommand {
         }
 
         It "Exits with ExitCode 1" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Outputs a message indicating the failure" {
diff --git a/tests/chocolatey-tests/commands/choco-push.Tests.ps1 b/tests/pester-tests/commands/choco-push.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/choco-push.Tests.ps1
rename to tests/pester-tests/commands/choco-push.Tests.ps1
diff --git a/tests/chocolatey-tests/commands/choco-removed.Tests.ps1 b/tests/pester-tests/commands/choco-removed.Tests.ps1
similarity index 92%
rename from tests/chocolatey-tests/commands/choco-removed.Tests.ps1
rename to tests/pester-tests/commands/choco-removed.Tests.ps1
index e74c9e3304..bfa350b92d 100644
--- a/tests/chocolatey-tests/commands/choco-removed.Tests.ps1
+++ b/tests/pester-tests/commands/choco-removed.Tests.ps1
@@ -37,7 +37,7 @@ exit $command.Count
         }
 
         It 'Exits with Success (0)' {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It 'Reports the correct command name' {
@@ -68,7 +68,7 @@ exit $command.Count
         }
 
         It 'Exits with Failure (1)' {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It 'Reports missing API key' {
@@ -85,7 +85,7 @@ exit $command.Count
         }
 
         It 'Exits with Failure (1)' {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Reports that the command doesn't exist" {
@@ -113,7 +113,7 @@ exit $command.Count
         }
 
         It 'Exits with Failure (1)' {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Reports that the path for the source could not be resolved" {
@@ -127,7 +127,7 @@ exit $command.Count
         }
 
         It 'Exits with Success (0)' {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Reports that the command doesn't exist" {
diff --git a/tests/chocolatey-tests/commands/choco-search.Tests.ps1 b/tests/pester-tests/commands/choco-search.Tests.ps1
similarity index 92%
rename from tests/chocolatey-tests/commands/choco-search.Tests.ps1
rename to tests/pester-tests/commands/choco-search.Tests.ps1
index 442fdd3b8a..15b4fe5801 100644
--- a/tests/chocolatey-tests/commands/choco-search.Tests.ps1
+++ b/tests/pester-tests/commands/choco-search.Tests.ps1
@@ -43,7 +43,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Lists available packages once" {
@@ -70,7 +70,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Contains packages and versions with a space between them" {
@@ -93,7 +93,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Shows each instance of an available package" {
@@ -119,7 +119,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Shows each instance of an available package" {
@@ -149,7 +149,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Shows version <_> of the package" -ForEach @("1.1.0"; "1.0.0") {
@@ -164,7 +164,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Should contain packages and version with a space between them" {
@@ -201,7 +201,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Outputs an appropriate message to indicate the failure to search no sources, and nothing else" {
@@ -215,7 +215,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Should contain packages and version with a space between them" {
@@ -265,7 +265,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays the package <_>" -ForEach @("mvcmusicstore-db 1.2.0"; "mvcmusicstore-web 1.2.0") {
@@ -288,7 +288,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays the package <_>" -ForEach @("mvcmusicstore-db 1.2.0"; "mvcmusicstore-web 1.2.0") {
@@ -309,7 +309,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Should list package isexactversiondependency v<_>" -ForEach @("1.0.1"; "1.0.0"; "2.0.0"; "1.1.0") {
@@ -329,7 +329,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SearchCommand, FindComma
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Should list package isexactversiondependency v<_>" -ForEach @("1.0.1"; "1.0.0"; "2.0.0"; "1.1.0"; "1.0.0-beta") {
diff --git a/tests/chocolatey-tests/commands/choco-source.Tests.ps1 b/tests/pester-tests/commands/choco-source.Tests.ps1
similarity index 92%
rename from tests/chocolatey-tests/commands/choco-source.Tests.ps1
rename to tests/pester-tests/commands/choco-source.Tests.ps1
index 8220951ae9..701550edad 100644
--- a/tests/chocolatey-tests/commands/choco-source.Tests.ps1
+++ b/tests/pester-tests/commands/choco-source.Tests.ps1
@@ -42,7 +42,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -76,7 +76,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -120,7 +120,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -167,7 +167,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -206,7 +206,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -232,7 +232,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -263,7 +263,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -287,7 +287,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -311,7 +311,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -335,7 +335,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -366,7 +366,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -394,7 +394,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
@@ -415,7 +415,7 @@ Describe "choco <_>" -ForEach $Command -Tag Chocolatey, SourceCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays chocolatey name with version" {
diff --git a/tests/chocolatey-tests/commands/choco-template.Tests.ps1 b/tests/pester-tests/commands/choco-template.Tests.ps1
similarity index 92%
rename from tests/chocolatey-tests/commands/choco-template.Tests.ps1
rename to tests/pester-tests/commands/choco-template.Tests.ps1
index c5f65ad0d0..55ba42cb7c 100644
--- a/tests/chocolatey-tests/commands/choco-template.Tests.ps1
+++ b/tests/pester-tests/commands/choco-template.Tests.ps1
@@ -28,7 +28,7 @@ Describe "choco <_>" -ForEach @(
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays the templates expected" {
@@ -51,7 +51,7 @@ Describe "choco <_>" -ForEach @(
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays the templates expected" {
@@ -74,7 +74,7 @@ Describe "choco <_>" -ForEach @(
         }
 
         It "Exits with Failure (1)" {
-            $Output.ExitCode | Should -Be 1
+            $Output.ExitCode | Should -Be 1 -Because $Output.String
         }
 
         It "Displays error with correct format" {
@@ -92,7 +92,7 @@ Describe "choco <_>" -ForEach @(
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays template information" {
@@ -139,7 +139,7 @@ Describe "choco <_>" -ForEach @(
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays template name and version" {
@@ -159,7 +159,7 @@ Describe "choco <_>" -ForEach @(
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays the templates marking the default as expected" {
@@ -184,7 +184,7 @@ Describe "choco <_>" -ForEach @(
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays the templates marking the default as expected" {
@@ -207,7 +207,7 @@ Describe "choco <_>" -ForEach @(
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Displays <Name> template information" -ForEach @(
diff --git a/tests/chocolatey-tests/commands/choco-uninstall.Tests.ps1 b/tests/pester-tests/commands/choco-uninstall.Tests.ps1
similarity index 97%
rename from tests/chocolatey-tests/commands/choco-uninstall.Tests.ps1
rename to tests/pester-tests/commands/choco-uninstall.Tests.ps1
index 220b68ea2c..9b58cb0335 100644
--- a/tests/chocolatey-tests/commands/choco-uninstall.Tests.ps1
+++ b/tests/pester-tests/commands/choco-uninstall.Tests.ps1
@@ -407,7 +407,7 @@ Describe "choco uninstall" -Tag Chocolatey, UninstallCommand {
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Uninstall package successfully" {
diff --git a/tests/chocolatey-tests/commands/choco-upgrade.Tests.ps1 b/tests/pester-tests/commands/choco-upgrade.Tests.ps1
similarity index 97%
rename from tests/chocolatey-tests/commands/choco-upgrade.Tests.ps1
rename to tests/pester-tests/commands/choco-upgrade.Tests.ps1
index ac9ef8fdcc..befc8dfc84 100644
--- a/tests/chocolatey-tests/commands/choco-upgrade.Tests.ps1
+++ b/tests/pester-tests/commands/choco-upgrade.Tests.ps1
@@ -491,7 +491,7 @@ To upgrade a local, or remote file, you may use:
 
         # This was broken in v1.3.1
         It "Exits with Success (0)" -Tag Broken {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Outputs a message showing that installation was successful" {
@@ -513,7 +513,7 @@ To upgrade a local, or remote file, you may use:
         }
 
         It "Exits with Success (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Outputs line with package name version and old version" {
diff --git a/tests/chocolatey-tests/commands/choco-version.Tests.ps1 b/tests/pester-tests/commands/choco-version.Tests.ps1
similarity index 89%
rename from tests/chocolatey-tests/commands/choco-version.Tests.ps1
rename to tests/pester-tests/commands/choco-version.Tests.ps1
index 4568656dae..c7d8e3f795 100644
--- a/tests/chocolatey-tests/commands/choco-version.Tests.ps1
+++ b/tests/pester-tests/commands/choco-version.Tests.ps1
@@ -17,7 +17,7 @@ Describe "choco version" -Tag Chocolatey, VersionCommand -Skip:(Test-ChocolateyV
         }
 
         It "Exits successfully (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Reports that the command is deprecated" {
@@ -36,7 +36,7 @@ Describe "choco version" -Tag Chocolatey, VersionCommand -Skip:(Test-ChocolateyV
         }
 
         It "Exits successfully (0)" {
-            $Output.ExitCode | Should -Be 0
+            $Output.ExitCode | Should -Be 0 -Because $Output.String
         }
 
         It "Outputs Help for Version" {
diff --git a/tests/chocolatey-tests/commands/testnuspecs/basic-dependencies/basic-dependencies.nuspec b/tests/pester-tests/commands/testnuspecs/basic-dependencies/basic-dependencies.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/basic-dependencies/basic-dependencies.nuspec
rename to tests/pester-tests/commands/testnuspecs/basic-dependencies/basic-dependencies.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/basic/basic.nuspec b/tests/pester-tests/commands/testnuspecs/basic/basic.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/basic/basic.nuspec
rename to tests/pester-tests/commands/testnuspecs/basic/basic.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/basic/tools/purpose.txt b/tests/pester-tests/commands/testnuspecs/basic/tools/purpose.txt
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/basic/tools/purpose.txt
rename to tests/pester-tests/commands/testnuspecs/basic/tools/purpose.txt
diff --git a/tests/chocolatey-tests/commands/testnuspecs/cdata/cdata.nuspec b/tests/pester-tests/commands/testnuspecs/cdata/cdata.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/cdata/cdata.nuspec
rename to tests/pester-tests/commands/testnuspecs/cdata/cdata.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/description-long.nuspec b/tests/pester-tests/commands/testnuspecs/description-long.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/description-long.nuspec
rename to tests/pester-tests/commands/testnuspecs/description-long.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/empty-requireLicenseAcceptance.nuspec b/tests/pester-tests/commands/testnuspecs/empty-requireLicenseAcceptance.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/empty-requireLicenseAcceptance.nuspec
rename to tests/pester-tests/commands/testnuspecs/empty-requireLicenseAcceptance.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/empty.nuspec b/tests/pester-tests/commands/testnuspecs/empty.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/empty.nuspec
rename to tests/pester-tests/commands/testnuspecs/empty.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/forward-slash/forward-slash.nuspec b/tests/pester-tests/commands/testnuspecs/forward-slash/forward-slash.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/forward-slash/forward-slash.nuspec
rename to tests/pester-tests/commands/testnuspecs/forward-slash/forward-slash.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/forward-slash/tools/purpose.txt b/tests/pester-tests/commands/testnuspecs/forward-slash/tools/purpose.txt
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/forward-slash/tools/purpose.txt
rename to tests/pester-tests/commands/testnuspecs/forward-slash/tools/purpose.txt
diff --git a/tests/chocolatey-tests/commands/testnuspecs/full/full.nuspec b/tests/pester-tests/commands/testnuspecs/full/full.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/full/full.nuspec
rename to tests/pester-tests/commands/testnuspecs/full/full.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/full/tools/purpose.txt b/tests/pester-tests/commands/testnuspecs/full/tools/purpose.txt
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/full/tools/purpose.txt
rename to tests/pester-tests/commands/testnuspecs/full/tools/purpose.txt
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-bugtrackerurl.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-bugtrackerurl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-bugtrackerurl.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-bugtrackerurl.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-character-and.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-character-and.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-character-and.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-character-and.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-character-lesser.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-character-lesser.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-character-lesser.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-character-lesser.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-docsurl.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-docsurl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-docsurl.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-docsurl.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-iconurl.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-iconurl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-iconurl.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-iconurl.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-id.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-id.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-id.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-id.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-licenseUrl.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-licenseUrl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-licenseUrl.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-licenseUrl.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-mailinglisturl.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-mailinglisturl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-mailinglisturl.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-mailinglisturl.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-no-content.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-no-content.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-no-content.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-no-content.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-projectsourceurl.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-projectsourceurl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-projectsourceurl.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-projectsourceurl.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-projecturl.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-projecturl.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-projecturl.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-projecturl.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-requireLicenseAcceptance.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-requireLicenseAcceptance.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-requireLicenseAcceptance.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-requireLicenseAcceptance.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/invalid-version.nuspec b/tests/pester-tests/commands/testnuspecs/invalid-version.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/invalid-version.nuspec
rename to tests/pester-tests/commands/testnuspecs/invalid-version.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/missing.nuspec b/tests/pester-tests/commands/testnuspecs/missing.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/missing.nuspec
rename to tests/pester-tests/commands/testnuspecs/missing.nuspec
diff --git a/tests/chocolatey-tests/commands/testnuspecs/required.nuspec b/tests/pester-tests/commands/testnuspecs/required.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testnuspecs/required.nuspec
rename to tests/pester-tests/commands/testnuspecs/required.nuspec
diff --git a/tests/chocolatey-tests/commands/testpackages/.gitignore b/tests/pester-tests/commands/testpackages/.gitignore
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/.gitignore
rename to tests/pester-tests/commands/testpackages/.gitignore
diff --git a/tests/chocolatey-tests/commands/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec b/tests/pester-tests/commands/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec
rename to tests/pester-tests/commands/testpackages/chocolatey-dummy-package/1.0.0/chocolatey-dummy-package.nuspec
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/installpackage.nuspec b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/installpackage.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/installpackage.nuspec
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/installpackage.nuspec
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/Casemismatch.exe.ignore
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/casemismatch.exe b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/casemismatch.exe
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/casemismatch.exe
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/casemismatch.exe
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1 b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyBeforeModify.ps1
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1 b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyinstall.ps1
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1 b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/chocolateyuninstall.ps1
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/console.exe b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/console.exe
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/console.exe
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/console.exe
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe.gui b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe.gui
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe.gui
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/graphical.exe.gui
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe
diff --git a/tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore b/tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore
rename to tests/pester-tests/commands/testpackages/installpackage/1.0.0/tools/not.installed.exe.ignore
diff --git a/tests/chocolatey-tests/commands/testpackages/packagewithscript/1.0.0/packagewithscript.nuspec b/tests/pester-tests/commands/testpackages/packagewithscript/1.0.0/packagewithscript.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/packagewithscript/1.0.0/packagewithscript.nuspec
rename to tests/pester-tests/commands/testpackages/packagewithscript/1.0.0/packagewithscript.nuspec
diff --git a/tests/chocolatey-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyBeforeModify.ps1 b/tests/pester-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyBeforeModify.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyBeforeModify.ps1
rename to tests/pester-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyBeforeModify.ps1
diff --git a/tests/chocolatey-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyinstall.ps1 b/tests/pester-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyinstall.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyinstall.ps1
rename to tests/pester-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyinstall.ps1
diff --git a/tests/chocolatey-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyuninstall.ps1 b/tests/pester-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyuninstall.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyuninstall.ps1
rename to tests/pester-tests/commands/testpackages/packagewithscript/1.0.0/tools/chocolateyuninstall.ps1
diff --git a/tests/chocolatey-tests/commands/testpackages/too-long-description/1.0.0/too-long-description.nuspec b/tests/pester-tests/commands/testpackages/too-long-description/1.0.0/too-long-description.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/too-long-description/1.0.0/too-long-description.nuspec
rename to tests/pester-tests/commands/testpackages/too-long-description/1.0.0/too-long-description.nuspec
diff --git a/tests/chocolatey-tests/commands/testpackages/too-long-title/1.0.0/too-long-title.nuspec b/tests/pester-tests/commands/testpackages/too-long-title/1.0.0/too-long-title.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/too-long-title/1.0.0/too-long-title.nuspec
rename to tests/pester-tests/commands/testpackages/too-long-title/1.0.0/too-long-title.nuspec
diff --git a/tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1 b/tests/pester-tests/commands/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1
rename to tests/pester-tests/commands/testpackages/zip-log-disable-test/tools/chocolateyinstall.ps1
diff --git a/tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip b/tests/pester-tests/commands/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip
rename to tests/pester-tests/commands/testpackages/zip-log-disable-test/tools/zip-log-disable-test.zip
diff --git a/tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec b/tests/pester-tests/commands/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec
similarity index 100%
rename from tests/chocolatey-tests/commands/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec
rename to tests/pester-tests/commands/testpackages/zip-log-disable-test/zip-log-disable-test.nuspec
diff --git a/tests/chocolatey-tests/features/ChocolateyCache.Tests.ps1 b/tests/pester-tests/features/ChocolateyCache.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/features/ChocolateyCache.Tests.ps1
rename to tests/pester-tests/features/ChocolateyCache.Tests.ps1
diff --git a/tests/chocolatey-tests/features/ChocolateyFunctions.Tests.ps1 b/tests/pester-tests/features/ChocolateyFunctions.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/features/ChocolateyFunctions.Tests.ps1
rename to tests/pester-tests/features/ChocolateyFunctions.Tests.ps1
diff --git a/tests/chocolatey-tests/features/EnvironmentVariables.Tests.ps1 b/tests/pester-tests/features/EnvironmentVariables.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/features/EnvironmentVariables.Tests.ps1
rename to tests/pester-tests/features/EnvironmentVariables.Tests.ps1
diff --git a/tests/chocolatey-tests/features/Hooks.Tests.ps1 b/tests/pester-tests/features/Hooks.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/features/Hooks.Tests.ps1
rename to tests/pester-tests/features/Hooks.Tests.ps1
diff --git a/tests/chocolatey-tests/features/Proxy.Tests.ps1 b/tests/pester-tests/features/Proxy.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/features/Proxy.Tests.ps1
rename to tests/pester-tests/features/Proxy.Tests.ps1
diff --git a/tests/chocolatey-tests/features/PythonSource.Tests.ps1 b/tests/pester-tests/features/PythonSource.Tests.ps1
similarity index 100%
rename from tests/chocolatey-tests/features/PythonSource.Tests.ps1
rename to tests/pester-tests/features/PythonSource.Tests.ps1