New Refactor to Generate Calendar with CalendarGen and refactor in CalendarCupTest