dodane pozostale DAO, refactoring testow