Index: branches/reconfiguration/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp
===================================================================
--- branches/reconfiguration/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp	(revision 915)
+++ branches/reconfiguration/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp	(revision 919)
@@ -5346,5 +5346,5 @@
             case CLEANUP_TEST_HEADER:
             {
-                if (not p_dspin_clack.read) break;
+                if (not p_dspin_clack.read.read()) break;
                 r_cleanup_fsm = CLEANUP_TEST_SIGNATURE;
                 break;
@@ -5353,5 +5353,5 @@
             case CLEANUP_TEST_SIGNATURE:
             {
-                if (not p_dspin_clack.read) break;
+                if (not p_dspin_clack.read.read()) break;
                 r_cc_test_to_cleanup_req = false;
                 r_cleanup_fsm = CLEANUP_IDLE;
@@ -6735,12 +6735,5 @@
             case CC_TEST_WAIT:
                 if (r_cc_test_to_cc_send_req.read() or
-                    r_cc_test_to_cleanup_req.read())
-                {
-                    // TODO:
-                    // When a timeout exception is triggered:
-                    //  1. go to IDLE
-                    //  2. consume the test flit from the FIFO
-                    break;
-                }
+                    r_cc_test_to_cleanup_req.read()) break;
 
                 cc_receive_to_cc_test_fifo_get = true;
@@ -7418,5 +7411,5 @@
             case CC_SEND_TEST_HEADER:         // send first flit TEST (from CC_TEST FSM)
             {
-                if (not p_dspin_m2p.read) break;
+                if (not p_dspin_m2p.read.read()) break;
                 r_cc_send_fsm = CC_SEND_TEST_SIGNATURE;
                 break;
@@ -7425,5 +7418,5 @@
             case CC_SEND_TEST_SIGNATURE:      // send second flit TEST (from CC_TEST FSM)
             {
-                if (not p_dspin_m2p.read) break;
+                if (not p_dspin_m2p.read.read()) break;
                 r_cc_test_to_cc_send_req = false;
                 r_cc_send_fsm = CC_SEND_TEST_IDLE;