Fixed test for rails.
Merge branch 'test'