Use Rspec 3.0 assertions (expect instead of should)
Remove stub for Rspec mocks