Update notes for submitted changes

* Refactor usage of custom_match tests