Fix UT after previous refactoring