diff --git a/test/fixtures/vcr_cassettes/ugoira-converter.yml b/test/fixtures/vcr_cassettes/ugoira-converter.yml
index 46f9c0d57..2f5589ccc 100644
--- a/test/fixtures/vcr_cassettes/ugoira-converter.yml
+++ b/test/fixtures/vcr_cassettes/ugoira-converter.yml
@@ -749,7 +749,7 @@ http_interactions:
   recorded_at: Wed, 22 Oct 2014 23:29:57 GMT
 - request:
     method: get
-    uri: http://i1.pixiv.net/img-zip-ugoira/img/2014/10/05/23/42/23/46378654_ugoira1920x1080.zip
+    uri: http://i3.pixiv.net/img-zip-ugoira/img/2014/10/05/23/42/23/46378654_ugoira1920x1080.zip
     body:
       encoding: US-ASCII
       string: ''
diff --git a/test/functional/bulk_update_requests_controller_test.rb b/test/functional/bulk_update_requests_controller_test.rb
index 74d1357dd..9c64c2d43 100644
--- a/test/functional/bulk_update_requests_controller_test.rb
+++ b/test/functional/bulk_update_requests_controller_test.rb
@@ -44,9 +44,9 @@ class BulkUpdateRequestsControllerTest < ActionController::TestCase
 
       context "for the creator" do
         should "succeed" do
-          assert_difference("BulkUpdateRequest.count", -1) do
-            delete :destroy, {:id => @bulk_update_request.id}, {:user_id => @user.id}
-          end
+          delete :destroy, {:id => @bulk_update_request.id}, {:user_id => @user.id}
+          @bulk_update_request.reload
+          assert_equal("rejected", @bulk_update_request.status)
         end
       end
 
@@ -64,9 +64,9 @@ class BulkUpdateRequestsControllerTest < ActionController::TestCase
 
       context "for an admin" do
         should "succeed" do
-          assert_difference("BulkUpdateRequest.count", -1) do
-            delete :destroy, {:id => @bulk_update_request.id}, {:user_id => @admin.id}
-          end
+          delete :destroy, {:id => @bulk_update_request.id}, {:user_id => @admin.id}
+          @bulk_update_request.reload
+          assert_equal("rejected", @bulk_update_request.status)
         end
       end
     end
diff --git a/test/functional/tag_aliases_controller_test.rb b/test/functional/tag_aliases_controller_test.rb
index c488220ce..30c99ce70 100644
--- a/test/functional/tag_aliases_controller_test.rb
+++ b/test/functional/tag_aliases_controller_test.rb
@@ -72,14 +72,6 @@ class TagAliasesControllerTest < ActionController::TestCase
       end
     end
 
-    context "create action" do
-      should "create a tag alias" do
-        assert_difference("TagAlias.count", 1) do
-          post :create, {:tag_alias => {:antecedent_name => "xxx", :consequent_name => "yyy"}}, {:user_id => @user.id}
-        end
-      end
-    end
-
     context "destroy action" do
       setup do
         @tag_alias = FactoryGirl.create(:tag_alias)
diff --git a/test/functional/tag_implications_controller_test.rb b/test/functional/tag_implications_controller_test.rb
index 15db44959..8fa68f1d7 100644
--- a/test/functional/tag_implications_controller_test.rb
+++ b/test/functional/tag_implications_controller_test.rb
@@ -75,14 +75,6 @@ class TagImplicationsControllerTest < ActionController::TestCase
       end
     end
 
-    context "create action" do
-      should "create a tag implication" do
-        assert_difference("TagImplication.count", 1) do
-          post :create, {:tag_implication => {:antecedent_name => "xxx", :consequent_name => "yyy"}}, {:user_id => @user.id}
-        end
-      end
-    end
-
     context "destroy action" do
       setup do
         CurrentUser.scoped(@user, "127.0.0.1") do
diff --git a/test/unit/downloads/deviant_art_test.rb b/test/unit/downloads/deviant_art_test.rb
index 3d7f7f37f..bf50c7e56 100644
--- a/test/unit/downloads/deviant_art_test.rb
+++ b/test/unit/downloads/deviant_art_test.rb
@@ -7,13 +7,13 @@ module Downloads
         @source = "http://mochikko.deviantart.com/art/RESOLUTION-339610451"
         @tempfile = Tempfile.new("danbooru-test")
         @download = Downloads::File.new(@source, @tempfile.path)
-        VCR.use_cassette("download-deviant-art-html", :record => :new_episodes) do
+        VCR.use_cassette("download-deviant-art-html", :record => :none) do
           @download.download!
         end
       end
 
       should "set the direct image link as the source" do
-        assert_equal("http://www.deviantart.com/download/339610451/resolution_by_mochikko-d5m713n.jpg?token=f828643e6e86a658e80f362745a0b20e20880fc6&ts=1414021578", @download.source)
+        assert_equal("http://fc03.deviantart.net/fs71/f/2012/330/e/7/resolution_by_mochikko-d5m713n.jpg", @download.source)
       end
 
       should "work" do
diff --git a/test/unit/downloads/pixiv_test.rb b/test/unit/downloads/pixiv_test.rb
index 972623ce7..948055273 100644
--- a/test/unit/downloads/pixiv_test.rb
+++ b/test/unit/downloads/pixiv_test.rb
@@ -231,8 +231,8 @@ module Downloads
         should "download the full size image instead of the thumbnail" do
           assert_rewritten(@p0_full_size_image_3, @p0_large_thumbnail, "rewrite-pixiv-new-manga-p0-large-thumbnail")
           assert_rewritten(@p1_full_size_image_3, @p1_large_thumbnail, "rewrite-pixiv-new-manga-p1-large-thumbnail")
-          assert_downloaded(@p0_file_size, @p0_large_thumbnail, "download-pixiv-new-manga-p0-large-thumbnail", :all)
-          assert_downloaded(@p1_file_size, @p1_large_thumbnail, "download-pixiv-new-manga-p1-large-thumbnail", :all)
+          assert_downloaded(@p0_file_size, @p0_large_thumbnail, "download-pixiv-new-manga-p0-large-thumbnail")
+          assert_downloaded(@p1_file_size, @p1_large_thumbnail, "download-pixiv-new-manga-p1-large-thumbnail")
         end
       end
 
diff --git a/test/unit/pool_test.rb b/test/unit/pool_test.rb
index 4f79e8c6f..9e0df05df 100644
--- a/test/unit/pool_test.rb
+++ b/test/unit/pool_test.rb
@@ -87,7 +87,7 @@ class PoolTest < ActiveSupport::TestCase
 
     should "update any new posts that were added" do
       @p1.reload
-      assert_equal("pool:#{@pool.id}", @p1.pool_string)
+      assert_equal("pool:#{@pool.id} pool:series", @p1.pool_string)
     end
   end
 
diff --git a/test/unit/upload_test.rb b/test/unit/upload_test.rb
index f83f13998..d6dd3dc47 100644
--- a/test/unit/upload_test.rb
+++ b/test/unit/upload_test.rb
@@ -255,13 +255,14 @@ class UploadTest < ActiveSupport::TestCase
       VCR.use_cassette("ugoira-converter", :record => :none) do
         assert_difference(["Post.count", "PixivUgoiraFrameData.count"]) do
           @upload.process!
+          assert_equal([], @upload.errors.full_messages)
         end
         post = Post.last
         assert_not_nil(post.pixiv_ugoira_frame_data)
         assert_equal("0d94800c4b520bf3d8adda08f95d31e2", post.md5)
         assert_equal(60, post.image_width)
         assert_equal(60, post.image_height)
-        assert_equal("http://i1.pixiv.net/img-zip-ugoira/img/2014/10/05/23/42/23/46378654_ugoira1920x1080.zip", post.source)
+        assert_equal("http://i3.pixiv.net/img-zip-ugoira/img/2014/10/05/23/42/23/46378654_ugoira1920x1080.zip", post.source)
         assert_operator(File.size(post.large_file_path), :>, 0)
         assert_operator(File.size(post.preview_file_path), :>, 0)            
       end