Move model factory helpers in to test helpers