Switch to database_cleaner
Sync refactoring