Co-authored-by: Renovate Bot <bot@renovateapp.com>
* Fix inconsistencies in contract/test hierachy * changelog entry