Update notes for submitted changes

* Restructure tests directory in preparation for cli integration tests