[IMP] Correct for next date should not be today if today is possible and add yml tests