added FactoryGirl and factories