wip - django 1.7 - convert to use factories - flakes #660