Sockets pass first test

Have changed over the client/server test code to use Nigel's sockets.