added more factories
Merge branch 'factorygirl'