Fix RSpec3 deprecation warnings