Improved DAO tests

- improved DAO tests