So one of the benefits of refactoring the API client into another class is FakeWeb can be eliminated entirely. :grin: