diff --git a/LCS/AMC/AMCBase/test/tConverterCommand.cc b/LCS/AMC/AMCBase/test/tConverterCommand.cc
index 59e5023dd3b96efbc36f4df99296d244c284f839..1a7cc479d9a0ae06edb1424ed2dc93ebf490cd27 100644
--- a/LCS/AMC/AMCBase/test/tConverterCommand.cc
+++ b/LCS/AMC/AMCBase/test/tConverterCommand.cc
@@ -77,5 +77,5 @@ int main(int /*argc*/, const char* const argv[])
     cerr << e << endl;
     return 1;
   }
-  return 2;  // forces assay to flag missing .stdout file as an error
+  return 0;
 }
diff --git a/LCS/AMC/AMCBase/test/tConverterCommand.sh b/LCS/AMC/AMCBase/test/tConverterCommand.sh
index f9de3e917207d974d0d39d57c527e43b59e31da3..36593812169877f17c87cdd764ec15e2fa1717dd 100755
--- a/LCS/AMC/AMCBase/test/tConverterCommand.sh
+++ b/LCS/AMC/AMCBase/test/tConverterCommand.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-$lofar_sharedir/runtest.sh tConverterCommand 2>&1 > tConverterCommand.log
+$lofar_sharedir/runtest.sh -stdout tConverterCommand 2>&1 > tConverterCommand.log
diff --git a/LCS/AMC/AMCBase/test/tConverterStatus.cc b/LCS/AMC/AMCBase/test/tConverterStatus.cc
index 7e4acc8be8a078429755f24b08f7f88be9a5a22a..60cc8ecedff766aed8b78bb4b072940de498678a 100644
--- a/LCS/AMC/AMCBase/test/tConverterStatus.cc
+++ b/LCS/AMC/AMCBase/test/tConverterStatus.cc
@@ -66,5 +66,5 @@ int main(int /*argc*/, const char* const argv[])
     cerr << e << endl;
     return 1;
   }
-  return 2;  // forces assay to flag missing .stdout file as an error
+  return 0;
 }
diff --git a/LCS/AMC/AMCBase/test/tConverterStatus.sh b/LCS/AMC/AMCBase/test/tConverterStatus.sh
index 9dc1e69f2928eda22e7bc4c98488a8e3c1dcbb7d..319b14b18d8994ff592e01801fd2afd61bf381c8 100755
--- a/LCS/AMC/AMCBase/test/tConverterStatus.sh
+++ b/LCS/AMC/AMCBase/test/tConverterStatus.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-$lofar_sharedir/runtest.sh tConverterStatus 2>&1 > tConverterStatus.log
+$lofar_sharedir/runtest.sh -stdout tConverterStatus 2>&1 > tConverterStatus.log
diff --git a/LCS/AMC/AMCBase/test/tDirection.cc b/LCS/AMC/AMCBase/test/tDirection.cc
index 55d0ce79c4dbc9371b61338260a4dc3b18797c48..53f330e16f208b79804d099b5f671efa048579a6 100644
--- a/LCS/AMC/AMCBase/test/tDirection.cc
+++ b/LCS/AMC/AMCBase/test/tDirection.cc
@@ -102,5 +102,5 @@ int main(int /*argc*/, const char* argv[])
     return 1;
   }
 
-  return 2;  // forces assay to flag missing .stdout file as an error
+  return 0;
 }
diff --git a/LCS/AMC/AMCBase/test/tDirection.sh b/LCS/AMC/AMCBase/test/tDirection.sh
index f8ca9a21cdefe6bde8d6b2d4af53636bfee80aa4..e30277208db15ce6742175daebcd21a306d75444 100755
--- a/LCS/AMC/AMCBase/test/tDirection.sh
+++ b/LCS/AMC/AMCBase/test/tDirection.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-$lofar_sharedir/runtest.sh tDirection 2>&1 > tDirection.log
+$lofar_sharedir/runtest.sh -stdout tDirection 2>&1 > tDirection.log
diff --git a/LCS/AMC/AMCBase/test/tPosition.cc b/LCS/AMC/AMCBase/test/tPosition.cc
index 320932f8a3aa51de78649095db545871bbfc6cec..dc8c07399b4c7e84e97ca5259d9abb842d4532ff 100644
--- a/LCS/AMC/AMCBase/test/tPosition.cc
+++ b/LCS/AMC/AMCBase/test/tPosition.cc
@@ -179,5 +179,5 @@ int main(int, const char* argv[])
     return 1;
   }
 
-  return 2;  // forces assay to flag missing .stdout file as an error
+  return 0;
 }
diff --git a/LCS/AMC/AMCBase/test/tPosition.sh b/LCS/AMC/AMCBase/test/tPosition.sh
index d1875c269a3e8e0e6407cace6fc83e28c5cfd206..ae5e487759d657f2ff13f29c69b7f40fa1de03e4 100755
--- a/LCS/AMC/AMCBase/test/tPosition.sh
+++ b/LCS/AMC/AMCBase/test/tPosition.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-$lofar_sharedir/runtest.sh tPosition 2>&1 > tPosition.log
+$lofar_sharedir/runtest.sh -stdout tPosition 2>&1 > tPosition.log
diff --git a/LCS/AMC/AMCImpl/test/tConverter.cc b/LCS/AMC/AMCImpl/test/tConverter.cc
index afc1990985c397b94570783939fbb6d87ff71057..ad01621c9fe6f8a6f400b94f53bf7a263850af20 100644
--- a/LCS/AMC/AMCImpl/test/tConverter.cc
+++ b/LCS/AMC/AMCImpl/test/tConverter.cc
@@ -392,5 +392,5 @@ int main(int /*argc*/, const char* const argv[])
     return 1;
   }
 
-  return 2;  // forces assay to flag missing .stdout file as an error
+  return 0;
 }
diff --git a/LCS/AMC/AMCImpl/test/tConverter.sh b/LCS/AMC/AMCImpl/test/tConverter.sh
index 38d806a29b62f63c76ed24dea69b00936317743e..ee5e7dda5b85eec2aea9d8e3475f2de537ba7509 100755
--- a/LCS/AMC/AMCImpl/test/tConverter.sh
+++ b/LCS/AMC/AMCImpl/test/tConverter.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 echo "impl" > tConverter.in
-$lofar_sharedir/runtest.sh tConverter > tConverter_impl.log
+$lofar_sharedir/runtest.sh -stdout tConverter > tConverter_impl.log
 echo "client localhost 31339" > tConverter.in
-$lofar_sharedir/runtest.sh tConverter > tConverter_client.log
+$lofar_sharedir/runtest.sh -stdout tConverter > tConverter_client.log
diff --git a/LCS/Common/test/Makefile.am b/LCS/Common/test/Makefile.am
index 340928e26119aaa244dbc6de17e5a50b5af5ddd1..74244bae63ee6cb7736958c9d8ac3d62f886b4df 100644
--- a/LCS/Common/test/Makefile.am
+++ b/LCS/Common/test/Makefile.am
@@ -1,5 +1,5 @@
 check_PROGRAMS	      =	testLogger \
-			tAllocator tDataConvert tDeployment tFileLocator \
+			tAllocator tDataConvert tFileLocator \
 			tStringUtil tHexdump testSocket tComplex tProcess \
 			tRunOnNode tTimer tNumeric
 
@@ -50,10 +50,6 @@ tDataConvert_SOURCES		= tDataConvert.cc
 tDataConvert_LDADD		= ../src/libcommon.la
 tDataConvert_DEPENDENCIES	= ../src/libcommon.la $(LOFAR_DEPEND)
 
-tDeployment_SOURCES		= tDeployment.cc
-tDeployment_LDADD		= ../src/libcommon.la
-tDeployment_DEPENDENCIES	= ../src/libcommon.la $(LOFAR_DEPEND)
-
 tFileLocator_SOURCES		= tFileLocator.cc
 tFileLocator_LDADD		    = ../src/libcommon.la
 tFileLocator_DEPENDENCIES	= ../src/libcommon.la $(LOFAR_DEPEND)
diff --git a/LCS/Common/test/tNumeric.cc b/LCS/Common/test/tNumeric.cc
index 579942c2833dd0d15c160bd6d3467017a35c0dc4..88334c1d75a8f6757dfeb8d1244f1ca81c5f6573 100644
--- a/LCS/Common/test/tNumeric.cc
+++ b/LCS/Common/test/tNumeric.cc
@@ -392,5 +392,5 @@ int main(int /*argc*/, const char* argv[])
     return 1;
   }
   LOG_INFO("Program terminated successfully");
-  return 2;  // forces assay to flag missing .stdout file as an error
+  return 0;
 }
diff --git a/LCS/Common/test/tNumeric.sh b/LCS/Common/test/tNumeric.sh
index f80ddad6e119473ca10d7344ad268d158a861805..3757c30f0a9d07128589095f8264ceb7dd6475a1 100755
--- a/LCS/Common/test/tNumeric.sh
+++ b/LCS/Common/test/tNumeric.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-$lofar_sharedir/runtest.sh tNumeric 2>&1 > tNumeric_test.log
+$lofar_sharedir/runtest.sh -stdout tNumeric 2>&1 > tNumeric_test.log
diff --git a/LCS/Common/test/tProcess.cc b/LCS/Common/test/tProcess.cc
index dc3c2dfc19807f9ad0dcbe2b8735ab07bc47f771..c98ea907f3d8a23cab5cea9027b4572ba1d8190f 100644
--- a/LCS/Common/test/tProcess.cc
+++ b/LCS/Common/test/tProcess.cc
@@ -94,5 +94,5 @@ int main (int /*argc*/, const char* argv[])
     return 1;
   }
 
-  return 2;  // forces assay to flag missing .stdout file as an error
+  return 0;
 }
diff --git a/LCS/Common/test/tProcess.sh b/LCS/Common/test/tProcess.sh
index ef0d4581cb5015fcdaef0ceec87cc18a4d80a1f0..31efb1b6387ab12681358dae4a643b7421f4056c 100755
--- a/LCS/Common/test/tProcess.sh
+++ b/LCS/Common/test/tProcess.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-$lofar_sharedir/runtest.sh tProcess 2>&1 > tProcess.log
+$lofar_sharedir/runtest.sh -stdout tProcess 2>&1 > tProcess.log
diff --git a/LCS/Common/test/tProcess.stdout b/LCS/Common/test/tProcess.stdout
index 9ef39553e7932a39879881673b219b022c18899d..d2fdf9d567eac3bd25ebf384ee94e64318b40d44 100644
--- a/LCS/Common/test/tProcess.stdout
+++ b/LCS/Common/test/tProcess.stdout
@@ -1,3 +1,2 @@
 S
-S
 Z