fixed tests (CalendarTest not stable)