diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index adf61d1..ca89ea5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,9 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="7c8802f8-163e-48a6-9d7a-9324ac89091d" name="Default" comment="">
-      <change afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -52,47 +51,69 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="false">
+      <file leaf-file-name="QueryTest.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="442">
-              <caret line="36" column="40" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="40" />
+            <state relative-caret-position="233">
+              <caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="391">
-              <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="true">
+      <file leaf-file-name="QueryRegisterTest.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="192">
-              <caret line="28" column="47" selection-start-line="28" selection-start-column="47" selection-end-line="28" selection-end-column="47" />
+            <state relative-caret-position="170">
+              <caret line="37" column="118" selection-start-line="37" selection-start-column="118" selection-end-line="37" selection-end-column="118" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file leaf-file-name="FabricClientWrapper.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="119">
+              <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
+              <folding>
+                <element signature="e#629#630#0" expanded="true" />
+                <element signature="e#658#659#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="97">
+              <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Config.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="731">
+              <caret line="43" column="57" selection-start-line="43" selection-start-column="57" selection-end-line="43" selection-end-column="69" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="ChaincodeTransactionTest.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="147">
-              <caret line="44" column="123" lean-forward="true" selection-start-line="44" selection-start-column="123" selection-end-line="44" selection-end-column="123" />
+            <state relative-caret-position="782">
+              <caret line="62" column="12" selection-start-line="62" selection-start-column="12" selection-end-line="71" selection-end-column="99" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
+      <file leaf-file-name="ChannelClientWrapper.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="748">
-              <caret line="59" column="108" selection-start-line="59" selection-start-column="108" selection-end-line="59" selection-end-column="108" />
+            <state relative-caret-position="629">
+              <caret line="52" column="39" selection-start-line="52" selection-start-column="39" selection-end-line="52" selection-end-column="39" />
             </state>
           </provider>
         </entry>
@@ -136,7 +157,6 @@
         <option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/utility/ReadUserTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java" />
-        <option value="$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/CreateChaincodeUserTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/restService/DatabaseUserResource.java" />
@@ -150,6 +170,7 @@
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/client/TestRegisterEnrollUser.java" />
         <option value="$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java" />
+        <option value="$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java" />
       </list>
@@ -176,7 +197,6 @@
     </navigator>
     <panes>
       <pane id="AndroidView" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -229,14 +249,6 @@
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="blockchain" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
-              <item name="java-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
               <item name="java-api" type="462c0819:PsiDirectoryNode" />
@@ -346,15 +358,6 @@
               <item name="blockchain" type="462c0819:PsiDirectoryNode" />
               <item name="query" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
-              <item name="java-api" type="462c0819:PsiDirectoryNode" />
-              <item name="src" type="462c0819:PsiDirectoryNode" />
-              <item name="test" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="blockchain" type="462c0819:PsiDirectoryNode" />
-              <item name="query" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="java-api" type="b2602c69:ProjectViewProjectNode" />
               <item name="java-api" type="462c0819:PsiDirectoryNode" />
@@ -386,6 +389,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="PackagesPane" />
       <pane id="Scope" />
     </panes>
   </component>
@@ -421,7 +425,7 @@
       </list>
     </option>
   </component>
-  <component name="RunManager" selected="JUnit.QueryRegisterTest">
+  <component name="RunManager" selected="JUnit.QueryTest">
     <configuration default="true" type="Application" factoryName="Application">
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     </configuration>
@@ -460,6 +464,10 @@
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="blockchain.query" />
       <option name="MAIN_CLASS_NAME" value="blockchain.query.QueryRegisterTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
       <option name="PASS_PARENT_ENVS" value="true" />
       <option name="TEST_SEARCH_SCOPE">
@@ -475,8 +483,14 @@
           <option name="ENABLED" value="true" />
         </pattern>
       </extension>
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="blockchain.query" />
       <option name="MAIN_CLASS_NAME" value="blockchain.query.QueryTest" />
+      <option name="METHOD_NAME" />
+      <option name="TEST_OBJECT" value="class" />
+      <option name="VM_PARAMETERS" />
+      <option name="PARAMETERS" />
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
       <option name="PASS_PARENT_ENVS" value="true" />
       <option name="TEST_SEARCH_SCOPE">
@@ -574,19 +588,17 @@
     </configuration>
     <list>
       <item itemvalue="Spring Boot.App" />
+      <item itemvalue="JUnit.QueryWrapperTest" />
       <item itemvalue="JUnit.QueryTest" />
       <item itemvalue="JUnit.TestEnrollAdmin" />
       <item itemvalue="JUnit.ChaincodeTransactionTest" />
-      <item itemvalue="JUnit.QueryChannelTest" />
       <item itemvalue="JUnit.QueryRegisterTest" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="JUnit.QueryRegisterTest" />
         <item itemvalue="JUnit.QueryTest" />
+        <item itemvalue="JUnit.QueryRegisterTest" />
         <item itemvalue="JUnit.TestEnrollAdmin" />
-        <item itemvalue="JUnit.QueryChannelTest" />
-        <item itemvalue="JUnit.TestRegisterEnrollUser" />
       </list>
     </recent_temporary>
   </component>
@@ -630,16 +642,12 @@
       <workItem from="1552248848133" duration="108000" />
       <workItem from="1552592166048" duration="379000" />
       <workItem from="1552597573100" duration="981000" />
+      <workItem from="1552636396590" duration="1630000" />
+      <workItem from="1552644219305" duration="1516000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="QueryChannelTest - 2019.02.26 at 19h 54m 09s.xml">
-      <configuration name="QueryChannelTest" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="TestEnrollAdmin - 2019.02.27 at 20h 28m 27s.xml">
-      <configuration name="TestEnrollAdmin" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="QueryChannelTest - 2019.02.27 at 20h 28m 38s.xml">
       <configuration name="QueryChannelTest" configurationId="JUnit" />
     </history-entry>
@@ -664,36 +672,51 @@
     <history-entry file="QueryRegisterTest - 2019.03.14 at 22h 12m 09s.xml">
       <configuration name="QueryRegisterTest" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="QueryRegisterTest - 2019.03.15 at 09h 05m 13s.xml">
+      <configuration name="QueryRegisterTest" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="QueryTest - 2019.03.15 at 09h 05m 31s.xml">
+      <configuration name="QueryTest" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="44454000" />
+    <option name="totallyTimeSpent" value="47600000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.28338632" />
+      <window_info anchor="right" id="Palette" order="3" />
+      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.16145833" side_tool="true" visible="true" weight="0.2858661" />
+      <window_info anchor="right" id="Maven Projects" order="3" />
+      <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
+      <window_info id="Capture Tool" order="8" />
+      <window_info id="Designer" order="2" />
+      <window_info anchor="right" id="Database" order="3" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info id="UI Designer" order="4" />
+      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.71510416" weight="0.3995749" />
+      <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="right" id="Palette&#9;" order="3" />
+      <window_info id="Image Layers" order="2" />
+      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="right" id="Capture Analysis" order="3" />
+      <window_info anchor="bottom" id="Version Control" order="10" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.8385417" weight="0.2858661" />
+      <window_info anchor="bottom" id="Spring" order="12" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1953125" />
+      <window_info anchor="right" id="Bean Validation" order="3" />
+      <window_info id="Web" order="7" side_tool="true" />
+      <window_info id="Learn" order="6" />
       <window_info anchor="right" id="Theme Preview" order="7" />
       <window_info id="Favorites" order="5" side_tool="true" />
-      <window_info id="Learn" order="6" />
-      <window_info id="Web" order="7" side_tool="true" />
-      <window_info id="Capture Tool" order="8" />
-      <window_info anchor="bottom" id="Message" order="0" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.8390302" weight="0.5210608" />
-      <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.71510416" weight="0.3995749" />
-      <window_info anchor="bottom" id="Spring" order="12" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Messages" order="8" />
-      <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
-      <window_info anchor="bottom" id="Version Control" order="10" />
-      <window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.1609698" side_tool="true" visible="true" weight="0.5210608" />
-      <window_info anchor="bottom" id="Spring" order="12" />
-      <window_info anchor="bottom" id="Java Enterprise" order="13" />
+      <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
       <window_info anchor="bottom" id="Find" order="1" />
     </layout>
   </component>
@@ -708,7 +731,7 @@
       <breakpoints>
         <line-breakpoint enabled="true" type="java-line">
           <url>file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java</url>
-          <line>38</line>
+          <line>41</line>
           <properties />
           <option name="timeStamp" value="1" />
         </line-breakpoint>
@@ -716,34 +739,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="44" selection-start-line="44" selection-end-line="44" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/hyperledger/fabric-sdk-java/fabric-sdk-java/1.2.1/fabric-sdk-java-1.2.1.jar!/org/hyperledger/fabric/sdk/HFClient.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="833">
-          <caret line="49" lean-forward="true" selection-start-line="49" selection-end-line="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="19" selection-start-line="19" selection-end-line="19" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="272">
-          <caret line="25" column="74" lean-forward="true" selection-start-line="25" selection-start-column="74" selection-end-line="25" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="493">
@@ -791,13 +786,6 @@
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/CAClient.java" />
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="413">
-          <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/log4j.properties" />
     <entry file="file://$PROJECT_DIR$/.idea/compiler.xml">
       <provider selected="true" editor-type-id="text-editor" />
@@ -906,10 +894,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="1377">
           <caret line="91" column="34" selection-start-line="91" selection-start-column="34" selection-end-line="91" selection-end-column="34" />
-          <folding>
-            <element signature="e#4324#4325#0" expanded="true" />
-            <element signature="e#4386#4387#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -997,13 +981,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="629">
-          <caret line="37" column="64" selection-start-line="37" selection-start-column="64" selection-end-line="37" selection-end-column="64" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/client/TestEnrollAdmin.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="357">
@@ -1025,45 +1002,63 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="38" column="65" selection-start-line="38" selection-start-column="65" selection-end-line="38" selection-end-column="65" />
+        <state relative-caret-position="340">
+          <caret line="30" selection-start-line="30" selection-end-line="30" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/configuration/Config.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="731">
+          <caret line="43" column="57" selection-start-line="43" selection-start-column="57" selection-end-line="43" selection-end-column="69" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/ChannelClientWrapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="748">
-          <caret line="59" column="108" selection-start-line="59" selection-start-column="108" selection-end-line="59" selection-end-column="108" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryChannelTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="391">
-          <caret line="33" lean-forward="true" selection-start-line="33" selection-end-line="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="442">
-          <caret line="36" column="40" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="40" />
+        <state relative-caret-position="629">
+          <caret line="52" column="39" selection-start-line="52" selection-start-column="39" selection-end-line="52" selection-end-column="39" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/ChaincodeTransactionTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="147">
-          <caret line="44" column="123" lean-forward="true" selection-start-line="44" selection-start-column="123" selection-end-line="44" selection-end-column="123" />
+        <state relative-caret-position="782">
+          <caret line="62" column="12" selection-start-line="62" selection-start-column="12" selection-end-line="71" selection-end-column="99" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="233">
+          <caret line="36" column="41" selection-start-line="36" selection-start-column="41" selection-end-line="36" selection-end-column="41" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/blockchain/client/FabricClientWrapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="119">
+          <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
+          <folding>
+            <element signature="e#629#630#0" expanded="true" />
+            <element signature="e#658#659#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="97">
+          <caret line="27" column="20" selection-start-line="27" selection-start-column="20" selection-end-line="27" selection-end-column="20" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/test/java/blockchain/query/QueryRegisterTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="28" column="47" selection-start-line="28" selection-start-column="47" selection-end-line="28" selection-end-column="47" />
+        <state relative-caret-position="170">
+          <caret line="37" column="118" selection-start-line="37" selection-start-column="118" selection-end-line="37" selection-end-column="118" />
         </state>
       </provider>
     </entry>
diff --git a/src/test/java/blockchain/query/QueryRegisterTest.java b/src/test/java/blockchain/query/QueryRegisterTest.java
index bc187cf..a52f92e 100644
--- a/src/test/java/blockchain/query/QueryRegisterTest.java
+++ b/src/test/java/blockchain/query/QueryRegisterTest.java
@@ -7,12 +7,13 @@ import blockchain.user.UserContext;
 import blockchain.utility.Util;
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Logger;
-import org.hyperledger.fabric.sdk.ChaincodeResponse;
-import org.hyperledger.fabric.sdk.ProposalResponse;
+import org.hyperledger.fabric.sdk.*;
 import org.junit.Ignore;
 import org.junit.Test;
 
 import java.util.Collection;
+import java.util.List;
+import java.util.stream.Collectors;
 
 
 //Test to get balance of a User
@@ -24,28 +25,42 @@ public class QueryRegisterTest {
     public void TestAQueryChannels() {
         BasicConfigurator.configure();
 
-        //UserContext user = Util.readUserContext(Config.ORG1,Config.ADMIN);
         UserContext user = Util.readUserContext(Config.ORG1,"admin");
         //TODO BASE ON ChaincodeTransactionTest
         try{
+
             String chaincode = Config.CHAINCODE_NAME;
             FabricClientWrapper fabricClientWrapper = new FabricClientWrapper(user);
+            ChannelClientWrapper channelClientWrapper = fabricClientWrapper.createChannelClient(Config.CHANNEL_NAME);
 
-            ChannelClientWrapper channelClientWrapper = ChannelClientWrapper.setupChannel(fabricClientWrapper);
+            Channel channel = channelClientWrapper.getChannel();
+            Peer peer = fabricClientWrapper.getClient().newPeer(Config.ORG1_PEER_0,Config.ORG1_PEER_0_URL);
+            EventHub eventHub = fabricClientWrapper.getClient().newEventHub("eventhub01", "grpc://93.30.148.59:8053");
+            Orderer orderer = fabricClientWrapper.getClient().newOrderer(Config.ORDERER_NAME,Config.ORDERER_URL);
+            channel.addPeer(peer);
+            channel.addEventHub(eventHub);
+            channel.addOrderer(orderer);
+            channel.initialize();
 
+            TransactionProposalRequest tpr = fabricClientWrapper.getClient().newTransactionProposalRequest();
+            ChaincodeID cid = ChaincodeID.newBuilder().setName(Config.CHAINCODE_NAME).build();
+            tpr.setChaincodeID(cid);
+            tpr.setFcn("register");
+            tpr.setArgs(new String[]{"user_test","100"}); //register user_test with 100
 
-            String[] args1 = {"user_test","100"};
+            Collection<ProposalResponse> responses = channel.sendTransactionProposal(tpr);
+            List<ProposalResponse> invalid = responses.stream().filter(r -> r.isInvalid()).collect(Collectors.toList());
 
-            Collection<ProposalResponse> responseQuery = channelClientWrapper.queryByChainCode(chaincode,"register",args1);
-            for(ProposalResponse pres : responseQuery){
-                ChaincodeResponse.Status status = pres.getStatus();
-                if(status.getStatus()!=200){
-                    throw new Exception(pres.getMessage());
-                }
-                String stringResponse = new String(pres.getChaincodeActionResponsePayload());
-                logger.info("RESPONSE : "+stringResponse);
+            if (!invalid.isEmpty()) {
+                invalid.forEach(response -> {
+                    logger.error(response.getMessage());
+                });
             }
 
+            logger.info("SEND REQUEST");
+            BlockEvent.TransactionEvent event = channel.sendTransaction(responses).get();
+            logger.info("Event id : "+event.getTransactionID()); //print transaction id
+
         }catch (Exception e){
             e.printStackTrace();
         }