A bit more wiring up of the main client+server classes and a couple of integration tests.