updated BaseTest and AccountTest