HHH-4412 Corrected multiple test issues found in matrix CI