Improve Account import UT