CalendarDaoImplTest improved