updated DAOs with test cases.