Fix test failure following an untested rebase