Updated for RSpec 2.0