Fix failing specs and upgrade to RSpec 3