Starting to add metering validation to tests