Collapse factories into one
Merge pull request #84 from ironcladlou/collapse-factories

Collapse factories into one