add account builder & tests