Reorganized dao tests + cleaned BaseDAOTest