#673 - refactor to enable mocking, move inconvenience calculation to TariffEvaluationHelper