Update for current testing and reporting approach.