Refactor CalendarGen, CalendarLeagueGenTest