Added AccountService interface and mock implementation for testing.
Merged conflicting changes.