Updated DAO Tests