Renamed NewCalculator to TestableCalculator