diff --git a/data/pldm_variables.py b/data/pldm_variables.py
index 7c2536e..084234a 100755
--- a/data/pldm_variables.py
+++ b/data/pldm_variables.py
@@ -112,16 +112,19 @@
     'datalength': ['10'],
     'pldmterminushandle': ['0'],
     'entitytype': ['System Board', 'Chassis front panel board (control panel)',
-                   'Management Controller', '208(OEM)', 'Power converter'],
-    'containerid': ['0', '1']}
+                   'Management Controller', '208(OEM)', 'Power converter',
+                   'System (logical)', 'System chassis (main enclosure)',
+                   'Chassis front panel board (control panel)'],
+    'containerid': ['0', '1', '2', '3']}
 
 RESPONSE_DICT_GETPDR_PDRENTITYASSOCIATION = {
     'pdrheaderversion': ['1'],
     'pdrtype': ['15'],
     'recordchangenumber': ['0'],
-    'containerid': ['1'],
+    'containerid': ['1', '2', '3'],
     'associationtype': ['Physical'],
-    'containerentitytype': ['System Board'],
+    'containerentitytype': ['System Board', 'System (logical)',
+                            'System chassis (main enclosure)']
 }
 
 PLDM_PDR_TYPES = {
diff --git a/pldm/test_pldm_bios.robot b/pldm/test_pldm_bios.robot
index 51de0f1..1e3533d 100644
--- a/pldm/test_pldm_bios.robot
+++ b/pldm/test_pldm_bios.robot
@@ -95,7 +95,6 @@
     # [     minimumstringlength]:                      1
     # [     maximumstringlength]:                      100
     # [     defaultstringlength]:                      15
-    # [     defaultstring]:                            witherspoon-128
 
     ${pldm_output}=  Pldmtool  bios GetBIOSTable --type AttributeTable
     Rprint Vars  pldm_output
@@ -112,7 +111,6 @@
     # [attributehandle]:                              0
     # [     attributetype]:                           BIOSStringReadOnly
     # [     currentstringlength]:                     15
-    # [     currentstring]:                           witherspoon-128
 
     ${pldm_output}=  Pldmtool  bios GetBIOSTable --type AttributeValueTable
     Log To Console  ${pldm_output}
diff --git a/pldm/test_pldm_platform.robot b/pldm/test_pldm_platform.robot
index d686531..7b04003 100644
--- a/pldm/test_pldm_platform.robot
+++ b/pldm/test_pldm_platform.robot
@@ -107,4 +107,5 @@
 Pldmtool Platform Suite Cleanup
     [Documentation]    Reset BMC at suite cleanup.
 
+    Redfish Hard Power Off
     Redfish OBMC Reboot (off)