diff --git a/Gemfile b/Gemfile
index a07d0e99..50349efb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -9,8 +9,8 @@ gem 'oauth2', ">= 0.1.1"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem 'rspec-rails'
+  gem "rspec", "~> 2.5.0"
+  gem 'rspec-rails', "~> 2.5.0"
   gem 'ruby-debug19'
   gem 'sqlite3-ruby', :require => 'sqlite3'
   gem "yard", "~> 0.6.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index c8be8d8a..66976256 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,19 +81,19 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.3.0)
+      rspec (~> 2.5.0)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -124,8 +124,8 @@ DEPENDENCIES
   oauth (>= 0.4.4)
   oauth2 (>= 0.1.1)
   rails (>= 3.0.0)
-  rspec (~> 2.3.0)
-  rspec-rails
+  rspec (~> 2.5.0)
+  rspec-rails (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
   sqlite3-ruby
diff --git a/spec/Gemfile b/spec/Gemfile
index 409462a4..a80650c5 100644
--- a/spec/Gemfile
+++ b/spec/Gemfile
@@ -6,7 +6,7 @@ gem "sorcery", '0.3.1', :path => '../../../'
 gem 'oauth', ">= 0.4.4"
 gem 'oauth2', ">= 0.1.1"
 group :development do
-  gem 'rspec'
+  gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
 end
diff --git a/spec/Gemfile.lock b/spec/Gemfile.lock
index 70dcb760..52f266af 100644
--- a/spec/Gemfile.lock
+++ b/spec/Gemfile.lock
@@ -81,14 +81,14 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.5.0)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -115,7 +115,7 @@ DEPENDENCIES
   oauth (>= 0.4.4)
   oauth2 (>= 0.1.1)
   rails (= 3.0.3)
-  rspec
+  rspec (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
   sorcery (= 0.3.1)!
diff --git a/spec/Rakefile b/spec/Rakefile
index 5d083a65..60b817ce 100644
--- a/spec/Rakefile
+++ b/spec/Rakefile
@@ -8,4 +8,5 @@ task :default => :spec
 desc "Run all specs for a specific rails version"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = '*_spec.rb'
+  t.rspec_opts = ["--options #{File.dirname(__FILE__)}/spec.opts"]
 end
\ No newline at end of file
diff --git a/spec/rails3/app_root/.gitignore b/spec/rails3/.gitignore
similarity index 100%
rename from spec/rails3/app_root/.gitignore
rename to spec/rails3/.gitignore
diff --git a/spec/rails3/.rspec b/spec/rails3/.rspec
index 4e1e0d2f..53607ea5 100644
--- a/spec/rails3/.rspec
+++ b/spec/rails3/.rspec
@@ -1 +1 @@
---color
+--colour
diff --git a/spec/rails3/app_root/Gemfile b/spec/rails3/Gemfile
similarity index 83%
rename from spec/rails3/app_root/Gemfile
rename to spec/rails3/Gemfile
index 08c6d26f..30c10045 100644
--- a/spec/rails3/app_root/Gemfile
+++ b/spec/rails3/Gemfile
@@ -5,8 +5,8 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
 gem "sorcery", '0.3.1', :path => '../../../'
 
 group :development, :test do
-  gem 'rspec'
-  gem 'rspec-rails'
+  gem "rspec", "~> 2.5.0"
+  gem 'rspec-rails', "~> 2.5.0"
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
   gem 'timecop'
diff --git a/spec/rails3/app_root/Gemfile.lock b/spec/rails3/Gemfile.lock
similarity index 91%
rename from spec/rails3/app_root/Gemfile.lock
rename to spec/rails3/Gemfile.lock
index fd9c059b..681928ab 100644
--- a/spec/rails3/app_root/Gemfile.lock
+++ b/spec/rails3/Gemfile.lock
@@ -1,6 +1,7 @@
 PATH
   remote: ../../../
   specs:
+    oauth (0.4.4)
     sorcery (0.3.1)
       bcrypt-ruby (~> 2.1.4)
       json (>= 1.5.1)
@@ -65,7 +66,6 @@ GEM
     mime-types (1.16)
     multi_json (0.0.5)
     multipart-post (1.1.0)
-    oauth (0.4.4)
     oauth2 (0.4.0)
       faraday (~> 0.6.0)
       multi_json (~> 0.0.4)
@@ -89,19 +89,19 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    rspec-rails (2.3.1)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.3.0)
+      rspec (~> 2.5.0)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -127,8 +127,8 @@ PLATFORMS
 
 DEPENDENCIES
   rails (= 3.0.3)
-  rspec
-  rspec-rails
+  rspec (~> 2.5.0)
+  rspec-rails (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
   sorcery (= 0.3.1)!
diff --git a/spec/rails3/app_root/README b/spec/rails3/README
similarity index 100%
rename from spec/rails3/app_root/README
rename to spec/rails3/README
diff --git a/spec/rails3/app_root/Rakefile b/spec/rails3/Rakefile
similarity index 76%
rename from spec/rails3/app_root/Rakefile
rename to spec/rails3/Rakefile
index 440268ec..cb9a7b4a 100644
--- a/spec/rails3/app_root/Rakefile
+++ b/spec/rails3/Rakefile
@@ -7,4 +7,5 @@ task :default => :spec
 desc "Run all specs for a specific rails version"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = '**/*_spec.rb'
+  t.rspec_opts = ["--options #{File.dirname(__FILE__)}/spec/spec.opts"]
 end
\ No newline at end of file
diff --git a/spec/rails3/app_root/Rakefile.unused b/spec/rails3/Rakefile.unused
similarity index 100%
rename from spec/rails3/app_root/Rakefile.unused
rename to spec/rails3/Rakefile.unused
diff --git a/spec/rails3/app_root/app/controllers/application_controller.rb b/spec/rails3/app/controllers/application_controller.rb
similarity index 100%
rename from spec/rails3/app_root/app/controllers/application_controller.rb
rename to spec/rails3/app/controllers/application_controller.rb
diff --git a/spec/rails3/app_root/app/helpers/application_helper.rb b/spec/rails3/app/helpers/application_helper.rb
similarity index 100%
rename from spec/rails3/app_root/app/helpers/application_helper.rb
rename to spec/rails3/app/helpers/application_helper.rb
diff --git a/spec/rails3/app_root/app/mailers/sorcery_mailer.rb b/spec/rails3/app/mailers/sorcery_mailer.rb
similarity index 100%
rename from spec/rails3/app_root/app/mailers/sorcery_mailer.rb
rename to spec/rails3/app/mailers/sorcery_mailer.rb
diff --git a/spec/rails3/app_root/app/models/authentication.rb b/spec/rails3/app/models/authentication.rb
similarity index 100%
rename from spec/rails3/app_root/app/models/authentication.rb
rename to spec/rails3/app/models/authentication.rb
diff --git a/spec/rails3/app_root/app/models/user.rb b/spec/rails3/app/models/user.rb
similarity index 100%
rename from spec/rails3/app_root/app/models/user.rb
rename to spec/rails3/app/models/user.rb
diff --git a/spec/rails3/app_root/app/views/layouts/application.html.erb b/spec/rails3/app/views/layouts/application.html.erb
similarity index 100%
rename from spec/rails3/app_root/app/views/layouts/application.html.erb
rename to spec/rails3/app/views/layouts/application.html.erb
diff --git a/spec/rails3/app_root/app/views/sorcery_mailer/activation_email.html.erb b/spec/rails3/app/views/sorcery_mailer/activation_email.html.erb
similarity index 100%
rename from spec/rails3/app_root/app/views/sorcery_mailer/activation_email.html.erb
rename to spec/rails3/app/views/sorcery_mailer/activation_email.html.erb
diff --git a/spec/rails3/app_root/app/views/sorcery_mailer/activation_email.text.erb b/spec/rails3/app/views/sorcery_mailer/activation_email.text.erb
similarity index 100%
rename from spec/rails3/app_root/app/views/sorcery_mailer/activation_email.text.erb
rename to spec/rails3/app/views/sorcery_mailer/activation_email.text.erb
diff --git a/spec/rails3/app_root/app/views/sorcery_mailer/activation_success_email.html.erb b/spec/rails3/app/views/sorcery_mailer/activation_success_email.html.erb
similarity index 100%
rename from spec/rails3/app_root/app/views/sorcery_mailer/activation_success_email.html.erb
rename to spec/rails3/app/views/sorcery_mailer/activation_success_email.html.erb
diff --git a/spec/rails3/app_root/app/views/sorcery_mailer/activation_success_email.text.erb b/spec/rails3/app/views/sorcery_mailer/activation_success_email.text.erb
similarity index 100%
rename from spec/rails3/app_root/app/views/sorcery_mailer/activation_success_email.text.erb
rename to spec/rails3/app/views/sorcery_mailer/activation_success_email.text.erb
diff --git a/spec/rails3/app_root/app/views/sorcery_mailer/reset_password_email.html.erb b/spec/rails3/app/views/sorcery_mailer/reset_password_email.html.erb
similarity index 100%
rename from spec/rails3/app_root/app/views/sorcery_mailer/reset_password_email.html.erb
rename to spec/rails3/app/views/sorcery_mailer/reset_password_email.html.erb
diff --git a/spec/rails3/app_root/app/views/sorcery_mailer/reset_password_email.text.erb b/spec/rails3/app/views/sorcery_mailer/reset_password_email.text.erb
similarity index 100%
rename from spec/rails3/app_root/app/views/sorcery_mailer/reset_password_email.text.erb
rename to spec/rails3/app/views/sorcery_mailer/reset_password_email.text.erb
diff --git a/spec/rails3/app_root/.rspec b/spec/rails3/app_root/.rspec
deleted file mode 100644
index 53607ea5..00000000
--- a/spec/rails3/app_root/.rspec
+++ /dev/null
@@ -1 +0,0 @@
---colour
diff --git a/spec/rails3/app_root/config/database.yml b/spec/rails3/app_root/config/database.yml
deleted file mode 100644
index 57974119..00000000
--- a/spec/rails3/app_root/config/database.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# SQLite version 3.x
-#   gem install sqlite3-ruby (not necessary on OS X Leopard)
-development:
-  adapter: sqlite3
-  database: db/development.sqlite3
-  pool: 5
-  timeout: 5000
-
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
-test:
-  adapter: sqlite3
-  database: db/test.sqlite3
-  pool: 5
-  timeout: 5000
-
-production:
-  adapter: sqlite3
-  database: db/production.sqlite3
-  pool: 5
-  timeout: 5000
-  
-in_memory:
-  adapter: sqlite3
-  database: ":memory:"
-  verbosity: quiet
diff --git a/spec/rails3/app_root/spec/spec.opts b/spec/rails3/app_root/spec/spec.opts
deleted file mode 100644
index 44f9a9cd..00000000
--- a/spec/rails3/app_root/spec/spec.opts
+++ /dev/null
@@ -1,2 +0,0 @@
---colour
---format progress
\ No newline at end of file
diff --git a/spec/rails3/app_root/config.ru b/spec/rails3/config.ru
similarity index 100%
rename from spec/rails3/app_root/config.ru
rename to spec/rails3/config.ru
diff --git a/spec/rails3/app_root/config/application.rb b/spec/rails3/config/application.rb
similarity index 100%
rename from spec/rails3/app_root/config/application.rb
rename to spec/rails3/config/application.rb
diff --git a/spec/rails3/app_root/config/boot.rb b/spec/rails3/config/boot.rb
similarity index 100%
rename from spec/rails3/app_root/config/boot.rb
rename to spec/rails3/config/boot.rb
diff --git a/spec/rails3/config/database.yml b/spec/rails3/config/database.yml
new file mode 100644
index 00000000..3691775f
--- /dev/null
+++ b/spec/rails3/config/database.yml
@@ -0,0 +1,27 @@
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+# development:
+#   adapter: sqlite3
+#   database: db/development.sqlite3
+#   pool: 5
+#   timeout: 5000
+# 
+# # Warning: The database defined as "test" will be erased and
+# # re-generated from your development database when you run "rake".
+# # Do not set this db to the same as development or production.
+# test:
+#   adapter: sqlite3
+#   database: db/test.sqlite3
+#   pool: 5
+#   timeout: 5000
+# 
+# production:
+#   adapter: sqlite3
+#   database: db/production.sqlite3
+#   pool: 5
+#   timeout: 5000
+  
+in_memory:
+  adapter: sqlite3
+  database: ":memory:"
+  verbosity: quiet
diff --git a/spec/rails3/app_root/config/environment.rb b/spec/rails3/config/environment.rb
similarity index 100%
rename from spec/rails3/app_root/config/environment.rb
rename to spec/rails3/config/environment.rb
diff --git a/spec/rails3/app_root/config/environments/development.rb b/spec/rails3/config/environments/development.rb
similarity index 100%
rename from spec/rails3/app_root/config/environments/development.rb
rename to spec/rails3/config/environments/development.rb
diff --git a/spec/rails3/app_root/config/environments/in_memory.rb b/spec/rails3/config/environments/in_memory.rb
similarity index 100%
rename from spec/rails3/app_root/config/environments/in_memory.rb
rename to spec/rails3/config/environments/in_memory.rb
diff --git a/spec/rails3/app_root/config/environments/production.rb b/spec/rails3/config/environments/production.rb
similarity index 100%
rename from spec/rails3/app_root/config/environments/production.rb
rename to spec/rails3/config/environments/production.rb
diff --git a/spec/rails3/app_root/config/environments/test.rb b/spec/rails3/config/environments/test.rb
similarity index 100%
rename from spec/rails3/app_root/config/environments/test.rb
rename to spec/rails3/config/environments/test.rb
diff --git a/spec/rails3/app_root/config/initializers/backtrace_silencers.rb b/spec/rails3/config/initializers/backtrace_silencers.rb
similarity index 100%
rename from spec/rails3/app_root/config/initializers/backtrace_silencers.rb
rename to spec/rails3/config/initializers/backtrace_silencers.rb
diff --git a/spec/rails3/app_root/config/initializers/inflections.rb b/spec/rails3/config/initializers/inflections.rb
similarity index 100%
rename from spec/rails3/app_root/config/initializers/inflections.rb
rename to spec/rails3/config/initializers/inflections.rb
diff --git a/spec/rails3/app_root/config/initializers/mime_types.rb b/spec/rails3/config/initializers/mime_types.rb
similarity index 100%
rename from spec/rails3/app_root/config/initializers/mime_types.rb
rename to spec/rails3/config/initializers/mime_types.rb
diff --git a/spec/rails3/app_root/config/initializers/secret_token.rb b/spec/rails3/config/initializers/secret_token.rb
similarity index 100%
rename from spec/rails3/app_root/config/initializers/secret_token.rb
rename to spec/rails3/config/initializers/secret_token.rb
diff --git a/spec/rails3/app_root/config/initializers/session_store.rb b/spec/rails3/config/initializers/session_store.rb
similarity index 100%
rename from spec/rails3/app_root/config/initializers/session_store.rb
rename to spec/rails3/config/initializers/session_store.rb
diff --git a/spec/rails3/app_root/config/locales/en.yml b/spec/rails3/config/locales/en.yml
similarity index 100%
rename from spec/rails3/app_root/config/locales/en.yml
rename to spec/rails3/config/locales/en.yml
diff --git a/spec/rails3/app_root/config/routes.rb b/spec/rails3/config/routes.rb
similarity index 100%
rename from spec/rails3/app_root/config/routes.rb
rename to spec/rails3/config/routes.rb
diff --git a/spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb b/spec/rails3/db/migrate/activation/20101224223622_add_activation_to_users.rb
similarity index 100%
rename from spec/rails3/app_root/db/migrate/activation/20101224223622_add_activation_to_users.rb
rename to spec/rails3/db/migrate/activation/20101224223622_add_activation_to_users.rb
diff --git a/spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb b/spec/rails3/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
similarity index 100%
rename from spec/rails3/app_root/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
rename to spec/rails3/db/migrate/activity_logging/20101224223624_add_activity_logging_to_users.rb
diff --git a/spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb b/spec/rails3/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
similarity index 100%
rename from spec/rails3/app_root/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
rename to spec/rails3/db/migrate/brute_force_protection/20101224223626_add_brute_force_protection_to_users.rb
diff --git a/spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb b/spec/rails3/db/migrate/core/20101224223620_create_users.rb
similarity index 100%
rename from spec/rails3/app_root/db/migrate/core/20101224223620_create_users.rb
rename to spec/rails3/db/migrate/core/20101224223620_create_users.rb
diff --git a/spec/rails3/app_root/db/migrate/external/20101224223628_create_authentications.rb b/spec/rails3/db/migrate/external/20101224223628_create_authentications.rb
similarity index 100%
rename from spec/rails3/app_root/db/migrate/external/20101224223628_create_authentications.rb
rename to spec/rails3/db/migrate/external/20101224223628_create_authentications.rb
diff --git a/spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb b/spec/rails3/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
similarity index 100%
rename from spec/rails3/app_root/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
rename to spec/rails3/db/migrate/remember_me/20101224223623_add_remember_me_token_to_users.rb
diff --git a/spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb b/spec/rails3/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
similarity index 100%
rename from spec/rails3/app_root/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
rename to spec/rails3/db/migrate/reset_password/20101224223622_add_reset_password_to_users.rb
diff --git a/spec/rails3/app_root/db/schema.rb b/spec/rails3/db/schema.rb
similarity index 100%
rename from spec/rails3/app_root/db/schema.rb
rename to spec/rails3/db/schema.rb
diff --git a/spec/rails3/app_root/db/seeds.rb b/spec/rails3/db/seeds.rb
similarity index 100%
rename from spec/rails3/app_root/db/seeds.rb
rename to spec/rails3/db/seeds.rb
diff --git a/spec/rails3/app_root/lib/tasks/.gitkeep b/spec/rails3/lib/tasks/.gitkeep
similarity index 100%
rename from spec/rails3/app_root/lib/tasks/.gitkeep
rename to spec/rails3/lib/tasks/.gitkeep
diff --git a/spec/rails3/app_root/public/404.html b/spec/rails3/public/404.html
similarity index 100%
rename from spec/rails3/app_root/public/404.html
rename to spec/rails3/public/404.html
diff --git a/spec/rails3/app_root/public/422.html b/spec/rails3/public/422.html
similarity index 100%
rename from spec/rails3/app_root/public/422.html
rename to spec/rails3/public/422.html
diff --git a/spec/rails3/app_root/public/500.html b/spec/rails3/public/500.html
similarity index 100%
rename from spec/rails3/app_root/public/500.html
rename to spec/rails3/public/500.html
diff --git a/spec/rails3/app_root/public/favicon.ico b/spec/rails3/public/favicon.ico
similarity index 100%
rename from spec/rails3/app_root/public/favicon.ico
rename to spec/rails3/public/favicon.ico
diff --git a/spec/rails3/app_root/public/images/rails.png b/spec/rails3/public/images/rails.png
similarity index 100%
rename from spec/rails3/app_root/public/images/rails.png
rename to spec/rails3/public/images/rails.png
diff --git a/spec/rails3/app_root/public/index.html b/spec/rails3/public/index.html
similarity index 100%
rename from spec/rails3/app_root/public/index.html
rename to spec/rails3/public/index.html
diff --git a/spec/rails3/app_root/public/javascripts/application.js b/spec/rails3/public/javascripts/application.js
similarity index 100%
rename from spec/rails3/app_root/public/javascripts/application.js
rename to spec/rails3/public/javascripts/application.js
diff --git a/spec/rails3/app_root/public/javascripts/controls.js b/spec/rails3/public/javascripts/controls.js
similarity index 100%
rename from spec/rails3/app_root/public/javascripts/controls.js
rename to spec/rails3/public/javascripts/controls.js
diff --git a/spec/rails3/app_root/public/javascripts/dragdrop.js b/spec/rails3/public/javascripts/dragdrop.js
similarity index 100%
rename from spec/rails3/app_root/public/javascripts/dragdrop.js
rename to spec/rails3/public/javascripts/dragdrop.js
diff --git a/spec/rails3/app_root/public/javascripts/effects.js b/spec/rails3/public/javascripts/effects.js
similarity index 100%
rename from spec/rails3/app_root/public/javascripts/effects.js
rename to spec/rails3/public/javascripts/effects.js
diff --git a/spec/rails3/app_root/public/javascripts/prototype.js b/spec/rails3/public/javascripts/prototype.js
similarity index 100%
rename from spec/rails3/app_root/public/javascripts/prototype.js
rename to spec/rails3/public/javascripts/prototype.js
diff --git a/spec/rails3/app_root/public/javascripts/rails.js b/spec/rails3/public/javascripts/rails.js
similarity index 100%
rename from spec/rails3/app_root/public/javascripts/rails.js
rename to spec/rails3/public/javascripts/rails.js
diff --git a/spec/rails3/app_root/public/robots.txt b/spec/rails3/public/robots.txt
similarity index 100%
rename from spec/rails3/app_root/public/robots.txt
rename to spec/rails3/public/robots.txt
diff --git a/spec/rails3/app_root/public/stylesheets/.gitkeep b/spec/rails3/public/stylesheets/.gitkeep
similarity index 100%
rename from spec/rails3/app_root/public/stylesheets/.gitkeep
rename to spec/rails3/public/stylesheets/.gitkeep
diff --git a/spec/rails3/app_root/script/rails b/spec/rails3/script/rails
similarity index 100%
rename from spec/rails3/app_root/script/rails
rename to spec/rails3/script/rails
diff --git a/spec/rails3/app_root/spec/controller_activity_logging_spec.rb b/spec/rails3/spec/controller_activity_logging_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/controller_activity_logging_spec.rb
rename to spec/rails3/spec/controller_activity_logging_spec.rb
diff --git a/spec/rails3/app_root/spec/controller_brute_force_protection_spec.rb b/spec/rails3/spec/controller_brute_force_protection_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/controller_brute_force_protection_spec.rb
rename to spec/rails3/spec/controller_brute_force_protection_spec.rb
diff --git a/spec/rails3/app_root/spec/controller_http_basic_auth_spec.rb b/spec/rails3/spec/controller_http_basic_auth_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/controller_http_basic_auth_spec.rb
rename to spec/rails3/spec/controller_http_basic_auth_spec.rb
diff --git a/spec/rails3/app_root/spec/controller_oauth2_spec.rb b/spec/rails3/spec/controller_oauth2_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/controller_oauth2_spec.rb
rename to spec/rails3/spec/controller_oauth2_spec.rb
diff --git a/spec/rails3/app_root/spec/controller_oauth_spec.rb b/spec/rails3/spec/controller_oauth_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/controller_oauth_spec.rb
rename to spec/rails3/spec/controller_oauth_spec.rb
diff --git a/spec/rails3/app_root/spec/controller_remember_me_spec.rb b/spec/rails3/spec/controller_remember_me_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/controller_remember_me_spec.rb
rename to spec/rails3/spec/controller_remember_me_spec.rb
diff --git a/spec/rails3/app_root/spec/controller_session_timeout_spec.rb b/spec/rails3/spec/controller_session_timeout_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/controller_session_timeout_spec.rb
rename to spec/rails3/spec/controller_session_timeout_spec.rb
diff --git a/spec/rails3/app_root/spec/controller_spec.rb b/spec/rails3/spec/controller_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/controller_spec.rb
rename to spec/rails3/spec/controller_spec.rb
diff --git a/spec/rails3/spec/spec.opts b/spec/rails3/spec/spec.opts
new file mode 100644
index 00000000..b3eb8b49
--- /dev/null
+++ b/spec/rails3/spec/spec.opts
@@ -0,0 +1,2 @@
+--color
+--format documentation
\ No newline at end of file
diff --git a/spec/rails3/app_root/spec/spec_helper.orig.rb b/spec/rails3/spec/spec_helper.orig.rb
similarity index 100%
rename from spec/rails3/app_root/spec/spec_helper.orig.rb
rename to spec/rails3/spec/spec_helper.orig.rb
diff --git a/spec/rails3/app_root/spec/spec_helper.rb b/spec/rails3/spec/spec_helper.rb
similarity index 61%
rename from spec/rails3/app_root/spec/spec_helper.rb
rename to spec/rails3/spec/spec_helper.rb
index 5215ece3..f74fa34b 100644
--- a/spec/rails3/app_root/spec/spec_helper.rb
+++ b/spec/rails3/spec/spec_helper.rb
@@ -1,7 +1,12 @@
 $: << File.join(File.dirname(__FILE__), '..', '..', 'lib' )
-
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+# Set the default environment to sqlite3's in_memory database
+ENV['RAILS_ENV'] ||= 'in_memory'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'timecop'
 # require 'simplecov'
-# SimpleCov.root File.join(File.dirname(__FILE__), "..", "..", "app_root" )
+# SimpleCov.root File.join(File.dirname(__FILE__), "..", "..", "rails3" )
 # SimpleCov.start do
 #   add_filter "/config/"
 #   
@@ -13,20 +18,31 @@
 #   add_group 'Migrations', 'db/migrate'
 # end
 
-require 'timecop'
-# Set the default environment to sqlite3's in_memory database
-ENV['RAILS_ENV'] ||= 'in_memory'
-ENV['RAILS_ROOT'] = 'app_root'
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
 
-# Load the Rails environment and testing framework
-require "#{File.dirname(__FILE__)}/../config/environment"
-require 'rspec/rails'
 
 RSpec.configure do |config|
-  config.use_transactional_fixtures = true
-  config.use_instantiated_fixtures  = false
   config.include RSpec::Rails::ControllerExampleGroup, :example_group => { :file_path => /controller(.)*_spec.rb$/ }
+  # == Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+  config.mock_with :rspec
 
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+  
   config.before(:suite) do
     ActiveRecord::Migrator.migrate("#{Rails.root}/db/migrate/core")
   end
@@ -51,3 +67,4 @@ class TestMailer < ActionMailer::Base
 
 include ::Sorcery::TestHelpers
 include ::Sorcery::TestHelpers::Rails
+
diff --git a/spec/rails3/app_root/spec/user_activation_spec.rb b/spec/rails3/spec/user_activation_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/user_activation_spec.rb
rename to spec/rails3/spec/user_activation_spec.rb
diff --git a/spec/rails3/app_root/spec/user_activity_logging_spec.rb b/spec/rails3/spec/user_activity_logging_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/user_activity_logging_spec.rb
rename to spec/rails3/spec/user_activity_logging_spec.rb
diff --git a/spec/rails3/app_root/spec/user_brute_force_protection_spec.rb b/spec/rails3/spec/user_brute_force_protection_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/user_brute_force_protection_spec.rb
rename to spec/rails3/spec/user_brute_force_protection_spec.rb
diff --git a/spec/rails3/app_root/spec/user_oauth_spec.rb b/spec/rails3/spec/user_oauth_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/user_oauth_spec.rb
rename to spec/rails3/spec/user_oauth_spec.rb
diff --git a/spec/rails3/app_root/spec/user_remember_me_spec.rb b/spec/rails3/spec/user_remember_me_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/user_remember_me_spec.rb
rename to spec/rails3/spec/user_remember_me_spec.rb
diff --git a/spec/rails3/app_root/spec/user_reset_password_spec.rb b/spec/rails3/spec/user_reset_password_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/user_reset_password_spec.rb
rename to spec/rails3/spec/user_reset_password_spec.rb
diff --git a/spec/rails3/app_root/spec/user_spec.rb b/spec/rails3/spec/user_spec.rb
similarity index 100%
rename from spec/rails3/app_root/spec/user_spec.rb
rename to spec/rails3/spec/user_spec.rb
diff --git a/spec/rails3/app_root/vendor/plugins/.gitkeep b/spec/rails3/vendor/plugins/.gitkeep
similarity index 100%
rename from spec/rails3/app_root/vendor/plugins/.gitkeep
rename to spec/rails3/vendor/plugins/.gitkeep
diff --git a/spec/sinatra/Gemfile b/spec/sinatra/Gemfile
index 59523eac..13128c2d 100644
--- a/spec/sinatra/Gemfile
+++ b/spec/sinatra/Gemfile
@@ -5,7 +5,7 @@ gem 'sqlite3-ruby', :require => 'sqlite3'
 gem "sorcery", '0.3.1', :path => '../../'
 
 group :development, :test do
-  gem 'rspec'
+  gem "rspec", "~> 2.5.0"
   gem 'ruby-debug19'
   gem 'simplecov', '>= 0.3.8', :require => false # Will install simplecov-html as a dependency
   gem 'timecop'
diff --git a/spec/sinatra/Gemfile.lock b/spec/sinatra/Gemfile.lock
index 9295086a..47feed0c 100644
--- a/spec/sinatra/Gemfile.lock
+++ b/spec/sinatra/Gemfile.lock
@@ -71,7 +71,7 @@ GEM
       multi_json (~> 0.0.4)
     polyglot (0.3.1)
     rack (1.2.1)
-    rack-mount (0.6.13)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
@@ -89,14 +89,14 @@ GEM
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rspec (2.4.0)
-      rspec-core (~> 2.4.0)
-      rspec-expectations (~> 2.4.0)
-      rspec-mocks (~> 2.4.0)
-    rspec-core (2.4.0)
-    rspec-expectations (2.4.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.4.0)
+    rspec-mocks (2.5.0)
     ruby-debug-base19 (0.11.24)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -125,7 +125,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  rspec
+  rspec (~> 2.5.0)
   ruby-debug19
   simplecov (>= 0.3.8)
   sinatra (>= 1.2.0)
diff --git a/spec/sinatra/Rakefile b/spec/sinatra/Rakefile
index d62ab9e0..2994ea84 100644
--- a/spec/sinatra/Rakefile
+++ b/spec/sinatra/Rakefile
@@ -7,4 +7,5 @@ task :default => :spec
 desc "Run all specs"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.pattern = '**/*_spec.rb'
+  t.rspec_opts = ["--options #{File.dirname(__FILE__)}/spec/spec.opts"]
 end
\ No newline at end of file
diff --git a/spec/sinatra/spec/spec.opts b/spec/sinatra/spec/spec.opts
index 44f9a9cd..b3eb8b49 100644
--- a/spec/sinatra/spec/spec.opts
+++ b/spec/sinatra/spec/spec.opts
@@ -1,2 +1,2 @@
---colour
---format progress
\ No newline at end of file
+--color
+--format documentation
\ No newline at end of file
diff --git a/spec/spec.opts b/spec/spec.opts
index 44f9a9cd..b3eb8b49 100644
--- a/spec/spec.opts
+++ b/spec/spec.opts
@@ -1,2 +1,2 @@
---colour
---format progress
\ No newline at end of file
+--color
+--format documentation
\ No newline at end of file