Turned the server/client tests into an echo server