Merge pull request #20769 from ChayimFriedman2/ns-cleanup4

minor: Add regression test for another (long-standing) bug fixed by the new solver