More tests around ArrivalCalculator