Some refinements to code and UTs.