Refactored AccountService and it's tests