Corrected test harness defines, averager call