complete calc tests and class methods all passing