Minnor changes CalendarGenTest