Address CRs about Unit Tests