Add test for #16622 as of a6de6f5

cc @chancancode