Update notes for submitted changes

* Rewrited mox tests to mock (part 2)