Additional dao tests, small fixes in Dao classes and config.dist