Improvements in CalendarDaoImpl and CalendarDAOImplIntegTest