Fix CashFlows with new tests