diff --git a/test/testcpg.c b/test/testcpg.c
index 85d4ac50..065bf2d4 100644
--- a/test/testcpg.c
+++ b/test/testcpg.c
@@ -1,305 +1,431 @@
 /*
  * Copyright (c) 2006-2009 Red Hat Inc
  *
  * All rights reserved.
  *
  * Author: Christine Caulfield <ccaulfie@redhat.com>
  *
  * This software licensed under BSD license, the text of which follows:
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  * - Redistributions of source code must retain the above copyright notice,
  *   this list of conditions and the following disclaimer.
  * - Redistributions in binary form must reproduce the above copyright notice,
  *   this list of conditions and the following disclaimer in the documentation
  *   and/or other materials provided with the distribution.
  * - Neither the name of the MontaVista Software, Inc. nor the names of its
  *   contributors may be used to endorse or promote products derived from this
  *   software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <config.h>
 
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/select.h>
 #include <sys/un.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <time.h>
+#include <sys/time.h>
+#include <assert.h>
+#include <limits.h>
 
 #include <corosync/corotypes.h>
 #include <corosync/cpg.h>
 #include <corosync/swab.h>
 
+#ifdef QBLOG
 #include <qb/qblog.h>
+#endif
 
 static int quit = 0;
 static int show_ip = 0;
+static int restart = 0;
+static uint32_t nodeidStart = 0;
+
+static void print_localnodeid(cpg_handle_t handle);
 
 static void print_cpgname (const struct cpg_name *name)
 {
-	int i;
+	unsigned int i;
 
 	for (i = 0; i < name->length; i++) {
 		printf ("%c", name->value[i]);
 	}
 }
 
-static char * node_pid_format(unsigned int nodeid,int pid) {
+static char * node_pid_format(unsigned int nodeid, unsigned int pid) {
 	static char buffer[100];
 	if (show_ip) {
 		struct in_addr saddr;
 #if __BYTE_ORDER == __BIG_ENDIAN
 		saddr.s_addr = swab32(nodeid);
 #else
 		saddr.s_addr = nodeid;
 #endif
 		sprintf(buffer, "node/pid %s/%d", inet_ntoa(saddr),pid);
 	} 
 	else {
 		sprintf(buffer, "node/pid %d/%d", nodeid, pid);
 	} 
 	return buffer;
 }
 
+static void
+print_time(void)
+{
+#define     MAXLEN (256)
+	char buf[MAXLEN];
+	char hostname[HOST_NAME_MAX];
+	struct timeval tnow;
+	time_t t;
+	size_t len;
+	char *s = buf;
+
+	len = sizeof(hostname);
+	if(gethostname(hostname, len) == 0) {
+		hostname[len-1] = '\0';
+		char *longName = hostname;
+		if( (longName = strstr( hostname, "." )) != NULL )
+		*longName = '\0';
+	}
+
+	strcpy(s, hostname);
+	s += strlen(hostname);
+	s += snprintf(s, sizeof(buf)-(s-buf), ":%d", getpid());
+	t = time(0);
+	gettimeofday( &tnow, 0 );
+	s += strftime(s, sizeof(buf)-(s-buf) , " %Y-%m-%d %T", localtime(&t));
+	s += snprintf(s, sizeof(buf)-(s-buf), ".%03ld", tnow.tv_usec/1000);
+	assert(s-buf < (int)sizeof(buf));
+	printf("%s\n", buf);
+}
+
 
 static void DeliverCallback (
 	cpg_handle_t handle,
 	const struct cpg_name *groupName,
 	uint32_t nodeid,
 	uint32_t pid,
 	void *msg,
 	size_t msg_len)
 {
+	print_time();
 	printf("DeliverCallback: message (len=%lu)from %s: '%s'\n",
 		       (unsigned long int) msg_len, node_pid_format(nodeid, pid),
 		       (const char *)msg);
 }
 
 static void ConfchgCallback (
 	cpg_handle_t handle,
 	const struct cpg_name *groupName,
 	const struct cpg_address *member_list, size_t member_list_entries,
 	const struct cpg_address *left_list, size_t left_list_entries,
 	const struct cpg_address *joined_list, size_t joined_list_entries)
 {
-	int i;
+	unsigned int i;
+	int result;
+	uint32_t nodeid;
 
-	printf("\nConfchgCallback: group '");
+	print_time();
+	printf("ConfchgCallback: group '");
 	print_cpgname(groupName);
 	printf("'\n");
+	print_localnodeid(handle);
+
 	for (i=0; i<joined_list_entries; i++) {
 		printf("joined %s reason: %d\n",
 				node_pid_format(joined_list[i].nodeid, joined_list[i].pid),
 				joined_list[i].reason);
 	}
 
 	for (i=0; i<left_list_entries; i++) {
 		printf("left %s reason: %d\n",
 				node_pid_format(left_list[i].nodeid, left_list[i].pid),
 				left_list[i].reason);
 	}
 
 	printf("nodes in group now %lu\n",
 	       (unsigned long int) member_list_entries);
 	for (i=0; i<member_list_entries; i++) {
 		printf("%s\n",
 				node_pid_format(member_list[i].nodeid, member_list[i].pid));
 	}
 
+	result = cpg_local_get(handle, &nodeid);
+	if(result != CS_OK) {
+		printf("failed to get local nodeid %d\n", result);
+		nodeid = 0;
+	}
 	/* Is it us??
 	   NOTE: in reality we should also check the nodeid */
-	if (left_list_entries && left_list[0].pid == getpid()) {
-		printf("We have left the building\n");
-		quit = 1;
+	if (left_list_entries && (pid_t)left_list[0].pid == getpid()) {
+		printf("We might have left the building pid %d\n", left_list[0].pid);
+		/* can only use nodeidStart as a reliable check (version <= 1.4.2) */
+		if(nodeidStart) {
+			/* report dynamic nature of nodeid returned from local_get */
+			/*  local get of nodeid might change identity from original! */
+			if(htonl((uint32_t)nodeid) == INADDR_LOOPBACK) {
+				printf("We probably left the building switched identity? start nodeid %d nodeid %d current nodeid %d pid %d\n", nodeidStart, left_list[0].nodeid, nodeid, left_list[0].pid);
+			} else if(htonl((uint32_t)left_list[0].nodeid) == INADDR_LOOPBACK) {
+				printf("We probably left the building started alone? start nodeid %d nodeid %d current nodeid %d pid %d\n", nodeidStart, left_list[0].nodeid, nodeid, left_list[0].pid);
+			}
+			/* a possibly reliable way to check is based on original address */
+			if(left_list[0].nodeid == nodeidStart) {
+				printf("We have left the building direct match start nodeid %d nodeid %d local get current nodeid %d pid %d\n", nodeidStart, left_list[0].nodeid, nodeid, left_list[0].pid);
+				// quit = 1;
+				restart = 1;
+			} else {
+				printf("Probably another node with matching pid start nodeid %d nodeid %d current nodeid %d pid %d\n", nodeidStart, left_list[0].nodeid, nodeid, left_list[0].pid);
+			}
+		}
 	}
 }
 
 static void TotemConfchgCallback (
 	cpg_handle_t handle,
         struct cpg_ring_id ring_id,
         uint32_t member_list_entries,
         const uint32_t *member_list)
 {
-	int i;
+	unsigned int i;
 
-	printf ("\nTotemConfchgCallback: ringid (%u.%"PRIu64")\n",
+	printf("\n");
+	print_time();
+	printf ("TotemConfchgCallback: ringid (%u.%"PRIu64")\n",
 		ring_id.nodeid, ring_id.seq);
 
 	printf("active processors %lu: ",
 	       (unsigned long int) member_list_entries);
 	for (i=0; i<member_list_entries; i++) {
 		printf("%d ", member_list[i]);
 	}
 	printf ("\n");
 }
 
 static cpg_model_v1_data_t model_data = {
 	.cpg_deliver_fn =            DeliverCallback,
 	.cpg_confchg_fn =            ConfchgCallback,
 	.cpg_totem_confchg_fn =      TotemConfchgCallback,
 	.flags =                     CPG_MODEL_V1_DELIVER_INITIAL_TOTEM_CONF,
 };
 
 static void sigintr_handler (int signum) __attribute__((noreturn));
 static void sigintr_handler (int signum) {
 	exit (0);
 }
 static struct cpg_name group_name;
 
+#define retrybackoff(counter) {    \
+		counter++;                    \
+		printf("Restart operation after %ds\n", counter); \
+		sleep((unsigned int)counter);               \
+		restart = 1;			\
+		continue;			\
+}
 
 #define cs_repeat_init(counter, max, code) do {    \
 	code;                                 \
 	if (result == CS_ERR_TRY_AGAIN || result == CS_ERR_QUEUE_FULL || result == CS_ERR_LIBRARY) {  \
 		counter++;                    \
 		printf("Retrying operation after %ds\n", counter); \
-		sleep(counter);               \
+		sleep((unsigned int)counter);               \
 	} else {                              \
 		break;                        \
 	}                                     \
 } while (counter < max)
 
 #define cs_repeat(counter, max, code) do {    \
 	code;                                 \
 	if (result == CS_ERR_TRY_AGAIN || result == CS_ERR_QUEUE_FULL) {  \
 		counter++;                    \
 		printf("Retrying operation after %ds\n", counter); \
-		sleep(counter);               \
+		sleep((unsigned int)counter);               \
 	} else {                              \
 		break;                        \
 	}                                     \
 } while (counter < max)
 
+static void print_localnodeid(cpg_handle_t handle)
+{
+	char addrStr[128];
+	unsigned int retries;
+	unsigned int nodeid;
+	struct sockaddr_storage addr;
+	struct sockaddr_in *v4addr = (struct sockaddr_in *)&addr;
+	int result;
+
+	retries = 0;
+
+	cs_repeat(retries, 30, result = cpg_local_get(handle, &nodeid));
+	if (result != CS_OK) {
+		printf ("Could not get local node id\n");
+	} else {
+	v4addr->sin_addr.s_addr = nodeid;
+	if(inet_ntop(AF_INET, (const void *)&v4addr->sin_addr.s_addr,
+                           addrStr, (socklen_t)sizeof(addrStr)) == NULL) {
+		addrStr[0] = 0;
+	}
+	printf ("Local node id is %s/%x result %d\n", addrStr, nodeid, result);
+	}
+}
 
 int main (int argc, char *argv[]) {
 	cpg_handle_t handle;
 	fd_set read_fds;
 	int select_fd;
 	int result;
 	int retries;
 	const char *options = "i";
 	int opt;
 	unsigned int nodeid;
 	char *fgets_res;
 	struct cpg_address member_list[64];
 	int member_list_entries;
 	int i;
+	int recnt;
+	int doexit;
+	const char *exitStr = "EXIT";
 
+	doexit = 0;
+
+#ifdef QBLOG
 	qb_log_init("testcpg", LOG_USER, LOG_ERR);
 	qb_log_ctl(QB_LOG_SYSLOG, QB_LOG_CONF_ENABLED, QB_FALSE);
 	qb_log_filter_ctl(QB_LOG_STDERR, QB_LOG_FILTER_ADD,
 			  QB_LOG_FILTER_FILE, "*", LOG_TRACE);
 	qb_log_ctl(QB_LOG_STDERR, QB_LOG_CONF_ENABLED, QB_TRUE);
 	qb_log_format_set(QB_LOG_STDERR, "[%p] %f %b");
+#endif
 
 	while ( (opt = getopt(argc, argv, options)) != -1 ) {
 		switch (opt) {
 		case 'i':
 			show_ip = 1;
 			break;
 		}
 	}
 
 	if (argc > optind) {
 		strcpy(group_name.value, argv[optind]);
 		group_name.length = strlen(argv[optind]);
 	}
 	else {
 		strcpy(group_name.value, "GROUP");
 		group_name.length = 6;
 	}
+	recnt = 0;
 
-	retries = 0;
-	cs_repeat_init(retries, 30, result = cpg_model_initialize (&handle, CPG_MODEL_V1, (cpg_model_data_t *)&model_data, NULL));
-	if (result != CS_OK) {
-		printf ("Could not initialize Cluster Process Group API instance error %d\n", result);
-		exit (1);
-	}
-	retries = 0;
-	cs_repeat(retries, 30, result = cpg_local_get(handle, &nodeid));
-	if (result != CS_OK) {
-		printf ("Could not get local node id\n");
-		exit (1);
-	}
-	printf ("Local node id is %x\n", nodeid);
+	printf ("Type %s to finish\n", exitStr);
+	restart = 1;
 
-	retries = 0;
-	cs_repeat(retries, 30, result = cpg_join(handle, &group_name));
-	if (result != CS_OK) {
-		printf ("Could not join process group, error %d\n", result);
-		exit (1);
-	}
-
-	retries = 0;
-	cs_repeat(retries, 30, result = cpg_membership_get (handle, &group_name,
-		(struct cpg_address *)&member_list, &member_list_entries));
-	if (result != CS_OK) {
-		printf ("Could not get current membership list %d\n", result);
-		exit (1);
-	}
+	do {
+		if(restart) {
+			restart = 0;
+			retries = 0;
+			cs_repeat_init(retries, 30, result = cpg_model_initialize (&handle, CPG_MODEL_V1, (cpg_model_data_t *)&model_data, NULL));
+			if (result != CS_OK) {
+				printf ("Could not initialize Cluster Process Group API instance error %d\n", result);
+				retrybackoff(recnt);
+			}
+			retries = 0;
+			cs_repeat(retries, 30, result = cpg_local_get(handle, &nodeid));
+			if (result != CS_OK) {
+				printf ("Could not get local node id\n");
+				retrybackoff(recnt);
+			}
+			printf ("Local node id is %x\n", nodeid);
+			nodeidStart = nodeid;
+
+			retries = 0;
+			cs_repeat(retries, 30, result = cpg_join(handle, &group_name));
+			if (result != CS_OK) {
+				printf ("Could not join process group, error %d\n", result);
+				retrybackoff(recnt);
+			}
 
-	printf ("membership list\n");
-	for (i = 0; i < member_list_entries; i++) {
-		printf ("node id %d pid %d\n", member_list[i].nodeid,
-			member_list[i].pid);
-	}
+			retries = 0;
+			cs_repeat(retries, 30, result = cpg_membership_get (handle, &group_name,
+				(struct cpg_address *)&member_list, &member_list_entries));
+			if (result != CS_OK) {
+				printf ("Could not get current membership list %d\n", result);
+				retrybackoff(recnt);
+			}
+			recnt = 0;
 
+			printf ("membership list\n");
+			for (i = 0; i < member_list_entries; i++) {
+				printf ("node id %d pid %d\n", member_list[i].nodeid,
+					member_list[i].pid);
+			}
 
-	FD_ZERO (&read_fds);
-	cpg_fd_get(handle, &select_fd);
-	printf ("Type EXIT to finish\n");
-	do {
+			FD_ZERO (&read_fds);
+			cpg_fd_get(handle, &select_fd);
+		}
 		FD_SET (select_fd, &read_fds);
 		FD_SET (STDIN_FILENO, &read_fds);
 		result = select (select_fd + 1, &read_fds, 0, 0, 0);
 		if (result == -1) {
 			perror ("select\n");
 		}
 		if (FD_ISSET (STDIN_FILENO, &read_fds)) {
 			char inbuf[132];
 			struct iovec iov;
 
-			fgets_res = fgets(inbuf, sizeof(inbuf), stdin);
+			fgets_res = fgets(inbuf, (int)sizeof(inbuf), stdin);
 			if (fgets_res == NULL) {
+				doexit = 1;
 				cpg_leave(handle, &group_name);
 			}
-			if (strncmp(inbuf, "EXIT", 4) == 0) {
+			if (strncmp(inbuf, exitStr, strlen(exitStr)) == 0) {
+				doexit = 1;
 				cpg_leave(handle, &group_name);
 			}
 			else {
 				iov.iov_base = inbuf;
 				iov.iov_len = strlen(inbuf)+1;
 				cpg_mcast_joined(handle, CPG_TYPE_AGREED, &iov, 1);
 			}
 		}
 		if (FD_ISSET (select_fd, &read_fds)) {
-			if (cpg_dispatch (handle, CS_DISPATCH_ALL) != CS_OK)
-				exit(1);
+			if (cpg_dispatch (handle, CS_DISPATCH_ALL) != CS_OK) {
+				if(doexit) {
+					exit(1);
+				}
+				restart = 1;
+			}
 		}
-	} while (result && !quit);
-
+		if(restart) {
+			if(!doexit) {
+				result = cpg_finalize (handle);
+				printf ("Finalize+restart result is %d (should be 1)\n", result);
+				continue;
+			}
+		}
+	} while (result && !quit && !doexit);
 
 	result = cpg_finalize (handle);
 	printf ("Finalize  result is %d (should be 1)\n", result);
 	return (0);
 }