Convert to new Rspec expectation syntax