Dao/tests completed