Switch factories to new factory-boy style
Update requirements