diff --git a/common/core/src/test/java/zingg/common/core/executor/ExecutorTester.java b/common/core/src/test/java/zingg/common/core/executor/ExecutorTester.java
index 31f466715..2723b90fa 100644
--- a/common/core/src/test/java/zingg/common/core/executor/ExecutorTester.java
+++ b/common/core/src/test/java/zingg/common/core/executor/ExecutorTester.java
@@ -4,6 +4,7 @@
 import org.apache.commons.logging.LogFactory;
 
 import zingg.common.client.IArguments;
+import zingg.common.client.ClientOptions;
 import zingg.common.client.ZinggClientException;
 
 public class ExecutorTester<S, D, R, C, T>{
@@ -18,8 +19,8 @@ public ExecutorTester(ZinggBase<S, D, R, C, T> executor,ExecutorValidator<S, D,
 		this.validator = validator;
 	}
 	
-	public void initAndExecute(IArguments args, S session) throws ZinggClientException {
-		executor.init(args,session);
+	public void initAndExecute(IArguments args, S session, ClientOptions c) throws ZinggClientException {
+		executor.init(args,session, c);
 		executor.execute();
 	}
 	
diff --git a/common/core/src/test/java/zingg/common/core/executor/TestExecutorsGeneric.java b/common/core/src/test/java/zingg/common/core/executor/TestExecutorsGeneric.java
index 263520340..5e252af13 100644
--- a/common/core/src/test/java/zingg/common/core/executor/TestExecutorsGeneric.java
+++ b/common/core/src/test/java/zingg/common/core/executor/TestExecutorsGeneric.java
@@ -48,15 +48,24 @@ public String setupArgs() throws ZinggClientException, IOException {
 	List<ExecutorTester<S, D, R, C, T>> executorTesterList = new ArrayList<ExecutorTester<S, D, R, C, T>>();
 
 	public List<ExecutorTester<S, D, R, C, T>> getExecutors() throws ZinggClientException{
-		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(getTrainingDataFinder(), new TrainingDataFinderValidator<S, D, R, C, T>(getTrainingDataFinder())));
-		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(getLabeller(), new LabellerValidator<S, D, R, C, T>(getLabeller())));
-		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(getTrainingDataFinder(), new TrainingDataFinderValidator<S, D, R, C, T>(getTrainingDataFinder())));
-		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(getLabeller(), new LabellerValidator<S, D, R, C, T>(getLabeller())));
-		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(getTrainingDataFinder(), new TrainingDataFinderValidator<S, D, R, C, T>(getTrainingDataFinder())));
-		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(getLabeller(), new LabellerValidator<S, D, R, C, T>(getLabeller())));
-		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(getTrainer(),getTrainerValidator(getTrainer())));
-		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(getMatcher(),new MatcherValidator<S, D, R, C, T>(getMatcher())));
-		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(getLinker(),new LinkerValidator<S, D, R, C, T>(getLinker())));
+	    TrainingDataFinder<S, D, R, C, T> tdf = getTrainingDataFinder();
+		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(tdf, new TrainingDataFinderValidator<S, D, R, C, T>(tdf)));
+
+		Labeller<S, D, R, C, T> labeler = getLabeller();
+		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(labeler, new LabellerValidator<S, D, R, C, T>(labeler)));
+
+		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(tdf, new TrainingDataFinderValidator<S, D, R, C, T>(tdf)));
+		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(labeler, new LabellerValidator<S, D, R, C, T>(labeler)));
+
+		Trainer<S, D, R, C, T> trainer = getTrainer();
+		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(trainer,getTrainerValidator(trainer)));
+
+		Matcher<S, D, R, C, T> matcher = getMatcher();
+		executorTesterList.add(new ExecutorTester<S, D, R, C, T>(matcher,new MatcherValidator<S, D, R, C, T>(matcher)));
+
+		//Linker<S, D, R, C, T> linker = getLinker();
+		//executorTesterList.add(new ExecutorTester<S, D, R, C, T>(linker,new LinkerValidator<S, D, R, C, T>(linker)));
+
 		return executorTesterList;
 	}
 	
@@ -67,7 +76,7 @@ public void testExecutors() throws ZinggClientException {
 		List<ExecutorTester<S, D, R, C, T>> executorTesterList = getExecutors();
 
 		for (ExecutorTester<S, D, R, C, T> executorTester : executorTesterList) {
-			executorTester.initAndExecute(args,session);
+			executorTester.initAndExecute(args,session, new ClientOptions());
 			executorTester.validateResults();
 		}
 		
diff --git a/common/core/src/test/java/zingg/common/core/executor/TrainingDataFinderValidator.java b/common/core/src/test/java/zingg/common/core/executor/TrainingDataFinderValidator.java
index 98a303c43..e2d08a3a2 100644
--- a/common/core/src/test/java/zingg/common/core/executor/TrainingDataFinderValidator.java
+++ b/common/core/src/test/java/zingg/common/core/executor/TrainingDataFinderValidator.java
@@ -19,7 +19,8 @@ public TrainingDataFinderValidator(TrainingDataFinder<S, D, R, C, T> executor) {
 	@Override
 	public void validateResults() throws ZinggClientException {
 		// check that unmarked data has at least 10 rows
-		ZFrame<D, R, C> df = executor.getContext().getPipeUtil().read(false, false, executor.getContext().getPipeUtil().getTrainingDataUnmarkedPipe(executor.getArgs()));
+		ZFrame<D, R, C> df = executor.getContext().getPipeUtil().read(false, false, 
+			((TrainingDataFinder<S, D, R, C, T>) executor).getUnmarkedLocation());
 		
 		long trainingDataCount = df.count();
 		assertTrue(trainingDataCount > 10);