Add: various improvements to DaoMake and DaoTest;
Add: more tests.