Commits first refactoring with UT