Cleanup + CHANGELOG for pr 14886

Add CHANGELOG for #14886.
Also cleanup test a bit.

@chancancode ( just hit the green button :smile_cat: )