diff --git a/Library/Homebrew/cask/spec/support/Casks/version-latest-with-checksum.rb b/Library/Homebrew/cask/spec/support/Casks/version-latest-with-checksum.rb
index 8dbca1a690..884ddff908 100644
--- a/Library/Homebrew/cask/spec/support/Casks/version-latest-with-checksum.rb
+++ b/Library/Homebrew/cask/spec/support/Casks/version-latest-with-checksum.rb
@@ -1,4 +1,4 @@
 test_cask 'version-latest-with-checksum' do
   version :latest
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 end
diff --git a/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb b/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
index 1d1dba254c..56d16b1476 100644
--- a/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/alt_target_test.rb
@@ -24,7 +24,7 @@ describe Hbc::Artifact::App do
         url TestHelper.local_binary_url("caffeine.zip")
         homepage "http://example.com/local-caffeine"
         version "1.2.3"
-        sha256 "9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853"
+        sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
         app "subdir/Caffeine.app", target: "AnotherName.app"
       end
 
@@ -53,7 +53,7 @@ describe Hbc::Artifact::App do
       cask = local_alt_caffeine
 
       staged_app_path = cask.staged_path.join("Caffeine.app")
-      staged_app_copy = staged_app_path.sub("Caffeine.app", "CaffeineAgain.app")
+      staged_app_copy = staged_app_path.sub("Caffeine.app", "Caffeine Deluxe.app")
       FileUtils.cp_r staged_app_path, staged_app_copy
 
       shutup do
@@ -64,7 +64,7 @@ describe Hbc::Artifact::App do
       File.exist?(staged_app_path).must_equal false
 
       File.exist?(Hbc.appdir.join("AnotherNameAgain.app")).must_equal false
-      File.exist?(cask.staged_path.join("CaffeineAgain.app")).must_equal true
+      File.exist?(cask.staged_path.join("Caffeine Deluxe.app")).must_equal true
     end
 
     it "avoids clobbering an existing app by moving over it" do
diff --git a/Library/Homebrew/cask/test/cask/artifact/app_test.rb b/Library/Homebrew/cask/test/cask/artifact/app_test.rb
index c5aa783650..aef2883986 100644
--- a/Library/Homebrew/cask/test/cask/artifact/app_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/app_test.rb
@@ -24,7 +24,7 @@ describe Hbc::Artifact::App do
         url TestHelper.local_binary_url("caffeine.zip")
         homepage "http://example.com/local-caffeine"
         version "1.2.3"
-        sha256 "9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853"
+        sha256 "67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94"
         app "subdir/Caffeine.app"
       end
 
@@ -53,7 +53,7 @@ describe Hbc::Artifact::App do
       cask = local_caffeine
 
       staged_app_path = cask.staged_path.join("Caffeine.app")
-      staged_app_copy = staged_app_path.sub("Caffeine.app", "CaffeineAgain.app")
+      staged_app_copy = staged_app_path.sub("Caffeine.app", "Caffeine Deluxe.app")
       FileUtils.cp_r staged_app_path, staged_app_copy
 
       shutup do
@@ -63,8 +63,8 @@ describe Hbc::Artifact::App do
       File.ftype(Hbc.appdir.join("Caffeine.app")).must_equal "directory"
       File.exist?(staged_app_path).must_equal false
 
-      File.exist?(Hbc.appdir.join("CaffeineAgain.app")).must_equal false
-      File.exist?(cask.staged_path.join("CaffeineAgain.app")).must_equal true
+      File.exist?(Hbc.appdir.join("Caffeine Deluxe.app")).must_equal false
+      File.exist?(cask.staged_path.join("Caffeine Deluxe.app")).must_equal true
     end
 
     describe "when the target already exists" do
diff --git a/Library/Homebrew/cask/test/cask/artifact/suite_test.rb b/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
index 5f72c45659..7d0e8aad37 100644
--- a/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/suite_test.rb
@@ -7,9 +7,9 @@ describe Hbc::Artifact::Suite do
     end
   }
   let(:expected_path) {
-    Hbc.appdir.join("caffeine_suite")
+    Hbc.appdir.join("Caffeine")
   }
-  let(:source_path) { cask.staged_path.join("caffeine_suite") }
+  let(:source_path) { cask.staged_path.join("Caffeine") }
 
   it "moves the suite to the proper directory" do
     shutup do
diff --git a/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb b/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
index 3432597e05..afa4a61aaf 100644
--- a/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
+++ b/Library/Homebrew/cask/test/cask/artifact/two_apps_correct_test.rb
@@ -21,11 +21,11 @@ describe Hbc::Artifact::App do
         Hbc::Artifact::App.new(cask).install_phase
       end
 
-      File.ftype(Hbc.appdir.join("Caffeine.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Mini.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Mini.app")).must_equal false
 
-      File.ftype(Hbc.appdir.join("Caffeine-2.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine-2.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Pro.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Pro.app")).must_equal false
     end
 
     it "works with an application in a subdir" do
@@ -36,62 +36,63 @@ describe Hbc::Artifact::App do
         Hbc::Artifact::App.new(cask).install_phase
       end
 
-      File.ftype(Hbc.appdir.join("Caffeine.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Mini.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Mini.app")).must_equal false
 
-      File.ftype(Hbc.appdir.join("Caffeine-2.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine-2.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Pro.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Pro.app")).must_equal false
     end
 
     it "only uses apps when they are specified" do
       cask = local_two_apps_caffeine
 
-      app_path = cask.staged_path.join("Caffeine.app")
-      FileUtils.cp_r app_path, app_path.sub("Caffeine.app", "CaffeineAgain.app")
+      app_path = cask.staged_path.join("Caffeine Mini.app")
+      FileUtils.cp_r app_path, app_path.sub("Caffeine Mini.app", "Caffeine Deluxe.app")
 
       shutup do
         Hbc::Artifact::App.new(cask).install_phase
       end
 
-      File.ftype(Hbc.appdir.join("Caffeine.app")).must_equal "directory"
-      File.exist?(cask.staged_path.join("Caffeine.app")).must_equal false
+      File.ftype(Hbc.appdir.join("Caffeine Mini.app")).must_equal "directory"
+      File.exist?(cask.staged_path.join("Caffeine Mini.app")).must_equal false
 
-      File.exist?(Hbc.appdir.join("CaffeineAgain.app")).must_equal false
-      File.exist?(cask.staged_path.join("CaffeineAgain.app")).must_equal true
+      File.exist?(Hbc.appdir.join("Caffeine Deluxe.app")).must_equal false
+      File.exist?(cask.staged_path.join("Caffeine Deluxe.app")).must_equal true
     end
 
-    it "avoids clobbering an existing app (app 1)" do
-      cask = local_two_apps_caffeine
 
-      Hbc.appdir.join("Caffeine.app").mkpath
+    describe "avoids clobbering an existing app" do
+      let(:cask) { local_two_apps_caffeine }
 
-      TestHelper.must_output(self, lambda {
-        Hbc::Artifact::App.new(cask).install_phase
-      }, <<-MESSAGE.undent.chomp)
-         ==> Moving App 'Caffeine-2.app' to '#{Hbc.appdir.join('Caffeine-2.app')}'
-         ==> It seems there is already an App at '#{Hbc.appdir.join('Caffeine.app')}'; not moving.
-         MESSAGE
+      it "when the first app of two already exists" do
+        Hbc.appdir.join("Caffeine Mini.app").mkpath
 
-      source_path = cask.staged_path.join("Caffeine.app")
+        TestHelper.must_output(self, lambda {
+          Hbc::Artifact::App.new(cask).install_phase
+        }, <<-EOS.undent.chomp)
+             ==> It seems there is already an App at '#{Hbc.appdir.join('Caffeine Mini.app')}'; not moving.
+             ==> Moving App 'Caffeine Pro.app' to '#{Hbc.appdir.join('Caffeine Pro.app')}'
+           EOS
 
-      File.identical?(source_path, Hbc.appdir.join("Caffeine.app")).must_equal false
-    end
+        source_path = cask.staged_path.join("Caffeine Mini.app")
 
-    it "avoids clobbering an existing app (app 2)" do
-      cask = local_two_apps_caffeine
+        File.identical?(source_path, Hbc.appdir.join("Caffeine Mini.app")).must_equal false
+      end
 
-      Hbc.appdir.join("Caffeine-2.app").mkpath
+      it "when the second app of two already exists" do
+        Hbc.appdir.join("Caffeine Pro.app").mkpath
 
-      TestHelper.must_output(self, lambda {
-        Hbc::Artifact::App.new(cask).install_phase
-      }, <<-MESSAGE.undent.chomp)
-         ==> It seems there is already an App at '#{Hbc.appdir.join('Caffeine-2.app')}'; not moving.
-         ==> Moving App 'Caffeine.app' to '#{Hbc.appdir.join('Caffeine.app')}'
-         MESSAGE
+        TestHelper.must_output(self, lambda {
+          Hbc::Artifact::App.new(cask).install_phase
+        }, <<-EOS.undent.chomp)
+             ==> Moving App 'Caffeine Mini.app' to '#{Hbc.appdir.join('Caffeine Mini.app')}'
+             ==> It seems there is already an App at '#{Hbc.appdir.join('Caffeine Pro.app')}'; not moving.
+           EOS
 
-      source_path = cask.staged_path.join("Caffeine-2.app")
+        source_path = cask.staged_path.join("Caffeine Pro.app")
 
-      File.identical?(source_path, Hbc.appdir.join("Caffeine-2.app")).must_equal false
+        File.identical?(source_path, Hbc.appdir.join("Caffeine Pro.app")).must_equal false
+      end
     end
   end
 end
diff --git a/Library/Homebrew/cask/test/cask/installer_test.rb b/Library/Homebrew/cask/test/cask/installer_test.rb
index 6efd4affc2..6b0225189f 100644
--- a/Library/Homebrew/cask/test/cask/installer_test.rb
+++ b/Library/Homebrew/cask/test/cask/installer_test.rb
@@ -16,151 +16,64 @@ describe Hbc::Installer do
     end
 
     it "works with dmg-based Casks" do
-      transmission = Hbc.load("local-transmission")
+      asset = Hbc.load("container-dmg")
 
       shutup do
-        Hbc::Installer.new(transmission).install
+        Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("local-transmission", transmission.version)
+      dest_path = Hbc.caskroom.join("container-dmg", asset.version)
       dest_path.must_be :directory?
-      application = Hbc.appdir.join("Transmission.app")
-      application.must_be :directory?
+      file = Hbc.appdir.join("container")
+      file.must_be :file?
     end
 
-    it "works with tar-based Casks" do
-      tarball = Hbc.load("tarball")
+    it "works with tar-gz-based Casks" do
+      asset = Hbc.load("container-tar-gz")
 
       shutup do
-        Hbc::Installer.new(tarball).install
+        Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("tarball", tarball.version)
+      dest_path = Hbc.caskroom.join("container-tar-gz", asset.version)
       dest_path.must_be :directory?
-      application = Hbc.appdir.join("Tarball.app")
-      application.must_be :directory?
+      application = Hbc.appdir.join("container")
+      application.must_be :file?
     end
 
     it "works with cab-based Casks" do
       skip("cabextract not installed") unless Hbc.homebrew_prefix.join("bin", "cabextract").exist?
-      cab_container = Hbc.load("cab-container")
+      asset = Hbc.load("cab-container")
       empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
-      cab_container.stubs(:depends_on).returns(empty)
+      asset.stubs(:depends_on).returns(empty)
 
       shutup do
-        Hbc::Installer.new(cab_container).install
+        Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("cab-container", cab_container.version)
+      dest_path = Hbc.caskroom.join("cab-container", asset.version)
       dest_path.must_be :directory?
-      application = Hbc.appdir.join("Application.app")
-      application.must_be :directory?
+      application = Hbc.appdir.join("container")
+      application.must_be :file?
     end
 
     it "works with Adobe AIR-based Casks" do
       skip("Adobe AIR not installed") unless Hbc::Container::Air.installer_exist?
-      air_container = Hbc.load("adobe-air-container")
+      asset = Hbc.load("container-air")
 
       shutup do
-        Hbc::Installer.new(air_container).install
+        Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("adobe-air-container", air_container.version)
+      dest_path = Hbc.caskroom.join("container-air", asset.version)
       dest_path.must_be :directory?
-      application = Hbc.appdir.join("GMDesk.app")
+      application = Hbc.appdir.join("container.app")
       application.must_be :directory?
     end
 
     it "works with 7z-based Casks" do
       skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
-      sevenzip_container = Hbc.load("sevenzip-container")
-      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
-      sevenzip_container.stubs(:depends_on).returns(empty)
-
-      shutup do
-        Hbc::Installer.new(sevenzip_container).install
-      end
-
-      dest_path = Hbc.caskroom.join("sevenzip-container", sevenzip_container.version)
-      dest_path.must_be :directory?
-      application = Hbc.appdir.join("Application.app")
-      application.must_be :directory?
-    end
-
-    it "works with xar-based Casks" do
-      xar_container = Hbc.load("xar-container")
-
-      shutup do
-        Hbc::Installer.new(xar_container).install
-      end
-
-      dest_path = Hbc.caskroom.join("xar-container", xar_container.version)
-      dest_path.must_be :directory?
-      application = Hbc.appdir.join("Application.app")
-      application.must_be :directory?
-    end
-
-    it "works with Stuffit-based Casks" do
-      skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
-      stuffit_container = Hbc.load("stuffit-container")
-      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
-      stuffit_container.stubs(:depends_on).returns(empty)
-
-      shutup do
-        Hbc::Installer.new(stuffit_container).install
-      end
-
-      dest_path = Hbc.caskroom.join("stuffit-container", stuffit_container.version)
-      dest_path.must_be :directory?
-      application = Hbc.appdir.join("sheldonmac", "v1.0")
-      application.must_be :directory?
-    end
-
-    it "works with RAR-based Casks" do
-      skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
-      rar_container = Hbc.load("rar-container")
-      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
-      rar_container.stubs(:depends_on).returns(empty)
-
-      shutup do
-        Hbc::Installer.new(rar_container).install
-      end
-
-      dest_path = Hbc.caskroom.join("rar-container", rar_container.version)
-      dest_path.must_be :directory?
-      application = Hbc.appdir.join("Application.app")
-      application.must_be :directory?
-    end
-
-    it "works with bz2-based Casks" do
-      asset = Hbc.load("bzipped-asset")
-
-      shutup do
-        Hbc::Installer.new(asset).install
-      end
-
-      dest_path = Hbc.caskroom.join("bzipped-asset", asset.version)
-      dest_path.must_be :directory?
-      file = Hbc.appdir.join("bzipped-asset--#{asset.version}")
-      file.must_be :file?
-    end
-
-    it "works with pure gz-based Casks" do
-      asset = Hbc.load("gzipped-asset")
-
-      shutup do
-        Hbc::Installer.new(asset).install
-      end
-
-      dest_path = Hbc.caskroom.join("gzipped-asset", asset.version)
-      dest_path.must_be :directory?
-      file = Hbc.appdir.join("gzipped-asset--#{asset.version}")
-      file.must_be :file?
-    end
-
-    it "works with xz-based Casks" do
-      skip("unxz not installed") unless Hbc.homebrew_prefix.join("bin", "unxz").exist?
-      asset = Hbc.load("xzipped-asset")
+      asset = Hbc.load("container-7z")
       empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
       asset.stubs(:depends_on).returns(empty)
 
@@ -168,15 +81,102 @@ describe Hbc::Installer do
         Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("xzipped-asset", asset.version)
+      dest_path = Hbc.caskroom.join("container-7z", asset.version)
       dest_path.must_be :directory?
-      file = Hbc.appdir.join("xzipped-asset--#{asset.version}")
+      file = Hbc.appdir.join("container")
+      file.must_be :file?
+    end
+
+    it "works with xar-based Casks" do
+      asset = Hbc.load("container-xar")
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-xar", asset.version)
+      dest_path.must_be :directory?
+      file = Hbc.appdir.join("container")
+      file.must_be :file?
+    end
+
+    it "works with Stuffit-based Casks" do
+      skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
+      asset = Hbc.load("container-sit")
+      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
+      asset.stubs(:depends_on).returns(empty)
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-sit", asset.version)
+      dest_path.must_be :directory?
+      application = Hbc.appdir.join("container")
+      application.must_be :file?
+    end
+
+    it "works with RAR-based Casks" do
+      skip("unar not installed") unless Hbc.homebrew_prefix.join("bin", "unar").exist?
+      asset = Hbc.load("container-rar")
+      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
+      asset.stubs(:depends_on).returns(empty)
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-rar", asset.version)
+      dest_path.must_be :directory?
+      application = Hbc.appdir.join("container")
+      application.must_be :file?
+    end
+
+    it "works with pure bzip2-based Casks" do
+      asset = Hbc.load("container-bzip2")
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-bzip2", asset.version)
+      dest_path.must_be :directory?
+      file = Hbc.appdir.join("container-bzip2--#{asset.version}")
+      file.must_be :file?
+    end
+
+    it "works with pure gzip-based Casks" do
+      asset = Hbc.load("container-gzip")
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-gzip", asset.version)
+      dest_path.must_be :directory?
+      file = Hbc.appdir.join("container-gzip--#{asset.version}")
+      file.must_be :file?
+    end
+
+    it "works with pure xz-based Casks" do
+      skip("unxz not installed") unless Hbc.homebrew_prefix.join("bin", "unxz").exist?
+      asset = Hbc.load("container-xz")
+      empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
+      asset.stubs(:depends_on).returns(empty)
+
+      shutup do
+        Hbc::Installer.new(asset).install
+      end
+
+      dest_path = Hbc.caskroom.join("container-xz", asset.version)
+      dest_path.must_be :directory?
+      file = Hbc.appdir.join("container-xz--#{asset.version}")
       file.must_be :file?
     end
 
     it "works with lzma-based Casks" do
       skip("unlzma not installed") unless Hbc.homebrew_prefix.join("bin", "unlzma").exist?
-      asset = Hbc.load("lzma-asset")
+      asset = Hbc.load("container-lzma")
       empty = stub(formula: [], cask: [], macos: nil, arch: nil, x11: nil)
       asset.stubs(:depends_on).returns(empty)
 
@@ -184,9 +184,9 @@ describe Hbc::Installer do
         Hbc::Installer.new(asset).install
       end
 
-      dest_path = Hbc.caskroom.join("lzma-asset", asset.version)
+      dest_path = Hbc.caskroom.join("container-lzma", asset.version)
       dest_path.must_be :directory?
-      file = Hbc.appdir.join("lzma-asset--#{asset.version}")
+      file = Hbc.appdir.join("container-lzma--#{asset.version}")
       file.must_be :file?
     end
 
@@ -316,15 +316,15 @@ describe Hbc::Installer do
       end # wont_raise
     end
 
-    it "works properly with a direct URL to a pkg" do
-      naked_pkg = Hbc.load("naked-pkg")
+    it "works naked-pkg-based Casks" do
+      naked_pkg = Hbc.load("container-pkg")
 
       shutup do
         Hbc::Installer.new(naked_pkg).install
       end
 
-      dest_path = Hbc.caskroom.join("naked-pkg", naked_pkg.version)
-      pkg = dest_path.join("Naked.pkg")
+      dest_path = Hbc.caskroom.join("container-pkg", naked_pkg.version)
+      pkg = dest_path.join("container.pkg")
       pkg.must_be :file?
     end
 
diff --git a/Library/Homebrew/cask/test/support/Casks/adobe-air-container.rb b/Library/Homebrew/cask/test/support/Casks/adobe-air-container.rb
deleted file mode 100644
index 302f15703a..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/adobe-air-container.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'adobe-air-container' do
-  version '1.0.1'
-  sha256 '9b6e4174afa76f2af50238364fcf87525bc4ed2287acbe62925107ab6cda5c99'
-
-  url TestHelper.local_binary_url('GMDesk-1.01.air')
-  homepage 'http://robertnyman.com/gmdesk/'
-
-  app 'GMDesk.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb b/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb
index 6aa3f29c34..f1d6190bc4 100644
--- a/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb
+++ b/Library/Homebrew/cask/test/support/Casks/appdir-interpolation.rb
@@ -1,6 +1,6 @@
 test_cask 'appdir-interpolation' do
   version '2.61'
-  sha256 'd26d7481cf1229f879c05e11cbdf440d99db6d6342f26c73d8ba7861b975532f'
+  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/appdir-interpolation'
diff --git a/Library/Homebrew/cask/test/support/Casks/auto-updates.rb b/Library/Homebrew/cask/test/support/Casks/auto-updates.rb
index f49060f839..ac3e008659 100644
--- a/Library/Homebrew/cask/test/support/Casks/auto-updates.rb
+++ b/Library/Homebrew/cask/test/support/Casks/auto-updates.rb
@@ -1,6 +1,6 @@
 test_cask 'auto-updates' do
   version '2.61'
-  sha256 'd26d7481cf1229f879c05e11cbdf440d99db6d6342f26c73d8ba7861b975532f'
+  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/auto-updates'
diff --git a/Library/Homebrew/cask/test/support/Casks/bzipped-asset.rb b/Library/Homebrew/cask/test/support/Casks/bzipped-asset.rb
deleted file mode 100644
index 69c31b43c4..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/bzipped-asset.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'bzipped-asset' do
-  version '1.2.3'
-  sha256 'eaf67b3a62cb9275f96e45d05c70b94bef9ef1dae344083e93eda6b0b388a61c'
-
-  url TestHelper.local_binary_url('bzipped_asset.bz2')
-  homepage 'http://example.com/bzipped-asset'
-
-  app 'bzipped-asset--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/cab-container.rb b/Library/Homebrew/cask/test/support/Casks/cab-container.rb
deleted file mode 100644
index 59e25af4e3..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/cab-container.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'cab-container' do
-  version '1.2.3'
-  sha256 '192d0cf6b727473f9ba0f55cec793ee2a8f7113c5cfe9d49e05a087436c5efe2'
-
-  url TestHelper.local_binary_url('cabcontainer.cab')
-  homepage 'http://example.com/cab-container'
-
-  depends_on formula: 'cabextract'
-
-  app 'cabcontainer/Application.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-7z.rb b/Library/Homebrew/cask/test/support/Casks/container-7z.rb
new file mode 100644
index 0000000000..0526bf7fe6
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-7z.rb
@@ -0,0 +1,11 @@
+test_cask 'container-7z' do
+  version '1.2.3'
+  sha256 '3f9542ace85ed5f88549e2d0ea82210f8ddc87e0defbb78469d3aed719b3c964'
+
+  url TestHelper.local_binary_url('container.7z')
+  homepage 'https://example.com/container-7z'
+
+  depends_on formula: 'unar'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-air.rb b/Library/Homebrew/cask/test/support/Casks/container-air.rb
new file mode 100644
index 0000000000..949b0f7a77
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-air.rb
@@ -0,0 +1,9 @@
+test_cask 'container-air' do
+  version '0.1'
+  sha256 '554472e163f8a028629b12b468e29acda9f16b223dff74fcd218bba73cc2365a'
+
+  url TestHelper.local_binary_url('container.air')
+  homepage 'https://example.com/container-air'
+
+  app 'container.app'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb b/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb
new file mode 100644
index 0000000000..b11b032f38
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-bzip2.rb
@@ -0,0 +1,9 @@
+test_cask 'container-bzip2' do
+  version '1.2.3'
+  sha256 'eaf67b3a62cb9275f96e45d05c70b94bef9ef1dae344083e93eda6b0b388a61c'
+
+  url TestHelper.local_binary_url('container.bz2')
+  homepage 'https://example.com/container-bzip2'
+
+  app 'container-bzip2--1.2.3'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-cab.rb b/Library/Homebrew/cask/test/support/Casks/container-cab.rb
new file mode 100644
index 0000000000..5a2c462eb4
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-cab.rb
@@ -0,0 +1,11 @@
+test_cask 'container-cab' do
+  version '1.2.3'
+  sha256 'c267f5cebb14814c8e612a8b7d2bda02aec913f869509b6f1d3883427c0f552b'
+
+  url TestHelper.local_binary_url('container.cab')
+  homepage 'https://example.com/container-cab'
+
+  depends_on formula: 'cabextract'
+
+  app 'cabcontainer/Application.app'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-dmg.rb b/Library/Homebrew/cask/test/support/Casks/container-dmg.rb
new file mode 100644
index 0000000000..6eb8ac013f
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-dmg.rb
@@ -0,0 +1,9 @@
+test_cask 'container-dmg' do
+  version '1.2.3'
+  sha256 '74d89d4fa5cef175cf43666ce11fefa3741aa1522114042ac75e656be37141a1'
+
+  url TestHelper.local_binary_url('container.dmg')
+  homepage 'https://example.com/container-dmg'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-gzip.rb b/Library/Homebrew/cask/test/support/Casks/container-gzip.rb
new file mode 100644
index 0000000000..0a5c64ba93
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-gzip.rb
@@ -0,0 +1,9 @@
+test_cask 'container-gzip' do
+  version '1.2.3'
+  sha256 'fa4ebb5246583c4b6e62e1df4e3b71b4e38a1d7d91c025665827195d36214b20'
+
+  url TestHelper.local_binary_url('container.gz')
+  homepage 'https://example.com/container-gzip'
+
+  app 'container-gzip--1.2.3'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-lzma.rb b/Library/Homebrew/cask/test/support/Casks/container-lzma.rb
new file mode 100644
index 0000000000..faa37c3baa
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-lzma.rb
@@ -0,0 +1,11 @@
+test_cask 'container-lzma' do
+  version '1.2.3'
+  sha256 '9d7edb32d02ab9bd9749a5bde8756595ea4cfcb1da02ca11c30fb591d4c1ed85'
+
+  url TestHelper.local_binary_url('container.lzma')
+  homepage 'https://example.com/container-lzma'
+
+  depends_on formula: 'lzma'
+
+  app 'container-lzma--1.2.3'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-pkg.rb b/Library/Homebrew/cask/test/support/Casks/container-pkg.rb
new file mode 100644
index 0000000000..4f4cd99fa9
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-pkg.rb
@@ -0,0 +1,7 @@
+test_cask 'container-pkg' do
+  version '1.2.3'
+  sha256 '611c50c8a2a2098951d2cd0fd54787ed81b92cd97b4b08bd7cba17f1e1d8e40b'
+
+  url TestHelper.local_binary_url('container.pkg')
+  homepage 'https://example.com/container-pkg'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-rar.rb b/Library/Homebrew/cask/test/support/Casks/container-rar.rb
new file mode 100644
index 0000000000..2105b738df
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-rar.rb
@@ -0,0 +1,11 @@
+test_cask 'container-rar' do
+  version '1.2.3'
+  sha256 '419af7864c0e1f125515c49b08bd22e0f7de39f5285897c440fe03c714871763'
+
+  url TestHelper.local_binary_url('container.rar')
+  homepage 'https://example.com/container-rar'
+
+  depends_on formula: 'unar'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-sit.rb b/Library/Homebrew/cask/test/support/Casks/container-sit.rb
new file mode 100644
index 0000000000..282e229404
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-sit.rb
@@ -0,0 +1,11 @@
+test_cask 'container-sit' do
+  version '1.2.3'
+  sha256 '0d21a64dce625044345c8ecca888e5439feaf254dac7f884917028a744f93cf3'
+
+  url TestHelper.local_binary_url('container.sit')
+  homepage 'https://example.com/container-sit'
+
+  depends_on formula: 'unar'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb b/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb
new file mode 100644
index 0000000000..1e6c12959d
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-tar-gz.rb
@@ -0,0 +1,9 @@
+test_cask 'container-tar-gz' do
+  version '1.2.3'
+  sha256 'fab685fabf73d5a9382581ce8698fce9408f5feaa49fa10d9bc6c510493300f5'
+
+  url TestHelper.local_binary_url('container.tar.gz')
+  homepage 'https://example.com/container-tar-gz'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-xar.rb b/Library/Homebrew/cask/test/support/Casks/container-xar.rb
new file mode 100644
index 0000000000..96a81dc644
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-xar.rb
@@ -0,0 +1,9 @@
+test_cask 'container-xar' do
+  version '1.2.3'
+  sha256 '5bb8e09a6fc630ebeaf266b1fd2d15e2ae7d32d7e4da6668a8093426fa1ba509'
+
+  url TestHelper.local_binary_url('container.xar')
+  homepage 'https://example.com/container-xar'
+
+  app 'container'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/container-xz.rb b/Library/Homebrew/cask/test/support/Casks/container-xz.rb
new file mode 100644
index 0000000000..8fd42c73f6
--- /dev/null
+++ b/Library/Homebrew/cask/test/support/Casks/container-xz.rb
@@ -0,0 +1,11 @@
+test_cask 'container-xz' do
+  version '1.2.3'
+  sha256 '839263f474edde1d54a9101606e6f0dc9d963acc93f6dcc5af8d10ebc3187c02'
+
+  url TestHelper.local_binary_url('container.xz')
+  homepage 'https://example.com/container-xz'
+
+  depends_on formula: 'xz'
+
+  app 'container-xz--1.2.3'
+end
diff --git a/Library/Homebrew/cask/test/support/Casks/gzipped-asset.rb b/Library/Homebrew/cask/test/support/Casks/gzipped-asset.rb
deleted file mode 100644
index 20872922c3..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/gzipped-asset.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'gzipped-asset' do
-  version '1.2.3'
-  sha256 '832506ade94b3e41ecdf2162654eb75891a0749803229e82b2e0420fd1b9e8d2'
-
-  url TestHelper.local_binary_url('gzipped_asset.gz')
-  homepage 'http://example.com/gzipped-asset'
-
-  app 'gzipped-asset--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb
index c257b05a12..0cb56c283c 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb
@@ -1,12 +1,12 @@
 test_cask 'invalid-appcast-multiple' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   appcast 'http://example.com/appcast1.xml',
-          checkpoint: '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
   appcast 'http://example.com/appcast2.xml',
-          checkpoint: '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
   homepage 'http://example.com/invalid-appcast-multiple'
 
   app 'Caffeine.app'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb
index c387029648..c57d235393 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-url.rb
@@ -1,10 +1,10 @@
 test_cask 'invalid-appcast-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   appcast 1,
-          checkpoint: '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
   homepage 'http://example.com/invalid-appcast-url'
 
   app 'Caffeine.app'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb
index c3cdaf90cb..c37a796ea6 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-conflicts-with-key.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-conflicts-with-key' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-conflicts-with-key'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb
index 68cefaee9a..2582213cac 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-arch-value.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-arch-value' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-arch-value'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb
index 99b4387316..0ede1144fc 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-key.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-key' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-key'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb
index fdf4d6faf7..8ff76ef23a 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-bad-release.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-macos-bad-release' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-macos-bad-release'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb
index d00960ecf2..a5c6edc9c4 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-macos-conflicting-forms.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-macos-conflicting-forms' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-macos-conflicting-forms'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb
index e15e259338..306db3e761 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-depends-on-x11-value.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-depends-on-x11-value' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-depends-on-x11-value'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
index a61b7b045d..7d30a337a1 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-conflicting-keys.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-conflicting-keys' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-conflicting-keys'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb
index ba6761311e..44831de375 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-id.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-key-id' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-key-id'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb
index 7e4fc33c1f..217d1af510 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-key-url.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-key-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-key-url'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb
index 3392286263..8818d41298 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-missing-key.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-missing-key' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-missing-keys'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb
index 94125f9d9a..4bf13712f0 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-multiple-stanzas.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-multiple-stanzas' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-multiple-stanzas'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb
index 0e08f0c180..ad8caec737 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-parameter.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-parameter' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-type'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb
index f1cdfcb630..0102554753 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-signature-url.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-signature-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-signature-url'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb
index bfb67b3f94..3862732697 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-gpg-type.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-gpg-type' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/invalid-gpg-type'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb
index 90ede3b2f5..6ab549b11f 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-format.rb
@@ -1,6 +1,6 @@
 test_cask => 'invalid-header-format' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb
index a69b0d7524..4c51019f43 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-token-mismatch.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-header-token-mismatch-this-text-does-not-belong' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb
index d49b834679..d07c0f43bb 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-header-version.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-header-version' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-license-multiple.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-license-multiple.rb
index 5144152f50..706b9490b9 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-license-multiple.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-license-multiple.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-license-multiple' do
   version '2.61'
-  sha256 'd26d7481cf1229f879c05e11cbdf440d99db6d6342f26c73d8ba7861b975532f'
+  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/invalid-license-multiple'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-license-value.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-license-value.rb
index 5cb1b08eaf..dbc36e5810 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-license-value.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-license-value.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-license-value' do
   version '2.61'
-  sha256 'd26d7481cf1229f879c05e11cbdf440d99db6d6342f26c73d8ba7861b975532f'
+  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/invalid-license-value'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb
index 6efd64b22c..1dc8757398 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-stage-only-conflict.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-stage-only-conflict' do
   version '2.61'
-  sha256 'd26d7481cf1229f879c05e11cbdf440d99db6d6342f26c73d8ba7861b975532f'
+  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/invalid-stage-only-conflict'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb
index ee90fa81a0..0f562f13f3 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-two-homepage' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb
index 7a4dce7aef..8b2d435cc6 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-url.rb
@@ -1,6 +1,6 @@
 test_cask 'invalid-two-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   url 'http://example.com/caffeine.zip'
diff --git a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb
index a3c47c9072..78ec5f367e 100644
--- a/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb
+++ b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-version.rb
@@ -1,7 +1,7 @@
 test_cask 'invalid-two-version' do
   version '1.2.3'
   version '2.0'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb b/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb
index fb217cc20f..93a7624a52 100644
--- a/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb
+++ b/Library/Homebrew/cask/test/support/Casks/local-caffeine.rb
@@ -1,6 +1,6 @@
 test_cask 'local-caffeine' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/local-transmission.rb b/Library/Homebrew/cask/test/support/Casks/local-transmission.rb
index e0aa719a56..365ef02f74 100644
--- a/Library/Homebrew/cask/test/support/Casks/local-transmission.rb
+++ b/Library/Homebrew/cask/test/support/Casks/local-transmission.rb
@@ -1,6 +1,6 @@
 test_cask 'local-transmission' do
   version '2.61'
-  sha256 'd26d7481cf1229f879c05e11cbdf440d99db6d6342f26c73d8ba7861b975532f'
+  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/local-transmission'
diff --git a/Library/Homebrew/cask/test/support/Casks/lzma-asset.rb b/Library/Homebrew/cask/test/support/Casks/lzma-asset.rb
deleted file mode 100644
index f69bc7974e..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/lzma-asset.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'lzma-asset' do
-  version '1.2.3'
-  sha256 '9d7edb32d02ab9bd9749a5bde8756595ea4cfcb1da02ca11c30fb591d4c1ed85'
-
-  url TestHelper.local_binary_url('lzma-asset.lzma')
-  homepage 'http://example.com/xzipped-asset'
-
-  depends_on formula: 'lzma'
-
-  app 'lzma-asset--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/naked-pkg.rb b/Library/Homebrew/cask/test/support/Casks/naked-pkg.rb
deleted file mode 100644
index 4650ce55df..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/naked-pkg.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-test_cask 'naked-pkg' do
-  version '1.2.3'
-  sha256 '611c50c8a2a2098951d2cd0fd54787ed81b92cd97b4b08bd7cba17f1e1d8e40b'
-
-  url TestHelper.local_binary_url('Naked.pkg')
-  homepage 'http://example.com/naked-pkg'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/rar-container.rb b/Library/Homebrew/cask/test/support/Casks/rar-container.rb
deleted file mode 100644
index 60c525b601..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/rar-container.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'rar-container' do
-  version '1.2.3'
-  sha256 '35fb13fb13e6aefc38b60486627eff6b6b55b2f99f64bf47938530c6cf9e0a0f'
-
-  url TestHelper.local_binary_url('rarcontainer.rar')
-  homepage 'http://example.com/rar-container'
-
-  depends_on formula: 'unar'
-
-  app 'rarcontainer/Application.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/sevenzip-container.rb b/Library/Homebrew/cask/test/support/Casks/sevenzip-container.rb
deleted file mode 100644
index 7f8cfdb4e8..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/sevenzip-container.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'sevenzip-container' do
-  version '1.2.3'
-  sha256 '1550701e7848fcb94f5b0085cca527083a8662ddeb8c0a7bc5af6bd145797cc1'
-
-  url TestHelper.local_binary_url('sevenzipcontainer.7z')
-  homepage 'http://example.com/sevenzip-container'
-
-  depends_on formula: 'unar'
-
-  app 'sevenzipcontainer/Application.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/stage-only.rb b/Library/Homebrew/cask/test/support/Casks/stage-only.rb
index 25fa7460c3..d7fae47d6c 100644
--- a/Library/Homebrew/cask/test/support/Casks/stage-only.rb
+++ b/Library/Homebrew/cask/test/support/Casks/stage-only.rb
@@ -1,6 +1,6 @@
 test_cask 'stage-only' do
   version '2.61'
-  sha256 'd26d7481cf1229f879c05e11cbdf440d99db6d6342f26c73d8ba7861b975532f'
+  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/stage-only'
diff --git a/Library/Homebrew/cask/test/support/Casks/stuffit-container.rb b/Library/Homebrew/cask/test/support/Casks/stuffit-container.rb
deleted file mode 100644
index a42971ff50..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/stuffit-container.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'stuffit-container' do
-  version '1.2.3'
-  sha256 '892b6d49a98c546381d41dec9b0bbc04267ac008d72b99755968d357099993b7'
-
-  url TestHelper.local_binary_url('sheldonmac.sit')
-  homepage 'http://www.tobias-jung.de/seekingprofont/'
-
-  depends_on formula: 'unar'
-
-  artifact 'sheldonmac/v1.0', target: "#{Hbc.appdir}/sheldonmac/v1.0"
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/tarball.rb b/Library/Homebrew/cask/test/support/Casks/tarball.rb
deleted file mode 100644
index 3134a2f943..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/tarball.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'tarball' do
-  version '1.2.3'
-  sha256 :no_check
-
-  url TestHelper.local_binary_url('tarball.tgz')
-  homepage 'http://example.com/tarball'
-
-  app 'Tarball.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb b/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb
index 6d6456d86c..9a3196ce14 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb
@@ -1,6 +1,6 @@
 test_cask 'with-alt-target' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-appcast.rb b/Library/Homebrew/cask/test/support/Casks/with-appcast.rb
index acfb1565fb..fb4ad9249f 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-appcast.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-appcast.rb
@@ -1,10 +1,10 @@
 test_cask 'with-appcast' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   appcast 'http://example.com/appcast.xml',
-          checkpoint: '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+          checkpoint: '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
   homepage 'http://example.com/with-appcast'
 
   app 'Caffeine.app'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-caveats.rb b/Library/Homebrew/cask/test/support/Casks/with-caveats.rb
index 4412ceb3a2..38ae23b44a 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-caveats.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-caveats.rb
@@ -1,6 +1,6 @@
 test_cask 'with-caveats' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb b/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb
index 2690649c3e..db55930a28 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-conditional-caveats.rb
@@ -1,6 +1,6 @@
 test_cask 'with-conditional-caveats' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb b/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb
index 789c9839ab..540f14164b 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-conflicts-with.rb
@@ -1,6 +1,6 @@
 test_cask 'with-conflicts-with' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-conflicts-with'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch-failure.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch-failure.rb
index a257d7bbbf..5f9016be90 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch-failure.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch-failure.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-arch-failure' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-arch-failure'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb
index 9fc5baf1ad..0746c38744 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-arch.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-arch' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-arch'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb
index 7352895917..4a11a163ba 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic-helper.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-cask-cyclic-helper' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-cask-cyclic-helper'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb
index 776929e835..bb782ae19f 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-cyclic.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-cask-cyclic' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-cask-cyclic'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb
index f08e73ac44..1dc9393508 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask-multiple.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-cask-multiple' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-cask-multiple'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb
index 013da2379e..62f32c32b6 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-cask.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-cask' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-cask'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb
index bdc4e1f8b8..1d02add393 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula-multiple.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-formula-multiple' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-formula-multiple'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb
index 3d365a1876..3dd5428930 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-formula.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-formula' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-formula'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb
index 4b3b8320e3..9467825366 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-array.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-array' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-array'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb
index 448e44a03a..2780b94b7a 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-comparison.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-comparison' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-comparison'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb
index 8e7a9a1d63..4e3c777ec9 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-failure.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-failure' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-failure'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb
index 1dab7654c7..7c15e63080 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-string.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-string' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-string'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb
index 00a99c525f..10b1de754a 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-macos-symbol.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-macos-symbol' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-macos-symbol'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb
index 00ea1cef93..d52a0e8dfa 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11-false.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-x11-false' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-x11-false'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb
index 2345473340..c7384cf3ab 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-depends-on-x11.rb
@@ -1,6 +1,6 @@
 test_cask 'with-depends-on-x11' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-depends-on-x11'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb
index 5e6eb51b80..3d8d80445e 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact-no-target.rb
@@ -1,6 +1,6 @@
 test_cask 'with-generic-artifact-no-target' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-generic-artifact'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb
index 87bf43cba0..9e379c543a 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-generic-artifact.rb
@@ -1,6 +1,6 @@
 test_cask 'with-generic-artifact' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-generic-artifact'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb b/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb
index 68fa8123af..943421b82e 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-gpg-key-url.rb
@@ -1,6 +1,6 @@
 test_cask 'with-gpg-key-url' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-gpg-key-url'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-gpg.rb b/Library/Homebrew/cask/test/support/Casks/with-gpg.rb
index 84c29fe658..dcdd8f5933 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-gpg.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-gpg.rb
@@ -1,6 +1,6 @@
 test_cask 'with-gpg' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-gpg'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb b/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb
index 6291d7f880..7e9a8eac74 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-installer-manual.rb
@@ -1,6 +1,6 @@
 test_cask 'with-installer-manual' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb b/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb
index 3014a39456..c4b18417a9 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-installer-script.rb
@@ -1,6 +1,6 @@
 test_cask 'with-installer-script' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/with-install-script'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-license.rb b/Library/Homebrew/cask/test/support/Casks/with-license.rb
index ed2572cf2a..6a85c8e319 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-license.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-license.rb
@@ -1,6 +1,6 @@
 test_cask 'with-license' do
   version '2.61'
-  sha256 'd26d7481cf1229f879c05e11cbdf440d99db6d6342f26c73d8ba7861b975532f'
+  sha256 'e44ffa103fbf83f55c8d0b1bea309a43b2880798dae8620b1ee8da5e1095ec68'
 
   url TestHelper.local_binary_url('transmission-2.61.dmg')
   homepage 'http://example.com/with-license'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-suite.rb b/Library/Homebrew/cask/test/support/Casks/with-suite.rb
index 594276574d..dbaaaea679 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-suite.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-suite.rb
@@ -1,11 +1,11 @@
 test_cask 'with-suite' do
   version '1.2.3'
-  sha256 'd1302a0dc25aff72ad395ed01a830468b92253ffd28269574f3ac0b5eb8aad54'
+  sha256 'd95dcc12d4e5be0bc3cb9793c4b7e7f69a25f0b3c7418494b0c883957e6eeae4'
 
-  url TestHelper.local_binary_url('caffeine_suite.zip')
+  url TestHelper.local_binary_url('caffeine-suite.zip')
   name 'Caffeine'
   homepage 'http://example.com/with-suite'
   license :unknown # TODO: change license and remove this comment; ':unknown' is a machine-generated placeholder
 
-  suite 'caffeine_suite'
+  suite 'Caffeine'
 end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb b/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb
index a0b142528a..069eb9fed8 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-two-apps-correct.rb
@@ -1,10 +1,10 @@
 test_cask 'with-two-apps-correct' do
   version '1.2.3'
-  sha256 'c0c79dce9511c80603328013dbbcb80b859cc8b9190660b6832b5f0e60d74c82'
+  sha256 '3178fbfd1ea5d87a2a0662a4eb599ebc9a03888e73f37538d9f3f6ee69d2368e'
 
-  url TestHelper.local_binary_url('2_app_caffeine.zip')
+  url TestHelper.local_binary_url('caffeines.zip')
   homepage 'http://example.com/local-caffeine'
 
-  app 'Caffeine.app'
-  app 'Caffeine-2.app'
+  app 'Caffeine Mini.app'
+  app 'Caffeine Pro.app'
 end
diff --git a/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb b/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb
index 0ae37a79ce..baf6e52f0d 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-two-apps-incorrect.rb
@@ -1,6 +1,6 @@
 test_cask 'with-two-apps-incorrect' do
   version '1.2.3'
-  sha256 '9203c30951f9aab41ac294bbeb1dcef7bed401ff0b353dcb34d68af32ea51853'
+  sha256 '67cdb8a02803ef37fdbf7e0be205863172e41a561ca446cd84f0d7ab35a99d94'
 
   url TestHelper.local_binary_url('caffeine.zip')
   homepage 'http://example.com/local-caffeine'
diff --git a/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb b/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb
index 61adefab67..d4783e6a65 100644
--- a/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb
+++ b/Library/Homebrew/cask/test/support/Casks/with-two-apps-subdir.rb
@@ -1,10 +1,10 @@
 test_cask 'with-two-apps-subdir' do
   version '1.2.3'
-  sha256 '03edce6992a6095e120dcfadf7049158589ae6f0548c145ed1b1c6f2883f6dca'
+  sha256 'd687c22a21c02bd8f07da9302c8292b93a04df9a929e3f04d09aea6c76f75c65'
 
-  url TestHelper.local_binary_url('2_app_subdir.zip')
+  url TestHelper.local_binary_url('caffeines-subdir.zip')
   homepage 'http://example.com/local-caffeine'
 
-  app 'subdir/Caffeine.app'
-  app 'subdir/Caffeine-2.app'
+  app 'Caffeines/Caffeine Mini.app'
+  app 'Caffeines/Caffeine Pro.app'
 end
diff --git a/Library/Homebrew/cask/test/support/Casks/xar-container.rb b/Library/Homebrew/cask/test/support/Casks/xar-container.rb
deleted file mode 100644
index 158c4f7172..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/xar-container.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-test_cask 'xar-container' do
-  version '1.2.3'
-  sha256 '1418752ac49e859f88590db245015cb2f8b459f619e0c50fd6ff87b902c72ee1'
-
-  url TestHelper.local_binary_url('xarcontainer.xar')
-  homepage 'http://example.com/xar-container'
-
-  app 'xarcontainer/Application.app'
-end
diff --git a/Library/Homebrew/cask/test/support/Casks/xzipped-asset.rb b/Library/Homebrew/cask/test/support/Casks/xzipped-asset.rb
deleted file mode 100644
index badb252eef..0000000000
--- a/Library/Homebrew/cask/test/support/Casks/xzipped-asset.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-test_cask 'xzipped-asset' do
-  version '1.2.3'
-  sha256 '839263f474edde1d54a9101606e6f0dc9d963acc93f6dcc5af8d10ebc3187c02'
-
-  url TestHelper.local_binary_url('xzipped-asset.xz')
-  homepage 'http://example.com/xzipped-asset'
-
-  depends_on formula: 'xz'
-
-  app 'xzipped-asset--1.2.3'
-end
diff --git a/Library/Homebrew/cask/test/support/binaries/2_app_caffeine.zip b/Library/Homebrew/cask/test/support/binaries/2_app_caffeine.zip
deleted file mode 100755
index a678f7c11b..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/2_app_caffeine.zip and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/2_app_subdir.zip b/Library/Homebrew/cask/test/support/binaries/2_app_subdir.zip
deleted file mode 100755
index 27637a731d..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/2_app_subdir.zip and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/GMDesk-1.01.air b/Library/Homebrew/cask/test/support/binaries/GMDesk-1.01.air
deleted file mode 100644
index 215cd2b8b3..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/GMDesk-1.01.air and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/cabcontainer.cab b/Library/Homebrew/cask/test/support/binaries/cabcontainer.cab
deleted file mode 100644
index f1dec52dcc..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/cabcontainer.cab and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeine-suite.zip b/Library/Homebrew/cask/test/support/binaries/caffeine-suite.zip
new file mode 100644
index 0000000000..c38f771aeb
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/caffeine-suite.zip differ
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeine.zip b/Library/Homebrew/cask/test/support/binaries/caffeine.zip
index 74aca21db6..99d61bbfb7 100644
Binary files a/Library/Homebrew/cask/test/support/binaries/caffeine.zip and b/Library/Homebrew/cask/test/support/binaries/caffeine.zip differ
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeine_suite.zip b/Library/Homebrew/cask/test/support/binaries/caffeine_suite.zip
deleted file mode 100644
index 7fa5c958e5..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/caffeine_suite.zip and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeines-subdir.zip b/Library/Homebrew/cask/test/support/binaries/caffeines-subdir.zip
new file mode 100644
index 0000000000..ce5064d099
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/caffeines-subdir.zip differ
diff --git a/Library/Homebrew/cask/test/support/binaries/caffeines.zip b/Library/Homebrew/cask/test/support/binaries/caffeines.zip
new file mode 100644
index 0000000000..372fcc5229
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/caffeines.zip differ
diff --git a/Library/Homebrew/cask/test/support/binaries/container.7z b/Library/Homebrew/cask/test/support/binaries/container.7z
new file mode 100644
index 0000000000..30dbe24f71
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/container.7z differ
diff --git a/Library/Homebrew/cask/test/support/binaries/container.air b/Library/Homebrew/cask/test/support/binaries/container.air
new file mode 100644
index 0000000000..64005aea34
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/container.air differ
diff --git a/Library/Homebrew/cask/test/support/binaries/bzipped_asset.bz2 b/Library/Homebrew/cask/test/support/binaries/container.bz2
old mode 100644
new mode 100755
similarity index 100%
rename from Library/Homebrew/cask/test/support/binaries/bzipped_asset.bz2
rename to Library/Homebrew/cask/test/support/binaries/container.bz2
diff --git a/Library/Homebrew/cask/test/support/binaries/container.cab b/Library/Homebrew/cask/test/support/binaries/container.cab
new file mode 100644
index 0000000000..edc741aa12
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/container.cab differ
diff --git a/Library/Homebrew/cask/test/support/binaries/container.dmg b/Library/Homebrew/cask/test/support/binaries/container.dmg
new file mode 100644
index 0000000000..3b3cbf51c2
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/container.dmg differ
diff --git a/Library/Homebrew/cask/test/support/binaries/container.gz b/Library/Homebrew/cask/test/support/binaries/container.gz
new file mode 100755
index 0000000000..67ede6b965
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/container.gz differ
diff --git a/Library/Homebrew/cask/test/support/binaries/lzma-asset.lzma b/Library/Homebrew/cask/test/support/binaries/container.lzma
old mode 100644
new mode 100755
similarity index 100%
rename from Library/Homebrew/cask/test/support/binaries/lzma-asset.lzma
rename to Library/Homebrew/cask/test/support/binaries/container.lzma
diff --git a/Library/Homebrew/cask/test/support/binaries/Naked.pkg b/Library/Homebrew/cask/test/support/binaries/container.pkg
similarity index 100%
rename from Library/Homebrew/cask/test/support/binaries/Naked.pkg
rename to Library/Homebrew/cask/test/support/binaries/container.pkg
diff --git a/Library/Homebrew/cask/test/support/binaries/container.rar b/Library/Homebrew/cask/test/support/binaries/container.rar
new file mode 100644
index 0000000000..7477c3bb4e
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/container.rar differ
diff --git a/Library/Homebrew/cask/test/support/binaries/container.sit b/Library/Homebrew/cask/test/support/binaries/container.sit
new file mode 100755
index 0000000000..3e29d21dce
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/container.sit differ
diff --git a/Library/Homebrew/cask/test/support/binaries/container.tar.gz b/Library/Homebrew/cask/test/support/binaries/container.tar.gz
new file mode 100644
index 0000000000..c464fb413e
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/container.tar.gz differ
diff --git a/Library/Homebrew/cask/test/support/binaries/container.xar b/Library/Homebrew/cask/test/support/binaries/container.xar
new file mode 100644
index 0000000000..563a5ba1e6
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/container.xar differ
diff --git a/Library/Homebrew/cask/test/support/binaries/xzipped-asset.xz b/Library/Homebrew/cask/test/support/binaries/container.xz
old mode 100644
new mode 100755
similarity index 100%
rename from Library/Homebrew/cask/test/support/binaries/xzipped-asset.xz
rename to Library/Homebrew/cask/test/support/binaries/container.xz
diff --git a/Library/Homebrew/cask/test/support/binaries/gzipped_asset.gz b/Library/Homebrew/cask/test/support/binaries/gzipped_asset.gz
deleted file mode 100644
index 1ff300b4b6..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/gzipped_asset.gz and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/rarcontainer.rar b/Library/Homebrew/cask/test/support/binaries/rarcontainer.rar
deleted file mode 100644
index 9886993069..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/rarcontainer.rar and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/sevenzipcontainer.7z b/Library/Homebrew/cask/test/support/binaries/sevenzipcontainer.7z
deleted file mode 100644
index 226f620cd1..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/sevenzipcontainer.7z and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/sheldonmac.sit b/Library/Homebrew/cask/test/support/binaries/sheldonmac.sit
deleted file mode 100644
index 8814fc31ee..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/sheldonmac.sit and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/tarball.tgz b/Library/Homebrew/cask/test/support/binaries/tarball.tgz
deleted file mode 100644
index 0a9fb56957..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/tarball.tgz and /dev/null differ
diff --git a/Library/Homebrew/cask/test/support/binaries/transmission-2.61.dmg b/Library/Homebrew/cask/test/support/binaries/transmission-2.61.dmg
index b9629f837c..e72afe0278 100644
Binary files a/Library/Homebrew/cask/test/support/binaries/transmission-2.61.dmg and b/Library/Homebrew/cask/test/support/binaries/transmission-2.61.dmg differ
diff --git a/Library/Homebrew/cask/test/support/binaries/xarcontainer.xar b/Library/Homebrew/cask/test/support/binaries/xarcontainer.xar
deleted file mode 100644
index bd37cd4d66..0000000000
Binary files a/Library/Homebrew/cask/test/support/binaries/xarcontainer.xar and /dev/null differ