DAO tests refactor