Update version of factory boy from 1.2.0 to the latest version.

Had to make changes to factory setup, and did a bunch of test cleanup
along the way.