Modifed Client and TestServer
  -more work on the messages (upload/download)