refact dao tests