Revised ETCalc and testcalc
latest