Added more DAO tests