Updates for rspec 3.x