[No reviewer] Fix UTs