Update to Rails 3.2.16
Rewrite specs to new Rspec syntax, fix broken ones