refactored FactoryGirl associations