Fix a spec and deprecation errors from database_cleaner