diff --git a/Appraisals b/Appraisals
index 3f9e10c..fd7e74f 100644
--- a/Appraisals
+++ b/Appraisals
@@ -1,11 +1,3 @@
-appraise 'rails_40' do
-  gem 'rails', '~> 4.0.0'
-end
-
-appraise 'rails_41' do
-  gem 'rails', '~> 4.1.0'
-end
-
 appraise 'rails_42' do
   gem 'rails', '~> 4.2.0'
 end
diff --git a/Gemfile b/Gemfile
index 9e8c6bd..bf249f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,6 +6,7 @@ gem 'appraisal'
 
 gem 'fastimage'
 gem 'sqlite3'
+gem 'aws-sdk-s3'
 
 gem 'test-unit'
 gem 'thoughtbot-shoulda', '>= 2.9.0'
diff --git a/Rakefile b/Rakefile
index f745f1c..e94c763 100644
--- a/Rakefile
+++ b/Rakefile
@@ -15,6 +15,7 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'lib' << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
+  t.warning = false
 end
 
 desc 'Start an IRB session with all necessary files required.'
diff --git a/gemfiles/rails_40.gemfile b/gemfiles/rails_40.gemfile
deleted file mode 100644
index 253ada9..0000000
--- a/gemfiles/rails_40.gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "appraisal"
-gem "fastimage"
-gem "sqlite3"
-gem "test-unit"
-gem "thoughtbot-shoulda", ">= 2.9.0"
-gem "mocha"
-gem "pry"
-gem "pry-byebug"
-gem "rails", "~> 4.0.0"
-
-gemspec path: "../"
diff --git a/gemfiles/rails_41.gemfile b/gemfiles/rails_41.gemfile
deleted file mode 100644
index 20cf287..0000000
--- a/gemfiles/rails_41.gemfile
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "appraisal"
-gem "fastimage"
-gem "sqlite3"
-gem "test-unit"
-gem "thoughtbot-shoulda", ">= 2.9.0"
-gem "mocha"
-gem "pry"
-gem "pry-byebug"
-gem "rails", "~> 4.1.0"
-
-gemspec path: "../"
diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile
index ef071b0..6a11f6e 100644
--- a/gemfiles/rails_42.gemfile
+++ b/gemfiles/rails_42.gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "fastimage"
 gem "sqlite3"
+gem "aws-sdk-s3"
 gem "test-unit"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "mocha"
diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile
index e0eef65..4118642 100644
--- a/gemfiles/rails_5.gemfile
+++ b/gemfiles/rails_5.gemfile
@@ -5,6 +5,7 @@ source "http://rubygems.org"
 gem "appraisal"
 gem "fastimage"
 gem "sqlite3"
+gem "aws-sdk-s3"
 gem "test-unit"
 gem "thoughtbot-shoulda", ">= 2.9.0"
 gem "mocha"
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 6e21342..01cc7ef 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -26,6 +26,7 @@ require 'shoulda_macros/paperclip'
 FIXTURES_DIR = File.join(File.dirname(__FILE__), "fixtures")
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
+ActiveRecord::Base.try(:raise_in_transactional_callbacks=, true)
 ActiveRecord::Base.establish_connection(config['test'])
 
 def reset_class class_name