RSpec deprecations and tidying