Added t2 with new kvs-server/client.