Idiomatic changes  for CLickCalculator
Test Cases to check refactored code