Update XML

Update Calendar and CalendarProvider with testing