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 8dbca1a690bceaeb02e212740ab03d67d55a51d4..884ddff90820c50b682bf25613d0abad95ce5e8f 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 1d1dba254c38e8fc92816aba4627c2b44e58e116..56d16b147633c9008f4a4a52f5dc07d21c68b5f1 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 c5aa7836502202c3345f760fb7a926930aa18c43..aef2883986e0f447641f0c3b7d5f7707a456ae8f 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 5f72c45659bf281159a46578e11d4bc3f467f739..7d0e8aad3724d9b2e0156c1d4089be3262fb2e02 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 3432597e05b4d28a6ec08aed850c2c76a25646a2..afa4a61aafb853abd0d17f6e17f758f67691c0dd 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/support/Casks/invalid/invalid-appcast-multiple.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-appcast-multiple.rb
index c257b05a12bad0e0bf293351e2c77069c6db2143..0cb56c283c72bda713921a230e1441a4bcb87dde 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 c387029648f88b6226f72b087eba8bbf387e6b16..c57d23539302adadc3992601c236df134011599b 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 c3cdaf90cbf111cc5f69ad3aceabae12438970b2..c37a796ea6c6fadde8d5426f5f987706d5719f8e 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 68cefaee9a44d0d06c2392841eb53d76d58e3880..2582213cacffb845ccbf3ec6ab3e8f10a97dc490 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 99b4387316aea7b07905bf23f1d160b8731d97d1..0ede1144fcb04cc248f8228b225cd04e479e6def 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 fdf4d6faf7b0aab8762db4dd4f97dd7662e889c0..8ff76ef23a4102a7d7926f4092e288b65196505e 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 d00960ecf2cd90ad71c33afb4c769e305049cd32..a5c6edc9c42e6094ad4ac1d144f615b0c113b8b2 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 e15e259338ca05e16c3efb225cf9d4bbeb5cef8c..306db3e761abcdb7cdd6dafa973b90da5bafc1d0 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 a61b7b045d5aa4dcb2c9e8bbf9c71e889efd0718..7d30a337a1dc1ff94b944e0e954b94fcf3553b5b 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 ba6761311e15e36e7aeec3a0fbd9554ecb3c47a2..44831de3756aea8aee13fc4a7555dfb621cda151 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 7e4fc33c1f74b5294984b7a23c3b58686fa74c02..217d1af5102868e3c80fa21a3233a85b4723ad4f 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 33922862630b368ea61f2663ff886316cdd96069..8818d412984481e38858a69bec6284417ae8add0 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 94125f9d9a857e619fa054806df0c40265d421f0..4bf13712f0caa06e6e818f70f553f2cac98ff15b 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 0e08f0c18014b6d59f283a6896a31488a237cd2b..ad8caec737877ea97819acbd3059c34c49f698ab 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 f1cdfcb6304e50ccd5991d3d302aed078b404d6b..0102554753fc8b304252f0b24b05cdfe22997539 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 bfb67b3f946f123a2e237d4e6e9d36ab1aa05422..386273269740b801380494b5613977e513724b1b 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 90ede3b2f55c3bb695cdf63b3978686679772684..6ab549b11f0f8df6e4960fce58e52cb79883047a 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 a69b0d7524a3512d629de82afba6cebed9397b2e..4c51019f43c3ceedaa5b19822346588f8c9ee9b8 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 d49b8346792c9bdcdbe28c1a7e02252f8d4e50f2..d07c0f43bb8d5942b0cc58f332b2c5ac2e06fa92 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-two-homepage.rb b/Library/Homebrew/cask/test/support/Casks/invalid/invalid-two-homepage.rb
index ee90fa81a0be588bfe5f0cde84941e0a09c97ecd..0f562f13f349a111e0a0fd0e6ab7a7fdd2585687 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 7a4dce7aef1121cdcfb861e9131a2da80833dbe1..8b2d435cc6b5d8278372f4c97a54629ce75e7db5 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 a3c47c9072276872f2e71571c9d92c6568f15da0..78ec5f367e1ec2575b3bd122397d50eef3d9f78b 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 fb217cc20ff66c4b55b8ecfadd7e4399a8da28c7..93a7624a52201154709e2cb138babaf910868978 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/with-alt-target.rb b/Library/Homebrew/cask/test/support/Casks/with-alt-target.rb
index 6d6456d86cde617edbd6114934a89ee6da605f9a..9a3196ce141f13ac065867175d48008c7b4dd1ed 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 acfb1565fb36039323fb849b2425f9d693068728..fb4ad9249f4cf1d382817a1c59721df10995117e 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 4412ceb3a22ae07013126206fb91bae104bfb07e..38ae23b44af90f9799e71a58b1bb48210aaea30a 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 2690649c3e08760cd7998d8cb54cbbbfde7506e7..db55930a28e701ef77f32f8957c16ca94fba4a79 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 789c9839ab0ae03d12bcfdc9e0edd03dca43e6c1..540f14164be70fa0088f2d7fff4c5772fc399b8d 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 a257d7bbbf478ae2cbbc9ab0485d46fdc6736af4..5f9016be90ff9f35125c579f3f949e8d49ab976b 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 9fc5baf1add873ec8ddb9a999dd87e528341dbda..0746c387446c47c093519559be3046e902704728 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 73528959170b6ce15d4ce13167f64c8a59a01048..4a11a163ba3cbe9ddf5eba40a89333d32ac30ca3 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 776929e83591cf9fcfc816887c406911f2c150f2..bb782ae19fa6069756b307e10d0e20388b068ea3 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 f08e73ac44eefc250b05c91cc131e4ac3cf6a4f5..1dc9393508305227e18b62b8389e173b351de271 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 013da2379ea9e9d47c92dcbe8633c6b81a5a17cd..62f32c32b6e54c21274a8a6291e97717a03e1d0c 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 bdc4e1f8b88fb66a6f3972d56e9b6976f33960e7..1d02add393b46b4ccb176e8eb7466f2513a78b92 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 3d365a1876dc65698f4bc30e65c9299cab5d2992..3dd54289309afb9f1b01caa7e2b263e530e34a50 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 4b3b8320e34e1a8be44af79ce3f1e0350f4e4750..946782536669730b7284a7ec4975cd9f0f153b11 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 448e44a03aacaf8f8a1f73b2e5256f048093df27..2780b94b7a36c1dbb9273997c28a301c03178b86 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 8e7a9a1d6320ef7a11b5d215e11173c2b230740b..4e3c777ec9683ca9e73492589f3f654522c4728d 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 1dab7654c79aed4a4f4867da2375cf470bdc92f6..7c15e63080551a48055a667f3dc93ac0398917a0 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 00a99c525f987a439c0e61492da3986723e75bed..10b1de754aced5da7efa11a3e887fa53c8a0ceed 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 00ea1cef9343d9b887fb0fad2186605fc168c78c..d52a0e8dfa0ca9d2fa47c09ede485c2e9f9597c4 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 234547334025de7cb9ab7ae8faaf504bb61d227f..c7384cf3ab63ea9e75236233f870ae04b0ddc804 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 5e6eb51b80483148081844d1d6a0b2d990a7a591..3d8d80445e6b8a3fcdf821a79ddafaaf990e8f1e 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 87bf43cba083a1937d814df58cc94368b6253f10..9e379c543a748eb80b7e58853da8fce47b3a71e4 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 68fa8123afae775e76a7464beb609d47d0b3c8d8..943421b82e3d5f72060a696247e18194e533c333 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 84c29fe658bd7de5ba76679cf40e817ee74e738e..dcdd8f593369ec640722bcf2f02f4faf2ec7d1b9 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 6291d7f88078c8959a7ce86192e2e2c8c0023760..7e9a8eac74df8325a412d6d1cd037904951d20fb 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 3014a394569b5b9f5c0f0c7ba2f80b9a3c4eed40..c4b18417a992cae063d07ea2c9da6f1583c191c3 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-suite.rb b/Library/Homebrew/cask/test/support/Casks/with-suite.rb
index 594276574d0b5ec87aa78ab0f9f1f9c95ae59bb1..dbaaaea6796f7805332916ef334b3d55c546ba6d 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 a0b142528aa322106086db1ebd867da92c6f5250..069eb9fed804686003a32717c78312f2ee57d98f 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 0ae37a79ce8022cfb6d6235ae7d4bf1f9734b831..baf6e52f0d296261a484caf6cad8c3e7b6ace958 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 61adefab679e039942dabc06d23254483eb173d0..d4783e6a65ce087b4eb427d90902dd0a0e7692e6 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/binaries/2_app_caffeine.zip b/Library/Homebrew/cask/test/support/binaries/2_app_caffeine.zip
deleted file mode 100755
index a678f7c11bee4a261957eeb6505ba9914c0c7551..0000000000000000000000000000000000000000
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 27637a731daaa1f693189d0d7ddfa5d4abd82131..0000000000000000000000000000000000000000
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/caffeine-suite.zip b/Library/Homebrew/cask/test/support/binaries/caffeine-suite.zip
new file mode 100644
index 0000000000000000000000000000000000000000..c38f771aebdc6ebb2012d523df3bf386afbdd56a
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 74aca21db60f409b61f6c5c777e228d0334bc9ea..99d61bbfb7b30994ef3c7de1bf3a4a34b40c95ce 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 7fa5c958e5c37a01c79d515d638ef4bea0a90716..0000000000000000000000000000000000000000
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 0000000000000000000000000000000000000000..ce5064d09992cf2751964314dca100a39f1d2933
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 0000000000000000000000000000000000000000..372fcc5229936e8e27a001ab59e6e2d738d6195b
Binary files /dev/null and b/Library/Homebrew/cask/test/support/binaries/caffeines.zip differ