added returns calc to Calc class and adding tests