Update notes for submitted changes

* Replace tearDown with addCleanup in unit tests