Update notes for submitted changes

* tests/service: consolidate setUp/tearDown logic