Solve issues in UT