dao tests refactored