Refines UT and adds checks to Measure generation