Fixing test regressions in 2db4774978bc1866b0540753909543bc2b44644e (part 2)