Some TODO for Beth, and some test factoring.