added CalendarEvent, tests, updated Calendar