UTs:  fixes and improvements