Rspec - fix failures due to changes in error handling.