[IMP] account : Improved the 'type' in 'account.account.template'.
[imp]:converted test case old to new api

[imp]:improve code