Fix patch error and tests

Francois Eleouetrequested to merge
fix-tests into main

A small bug slipped-in while addressing last review comment here: !366 (comment 2756629509)

Merge request reports