refactor UT and translation module