Updated tests for Rails 3.1