Update to new Rspec expect syntax