Follow-up to #438, green tests for Rails 3.1 / 3.2