improved test cases, improved Dao