Added to the Calculator class.
Added more tests to CalculatorTests.