Test Fixes - CalendarEvent - macros