 
 (expect clojure_fabric.core.Channel
         (let [user (get-user "Org1MSP" "user1")]
-          (get-channel user "foo")))
-(expect clojure_fabric.core.Channel
-        (let [user (get-user "Org1MSP" "user1")]
-          (get-channel user "bar")))
+          (get-channel user "mychannel")))
 (expect clojure_fabric.core.Channel
         (let [user (get-user "Org2MSP" "user1")]
-          (get-channel user "foo")))
-(expect clojure_fabric.core.Channel
-        (let [user (get-user "Org2MSP" "user1")]
-          (get-channel user "bar")))
+          (get-channel user "mychannel")))
 
 (expect (let [user (get-user "Org1MSP" "user1")
-              bar-chan (get-channel user "bar")]
-          (get-peers bar-chan)))
+              mychannel (get-channel user "mychannel")]
+          (get-peers mychannel)))
 
 (expect (let [user (get-user "Org1MSP" "user1")
-              bar-chan (get-channel user "bar")]
-          (query-installed-chaincodes user (get-random-peer bar-chan))))
-#_
-(expect 11
-        (let [user (get-user "Org2MSP" "user1")]
-          (oquery-installed-chaincodes user "bar")))
+              mychannel (get-channel user "mychannel")]
+          (query-installed-chaincodes user (get-random-peer mychannel))))
+
 ;;; 3. Add orderers and peers
 
 ;;; 4. Add event-hubs

                               :peer "peers"
                               :orderer "orderers")
                             node-end-name+domain-name)
        dir (format "fixture/e2e-2Orgs/channel/crypto-config/%sOrganizations/%s/%s/msp/"
                    org-type-name domain-name end-node-dir)]
    {:pem (-> (format "%ssigncerts/%s-cert.pem" dir node-end-name+domain-name)
              (io/resource)

  [{:keys [org-type domain-name]} {user-name :name}]
  (let [org-type-name (name org-type)
        user-name+domain-name (format "%s@%s" (clojure.string/capitalize user-name) domain-name)
        dir (format "fixture/balance-transfer/artifacts/channel/crypto-config/%sOrganizations/%s/users/%s/msp/"
                    org-type-name domain-name user-name+domain-name)]
    {:private-key (-> (str dir "keystore/")
                      (io/resource)
