Update notes for submitted changes

* Re-factor tests