Fixed failing UT due to previous commit