diff --git a/arch/x86/scc/icc.c b/arch/x86/scc/icc.c
index f3ae7f41..3ea3c8cd 100644
--- a/arch/x86/scc/icc.c
+++ b/arch/x86/scc/icc.c
@@ -172,6 +172,7 @@ int icc_init(void)
 	int i, z, tmp;
 	uint64_t start, end, ticks, freq = 533;
 	uint32_t cr4;
+	uint32_t msg;
 
 	kputs("Initialize Rock Creek!\n");
 
@@ -212,26 +213,13 @@ int icc_init(void)
 
 	RCCE_barrier(&RCCE_COMM_WORLD);
 
-#if 0
 	kputs("RCCE test...\t");
-	if (my_ue == 0)
+	if (!RCCE_IAM)
 		msg = 0x4711;
-	if (RCCE_bcast((char*) &msg, sizeof(msg), 0, RCCE_COMM_WORLD) == RCCE_SUCCESS)
+	if ((RCCE_bcast((char*) &msg, sizeof(msg), 0, RCCE_COMM_WORLD) == RCCE_SUCCESS) && (msg == 0x4711))
 		kprintf("successfull! (0x%x)\n", msg);
 	else
 		kprintf("failed! (0x%x)\n", msg);
-#endif
-
-#if 0
-	char* str = RCCE_shmalloc(128);
-	if (my_ue == 1) {
-		memset(str, 0x00, 128);
-		strcpy(str, "Hello RCCE_shmalloc\n");
-	}
-	RCCE_barrier(&RCCE_COMM_WORLD);
-	kprintf("RCCE_shmalloc test: %s\n", str);
-	RCCE_shfree(str);
-#endif
 
 	// reset INTR/LINT0 flag
 	z = Z_PID(RC_MY_COREID);