changes in CalculatorTest