Update notes for submitted changes

* Remove mockito, and replace with mock