diff --git a/MAC/APL/PIC/TBBDriver/test/TBBTest.cc b/MAC/APL/PIC/TBBDriver/test/TBBTest.cc
index cf0576a50d98ae894a6eb910f31b6ef955c98a1c..2cab0c18cd8a0af65b3d45a4b55b85bde6bdf537 100644
--- a/MAC/APL/PIC/TBBDriver/test/TBBTest.cc
+++ b/MAC/APL/PIC/TBBDriver/test/TBBTest.cc
@@ -45,7 +45,7 @@ using namespace TBB_Test;
 TBBTest::TBBTest(string name)
     : GCFTask((State)&TBBTest::initial, name), Test(name)
 {
-  registerProtocol(TBB_PROTOCOL, TBB_PROTOCOL_signalnames);
+  GCF::TM::registerProtocol (TBB_PROTOCOL,      TBB_PROTOCOL_STRINGS);
 
   itsClient.init(*this, MAC_SVCMASK_TBBDRIVER, GCFPortInterface::SAP, TBB_PROTOCOL);
 	
@@ -386,7 +386,7 @@ GCFEvent::TResult TBBTest::test006(GCFEvent& e, GCFPortInterface& port)
 			/* start of the test sequence */
 			TBBReadEvent sw;
 				
-			sw.channel = 1;
+			sw.rcu = 1;
 				
 			TESTC_ABORT(itsClient.send(sw), TBBTest::final);
 		}
@@ -437,8 +437,6 @@ GCFEvent::TResult TBBTest::test007(GCFEvent& e, GCFPortInterface& port)
 			/* start of the test sequence */
 			TBBModeEvent sw;
 			
-			sw.board = itsboardmask; // boards tot test
-			
 			TESTC_ABORT(itsClient.send(sw), TBBTest::final);
 		}
 		break;
@@ -447,7 +445,9 @@ GCFEvent::TResult TBBTest::test007(GCFEvent& e, GCFPortInterface& port)
 		{
 			TBBModeAckEvent ack(e);
 
-			TESTC_ABORT(ack.status_mask == TBB_SUCCESS, TBBTest::final);
+			for (int boardnr = 0; boardnr < MAX_N_TBBBOARDS; boardnr++) {
+				TESTC_ABORT(ack.status_mask[boardnr] == TBB_SUCCESS, TBBTest::final);
+			}
 			LOG_INFO_STR("Udp test OK");
 
 			TRAN(TBBTest::test008);
@@ -510,7 +510,7 @@ GCFEvent::TResult TBBTest::test008(GCFEvent& e, GCFPortInterface& port)
 				LOG_INFO_STR(formatString("mp2version   = 0X%08X", ack.mp2version[cnt]));
 				LOG_INFO_STR(formatString("mp3version   = 0X%08X", ack.mp3version[cnt]));
 			}
-			LOG_INFO_STR(formatString	 ("Ack status = 0X%08X", ack.status_mask));
+			//LOG_INFO_STR(formatString	 ("Ack status = 0X%08X", ack.status_mask));
 			for (int boardnr = 0; boardnr < MAX_N_TBBBOARDS;boardnr++) {
 					TESTC_ABORT(ack.status_mask[boardnr] == TBB_SUCCESS, TBBTest::final);
 				}
diff --git a/MAC/APL/PIC/TBBDriver/test/TPStub.cc b/MAC/APL/PIC/TBBDriver/test/TPStub.cc
index ff14dced2a0944e5394c7bca089b3013bd8ab1a4..79818138e42c20141b0bc9e1b63bef1650b24cf6 100644
--- a/MAC/APL/PIC/TBBDriver/test/TPStub.cc
+++ b/MAC/APL/PIC/TBBDriver/test/TPStub.cc
@@ -48,8 +48,8 @@ using namespace TBB_Test;
 TPStub::TPStub(string name)
   : GCFTask((State)&TPStub::initial, name), Test(name)
 {
-  registerProtocol(TP_PROTOCOL, TP_PROTOCOL_signalnames);
-
+  GCF::TM::registerProtocol (TP_PROTOCOL,      TP_PROTOCOL_STRINGS);
+	 
   char addrstr[64];
   snprintf(addrstr, 64, "TPStub.MAC_ADDR_TBBDRIVER");