Rejiggering database_cleaner and test tweaks