Revert "Factory to fixture"
Merge pull request #54 from brianwisti/revert-53-factory-to-fixture

bah - Revert "Factory to fixture"