Fix specs and update to RSpec 3.1.x