Account test refactoring