Fix the issues in UT.