mv delete and put account id funcs to util
update unit tests