HHH-8420 multiple test-only fixes from matrix failures