dao tests are back again again
Merge branch 'increment' into newedge