attempted doing some optimization on the amount of cleanup done betwe…

…en the tests, and did some work to better support calendar servers where we cannot create and delete calendars