diff --git a/src/test/java/teetime/framework/AbstractCompositeStageTest.java b/src/test/java/teetime/framework/AbstractCompositeStageTest.java
index 2d8848e254988267fb20e473af0655f793d2895a..f023d6199695e0a3b47589d5b3c40db3d7a96706 100644
--- a/src/test/java/teetime/framework/AbstractCompositeStageTest.java
+++ b/src/test/java/teetime/framework/AbstractCompositeStageTest.java
@@ -48,12 +48,22 @@ public class AbstractCompositeStageTest {
 		}
 	}
 
-	private class TestCompositeStage extends AbstractCompositeStage {
+	private class TestCompositeOneStage extends AbstractCompositeStage {
+
+		private final Counter firstCounter = new Counter();
+
+		public TestCompositeOneStage() {
+			addThreadableStage(firstCounter);
+		}
+
+	}
+
+	private class TestCompositeTwoStage extends AbstractCompositeStage {
 
 		private final Counter firstCounter = new Counter();
 		private final Counter secondCounter = new Counter();
 
-		public TestCompositeStage() {
+		public TestCompositeTwoStage() {
 			addThreadableStage(firstCounter);
 			connectPorts(firstCounter.getOutputPort(), secondCounter.getInputPort());
 		}
@@ -62,13 +72,13 @@ public class AbstractCompositeStageTest {
 
 	private class TestNestingCompositeStage extends AbstractCompositeStage {
 
-		public TestCompositeStage firstCompositeStage;
-		public TestCompositeStage secondCompositeStage;
+		public TestCompositeOneStage firstCompositeStage;
+		public TestCompositeTwoStage secondCompositeStage;
 
 		public TestNestingCompositeStage() {
-			firstCompositeStage = new TestCompositeStage();
-			secondCompositeStage = new TestCompositeStage();
-			connectPorts(firstCompositeStage.secondCounter.getOutputPort(), secondCompositeStage.firstCounter.getInputPort());
+			firstCompositeStage = new TestCompositeOneStage();
+			secondCompositeStage = new TestCompositeTwoStage();
+			connectPorts(firstCompositeStage.firstCounter.getOutputPort(), secondCompositeStage.firstCounter.getInputPort());
 		}
 
 	}