[66390356] Using traits in factories instead of nested factories
Merge pull request #12 from mecampbellsoup/66390356_refactor_factories_to_use_traits

[66390356] Using traits in factories instead of nested factories