Factory-boy integration complete. Prepping for merge with testing.