Add tests for #9914
regen