account resolving added, test added