Implemented the new tariff evaluation
Added tests