diff --git a/Gemfile b/Gemfile
index 0c2618362..beca8b4d5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -62,7 +62,3 @@ group :development do
   gem 'ruby-prof'
   # gem 'sql-logging'
 end
-
-group :development, :test do
-  gem 'pry'
-end
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 040e7e3f1..975b25fa3 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -48,5 +48,5 @@ SimpleForm.setup do |config|
   # config.country_priority = nil
 
   # Default size for text inputs.
-  config.default_input_size = 30
+  # config.default_input_size = 30
 end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0e939a4f9..425c47b3f 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -99,6 +99,10 @@ class MockMemcache
   end
 end
 
+if defined?(MEMCACHE)
+  Object.send(:remove_const, :MEMCACHE)
+end
+
 MEMCACHE = MockMemcache.new
 
 VCR.configure do |c|