Update notes for submitted changes

* Rework class inheritance for scenario tests