Add test for RT #114696, fix and unfudge 2 related tests