Update notes for submitted changes

* Factor out common code in test_plan