Add: improvements to DaoMake and DaoTest for handling testing.