Upgrade to use rspec 3