Fix UTs after renaming of one test class