diff --git a/common/configtx/test/helper.go b/common/configtx/test/helper.go
index <HASH>..<HASH> 100644
--- a/common/configtx/test/helper.go
+++ b/common/configtx/test/helper.go
@@ -60,7 +60,7 @@ func MakeGenesisBlockFromMSPs(chainID string, appMSPConf, ordererMSPConf *msppro
 	}
 
 	channelGroup.Groups[channelconfig.OrdererGroupKey].Groups[ordererOrgID] = ordererOrg
-	channelGroup.Groups[channelconfig.ApplicationGroupKey].Groups[ordererOrgID] = applicationOrg
+	channelGroup.Groups[channelconfig.ApplicationGroupKey].Groups[appOrgID] = applicationOrg
 
 	return genesis.NewFactoryImpl(channelGroup).Block(chainID)
 }
[FAB-<I>] appOrgs put into wrong key in helper.go

The function MakeGenesisBlockFromMSPs skips appOrgID
and instead encodes the applicationOrg object into the orderer organization.

Change-Id: Ia8bb3b<I>bc<I>f9b<I>a<I>fc<I>aebe6c2e<I>