Fix test breakages introduced by 1c64a1611a6471c9928666749832c5ba510ec02d