Fix failed UTs