diff --git a/AlgebraicDataflowArchitectureModel/src/tests/DataFlowModelTest.java b/AlgebraicDataflowArchitectureModel/src/tests/DataFlowModelTest.java
index d2b8e9d..080a992 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/DataFlowModelTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/DataFlowModelTest.java
@@ -12,35 +12,51 @@
 
 	@Test
 	public void test() {
-		// Construct a dataflow architecture model.
+		// Construct a data-flow architecture model.
 		DataFlowModel model = new DataFlowModel();
-		IdentifierTemplate customer_off = new IdentifierTemplate(1);
-		IdentifierTemplate customer_add = new IdentifierTemplate(1);
-		IdentifierTemplate company_add = new IdentifierTemplate(1);
+		IdentifierTemplate customer_off = new IdentifierTemplate(1);		// an identifier template to specify a customer's office resource
+		IdentifierTemplate company_add = new IdentifierTemplate(1);			// an identifier template to specify a companie's address resource
+		IdentifierTemplate customer_add = new IdentifierTemplate(1);		// an identifier template to specify a customer's address resource
 		
-		DataflowChannelGenerator gin_1 = new DataflowChannelGenerator();	// set customer's office
+		// === gin_1 ===
+		//
+		// {x1}.customer_off(c, set(x)) = x
+		// {x1}.customer_off(c, e) = c
+		//
+		DataflowChannelGenerator gin_1 = new DataflowChannelGenerator();	// set customer's office (an input channel)
 		GroupSelector x1 = new GroupSelector();
 		ChannelMember customer_off_1 = new ChannelMember(customer_off);
-		customer_off_1.addSelector(x1);
+		customer_off_1.addSelector(x1);				// x1 is determined by the path parameter in customer's office template, and serves as a group selector in this channel
 		gin_1.addChannelMember(customer_off_1);
 		assertEquals(customer_off.getNumberOfParameters(), customer_off_1.getSelectors().size());
 		
-		DataflowChannelGenerator gin_2 = new DataflowChannelGenerator();	// set companie's address
+		// === gin_2 ===
+		//
+		// {x2}.company_add(a, set(y)) = y
+		// {x2}.company_add(a, e) = a
+		//
+		DataflowChannelGenerator gin_2 = new DataflowChannelGenerator();	// set companie's address (an input channel)
 		GroupSelector x2 = new GroupSelector();
 		ChannelMember company_add_1 = new ChannelMember(company_add);
-		company_add_1.addSelector(x2);
+		company_add_1.addSelector(x2);				// x2 is determined by the path parameter in companie's address template, and serves as a group selector in this channel
 		gin_2.addChannelMember(company_add_1);		
 		assertEquals(company_add.getNumberOfParameters(), company_add_1.getSelectors().size());
 		
+		// === g ===
+		//		
+		// {x3}.customer_off( c, update(y, z)) = y
+		//  {y}.company_add( a1, update(y, z)) = z
+		// {x3}.customer_add(a2, update(y, z)) = z
+		//
 		DataflowChannelGenerator g = new DataflowChannelGenerator();		// update customer's address
 		GroupSelector x3 = new GroupSelector();
 		ChannelSelector y = new ChannelSelector();
 		ChannelMember customer_off_2 = new ChannelMember(customer_off);
 		ChannelMember company_add_2 = new ChannelMember(company_add);
 		ChannelMember customer_add_2 = new ChannelMember(customer_add);
-		customer_off_2.addSelector(x3);
-		company_add_2.addSelector(y);
-		customer_add_2.addSelector(x3);
+		customer_off_2.addSelector(x3);				// x3 is determined by the path parameter in customer's office template, and serves as a group selector in this channel
+		company_add_2.addSelector(y);				// y is determined by the value of the customer's office resource, and serves as a channel selector in this channel
+		customer_add_2.addSelector(x3);				// x3 determines the path parameter in customer's address template to update
 		g.addChannelMemberAsInput(customer_off_2);
 		g.addChannelMemberAsInput(customer_add_2);
 		g.addChannelMemberAsOutput(company_add_2);
@@ -48,6 +64,7 @@
 		assertEquals(customer_add.getNumberOfParameters(), customer_add_2.getSelectors().size());
 		assertEquals(company_add.getNumberOfParameters(), company_add_2.getSelectors().size());
 		
+		// Construct a data-flow architecture model.
 		model.addIOChannelGenerator(gin_1);
 		model.addIOChannelGenerator(gin_2);
 		model.addChannelGenerator(g);