diff --git a/msp/org1/admin.context b/msp/org1/admin.context
index 60803d1..7511448 100644
Binary files a/msp/org1/admin.context and b/msp/org1/admin.context differ
diff --git a/src/main/java/blockchain/client/FabricClientWrapper.java b/src/main/java/blockchain/client/FabricClientWrapper.java
index 1c37e61..b06237c 100644
--- a/src/main/java/blockchain/client/FabricClientWrapper.java
+++ b/src/main/java/blockchain/client/FabricClientWrapper.java
@@ -36,7 +36,8 @@ public class FabricClientWrapper {
     public Set<String> queryForChannels() throws InvalidArgumentException, IllegalArgumentException, ProposalException {
         client.newChannel(Config.CHANNEL_NAME);
         client.newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL);
-        Peer peer = client.newPeer(Config.ORG_PEER,Config.ORG_PEER_URL);
+        //Peer peer = client.newPeer(Config.ORG_PEER,Config.ORG_PEER_URL);
+        Peer peer = client.newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL);
         return client.queryChannels(peer);
     }
 }
diff --git a/src/test/java/blockchain/query/CreateChaincodeUserTest.java b/src/test/java/blockchain/query/CreateChaincodeUserTest.java
new file mode 100644
index 0000000..7f12805
--- /dev/null
+++ b/src/test/java/blockchain/query/CreateChaincodeUserTest.java
@@ -0,0 +1,48 @@
+package blockchain.query;
+
+import blockchain.client.ChannelClientWrapper;
+import blockchain.client.FabricClientWrapper;
+import blockchain.configuration.Config;
+import blockchain.user.UserContext;
+import blockchain.utility.Util;
+import org.apache.log4j.BasicConfigurator;
+import org.hyperledger.fabric.sdk.Channel;
+import org.hyperledger.fabric.sdk.EventHub;
+import org.hyperledger.fabric.sdk.Orderer;
+import org.hyperledger.fabric.sdk.Peer;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CreateChaincodeUserTest {
+    @Test
+    public void TestCreateUser(){
+        BasicConfigurator.configure();
+        UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN);
+
+        try{
+            String chaincode = Config.CHAINCODE_NAME;
+            FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(user);
+            ChannelClientWrapper channelClientWrapper = fabricClientWrapper.createChannelClient(Config.CHANNEL_NAME);
+
+            Channel channel = channelClientWrapper.getChannel();
+            Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG_PEER,Config.ORG_PEER_URL);
+            EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", Config.ORG_PEER_EVENT_URL);
+            Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL);
+            channel.addPeer(peer);
+            channel.addEventHub(eventHub);
+            channel.addOrderer(orderer);
+            channel.initialize();
+
+            List<String> args = new ArrayList<>();
+            args.add("user1");
+            args.add("200");
+            args.add("user2");
+            args.add("150");
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
+}
diff --git a/src/test/java/blockchain/query/QueryTest.java b/src/test/java/blockchain/query/QueryTest.java
index da92875..b5af101 100644
--- a/src/test/java/blockchain/query/QueryTest.java
+++ b/src/test/java/blockchain/query/QueryTest.java
@@ -16,13 +16,13 @@ import java.util.Set;
 
 public class QueryTest {
     private static Logger logger = Logger.getLogger(QueryTest.class);
-    //DON'T WORK
+
     @Test
     public void TestAQueryChannels() {
         BasicConfigurator.configure();
 
-        UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN);
-        //UserContext user = Util.readUserContext(Config.ORG1,"User-org1");
+        //UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN);
+        UserContext user = Util.readUserContext(Config.ORG1,"User-org1");
 
         try{
 
@@ -44,10 +44,10 @@ public class QueryTest {
             ChannelClientWrapper channelClientWrapper = fabricClientWrapper.createChannelClient(Config.CHANNEL_NAME);
 
             Channel channel = channelClientWrapper.getChannel();
-            //Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL);
-            Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG_PEER,Config.ORG_PEER_URL);
-            //EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps577432.ovh.net:8053");
-            EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", Config.ORG_PEER_EVENT_URL);
+            Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL);
+            //Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG_PEER,Config.ORG_PEER_URL);
+            EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://vps577432.ovh.net:8053");
+            //EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", Config.ORG_PEER_EVENT_URL);
             Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL);
             channel.addPeer(peer);
             channel.addEventHub(eventHub);
diff --git a/target/classes/blockchain/client/FabricClientWrapper.class b/target/classes/blockchain/client/FabricClientWrapper.class
index 0370205..017d1ab 100644
Binary files a/target/classes/blockchain/client/FabricClientWrapper.class and b/target/classes/blockchain/client/FabricClientWrapper.class differ
diff --git a/target/test-classes/blockchain/query/ChaincodeTransactionTest.class b/target/test-classes/blockchain/query/ChaincodeTransactionTest.class
index 3d75b9c..deb57c0 100644
Binary files a/target/test-classes/blockchain/query/ChaincodeTransactionTest.class and b/target/test-classes/blockchain/query/ChaincodeTransactionTest.class differ
diff --git a/target/test-classes/blockchain/query/CreateChaincodeUserTest.class b/target/test-classes/blockchain/query/CreateChaincodeUserTest.class
new file mode 100644
index 0000000..bcfa8fe
Binary files /dev/null and b/target/test-classes/blockchain/query/CreateChaincodeUserTest.class differ
diff --git a/target/test-classes/blockchain/query/QueryTest.class b/target/test-classes/blockchain/query/QueryTest.class
index f0e4fdd..1c08942 100644
Binary files a/target/test-classes/blockchain/query/QueryTest.class and b/target/test-classes/blockchain/query/QueryTest.class differ