More testing, adding calendars