Fix the issue in the UTs.