Update notes for submitted changes

* Clean-up in the unit tests for NVP plugin