diff --git a/.gitattributes b/.gitattributes
index 70dd6b2c7192561e836a8a97faaa7bd87e9e9df3..939e42907d8e4480372967c51ed429bf69a48efe 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1053,6 +1053,7 @@ CEP/ParmDB/src/setupparmdb-part -text
 CEP/ParmDB/src/setupsourcedb -text
 CEP/ParmDB/src/setupsourcedb-part -text
 CEP/ParmDB/src/startparmdbdistr -text
+CEP/ParmDB/test/tParmDBLog.sh eol=lf
 CEP/ParmDB/test/tSourceDBBlob.in_shapelet -text
 CEP/ParmDB/test/tmakesourcedb.in_1 -text
 CEP/ParmDB/test/tmakesourcedb.in_2 -text
@@ -1996,6 +1997,7 @@ CMake/FindValgrind.cmake -text
 CMake/TODO -text
 CMake/testscripts/assay -text
 CMake/testscripts/checkfloat -text
+CMake/testscripts/default.debug -text
 CMake/variants/variants.b7015 -text
 CMake/variants/variants.dop256 -text
 CMake/variants/variants.dop282 -text
@@ -3957,6 +3959,7 @@ RTCP/LofarStMan/include/LofarStMan/CMakeLists.txt -text
 RTCP/LofarStMan/src/CMakeLists.txt -text
 RTCP/LofarStMan/src/makeFLAGwritable -text
 RTCP/LofarStMan/test/CMakeLists.txt -text
+RTCP/LofarStMan/test/tIOPerf.sh eol=lf
 RTCP/MetaDataGatherer/CMakeLists.txt -text
 RTCP/MetaDataGatherer/src/CMakeLists.txt -text
 RTCP/MetaDataGatherer/src/FinalMetaDataGatherer.cc -text
diff --git a/CEP/ParmDB/test/tParmDBLog.sh b/CEP/ParmDB/test/tParmDBLog.sh
new file mode 100755
index 0000000000000000000000000000000000000000..b6f013471b2347da639e869148f8db14b9cfb761
--- /dev/null
+++ b/CEP/ParmDB/test/tParmDBLog.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+./runctest.sh tParmDBLog
diff --git a/CMake/testscripts/default.debug b/CMake/testscripts/default.debug
new file mode 100644
index 0000000000000000000000000000000000000000..7cd8c8691e3cf631a0ba88ff248df0304e139ffc
--- /dev/null
+++ b/CMake/testscripts/default.debug
@@ -0,0 +1 @@
+Global 5
diff --git a/RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.cc b/RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.cc
index fd39aaaf248ccc087e8ca131c2a73b39e2076814..67c9597ce8426342a84887b9fa08d036abfa7351 100644
--- a/RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.cc
+++ b/RTCP/Cobalt/OutputProc/test/tMeasurementSetFormat.cc
@@ -43,7 +43,7 @@ int main()
   for( unsigned i = 0; i < sizeof suffixes / sizeof suffixes[0]; i++ ) {
     try {
       const string parsetName = string("tMeasurementSetFormat.parset") + suffixes[i];
-      const string msName = string("tMeasurementSetFormat") + suffixes[i] + "_tmp.ms";
+      const string msName = string("tMeasurementSetFormat_tmp") + suffixes[i] + ".MS";
 
       LOG_DEBUG_STR("Testing " << parsetName);
 
diff --git a/RTCP/LofarStMan/test/tIOPerf.sh b/RTCP/LofarStMan/test/tIOPerf.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d75d435bf42601afaeac63e88f5f800a506fee3e
--- /dev/null
+++ b/RTCP/LofarStMan/test/tIOPerf.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+./runctest.sh tIOPerf