Fix RSpec 3 deprecations