CAL-972 Improve Unit Tests for Calendar projects