Updates for rspec 3