As the #23387 comment, the temp fix for UT need to be improved to make it test the expected behavior. So let's add it. Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com> Upstream-commit: e0de1718ee269776c7b23a1b03d796800ed4f451 Component: engine