[Andr] to preMaster

a couple of tests for CalendarService