Issue fixes

Fixes #454 and #323 
Not with rspec 3
https://github.com/rspec/rspec-rails/issues/894