Revert "Add retrying to TestClient"

This reverts commit a1b19ca5611849a167c29d16df8b1bd6af0f8461.