diff --git a/test/Makefile b/test/Makefile
index 0ead41e..e4965f5 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,16 +2,18 @@ OPT = -O2
 DEBUG = 2
 CFLAGS = -I../include -Wall -std=c99 ${OPT}
 LDFLAGS = -L../lib
+LOADLIBES = -lpsyc -lm
+LOADLIBES_NET = ${LOADLIBES}
 TARGETS = testServer testParser testMatch testRender testText isRoutingVar getVarType
 WRAPPER =
 DIET = diet
 PORT = 4440
+NC = nc
+DIFF = diff
 
-LOADLIBES = -lpsyc -lm
 ifeq ($(shell uname),SunOS)
-  LOADLIBES_NET = ${LOADLIBES} -lsocket -lnsl
-else
-  LOADLIBES_NET = ${LOADLIBES}
+  LOADLIBES_NET := ${LOADLIBES_NET} -lsocket -lnsl
+  DIFF = gdiff
 endif
 
 all: ${TARGETS}
diff --git a/test/testServer.c b/test/testServer.c
index 41b6da7..255d425 100644
--- a/test/testServer.c
+++ b/test/testServer.c
@@ -434,6 +434,10 @@ int main (int argc, char **argv)
 								case PSYC_PARSE_ROUTING:
 								case PSYC_PARSE_ENTITY:
 								case PSYC_PARSE_ENTITY_END:
+									oper = 0;
+									name.length = 0;
+									value.length = 0;
+
 									if (pname->length >= 5 && memcmp(pname->ptr, "_list", 5) == 0)
 									{
 										if (verbose >= 2)