Stop using old stubbing syntax.
Address the rest of the rspec warnings.