Fix some UT failure