Added args test program and made minor change to client.