Minor UT refactoring