Upgrade to rspec 3
Convert should to expect