Add database_cleaner and something else