diff --git a/test/acts_as_authentic_test/base_test.rb b/test/acts_as_authentic_test/base_test.rb
index baa69ff1..27293178 100644
--- a/test/acts_as_authentic_test/base_test.rb
+++ b/test/acts_as_authentic_test/base_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class BaseTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/email_test.rb b/test/acts_as_authentic_test/email_test.rb
index 93364669..ad7d8518 100644
--- a/test/acts_as_authentic_test/email_test.rb
+++ b/test/acts_as_authentic_test/email_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class EmailTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/logged_in_status_test.rb b/test/acts_as_authentic_test/logged_in_status_test.rb
index 4a486515..4092818a 100644
--- a/test/acts_as_authentic_test/logged_in_status_test.rb
+++ b/test/acts_as_authentic_test/logged_in_status_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class LoggedInStatusTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/login_test.rb b/test/acts_as_authentic_test/login_test.rb
index 6025cb72..6159477e 100644
--- a/test/acts_as_authentic_test/login_test.rb
+++ b/test/acts_as_authentic_test/login_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class LoginTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/magic_columns_test.rb b/test/acts_as_authentic_test/magic_columns_test.rb
index 658ad6a8..d9fcfa49 100644
--- a/test/acts_as_authentic_test/magic_columns_test.rb
+++ b/test/acts_as_authentic_test/magic_columns_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class MagicColumnsTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/password_test.rb b/test/acts_as_authentic_test/password_test.rb
index db03aabd..3ae95a62 100644
--- a/test/acts_as_authentic_test/password_test.rb
+++ b/test/acts_as_authentic_test/password_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class PasswordTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/perishable_token_test.rb b/test/acts_as_authentic_test/perishable_token_test.rb
index 89ce0b17..32c95223 100644
--- a/test/acts_as_authentic_test/perishable_token_test.rb
+++ b/test/acts_as_authentic_test/perishable_token_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class PerishableTokenTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/persistence_token_test.rb b/test/acts_as_authentic_test/persistence_token_test.rb
index 8db7a798..b8dc3cb8 100644
--- a/test/acts_as_authentic_test/persistence_token_test.rb
+++ b/test/acts_as_authentic_test/persistence_token_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class PersistenceTokenTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/restful_authentication_test.rb b/test/acts_as_authentic_test/restful_authentication_test.rb
index 2acfd871..36dd1ec2 100644
--- a/test/acts_as_authentic_test/restful_authentication_test.rb
+++ b/test/acts_as_authentic_test/restful_authentication_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class RestfulAuthenticationTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/session_maintenance_test.rb b/test/acts_as_authentic_test/session_maintenance_test.rb
index 64d974b5..3ae53bb8 100644
--- a/test/acts_as_authentic_test/session_maintenance_test.rb
+++ b/test/acts_as_authentic_test/session_maintenance_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class SessionMaintenanceTest < ActiveSupport::TestCase
diff --git a/test/acts_as_authentic_test/single_access_test.rb b/test/acts_as_authentic_test/single_access_test.rb
index d2112d18..5127e3ee 100644
--- a/test/acts_as_authentic_test/single_access_test.rb
+++ b/test/acts_as_authentic_test/single_access_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module ActsAsAuthenticTest
   class SingleAccessTest < ActiveSupport::TestCase
diff --git a/test/authenticates_many_test.rb b/test/authenticates_many_test.rb
index f57aba95..66e488b7 100644
--- a/test/authenticates_many_test.rb
+++ b/test/authenticates_many_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class AuthenticatesManyTest < ActiveSupport::TestCase
   def test_scoping
diff --git a/test/crypto_provider_test/aes256_test.rb b/test/crypto_provider_test/aes256_test.rb
index 63d0903b..d5c8d17d 100644
--- a/test/crypto_provider_test/aes256_test.rb
+++ b/test/crypto_provider_test/aes256_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class AES256Test < ActiveSupport::TestCase
diff --git a/test/crypto_provider_test/bcrypt_test.rb b/test/crypto_provider_test/bcrypt_test.rb
index 8adca359..5e44f269 100644
--- a/test/crypto_provider_test/bcrypt_test.rb
+++ b/test/crypto_provider_test/bcrypt_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class BCrpytTest < ActiveSupport::TestCase
diff --git a/test/crypto_provider_test/sha1_test.rb b/test/crypto_provider_test/sha1_test.rb
index ec1f65dd..87653913 100644
--- a/test/crypto_provider_test/sha1_test.rb
+++ b/test/crypto_provider_test/sha1_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class Sha1Test < ActiveSupport::TestCase
diff --git a/test/crypto_provider_test/sha256_test.rb b/test/crypto_provider_test/sha256_test.rb
index 7ff0e1ad..c4ee718d 100644
--- a/test/crypto_provider_test/sha256_test.rb
+++ b/test/crypto_provider_test/sha256_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class Sha256Test < ActiveSupport::TestCase
diff --git a/test/crypto_provider_test/sha512_test.rb b/test/crypto_provider_test/sha512_test.rb
index 7d313e9f..fcb369ba 100644
--- a/test/crypto_provider_test/sha512_test.rb
+++ b/test/crypto_provider_test/sha512_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module CryptoProviderTest
   class Sha512Test < ActiveSupport::TestCase
diff --git a/test/i18n_test.rb b/test/i18n_test.rb
index fd7bbfc2..0b8f093e 100644
--- a/test/i18n_test.rb
+++ b/test/i18n_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class I18nTest < ActiveSupport::TestCase
   def test_uses_authlogic_as_scope_by_default
diff --git a/test/random_test.rb b/test/random_test.rb
index 3fcc55cb..dab4cd51 100644
--- a/test/random_test.rb
+++ b/test/random_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require 'test_helper'
 
 class RandomTest < ActiveSupport::TestCase
   def test_random_tokens_are_indeed_random
diff --git a/test/session_test/activation_test.rb b/test/session_test/activation_test.rb
index aee40a73..d2c7f0bd 100644
--- a/test/session_test/activation_test.rb
+++ b/test/session_test/activation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ActivationTest
diff --git a/test/session_test/active_record_trickery_test.rb b/test/session_test/active_record_trickery_test.rb
index 0942a6ef..bc766651 100644
--- a/test/session_test/active_record_trickery_test.rb
+++ b/test/session_test/active_record_trickery_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ActiveRecordTrickeryTest
@@ -29,7 +29,7 @@ def test_new_record
       
       def test_to_model
         session = UserSession.new
-        assert session, session.to_model
+        assert_equal session, session.to_model
       end
     end
   end
diff --git a/test/session_test/brute_force_protection_test.rb b/test/session_test/brute_force_protection_test.rb
index 9317f575..354b0b69 100644
--- a/test/session_test/brute_force_protection_test.rb
+++ b/test/session_test/brute_force_protection_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module BruteForceProtectionTest
diff --git a/test/session_test/callbacks_test.rb b/test/session_test/callbacks_test.rb
index 677b86e2..4fee22ae 100644
--- a/test/session_test/callbacks_test.rb
+++ b/test/session_test/callbacks_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class CallbacksTest < ActiveSupport::TestCase
diff --git a/test/session_test/cookies_test.rb b/test/session_test/cookies_test.rb
index 2baf138f..f24788a1 100644
--- a/test/session_test/cookies_test.rb
+++ b/test/session_test/cookies_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module CookiesTest
diff --git a/test/session_test/existence_test.rb b/test/session_test/existence_test.rb
index 3c219eeb..701599b0 100644
--- a/test/session_test/existence_test.rb
+++ b/test/session_test/existence_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ExistenceTest
diff --git a/test/session_test/http_auth_test.rb b/test/session_test/http_auth_test.rb
index 73ee4c82..3e89fbf5 100644
--- a/test/session_test/http_auth_test.rb
+++ b/test/session_test/http_auth_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class HttpAuthTest < ActiveSupport::TestCase
diff --git a/test/session_test/id_test.rb b/test/session_test/id_test.rb
index 3e7105de..653aa7ce 100644
--- a/test/session_test/id_test.rb
+++ b/test/session_test/id_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class IdTest < ActiveSupport::TestCase
diff --git a/test/session_test/klass_test.rb b/test/session_test/klass_test.rb
index 4f17d7d2..5d4b7f3a 100644
--- a/test/session_test/klass_test.rb
+++ b/test/session_test/klass_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module KlassTest
diff --git a/test/session_test/magic_columns_test.rb b/test/session_test/magic_columns_test.rb
index 6b7a1a29..c5f5d8ac 100644
--- a/test/session_test/magic_columns_test.rb
+++ b/test/session_test/magic_columns_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module MagicColumnsTest
diff --git a/test/session_test/magic_states_test.rb b/test/session_test/magic_states_test.rb
index 055a963d..0ce9ec1d 100644
--- a/test/session_test/magic_states_test.rb
+++ b/test/session_test/magic_states_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module SessionTest
diff --git a/test/session_test/params_test.rb b/test/session_test/params_test.rb
index 3a03f8a6..7c5b23c4 100644
--- a/test/session_test/params_test.rb
+++ b/test/session_test/params_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module ParamsTest
diff --git a/test/session_test/password_test.rb b/test/session_test/password_test.rb
index e357e287..fd6a62a2 100644
--- a/test/session_test/password_test.rb
+++ b/test/session_test/password_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module PasswordTest
diff --git a/test/session_test/perishability_test.rb b/test/session_test/perishability_test.rb
index 45ae4da8..ec95cf3d 100644
--- a/test/session_test/perishability_test.rb
+++ b/test/session_test/perishability_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class PerishabilityTest < ActiveSupport::TestCase
diff --git a/test/session_test/persistence_test.rb b/test/session_test/persistence_test.rb
index 2fbad1b7..df16a4ef 100644
--- a/test/session_test/persistence_test.rb
+++ b/test/session_test/persistence_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class PersistenceTest < ActiveSupport::TestCase
diff --git a/test/session_test/scopes_test.rb b/test/session_test/scopes_test.rb
index edc3c9d4..0b078851 100644
--- a/test/session_test/scopes_test.rb
+++ b/test/session_test/scopes_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class ScopesTest < ActiveSupport::TestCase
diff --git a/test/session_test/session_test.rb b/test/session_test/session_test.rb
index 242b0be5..edae0b9d 100644
--- a/test/session_test/session_test.rb
+++ b/test/session_test/session_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module SessionTest
diff --git a/test/session_test/timeout_test.rb b/test/session_test/timeout_test.rb
index 83a0e4a6..17e0b1a8 100644
--- a/test/session_test/timeout_test.rb
+++ b/test/session_test/timeout_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   module TimeoutTest
diff --git a/test/session_test/unauthorized_record_test.rb b/test/session_test/unauthorized_record_test.rb
index b715bf20..7e1181da 100644
--- a/test/session_test/unauthorized_record_test.rb
+++ b/test/session_test/unauthorized_record_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class UnauthorizedRecordTest < ActiveSupport::TestCase
diff --git a/test/session_test/validation_test.rb b/test/session_test/validation_test.rb
index 0d172025..632b2eea 100644
--- a/test/session_test/validation_test.rb
+++ b/test/session_test/validation_test.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper.rb'
+require 'test_helper'
 
 module SessionTest
   class ValidationTest < ActiveSupport::TestCase