Update notes for submitted changes

* more refactoring to be compatible with extended tests