simplified factories and fixed greg for tests
simplified factories and fixed greg for tests

danielspector/families,asullivan210/families,danielspector/families,alexwilkinson/families,alexwilkinson/families,asullivan210/families