Simplified factories and updated specs
Merge pull request #7 from doomspork/simplify-factories

Simplified factories and updated specs