Add a couple of tests for RT #76096
Update tests for RT #122437