Update to full rspec 3