WIP mention testing
fixed conflicts
Merge pull request #19 from wvmitchell/adding-factories

Adding factories