Fixed model tests and passed them
Merge branch 'master' of https://github.com/cicadas-2014/BJR
Fixed merge conflict in factories
Merge pull request #21 from kz363/master

Model tests