dao tests
dao test and merge