We again have some of our mocks not aligned with what mockery
autogenerates. This MR updates all affected **existing** mocks, so
calling `make mocks` will not have side effects in specific MRs.