Update notes for submitted changes

* Rearrange tests structures to tidy up