[No review required] Fix UTs (broken by interaction between two recent merges)