We said that the preferred way to unit test the APIs was to use `mockwebserver` instead of the Expect tests. As this is a new test class, could it be refactored to a *MockTest that uses `mockwebserver`?