Feature/factories

Implements factories to simplify our specs.  Closes #62