Improvenents in CalendarDAOImplTest