A bit of window dressing
Some changes to the Control protocol, taking baby steps towards a real protocol now.
Now pass test, but only using the RpcPeer not the older, more bogus client/server peers even if they are still present in the code.
Moving some more test-specific code out of the implementation classes, in preparation of refactoring them out of the test class.
Refactor  into implementation classes to make test code minimal.