HHH-2736 test case improvements