Add new Class Substract and Modified Test for Calc