Replace ActiveRecord hack with a cleaner DatabaseCleaner solution.