diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 0e7e100572c6fde0d34a0a1848a59dafc8989de9..59b81fc9343754acd4e266de9216acfcf95ba035 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
 #FindBugs User Preferences
-#Wed Dec 17 15:04:09 CET 2014
+#Fri Dec 19 10:27:19 CET 2014
 detector_threshold=3
 effort=max
 excludefilter0=.fbExcludeFilterFile|true
diff --git a/src/main/java/util/KiekerLoadDriver.java b/src/main/java/util/KiekerLoadDriver.java
index d8d1a25cda342bf32e9dd11314c54057c0d19a62..eb8146dd1568cba951a1b41311bbfcab922f046a 100644
--- a/src/main/java/util/KiekerLoadDriver.java
+++ b/src/main/java/util/KiekerLoadDriver.java
@@ -34,14 +34,15 @@ import kieker.common.util.registry.Registry;
 public class KiekerLoadDriver {
 
 	private final List<IMonitoringRecord> elementCollection = new LinkedList<IMonitoringRecord>();
+	private final IPipeFactory intraThreadPipeFactory;
 	private final RunnableStage runnableStage;
+
 	private long[] timings;
-	private final IPipeFactory intraThreadPipeFactory;
 
 	public KiekerLoadDriver(final File directory) {
+		intraThreadPipeFactory = PipeFactoryRegistry.INSTANCE.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false);
 		Stage producerPipeline = this.buildProducerPipeline(directory);
 		runnableStage = new RunnableStage(producerPipeline);
-		intraThreadPipeFactory = PipeFactoryRegistry.INSTANCE.getPipeFactory(ThreadCommunication.INTRA, PipeOrdering.ARBITRARY, false);
 	}
 
 	private Stage buildProducerPipeline(final File directory) {
diff --git a/src/main/resources/pipe-factories.conf b/src/main/resources/pipe-factories.conf
new file mode 100644
index 0000000000000000000000000000000000000000..e3d966cf8d0cab50e88237071d46309bd49b1347
--- /dev/null
+++ b/src/main/resources/pipe-factories.conf
@@ -0,0 +1,4 @@
+teetime.framework.pipe.SingleElementPipeFactory
+teetime.framework.pipe.OrderedGrowableArrayPipeFactory
+teetime.framework.pipe.UnorderedGrowablePipeFactory
+teetime.framework.pipe.SpScPipeFactory
\ No newline at end of file
diff --git a/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java b/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java
index dd6b89947036824612698bfc1a55a09f92d9d3c6..dc129f53d510f32648f9b9cc54ecd2bb605eabc5 100644
--- a/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java
+++ b/src/performancetest/java/teetime/examples/traceReductionWithThreads/ChwWorkTcpTraceReductionAnalysisWithThreadsTest.java
@@ -148,30 +148,30 @@ public class ChwWorkTcpTraceReductionAnalysisWithThreadsTest {
 	}
 
 	public static void main(final String[] args) {
-		ChwWorkTcpTraceReductionAnalysisWithThreadsTest analysis = new ChwWorkTcpTraceReductionAnalysisWithThreadsTest();
-		analysis.before();
+		ChwWorkTcpTraceReductionAnalysisWithThreadsTest analysisTest = new ChwWorkTcpTraceReductionAnalysisWithThreadsTest();
+		analysisTest.before();
 		try {
-			analysis.performAnalysisWith1Thread();
+			analysisTest.performAnalysisWith1Thread();
 		} catch (Exception e) {
 			System.err.println(e);
 		}
-		analysis.after();
+		analysisTest.after();
 
-		analysis.before();
+		analysisTest.before();
 		try {
-			analysis.performAnalysisWith2Threads();
+			analysisTest.performAnalysisWith2Threads();
 		} catch (Exception e) {
 			System.err.println(e);
 		}
-		analysis.after();
+		analysisTest.after();
 
-		analysis.before();
+		analysisTest.before();
 		try {
-			analysis.performAnalysisWith4Threads();
+			analysisTest.performAnalysisWith4Threads();
 		} catch (Exception e) {
 			System.err.println(e);
 		}
-		analysis.after();
+		analysisTest.after();
 	}
 
 }
diff --git a/src/test/resources/logback.xml b/src/test/resources/logback-test.xml
similarity index 100%
rename from src/test/resources/logback.xml
rename to src/test/resources/logback-test.xml