PRD: Reenable some CXX testcases

Change-Id: Ieb6784976b61a64122a6aa6eaf0263da8d6ea045
RTC: 148565
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33857
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>

12 files changed, 365 insertions, 164 deletions

diff --git a/src/usr/diag/mdia/test/makefile b/src/usr/diag/mdia/test/makefile
index 63dc21d67..935173ce5 100644
--- a/src/usr/diag/mdia/test/makefile
+++ b/src/usr/diag/mdia/test/makefile
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2016
+# Contributors Listed Below - COPYRIGHT 2012,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -45,8 +45,6 @@ OBJS += mdiafakecm.o
 
 MODULE = testmdia
 
-#TODO RTC 148565 - reenable test cases once they are updated
-#TESTS = *.H
-TESTS = mdiatestsm.H
+TESTS = mdiatestsm.H mdiatesttrace.H mdiatest.H mdiatestworkitem.H mdiatestmonitor.H mdiatestmba.H
 
 include ${ROOTPATH}/config.mk
diff --git a/src/usr/diag/prdf/test/prdfTest_ABus.H b/src/usr/diag/prdf/test/prdfTest_ABus.H
index ae6c6c1b1..565228f8e 100644
--- a/src/usr/diag/prdf/test/prdfTest_ABus.H
+++ b/src/usr/diag/prdf/test/prdfTest_ABus.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -43,44 +45,44 @@ class PBESFIR:public CxxTest::TestSuite
 
         void TestRecoverable(void)
         {
-            PRDS_BEGIN("PBESFIR Recoverable attention");
+            PRDS_BEGIN("PBIOOFIR Recoverable attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0xa0570000);
-            // GLOBAL_RE_FIR set bit 8
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B , 0x0080000000000000);
-            // ABUS_CHIPLET_RE_FIR set bit 2
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x08040001, 0x2000000000000000);
-            // set bit 0
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x08010800, 0x8000000000000000);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x720C0014);
+            // GLOBAL_RE_FIR set bit 5
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B , 0x0400000000000000);
+            // NEST Chiplet (recov error)  set bit 14
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05040001, 0x0002000000000000);
+            // set bit 20  (A0 link framer  error)
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013800, 0x0000080000000000);
             // ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x08010807, 0xFFFFFFFFFFFFFFFF);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013807, 0xFFFFFFFFFFFFFFFF);
             PRDS_START_SIM();
             if(!(PRDS_END()))
             {
-                TS_FAIL("Expected Signature Failed PBESFIR Recoverable attention");
+                TS_FAIL("Expected Signature Failed PBIOOFIR Recoverable attention");
             }
         }
 
         void TestCheckstop(void)
         {
-            /*
             PRDS_BEGIN("PBESFIR Checkstop attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::CHECK_STOP);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:ABUS{1}", 0xa0570003);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x720c001c);
             // GLOBAL_RE_FIR set bit 8
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001C , 0x0080000000000000);
-            // ABUS_CHIPLET_RE_FIR set bit 4
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:ABUS{1}", 0x08040000, 0x0800000000000000);
-            // set bit 3
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:ABUS{1}", 0x08010800, 0x1000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001C , 0x0400000000000000);
+            // NEST Chiplet (chkstop error)  set bit 16
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05040000,  0x0000800000000000);
+
+
+            // set bit 28  (PSR  A0 even link down error)
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013800, 0x0000000800000000);
             // ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:ABUS{1}", 0x08010807, 0x0000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05013807, 0x0000000000000000);
             PRDS_START_SIM();
             if(!(PRDS_END()))
             {
                 TS_FAIL("Expected Signature Failed PBESFIR Checkstop attention");
             }
-            */
         }
 };
 #endif
diff --git a/src/usr/diag/prdf/test/prdfTest_CenTpLFir.H b/src/usr/diag/prdf/test/prdfTest_CenTpLFir.H
index a532181fb..fee277771 100755
--- a/src/usr/diag/prdf/test/prdfTest_CenTpLFir.H
+++ b/src/usr/diag/prdf/test/prdfTest_CenTpLFir.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014                             */
+/* Contributors Listed Below - COPYRIGHT 2014,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -48,50 +48,56 @@ class CTPLFIR:public CxxTest::TestSuite
         {
             PRDS_BEGIN("Centaur PLL test");
 
-            PRDS_ERROR_ENTRY("NODE{0}:MEMBUF{4}", PRDF::RECOVERABLE);
+            PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
 
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:MEMBUF{4}",0x00ed0000 );
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x00ed0000 );
 
             //GLOBAL_RE_FIR
-            PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x570F001B, 0x4000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
 
             //TP_CHIPLET_RE_FIR
-            PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040001, 0x4000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
 
-            //TP_LFIR
-            PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x0104000a, 0x0000180000000000);
+            //TP_LFIR  -- bit 21:22 on P9
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000060000000000);
 
             //TP_LFIR_ACT1
-            PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
 
             PRDS_START_SIM();
 
-            PRDS_END();
+            if(!(PRDS_END()))
+            {
+                TS_FAIL("Expected Signature Failed Centaur PLL test");
+            }
         }
 
         void TestCenPllAtThreshold(void)
         {
             PRDS_BEGIN("Centaur PLL test At Threshold");
 
-            PRDS_ERROR_ENTRY("NODE{0}:MEMBUF{4}", PRDF::RECOVERABLE);
+            PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
 
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:MEMBUF{4}",0x00ed0000 );
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}",  0x00ed0000 );
 
             //GLOBAL_RE_FIR
-            PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x570F001B, 0x4000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
 
             //TP_CHIPLET_RE_FIR
-            PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040001, 0x4000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
 
-            //TP_LFIR
-            PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x0104000a, 0x0000180000000000);
+            //TP_LFIR  -- bit 21:22 on P9
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000060000000000);  
 
             //TP_LFIR_ACT1
-            PRDS_SCR_WRITE("NODE{0}:MEMBUF{4}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
 
             PRDS_START_SIM();
 
-            PRDS_END();
+            if(!(PRDS_END()))
+            {
+                TS_FAIL("Centaur PLL test At Threshold");
+            }
         }
 
 };
diff --git a/src/usr/diag/prdf/test/prdfTest_Ex.H b/src/usr/diag/prdf/test/prdfTest_Ex.H
index 2dcdd2dae..269e5f65d 100644
--- a/src/usr/diag/prdf/test/prdfTest_Ex.H
+++ b/src/usr/diag/prdf/test/prdfTest_Ex.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -48,21 +48,26 @@ class ExLFIR:public CxxTest::TestSuite
 
         void TestRecoverable(void)
         {
-            PRDS_BEGIN("EXLFIR recoverable attention");
+            PRDS_BEGIN("ECLFIR recoverable attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EX{5}", 0xb53a0007);
-            // GLOBAL_RE_FIR set bit 21
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x0000040000000000);
-            // EX_CHIPLET_RE_FIR[1] Attention from EXLFIR
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040001, 0x4000000000000000);
-            // set EXLFIR[7]
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x1004000a, 0x0100000000000000);
-            // EXLFIR_ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040011, 0xFFFFFFFFFFFFFFFF);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                                     0x33e70007);
+            // GLOBAL_RE_FIR set bit 32
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0000000080000000);
+            // EC_CHIPLET_RE_FIR[1] Attention from ECLFIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20040001, 0x4000000000000000);
+            // set ECLFIR[7]
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x2004000a, 0x0100000000000000);
+            // ECLFIR_ACT1
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20040011, 0xFFFFFFFFFFFFFFFF);
+
             PRDS_START_SIM();
             if(!(PRDS_END()))
             {
-                TS_FAIL("Expected Signature Failed EXLFIR recoverable attention");
+                TS_FAIL("Expected Signature Failed ECLFIR recoverable attention");
             }
         }
 
@@ -71,15 +76,18 @@ class ExLFIR:public CxxTest::TestSuite
 
             PRDS_BEGIN("L3CE Test");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EX{4}", 0xc6b00004);
-            // GLOBAL_RE_FIR bit 20
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x0000080000000000);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EQ{0}:EX{0}", 0xf08d0004);
+            // GLOBAL_RE_FIR bit 16
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0000800000000000);
             // EX_CHIPLET_RE_FIR[4] - Analyze L3FIR
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{4}", 0x10040001, 0x0800000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}", 0x10040001,
+                            0x2000000000000000);
             // EX_L3FIR
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{4}", 0x10010800, 0x0800000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}",
+                            0x10011800, 0x0800000000000000);
             // EX_L3FIR_ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{4}", 0x10010807, 0x0800000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}",
+                            0x10011807, 0x0800000000000000);
             PRDS_START_SIM();
             if(!(PRDS_END()))
             {
@@ -91,27 +99,37 @@ class ExLFIR:public CxxTest::TestSuite
         {
             PRDS_BEGIN("COREFIR recoverable attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EX{5}", 0xc8e9003c);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                                     0xdd3f003c);
+
             // GLOBAL_RE_FIR
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x0000040000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0000000080000000);
             // GLOBALUNITXSTPFIR
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x51040001, 0x0000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x50040018, 0x0000000000000000);
             // EX_CHIPLET_RE_FIR
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040001, 0x2000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20040001, 0x2000000000000000);
             // EX_CHIPLET_RE_FIR_MASK
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10040002, 0x20ffffc000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20040002, 0x20ffffc000000000);
             // COREFIR bit 60 on
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013100, 0x0000000000000008);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20010a40, 0x0000000000000008);
             // COREFIR WOF bit 60 on
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013108, 0x0000000000000008);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20010A48, 0x0000000000000008);
             // COREFIR_ACT0
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013106, 0x15a20c688a448b01);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20010A46, 0x15a20c688a448b01);
             // COREFIR_ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013107, 0xfefc17f7ff9c8a09);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20010A47, 0xfefc17f7ff9c8a09);
             // COREHMEER
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x1001329B, 0xac10080000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20010A96, 0xac10080000000000);
             // SPATTN_0
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EX{5}", 0x10013007, 0x0000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:EQ{0}:EX{0}:CORE{0}",
+                            0x20010A99, 0x0000000000000000);
 
             PRDS_START_SIM();
             if(!(PRDS_END()))
diff --git a/src/usr/diag/prdf/test/prdfTest_Mcs.H b/src/usr/diag/prdf/test/prdfTest_Mcs.H
index 459757be3..1daed57f8 100644
--- a/src/usr/diag/prdf/test/prdfTest_Mcs.H
+++ b/src/usr/diag/prdf/test/prdfTest_Mcs.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -43,66 +45,96 @@ class MCIFIR:public CxxTest::TestSuite
 
         void TestRecoverable(void)
         {
-            PRDS_BEGIN("MCI20 Recoverable attention");
+            PRDS_BEGIN("MCI23 Recoverable attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:MCS{4}", 0x2f270000);
-            // GLOBAL_RE_FIR set bit 1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B , 0x4000000000000000);
-            // TP_CHIPLET_RE_FIR set bit 7
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x0100000000000000);
-            // set bit 0
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCS{4}", 0x02011840, 0x8000000000000000);
+
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:MCBIST{1}:MCS{0}", 0xc4f70000);
+
+            // GLOBAL_RE_FIR set bit 3
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B , 0x1000000000000000);
+            // Nest --  set MCS23_0 bit
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x03040001, 0x2000000000000000);
+
+            // MCIFIR  0x05010800 / 0x03010800
+            // set bit 0 -- MC internal RECOV error
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{1}:MCS{0}", 0x05010800, 0x8000000000000000);
+
+            // MCIFIR  0x05010807 / 0x03010807
             // ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCS{4}", 0x02011847, 0xFFFFFFFFFFFFFFFF);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{1}:MCS{0}", 0x05010807, 0xFFFFFFFFFFFFFFFF);
+
             PRDS_START_SIM();
             if(!(PRDS_END()))
             {
-                TS_FAIL("Expected Signature Failed MCI20 Recoverable attention");
+                TS_FAIL("Expected Signature Failed MCI23 Recoverable attention");
             }
         }
 
+
         void TestCheckstop(void)
         {
-            /*
-            PRDS_BEGIN("MCI20 Checkstop attention");
+            PRDS_BEGIN("MCI23 Chkstop attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::CHECK_STOP);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:MCS{4}", 0x2f270003);
-            // GLOBAL_RE_FIR set bit 1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001C , 0x4000000000000000);
-            // TP_CHIPLET_RE_FIR set bit 9
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040000, 0x0080000000000000);
-            // set bit 3
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCS{4}", 0x02011840, 0x1000000000000000);
+
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:MCBIST{1}:MCS{0}", 0xc4f70001);
+
+            // GLOBAL_CS_FIR set bit 3
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001C , 0x1000000000000000);
+            // Nest --  set MCS23_0 bit
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x03040000, 0x0800000000000000);
+
+            // NEST CHIPLET_RE_FIR set bit 9
+            // MCIFIR  0x05010800 / 0x03010800
+            // set bit 1 -- MC internal non-RECOV error
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{1}:MCS{0}", 0x05010800, 0x4000000000000000);
+
+            // MCIFIR  0x05010807 / 0x03010807
             // ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCS{4}", 0x02011847, 0x0000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{1}:MCS{0}", 0x05010807, 0x0000000000000000);
+
             PRDS_START_SIM();
             if(!(PRDS_END()))
             {
-                TS_FAIL("Expected Signature Failed MCI20 Checkstop attention");
+                TS_FAIL("Expected Signature Failed MCI20 Chkstop attention");
             }
-            */
         }
 
+
         void TestSpecialAttention(void)
         {
             PRDS_BEGIN("MCI20 Special attention");
-            PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::SPECIAL);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:MCS{4}", 0x2f270001);
-            // GLOBAL_SPA_FIR set bit 1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001A , 0x4000000000000000);
-            // TP_CHIPLET_RE_FIR set bit 5
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040004, 0x0400000000000000);
-            // set bit 1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCS{4}", 0x02011840, 0x4000000000000000);
-            // ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCS{4}", 0x02011846, 0xFFFFFFFFFFFFFFFF);
+            PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::HOST_ATTN);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x5993000a);
+
+            // To treat spec attn as HOST attn
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{0}", 0x070123E0 , 0x0000000000000001);
+            // GLOBAL HOST Attn_FIR set bit 7
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x50040009 , 0x0100000000000000);
+
+            // MCS chiplet HOST attn_FIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{0}", 0x07040009, 0x8040000000000000);
+            // MASK
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{0}", 0x0704001A, 0x0F0FFFFFFFFFFFFF);
+
+            // set bit for maint cmd complete
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{0}", 0x07012300, 0x0020000000000000);
+            // ACT0 - spec/host
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{0}", 0x07012306, 0x0020000000000000);
+            // MASK
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}:MCBIST{0}", 0x07012303, 0xFFDFFFFFFFFFFFFF);
+
+
+        // Although this will run, PRD code will assert since we are not
+        // running in MDIA mode when we get this host/spec attention.
+        // Hence, need to skip this for now.
+        /*
             PRDS_START_SIM();
             if(!(PRDS_END()))
             {
                 TS_FAIL("Expected Signature Failed MCI20 Special attention");
             }
+        */
         }
-
 };
 
 
diff --git a/src/usr/diag/prdf/test/prdfTest_NimbusTpLFir.H b/src/usr/diag/prdf/test/prdfTest_NimbusTpLFir.H
new file mode 100755
index 000000000..3c00af963
--- /dev/null
+++ b/src/usr/diag/prdf/test/prdfTest_NimbusTpLFir.H
@@ -0,0 +1,104 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/usr/diag/prdf/test/prdfTest_NimbusTpLFir.H $              */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2017                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+
+#ifndef __TEST_PRDFCTPLFIR_H
+#define __TEST_PRDFCTPLFIR_H
+
+#ifdef __HOSTBOOT_MODULE
+  #include <cxxtest/TestSuite.H>
+  #include <errl/errlentry.H>
+  #include <errl/errlmanager.H>
+#else
+  #include <cxxtest/TestSuite.h>
+  #include <fsp/FipsGlobalFixture.H>
+  #include <errlentry.H>
+#endif
+
+#include <prdfTrace.H>
+#include <prdfMain.H>
+#include "prdfsimMacros.H"
+
+class NTPLFIR:public CxxTest::TestSuite
+{
+    public:
+
+        void TestNimPll(void)
+        {
+            PRDS_BEGIN("Nimbus PLL test");
+
+            PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
+
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x00ed0000 );
+
+            //GLOBAL_RE_FIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
+
+            //TP_CHIPLET_RE_FIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
+
+            //TP_LFIR  -- bit 21:22 on P9
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000060000000000);
+
+            //TP_LFIR_ACT1
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
+
+            PRDS_START_SIM();
+
+            if(!(PRDS_END()))
+            {
+                TS_FAIL("Expected Signature Failed Nimbus PLL test");
+            }
+        }
+
+        void TestNimPllAtThreshold(void)
+        {
+            PRDS_BEGIN("Nimbus PLL test At Threshold");
+
+            PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
+
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}",  0x00ed0000 );
+
+            //GLOBAL_RE_FIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x4000000000000000);
+
+            //TP_CHIPLET_RE_FIR
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x4000000000000000);
+
+            //TP_LFIR  -- bit 21:22 on P9
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0104000a, 0x0000060000000000);
+
+            //TP_LFIR_ACT1
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040011, 0xFFFFFFFFFFFFFFFF);
+
+            PRDS_START_SIM();
+
+            if(!(PRDS_END()))
+            {
+                TS_FAIL("Nimbus PLL test At Threshold");
+            }
+        }
+
+};
+#endif
diff --git a/src/usr/diag/prdf/test/prdfTest_Proc.H b/src/usr/diag/prdf/test/prdfTest_Proc.H
index bc93fd6e4..ba8f50423 100644
--- a/src/usr/diag/prdf/test/prdfTest_Proc.H
+++ b/src/usr/diag/prdf/test/prdfTest_Proc.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -46,9 +48,9 @@ class OCCFIR:public CxxTest::TestSuite
         {
             PRDS_BEGIN("OCCFIR recoverable attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x6c290000);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x7d530000);
             // GLOBAL_RE_FIR set bit 1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}",0x570F001B , 0x4000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}",0x500F001B , 0x4000000000000000);
             // TP_CHIPLET_RE_FIR set bit 2
             PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040001, 0x2000000000000000);
             // set bit 0
@@ -64,12 +66,11 @@ class OCCFIR:public CxxTest::TestSuite
 
         void  TestCheckStop(void)
         {
-            /*
             PRDS_BEGIN("OCCFIR checkstop attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::CHECK_STOP);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x6c290002);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x7d530002);
             // GLOBAL_RE_FIR set bit 1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001C , 0x4000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001C , 0x4000000000000000);
             // TP_CHIPLET_RE_FIR set bit 4
             PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x01040000, 0x0800000000000000);
             //set bit 2
@@ -81,7 +82,6 @@ class OCCFIR:public CxxTest::TestSuite
             {
                 TS_FAIL("Expected Signature Failed OCCFIR checkstop attention");
             }
-            */
         }
 
 };
diff --git a/src/usr/diag/prdf/test/prdfTest_ProcCentFir.H b/src/usr/diag/prdf/test/prdfTest_ProcCentFir.H
index 877e5ad4f..73ae0f1ab 100755
--- a/src/usr/diag/prdf/test/prdfTest_ProcCentFir.H
+++ b/src/usr/diag/prdf/test/prdfTest_ProcCentFir.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -48,19 +50,19 @@ class PCENTFIR:public CxxTest::TestSuite
 
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
 
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}",0x42410004 );
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}",0xfe680004 );
 
             //GLOBAL_RE_FIR
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B, 0x2000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B, 0x0400000000000000);
 
             //PB_CHIPLET_RE_FIR
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x02040001, 0x0200000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05040001, 0x0400000000000000);
 
             //PBCENTFIR
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x02010C40, 0x0800000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05011C00, 0x0800000000000000);
 
             //PBCENTFIR_ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x02010C47, 0xFFFFFFFFFFFFFFFF);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x05011C07, 0xFFFFFFFFFFFFFFFF);
 
             PRDS_START_SIM();
 
diff --git a/src/usr/diag/prdf/test/prdfTest_XBus.H b/src/usr/diag/prdf/test/prdfTest_XBus.H
index a458950bb..ad5e3656c 100644
--- a/src/usr/diag/prdf/test/prdfTest_XBus.H
+++ b/src/usr/diag/prdf/test/prdfTest_XBus.H
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -45,15 +47,15 @@ class XBUSFIR:public CxxTest::TestSuite
         {
             PRDS_BEGIN("XBUSFIR Recoverable attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::RECOVERABLE);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0xdb010000);
-            // GLOBAL_RE_FIR set bit 4
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001B , 0x0800000000000000);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x18fc0000);
+            // GLOBAL_RE_FIR set bit 6
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001B , 0x0200000000000000);
             // XBUS_CHIPLET_RE_FIR set bit 1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x04040001, 0x4000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x06040001, 0x4000000000000000);
             // set bit 0
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0404000a, 0x8000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0604000a, 0x8000000000000000);
             // ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x04040011, 0xFFFFFFFFFFFFFFFF);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x06040011, 0xFFFFFFFFFFFFFFFF);
             PRDS_START_SIM();
             if(!(PRDS_END()))
             {
@@ -65,24 +67,22 @@ class XBUSFIR:public CxxTest::TestSuite
 
         void TestCheckstop(void)
         {
-            /*
             PRDS_BEGIN("XBUSFIR Checkstop attention");
             PRDS_ERROR_ENTRY("NODE{0}:PROC{0}", PRDF::CHECK_STOP);
-            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}:XBUS{1}", 0xdb010002);
-            // GLOBAL_RE_FIR set bit 4
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x570F001C , 0x0800000000000000);
-            // XBUS_CHIPLET_RE_FIR set bit 3
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:XBUS{1}", 0x04040000, 0x1000000000000000);
+            PRDS_EXPECTED_SIGNATURE("NODE{0}:PROC{0}", 0x18fc0002);
+            // GLOBAL_CHKSTOP_FIR set bit 6
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x500F001C , 0x0200000000000000);
+            // XBUS_CHIPLET_CHKSTOP_FIR set bit 3
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x06040000, 0x1000000000000000);
             // set bit 2
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:XBUS{1}", 0x0404000a, 0x2000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x0604000a, 0x2000000000000000);
             // ACT1
-            PRDS_SCR_WRITE("NODE{0}:PROC{0}:XBUS{1}", 0x04040011, 0x0000000000000000);
+            PRDS_SCR_WRITE("NODE{0}:PROC{0}", 0x06040011, 0x0000000000000000);
             PRDS_START_SIM();
             if(!(PRDS_END()))
             {
                 TS_FAIL("Expected Signature Failed XBUSFIR Checkstop attention");
             }
-            */
         }
 };
 #endif
diff --git a/src/usr/diag/prdf/test/prdf_hb_common_test.mk b/src/usr/diag/prdf/test/prdf_hb_common_test.mk
index 291ad525e..68bb6f56f 100755
--- a/src/usr/diag/prdf/test/prdf_hb_common_test.mk
+++ b/src/usr/diag/prdf/test/prdf_hb_common_test.mk
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2016
+# Contributors Listed Below - COPYRIGHT 2012,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -78,17 +78,25 @@ OBJS += prdfsimServices.o
 OBJS += prdsimSignatureParser.o
 OBJS += prdfsimUtil.o
 
-#TODO RTC 148565 - reenable once test cases updated for P9
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_ABus.H
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_Ex.H
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest.H
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_Mba.H
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_Mcs.H
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_Proc.H
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_XBus.H
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_McsMciFir.H
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_ProcCentFir.H
-#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_ProcMbsFir.H
+TESTS += ${PRD_USR_TEST_PATH}/prdfTest_Proc.H
+TESTS += ${PRD_USR_TEST_PATH}/prdfTest.H
+TESTS += ${PRD_USR_TEST_PATH}/prdfTest_XBus.H
+TESTS += ${PRD_USR_TEST_PATH}/prdfTest_ABus.H
+TESTS += ${PRD_USR_TEST_PATH}/prdfTest_ProcCentFir.H
+TESTS += ${PRD_USR_TEST_PATH}/prdfTest_Ex.H
+TESTS += ${PRD_USR_TEST_PATH}/prdfTest_NimbusTpLFir.H
+TESTS += ${PRD_USR_TEST_PATH}/prdfTest_Mcs.H
+
+
+# Wait for PLL code and Ben
 #TESTS += ${PRD_USR_TEST_PATH}/prdfTest_ProcTpLFir.H
+
+#TODO RTC 167288 - Once Cumulus/Centaur are ready we update these
+# Need Centaurs for this (CUMULUS processor chip)
 #TESTS += ${PRD_USR_TEST_PATH}/prdfTest_CentCs.H
+#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_Mba.H
+#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_ProcMbsFir.H
 #TESTS += ${PRD_USR_TEST_PATH}/prdfTest_CenTpLFir.H
+#TESTS += ${PRD_USR_TEST_PATH}/prdfTest_McsMciFir.H
+
+
diff --git a/src/usr/diag/prdf/test/prdfsimUtil.C b/src/usr/diag/prdf/test/prdfsimUtil.C
index e23aa8fdd..023ed9491 100755
--- a/src/usr/diag/prdf/test/prdfsimUtil.C
+++ b/src/usr/diag/prdf/test/prdfsimUtil.C
@@ -5,7 +5,9 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -44,6 +46,7 @@ struct epath_array
   EntityPath::PathElement pathE;
 };
 
+// NOTE: Items must be in the order of the entity path
 const epath_array EPATH_ARRAY_MAP[] =
 {
     {"NODE{0}", {TYPE_NODE, 0}},
@@ -56,6 +59,14 @@ const epath_array EPATH_ARRAY_MAP[] =
     {"PROC{5}", {TYPE_PROC, 5}},
     {"PROC{6}", {TYPE_PROC, 6}},
     {"PROC{7}", {TYPE_PROC, 7}},
+
+    {"EQ{0}", {TYPE_EQ, 0}},
+    {"EQ{1}", {TYPE_EQ, 1}},
+    {"EQ{2}", {TYPE_EQ, 2}},
+    {"EQ{3}", {TYPE_EQ, 3}},
+    {"EQ{4}", {TYPE_EQ, 4}},
+    {"EQ{5}", {TYPE_EQ, 5}},
+
     {"EX{0}", {TYPE_EX, 0}},
     {"EX{1}", {TYPE_EX, 1}},
     {"EX{2}", {TYPE_EX, 2}},
@@ -68,25 +79,42 @@ const epath_array EPATH_ARRAY_MAP[] =
     {"EX{9}", {TYPE_EX, 9}},
     {"EX{10}", {TYPE_EX, 10}},
     {"EX{11}", {TYPE_EX, 11}},
-    {"EX{12}", {TYPE_EX, 12}},
-    {"EX{13}", {TYPE_EX, 13}},
-    {"EX{14}", {TYPE_EX, 14}},
-    {"EX{15}", {TYPE_EX, 15}},
-    {"ABUS{0}", {TYPE_ABUS, 0}},
-    {"ABUS{1}", {TYPE_ABUS, 1}},
-    {"ABUS{2}", {TYPE_ABUS, 2}},
-    {"XBUS{0}", {TYPE_XBUS, 0}},
-    {"XBUS{1}", {TYPE_XBUS, 1}},
-    {"XBUS{2}", {TYPE_XBUS, 2}},
-    {"XBUS{3}", {TYPE_XBUS, 3}},
+
+    {"CORE{0}", {TYPE_CORE, 0}},
+    {"CORE{1}", {TYPE_CORE, 1}},
+    {"CORE{2}", {TYPE_CORE, 2}},
+    {"CORE{3}", {TYPE_CORE, 3}},
+    {"CORE{4}", {TYPE_CORE, 4}},
+    {"CORE{5}", {TYPE_CORE, 5}},
+    {"CORE{6}", {TYPE_CORE, 6}},
+    {"CORE{7}", {TYPE_CORE, 7}},
+    {"CORE{8}", {TYPE_CORE, 8}},
+    {"CORE{9}", {TYPE_CORE, 9}},
+    {"CORE{10}",{TYPE_CORE,10}},
+    {"CORE{11}",{TYPE_CORE,11}},
+    {"CORE{12}",{TYPE_CORE,12}},
+    {"CORE{13}",{TYPE_CORE,13}},
+    {"CORE{14}",{TYPE_CORE,14}},
+    {"CORE{15}",{TYPE_CORE,15}},
+    {"CORE{16}",{TYPE_CORE,16}},
+    {"CORE{17}",{TYPE_CORE,17}},
+    {"CORE{18}",{TYPE_CORE,18}},
+    {"CORE{19}",{TYPE_CORE,19}},
+    {"CORE{20}",{TYPE_CORE,20}},
+    {"CORE{21}",{TYPE_CORE,21}},
+    {"CORE{22}",{TYPE_CORE,22}},
+    {"CORE{23}",{TYPE_CORE,23}},
+
+    {"MCBIST{0}", {TYPE_MCBIST, 0}},
+    {"MCBIST{1}", {TYPE_MCBIST, 1}},
+    {"MCBIST{2}", {TYPE_MCBIST, 2}},
+    {"MCBIST{3}", {TYPE_MCBIST, 3}},
+
     {"MCS{0}", {TYPE_MCS, 0}},
     {"MCS{1}", {TYPE_MCS, 1}},
     {"MCS{2}", {TYPE_MCS, 2}},
     {"MCS{3}", {TYPE_MCS, 3}},
-    {"MCS{4}", {TYPE_MCS, 4}},
-    {"MCS{5}", {TYPE_MCS, 5}},
-    {"MCS{6}", {TYPE_MCS, 6}},
-    {"MCS{7}", {TYPE_MCS, 7}},
+
     {"MEMBUF{0}", {TYPE_MEMBUF, 0}},
     {"MEMBUF{1}", {TYPE_MEMBUF, 1}},
     {"MEMBUF{2}", {TYPE_MEMBUF, 2}},
@@ -95,8 +123,9 @@ const epath_array EPATH_ARRAY_MAP[] =
     {"MEMBUF{5}", {TYPE_MEMBUF, 5}},
     {"MEMBUF{6}", {TYPE_MEMBUF, 6}},
     {"MEMBUF{7}", {TYPE_MEMBUF, 7}},
+
     {"MBA{0}", {TYPE_MBA, 0}},
-    {"MBA{1}", {TYPE_MBA, 1}},
+    {"MBA{1}", {TYPE_MBA, 1}}
 };
 
 const uint64_t NUM_EPATH_ARRAY = sizeof(EPATH_ARRAY_MAP)/sizeof(EPATH_ARRAY_MAP[0]);
@@ -166,7 +195,8 @@ TARGETING::Target* string2Target(const char * i_str)
 
     if ( NULL != l_retTarget )
     {
-        PRDF_TRAC("string2Target() l_retTarget=0x%08x, epath=", getHuid(l_retTarget));
+        PRDF_TRAC("string2Target() l_retTarget=0x%08x, epath=see target traces",
+                  getHuid(l_retTarget));
         epath.dump();
     }
 
diff --git a/src/usr/testcore/rtloader/loader.H b/src/usr/testcore/rtloader/loader.H
index 006647811..32954a5c7 100644
--- a/src/usr/testcore/rtloader/loader.H
+++ b/src/usr/testcore/rtloader/loader.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -124,6 +124,7 @@ class RuntimeLoaderTest : public CxxTest::TestSuite
                 intf->pnor_read = rt_pnor_read;
                 intf->pnor_write= rt_pnor_write;
                 intf->ipmi_msg= rt_ipmi_msg;
+                intf->clock_gettime = clock_gettime;
 
                 // Call init.
                 runtimeInterfaces_t* rtInterface =