Merge "Improve calibration and accouting in flush-finish tests" into mnc-dev