Update to new rspec expect syntax