diff --git a/.gitignore b/.gitignore
index f7bf99c4..2eaee58a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *~
 coverage/*
 *.sqlite3
+.bundle
 rdoc/*
 pkg
 log
diff --git a/Gemfile b/Gemfile
index 5a985d70..e348b0c9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,10 +1,10 @@
-source "http://gemcutter.org"
+source "http://rubygems.org"
 
 # Need to install Rails from source
-gem "rails", :path => "../rails"
-gem "warden", "0.10.5"
+gem "rails", "3.0.0.beta4"
+gem "warden", "0.10.7"
 gem "sqlite3-ruby"
-gem "webrat", "0.7"
+gem "webrat", "0.7.0"
 gem "mocha", :require => false
 gem "bcrypt-ruby", :require => "bcrypt"
 
diff --git a/test/models/lockable_test.rb b/test/models/lockable_test.rb
index 17e239da..7abbd667 100644
--- a/test/models/lockable_test.rb
+++ b/test/models/lockable_test.rb
@@ -64,7 +64,7 @@ class LockableTest < ActiveSupport::TestCase
     user.unlock_access!
     assert_nil user.reload.locked_at
     assert_nil user.reload.unlock_token
-    assert 0, user.reload.failed_attempts
+    assert_equal 0, user.reload.failed_attempts
   end
 
   test 'should not unlock an unlocked user' do