refactoring on UT