Pre Rails 3.2 test updates