MT#9733 fix the test flows