Added more DAO unit tests