Fix test errors after the merge 2fba91b73c0f3d