diff --git a/data/variables.py b/data/variables.py
index 65cd74a..71744a5 100644
--- a/data/variables.py
+++ b/data/variables.py
@@ -9,7 +9,9 @@
 
 # REST URI base endpoint paths.
 CONTROL_URI = OPENBMC_BASE_URI + 'control/'
-SETTINGS_URI = OPENBMC_BASE_URI + 'settings/'
+# old vs new code dependencies in many places.
+# TODO: remove when ready.
+SETTINGS_URI = '/org/openbmc/settings/'
 WATCHDOG_URI = OPENBMC_BASE_URI + 'watchdog/'
 TIME_MANAGER_URI = OPENBMC_BASE_URI + 'time/'
 XYZ_NETWORK_MANAGER = OPENBMC_BASE_URI + 'network/'
diff --git a/tests/ipmi/test_chassis.robot b/tests/ipmi/test_chassis.robot
index 183958c..a3736ed 100755
--- a/tests/ipmi/test_chassis.robot
+++ b/tests/ipmi/test_chassis.robot
@@ -6,6 +6,7 @@
 Resource               ../../lib/openbmc_ffdc.robot
 Resource               ../../lib/utils.robot
 Resource               ../../lib/resource.txt
+Resource               ../../lib/state_manager.robot
 
 Suite Setup            Open Connection And Log In
 Suite Teardown         Close All Connections
@@ -21,7 +22,7 @@
     ...               using IPMI Get Chassis status command.
     [Tags]  IPMI_Chassis_Status_On
 
-    Initiate Power On
+    Initiate Host Boot
     ${resp}=  Run IPMI Standard Command  chassis status
     ${power_status}=  Get Lines Containing String  ${resp}  System Power
     Should Contain  ${power_status}  on
@@ -31,7 +32,7 @@
     ...               using IPMI Get Chassis status command.
     [Tags]  IPMI_Chassis_Status_Off
 
-    Initiate Power Off
+    Initiate Host PowerOff
     ${resp}=  Run IPMI Standard Command  chassis status
     ${power_status}=  Get Lines Containing String  ${resp}  System Power
     Should Contain  ${power_status}    off
@@ -49,7 +50,7 @@
      ...  Get Lines Containing String  ${resp}  Power Restore Policy
      Should Contain  ${power_status}  always-on
 
-     Set BMC Power Policy  RESTORE_LAST_STATE
+     Set BMC Power Policy  ${RESTORE_LAST_STATE}
      ${resp}=  Run IPMI Standard Command  chassis status
      ${power_status}=
      ...  Get Lines Containing String  ${resp}  Power Restore Policy
@@ -83,8 +84,6 @@
 Test Exit Logs
     [Documentation]    Log FFDC if test failed.
 
-    Set BMC Power Policy  RESTORE_LAST_STATE
-    ${power_policy}=  Read Attribute  ${HOST_SETTING}  power_policy
-    Should Be Equal  ${power_policy}  RESTORE_LAST_STATE
+    Set BMC Power Policy  ${RESTORE_LAST_STATE}
 
     FFDC On Test Case Fail