Added account manager and test