Co-authored-by: Francisco Giordano <frangio.1@gmail.com>
* Fix inconsistencies in contract/test hierachy * changelog entry