Modify fudging for RT #116280
Add test for RT #120561