fix deprecations for rails 4
Merge pull request #1 from clod81/fix_rails_4_test_deprecations

fix deprecations for rails 4