Rails 3.1 spec fixes