Fix UT with previous modifications