Reverted name refactor in account manager·
Added tests with pytest