Fix broken tests after !1011

Fix broken tests after !1011 it was merged too fast.

/reviewed-on !1018
3 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds