Upgrade: rspec-rails (2.12.0 ~> 2.14.0) (part 2, test tweaks)