Update tests to follow Rec!779
N.B. To be merged after !307 (merged) (based on that MR to avoid merge conflicts as we are touching some of the same files)
Edited by Marco Cattaneo
N.B. To be merged after !307 (merged) (based on that MR to avoid merge conflicts as we are touching some of the same files)