More tests - retcalc 59.5% covered