This is in preparation of moving all tests into a separate package to
enable ease of coverage checking and testing.

This reverts commit 6f34bad5.

grpc namespace and not supported by older compilers. Not sure
why I didn't catch this earlier.

Only one of these is used, and in only one place, as of this commit,
but they will be used widely after further development.

They don’t work against the local server.