Restore UTs & minor associated fixes... :-)