Revise test codes according to CRs