Switch to expect for merge rspec