Cleaned MeasureHandler class from testing cruft
Merged commits