Fix UT after Html merge