Fixed bug in Account and AccountTest