Changes in DAO ans tests