diff --git a/src/cxxTemplates/test/Makefile.Unix b/src/cxxTemplates/test/Makefile.Unix
index 6542a5b47..472dc4871 100644
--- a/src/cxxTemplates/test/Makefile.Unix
+++ b/src/cxxTemplates/test/Makefile.Unix
@@ -2,21 +2,21 @@
 TOP = ../../../..
 include $(TOP)/config/CONFIG_BASE
 
-SRCS.c += ../resourceLibTest.cc
-SRCS.c += ../tsDLListBench.cc
-SRCS.c += ../tsDLListTest.cc
-SRCS.c += ../tsSLListBench.cc
-SRCS.c += ../tsSLListTest.cc
+SRCS.cc += ../resourceLibTest.cc
+SRCS.cc += ../tsDLListBench.cc
+SRCS.cc += ../tsDLListTest.cc
+SRCS.cc += ../tsSLListBench.cc
+SRCS.cc += ../tsSLListTest.cc
 
-TARGETS += resourceLibTest
-TARGETS += tsDLListBench
-TARGETS += tsDLListTest
-TARGETS += tsSLListTest
+TARGETS += buildHere
+#TARGETS += resourceLibTest
+#TARGETS += tsDLListBench
+#TARGETS += tsDLListTest
+#TARGETS += tsSLListTest
 
 include $(TOP)/config/RULES.Unix
 
-ifdef fred
-all: resourceLibTest tsDLListBench tsDLListTest tsSLListBench tsSLListTest
+buildHere: resourceLibTest tsDLListBench tsDLListTest tsSLListBench tsSLListTest
 
 resourceLibTest: resourceLibTest.o
 	$(LINK.cc) -o $@ $<
@@ -32,5 +32,4 @@ tsSLListBench: tsSLListBench.o
 
 tsSLListTest: tsSLListTest.o
 	$(LINK.cc) -o $@ $<
-endif
 
diff --git a/src/cxxTemplates/test/tsDLListTest.cc b/src/cxxTemplates/test/tsDLListTest.cc
index 98815c3c2..d581e083f 100644
--- a/src/cxxTemplates/test/tsDLListTest.cc
+++ b/src/cxxTemplates/test/tsDLListTest.cc
@@ -35,9 +35,9 @@ main ()
 
 	list.add(*pFred);
 	list.add(*pFredII);
-	pFredBack = list.first();
+	pFredBack = iter();
 	assert(pFredBack == pFred);
-	pFredBack = list.last();
+	pFredBack = iter();
 	assert(pFredBack == pFredII);
 	list.remove(*pFred);
 	list.add(*pFred);
@@ -51,6 +51,7 @@ main ()
 	list.add(* new fred("C"));
 	list.add(* new fred("D"));
 
+	iter.reset();
 	while (pFredBack = iter()) {
 		pFredBack->show();
 	}
diff --git a/src/cxxTemplates/test/tsSLListBench.cc b/src/cxxTemplates/test/tsSLListBench.cc
index df12cf361..e23795b06 100644
--- a/src/cxxTemplates/test/tsSLListBench.cc
+++ b/src/cxxTemplates/test/tsSLListBench.cc
@@ -3,6 +3,7 @@
 
 #include <tsSLList.h>
 #include <assert.h>
+#include <stdio.h>
 #include <time.h>
 
 class fred : public tsSLNode<fred> {
diff --git a/src/cxxTemplates/test/tsSLListTest.cc b/src/cxxTemplates/test/tsSLListTest.cc
index 92da6db58..de3750f58 100644
--- a/src/cxxTemplates/test/tsSLListTest.cc
+++ b/src/cxxTemplates/test/tsSLListTest.cc
@@ -3,6 +3,7 @@
 
 #include <tsSLList.h>
 #include <assert.h>
+#include <stdio.h>
 
 class fred : public tsSLNode<fred> {
 public:
@@ -36,12 +37,12 @@ main ()
 	list.add(*pFredII);
 	pFredBack = iter();
 	assert(pFredBack == pFredII);
-	list.remove(*pFred); // removes pFredII
-	list.add(*pFredII);
-	pFredBack = list.get();
-	assert (pFredBack == pFredII);
+	list.remove(*pFredII);  // removes *pFred !!
+	list.add(*pFred);
 	pFredBack = list.get();
 	assert (pFredBack == pFred);
+	pFredBack = list.get();
+	assert (pFredBack == pFredII);
 	list.add(*pFredII);
 	list.add(*pFred);
 	iter.reset();
diff --git a/src/libCom/cxxTemplates/test/tsDLListTest.cc b/src/libCom/cxxTemplates/test/tsDLListTest.cc
index 98815c3c2..d581e083f 100644
--- a/src/libCom/cxxTemplates/test/tsDLListTest.cc
+++ b/src/libCom/cxxTemplates/test/tsDLListTest.cc
@@ -35,9 +35,9 @@ main ()
 
 	list.add(*pFred);
 	list.add(*pFredII);
-	pFredBack = list.first();
+	pFredBack = iter();
 	assert(pFredBack == pFred);
-	pFredBack = list.last();
+	pFredBack = iter();
 	assert(pFredBack == pFredII);
 	list.remove(*pFred);
 	list.add(*pFred);
@@ -51,6 +51,7 @@ main ()
 	list.add(* new fred("C"));
 	list.add(* new fred("D"));
 
+	iter.reset();
 	while (pFredBack = iter()) {
 		pFredBack->show();
 	}
diff --git a/src/libCom/cxxTemplates/test/tsSLListBench.cc b/src/libCom/cxxTemplates/test/tsSLListBench.cc
index df12cf361..e23795b06 100644
--- a/src/libCom/cxxTemplates/test/tsSLListBench.cc
+++ b/src/libCom/cxxTemplates/test/tsSLListBench.cc
@@ -3,6 +3,7 @@
 
 #include <tsSLList.h>
 #include <assert.h>
+#include <stdio.h>
 #include <time.h>
 
 class fred : public tsSLNode<fred> {
diff --git a/src/libCom/cxxTemplates/test/tsSLListTest.cc b/src/libCom/cxxTemplates/test/tsSLListTest.cc
index 92da6db58..de3750f58 100644
--- a/src/libCom/cxxTemplates/test/tsSLListTest.cc
+++ b/src/libCom/cxxTemplates/test/tsSLListTest.cc
@@ -3,6 +3,7 @@
 
 #include <tsSLList.h>
 #include <assert.h>
+#include <stdio.h>
 
 class fred : public tsSLNode<fred> {
 public:
@@ -36,12 +37,12 @@ main ()
 	list.add(*pFredII);
 	pFredBack = iter();
 	assert(pFredBack == pFredII);
-	list.remove(*pFred); // removes pFredII
-	list.add(*pFredII);
-	pFredBack = list.get();
-	assert (pFredBack == pFredII);
+	list.remove(*pFredII);  // removes *pFred !!
+	list.add(*pFred);
 	pFredBack = list.get();
 	assert (pFredBack == pFred);
+	pFredBack = list.get();
+	assert (pFredBack == pFredII);
 	list.add(*pFredII);
 	list.add(*pFred);
 	iter.reset();