Added missing tests and small fix for OrderedCalculator.