Move the Client unit tests over to mocking the Dispatcher API rather than the Transport API.