Clean up some RSpec deprecations