Update RSpec, remove deprecation warnings