Fixed migration and FactoryGirl integration