Fixed to work with new RSpec format