CalendarToday: Fixing timebomb with tests