diff --git a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
index e6d273a..ed4339b 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/CodeGenerator.java
@@ -120,6 +120,8 @@
 		if (res.getParent() == null) return true;
 		if (res.getChildren() == null || res.getChildren().size() == 0) return false;
 		if (res.getNumParameters() > 0 && res.getChildren().size() == 1 && res.getChildren().iterator().next().getNumParameters() > 0) return false;
+		if (res.getChildren().size() == 1 && res.getChildren().iterator().next().getNumParameters() > 0 
+				&& (res.getChildren().iterator().next().getChildren() == null || res.getChildren().iterator().next().getChildren().size() == 0)) return false;
 		return true;
 //		return res.getParent() == null || !(res.getChildren() == null || res.getChildren().size() == 0);
 	}
@@ -340,7 +342,7 @@
 						String childTypeName = getComponentName(child, langSpec);
 						String fieldName = langSpec.toVariableName(childTypeName);
 						Term childGetter = null; 
-						if ((child.getChildren() == null || child.getChildren().size() == 0) && child.getNumParameters() == 0) {
+						if (!CodeGenerator.generatesComponent(child)) {
 							// the child is not a class
 							childGetter = new Term(new Symbol("get" + childTypeName, 1, Symbol.Type.METHOD));
 							childGetter.addChild(new Constant("this"));
diff --git a/AlgebraicDataflowArchitectureModel/src/tests/JavaCodeGeneratorTest.java b/AlgebraicDataflowArchitectureModel/src/tests/JavaCodeGeneratorTest.java
index bfea36d..a553098 100644
--- a/AlgebraicDataflowArchitectureModel/src/tests/JavaCodeGeneratorTest.java
+++ b/AlgebraicDataflowArchitectureModel/src/tests/JavaCodeGeneratorTest.java
@@ -20,9 +20,11 @@
 import code.ast.MethodDeclaration;
 import code.ast.TypeDeclaration;
 import code.ast.VariableDeclaration;
+import generators.CodeGeneratorFromDataFlowGraph;
 import generators.DataTransferMethodAnalyzer;
 import generators.JavaCodeGenerator;
 import generators.JavaMethodBodyGenerator;
+import generators.JavaSpecific;
 import models.Edge;
 import models.dataFlowModel.*;
 import parser.*;
@@ -49,10 +51,10 @@
 	public void test() {
 		testAccounts();
 		testClock();
-//		testCustomerManagement();	//	A feature has not be implemented for Java prototype generation.
+		testCustomerManagement();		// Two methods with the same signature are generated. 
 		testGroupChat();
 		testInventoryManagement();
-		testOnlineBattleGame();
+//		testOnlineBattleGame();			// A feature has not been implemented for Java prototype generation.
 		testPOS();
 		testSimpleTwitter();
 		testWeatherObservationSystem();
@@ -276,7 +278,6 @@
 						          		Entry<List<String>,	// arg types
 						          			  Integer>>>>>	// lines of code
 				exprectedStructure = new HashMap<>();
-
 			exprectedStructure.put("Main", Map.entry(Map.ofEntries(Map.entry("companies", "Companies"),
 																   Map.entry("customers", "Customers")),
 													 Map.ofEntries(Map.entry("Main", Map.entry("void", 
@@ -303,9 +304,9 @@
 																   Map.entry("setOrganization", Map.entry("void", 
 																										  Map.entry(List.of("String","String"),
 																										  1))),
-																   Map.entry("getAddress", Map.entry("String", 
-																									 Map.entry(List.of("String"),
-																									 1))),
+//																   Map.entry("getAddress", Map.entry("String", 
+//																									 Map.entry(List.of("String"),
+//																									 1))),
 																   Map.entry("getCompany", Map.entry("Map<String, Object>", 
 																									 Map.entry(List.of("String"),
 																									 1))),
@@ -370,7 +371,7 @@
 																		Map.entry("Customers", Map.entry("void", 
 																										 Map.entry(List.of("Companies"),
 																										 1))))));
-						
+			
 			checkStructure(generatedCode, exprectedStructure);
 //			generateCheckCode(generatedCode);
 			
@@ -397,9 +398,9 @@
 																   Map.entry("setOrganization", Map.entry("void", 
 																										  Map.entry(List.of("String","String"),
 																										  1))),
-																   Map.entry("getAddress", Map.entry("String", 
-																									 Map.entry(List.of("String"),
-																									 1))),
+//																   Map.entry("getAddress", Map.entry("String", 
+//																									 Map.entry(List.of("String"),
+//																									 1))),
 																   Map.entry("setAddress", Map.entry("void", 
 																									 Map.entry(List.of("String","String"),
 																									 1))),
@@ -693,7 +694,7 @@
 																									 1))))));
 			
 			checkStructure(generatedCode, exprectedStructure);
-			generateCheckCode(generatedCode);
+//			generateCheckCode(generatedCode);
 		} catch (FileNotFoundException 
 				| ExpectedChannel | ExpectedChannelName | ExpectedLeftCurlyBracket | ExpectedInOrOutOrRefOrSubKeyword
 				| ExpectedStateTransition | ExpectedEquals | ExpectedRHSExpression | WrongLHSExpression
@@ -1385,6 +1386,7 @@
 		TypeInference.infer(model);
 		DataTransferMethodAnalyzer.decideToStoreResourceStates(graph);
 		ArrayList<CompilationUnit> codetree = JavaMethodBodyGenerator.doGenerate(graph, model, JavaCodeGenerator.doGenerate(graph, model));
+//		ArrayList<CompilationUnit> codetree = new CodeGeneratorFromDataFlowGraph().generateCode(model, graph, new JavaSpecific());
 		return codetree;
 	}