Index: trunk/test/test.sh
===================================================================
--- trunk/test/test.sh	(revision 27)
+++ trunk/test/test.sh	(revision 29)
@@ -185,4 +185,9 @@
 
 PW_DIR=`pwd`; export PW_DIR
+
+#
+# group/world writeable will cause problems
+#
+chmod go-w .
 #
 #
Index: trunk/test/testcompile.sh
===================================================================
--- trunk/test/testcompile.sh	(revision 27)
+++ trunk/test/testcompile.sh	(revision 29)
@@ -223,4 +223,5 @@
 	if [ -z "$GPG" ]; then
 	    log_skip $num $MAXTEST 'gpg not in PATH'
+            let "num = num + 1" >/dev/null
 	else
 	    if test -r "Makefile"; then
@@ -370,6 +371,5 @@
 	if [ -z "$GPG" ]; then
 	    log_skip $num $MAXTEST 'gpg not in PATH'
-	    let "num = num + 1" >/dev/null
-	    log_skip $num $MAXTEST 'gpg not in PATH'
+	    let "num = num + 3" >/dev/null
 	else
 	    if test -r "Makefile"; then
Index: trunk/test/testrun_2.sh
===================================================================
--- trunk/test/testrun_2.sh	(revision 27)
+++ trunk/test/testrun_2.sh	(revision 29)
@@ -732,5 +732,5 @@
 	rm -f ./.samhain_lock*
 
-	SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
+	SHCLT=`./yule -P $SHPW`
 
 	if test x$? = x0; then
@@ -741,5 +741,11 @@
 	fi
 
- 	echo $SHCLT >> testrc_2
+	SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
+	AHOST=`find_hostname`
+	SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
+	
+
+ 	echo $SHCLT1 >> testrc_2
+ 	echo $SHCLT2 >> testrc_2
 	cp testrc_2 testrc_22
 
Index: trunk/test/testrun_2a.sh
===================================================================
--- trunk/test/testrun_2a.sh	(revision 27)
+++ trunk/test/testrun_2a.sh	(revision 29)
@@ -197,5 +197,5 @@
 	rm -f ./.samhain_lock
 
-	SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
+	SHCLT=`./yule -P $SHPW`
 
 	if test x$? = x0; then
@@ -206,5 +206,12 @@
 	fi
 
- 	echo $SHCLT >> testrc_2
+	SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
+	AHOST=`find_hostname`
+	SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
+	
+
+ 	echo $SHCLT1 >> testrc_2
+ 	echo $SHCLT2 >> testrc_2
+
 
 	cp    ./testrc_2       ./rc.${SH_LOCALHOST}
Index: trunk/test/testrun_2b.sh
===================================================================
--- trunk/test/testrun_2b.sh	(revision 27)
+++ trunk/test/testrun_2b.sh	(revision 29)
@@ -144,5 +144,5 @@
     rm -f ./.samhain_lock
     
-    SHCLT=`./yule -P $SHPW | sed s%HOSTNAME%${SH_LOCALHOST}%`
+    SHCLT=`./yule -P $SHPW`
     
     if test x$? = x0; then
@@ -153,5 +153,12 @@
     fi
     
-    echo $SHCLT >> testrc_2
+    SHCLT1=`echo "${SHCLT}"  | sed s%HOSTNAME%${SH_LOCALHOST}%`
+    AHOST=`find_hostname`
+    SHCLT2=`echo "${SHCLT}"  | sed s%HOSTNAME%${AHOST}%`
+	
+
+    echo $SHCLT1 >> testrc_2
+    echo $SHCLT2 >> testrc_2
+
     
     cp    "${RCFILE_C}"              ./rc.${SH_LOCALHOST}