Add basic calculator and test methods