Fix Calendar(mocha)+Calendar and CalendarProvider(main)