Add FactoryGirl and DatabaseCleaner for more robust testing