Refactor CalendarDAOImplTest + CalendarDAOImplIntegTest