Update notes for submitted changes

* Fix regressions in unit test merge