Fix database_cleaner
Fix import
Fix up controller spec