[No review required] Fix UT