Dao test small fixes