WIP: Worked on DAO layer tests