Added more dao tests