Test updates post Rails 3.2. Don't merge