Calc Classes + test added