diff --git a/TODO b/TODO
index 8825856..7aaf7a6 100644
--- a/TODO
+++ b/TODO
@@ -19,5 +19,5 @@ readSize checks if size is in limits of size_t?
 
 void transportUnresponsive() { not implemented (also in Java)
 
-
+socket termination - usage of epicsSocketSystemCallInterruptMechanismQuery() API
  
diff --git a/startTestServer b/startTestServer
new file mode 100755
index 0000000..67f0e05
--- /dev/null
+++ b/startTestServer
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if [ "X$EPICS_BASE" = "X" ]; then
+    echo "Environment variable EPICS_BASE not set."
+    exit 1
+fi
+
+if [ "X$EPICS_HOST_ARCH" = "X" ]; then
+    EPICS_HOST_ARCH=`$EPICS_BASE/startup/EpicsHostArch`
+    if [ "X$EPICS_HOST_ARCH" = "X" ]; then
+        echo "Environment variable EPICS_HOST_ARCH not set, failed to auto-detect."
+        exit 1
+    fi
+    echo "Environment variable EPICS_HOST_ARCH not set, detected $EPICS_HOST_ARCH."
+fi
+
+# testServer
+echo "Starting pvAccess C++ test server..."
+./bin/$EPICS_HOST_ARCH/testServer