Some changes in DAOs, new tests added