Update for rails 3.2.13 and current rspec compatibility

No changes to test logic, just some syntax fixes for the current version of rails & rspec.