Updated to RSpec 2