Ref #15913. Improves test case.