More DAO tests.
Merge pull request #11 from marcjansen/more-dao-tests

More DAO tests.