Updates for RSpec 3