Test updates pre Rails32 Cont
Merge pull request #1245 from scottsds/continued_test_updates

Continued test updates