Required fixes re database_cleaner tests