fix unit test
fix dao