Update notes for submitted changes

* Replace tearDown with addCleanup - Part 2