Checkpoint work on the test client/server code