Improve account import UT and fix 0.6 issue