diff --git a/tests/packages/add-path/add-path.nuspec b/tests/packages/add-path/add-path.nuspec
index 8021a8069d..6a036c1822 100644
--- a/tests/packages/add-path/add-path.nuspec
+++ b/tests/packages/add-path/add-path.nuspec
@@ -1,77 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Read this before creating packages: https://docs.chocolatey.org/en-us/create/create-packages -->
-<!-- It is especially important to read the above link to understand additional requirements when publishing packages to the community feed aka dot org (https://community.chocolatey.org/packages). -->
-
-<!-- Test your packages in a test environment: https://github.com/chocolatey/chocolatey-test-environment -->
-
-<!--
-This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Reference. Chocolatey uses a special version of NuGet.Core that allows us to do more than was initially possible. As such there are certain things to be aware of:
-
-* the package xmlns schema url may cause issues with nuget.exe
-* Any of the following elements can ONLY be used by choco tools - projectSourceUrl, docsUrl, mailingListUrl, bugTrackerUrl, packageSourceUrl, provides, conflicts, replaces
-* nuget.exe can still install packages with those elements but they are ignored. Any authoring tools or commands will error on those elements
--->
-
-<!-- You can embed software files directly into packages, as long as you are not bound by distribution rights. -->
-<!-- * If you are an organization making private packages, you probably have no issues here -->
-<!-- * If you are releasing to the community feed, you need to consider distribution rights. -->
-<!-- Do not remove this test for UTF-8: if “Ω” doesn’t appear as greek uppercase omega letter enclosed in quotation marks, you should use an editor that supports UTF-8, not this one. -->
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
-    <!-- == PACKAGE SPECIFIC SECTION == -->
-    <!-- This section is about this package, although id and version have ties back to the software -->
-    <!-- id is lowercase and if you want a good separator for words, use '-', not '.'. Dots are only acceptable as suffixes for certain types of packages, e.g. .install, .portable, .extension, .template -->
-    <!-- If the software is cross-platform, attempt to use the same id as the debian/rpm package(s) if possible. -->
     <id>add-path</id>
-    <!-- version should MATCH as closely as possible with the underlying software -->
-    <!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
-    <!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
     <version>1.0.0</version>
-    <!-- <packageSourceUrl>Where is this Chocolatey package located (think GitHub)? packageSourceUrl is highly recommended for the community feed</packageSourceUrl>-->
-    <!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
-    <!--<owners>__REPLACE_YOUR_NAME__</owners>-->
-    <!-- ============================== -->
-
-    <!-- == SOFTWARE SPECIFIC SECTION == -->
-    <!-- This section is about the software itself -->
     <title>add-path (Install)</title>
-    <authors>__REPLACE_AUTHORS_OF_SOFTWARE_COMMA_SEPARATED__</authors>
-    <!-- projectUrl is required for the community feed -->
-    <projectUrl>https://_Software_Location_REMOVE_OR_FILL_OUT_</projectUrl>
-    <!-- There are a number of CDN Services that can be used for hosting the Icon for a package. More information can be found here: https://docs.chocolatey.org/en-us/create/create-packages#package-icon-guidelines -->
-    <!-- Here is an example using Githack -->
-    <!--<iconUrl>http://rawcdn.githack.com/__REPLACE_YOUR_REPO__/master/icons/add-path.png</iconUrl>-->
-    <!-- <copyright>Year Software Vendor</copyright> -->
-    <!-- If there is a license Url available, it is required for the community feed -->
-    <!-- <licenseUrl>Software License Location __REMOVE_OR_FILL_OUT__</licenseUrl>
-    <requireLicenseAcceptance>true</requireLicenseAcceptance>-->
-    <!--<projectSourceUrl>Software Source Location - is the software FOSS somewhere? Link to it with this</projectSourceUrl>-->
-    <!--<docsUrl>At what url are the software docs located?</docsUrl>-->
-    <!--<mailingListUrl></mailingListUrl>-->
-    <!--<bugTrackerUrl></bugTrackerUrl>-->
-    <tags>add-path SPACE_SEPARATED</tags>
-    <summary>__REPLACE__</summary>
-    <description>__REPLACE__MarkDown_Okay </description>
-    <!-- <releaseNotes>__REPLACE_OR_REMOVE__MarkDown_Okay</releaseNotes> -->
-    <!-- =============================== -->
-
-    <!-- Specifying dependencies and version ranges? https://docs.nuget.org/create/versioning#specifying-version-ranges-in-.nuspec-files -->
-    <!--<dependencies>
-      <dependency id="" version="__MINIMUM_VERSION__" />
-      <dependency id="" version="[__EXACT_VERSION__]" />
-      <dependency id="" version="[_MIN_VERSION_INCLUSIVE, MAX_VERSION_INCLUSIVE]" />
-      <dependency id="" version="[_MIN_VERSION_INCLUSIVE, MAX_VERSION_EXCLUSIVE)" />
-      <dependency id="" />
-      <dependency id="chocolatey-core.extension" version="1.1.0" />
-    </dependencies>-->
-    <!-- chocolatey-core.extension - https://community.chocolatey.org/packages/chocolatey-core.extension -->
-
-    <!--<provides>NOT YET IMPLEMENTED</provides>-->
-    <!--<conflicts>NOT YET IMPLEMENTED</conflicts>-->
-    <!--<replaces>NOT YET IMPLEMENTED</replaces>-->
+    <authors>Chocolatey Software</authors>
+    <projectUrl>https://chocolatey.org</projectUrl>
+    <tags>add-path</tags>
+    <summary>Package used for testing the add-path function</summary>
+    <description>Package used for testing the add-path function</description>
   </metadata>
   <files>
-    <!-- this section controls what actually gets packaged into the Chocolatey package -->
     <file src="tools\**" target="tools" />
   </files>
 </package>
diff --git a/tests/packages/failingdependency/0.9.9/failingdependency.nuspec b/tests/packages/failingdependency/0.9.9/failingdependency.nuspec
new file mode 100644
index 0000000000..2e38821882
--- /dev/null
+++ b/tests/packages/failingdependency/0.9.9/failingdependency.nuspec
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
+  <metadata>
+    <id>failingdependency</id>
+    <version>0.9.9</version>
+    <title>dependencyfailure (Install)</title>
+    <authors>Chocolatey Software</authors>
+    <projectUrl>https://chocolatey.org</projectUrl>
+    <tags>dependencyfailure admin</tags>
+    <summary>Package that fails to install by setting `ChocolateyExitCode` to `15608`. Used as part of dependency tree.</summary>
+    <description>Package that fails to install by setting `ChocolateyExitCode` to `15608`. Used as part of dependency tree.</description>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
diff --git a/tests/packages/failingdependency/0.9.9/tools/chocolateyinstall.ps1 b/tests/packages/failingdependency/0.9.9/tools/chocolateyinstall.ps1
new file mode 100644
index 0000000000..266daeb5e1
--- /dev/null
+++ b/tests/packages/failingdependency/0.9.9/tools/chocolateyinstall.ps1
@@ -0,0 +1,6 @@
+"Creating Runtime File"
+$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
+"Test File" | Out-File "$toolsDir\test-file.txt"
+
+Write-Error "This should fail!"
+$env:ChocolateyExitCode = '15608'
diff --git a/tests/packages/failingdependency/1.0.0/failingdependency.nuspec b/tests/packages/failingdependency/1.0.0/failingdependency.nuspec
new file mode 100644
index 0000000000..fef5a704f0
--- /dev/null
+++ b/tests/packages/failingdependency/1.0.0/failingdependency.nuspec
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
+  <metadata>
+    <id>failingdependency</id>
+    <version>1.0.0</version>
+    <title>dependencyfailure (Install)</title>
+    <authors>Chocolatey Software</authors>
+    <projectUrl>https://chocolatey.org</projectUrl>
+    <tags>dependencyfailure admin</tags>
+    <summary>Package that fails to install by setting `ChocolateyExitCode` to `15608`. Used as part of dependency tree.</summary>
+    <description>Package that fails to install by setting `ChocolateyExitCode` to `15608`. Used as part of dependency tree.</description>
+  </metadata>
+  <files>
+    <file src="tools\**" target="tools" />
+  </files>
+</package>
diff --git a/tests/packages/failingdependency/tools/chocolateyinstall.ps1 b/tests/packages/failingdependency/1.0.0/tools/chocolateyinstall.ps1
similarity index 100%
rename from tests/packages/failingdependency/tools/chocolateyinstall.ps1
rename to tests/packages/failingdependency/1.0.0/tools/chocolateyinstall.ps1
diff --git a/tests/packages/failingdependency/failingdependency.nuspec b/tests/packages/failingdependency/failingdependency.nuspec
deleted file mode 100644
index c8179b5e80..0000000000
--- a/tests/packages/failingdependency/failingdependency.nuspec
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
-  <metadata>
-    <id>failingdependency</id>
-    <version>1.0.0</version>
-    <title>dependencyfailure (Install)</title>
-    <authors>__REPLACE_AUTHORS_OF_SOFTWARE_COMMA_SEPARATED__</authors>
-    <projectUrl>https://_Software_Location_REMOVE_OR_FILL_OUT_</projectUrl>
-    <tags>dependencyfailure admin SPACE_SEPARATED</tags>
-    <summary>Package that fails to install. Used as part of dependency tree.</summary>
-    <description>Package that fails to install. Used as part of dependency tree.</description>
-  </metadata>
-  <files>
-    <file src="tools\**" target="tools" />
-  </files>
-</package>