[No reviewer] Fix up UT breakages