Fix up UTs