Extended measurement output
Improved testing