diff --git a/lib/fan_utils.robot b/lib/fan_utils.robot
index b4e69d2..c3b8583 100755
--- a/lib/fan_utils.robot
+++ b/lib/fan_utils.robot
@@ -2,6 +2,7 @@
 Documentation  Utilities for fan tests.
 
 Library        ../lib/bmc_ssh_utils.py
+Resource       ../lib/state_manager.robot
 Resource       ../lib/openbmc_ffdc_utils.robot
 Variables      ../data/variables.py
 
@@ -235,11 +236,10 @@
 
     ${number_of_fans}=  Get Length  ${fan_names}
 
-    Printn
-    Rprint Vars  number_of_fans  fan_names
     [Return]  ${number_of_fans}  ${fan_names}
 
 
+
 Reset Fans
     [Documentation]  Set the fans to functional state.
     # Set state of fans to functional by writing 1 to the Functional
@@ -283,7 +283,7 @@
 
 Verify Direct Fan Control
     [Documentation]  Verify direct control of fans.
-    [Arguments]  ${max_fan_target_setting}  ${min_speed}
+    [Arguments]  ${max_speed}  ${min_speed}
     ...  ${minutes_to_stabilize}  ${number_of_fans}  ${fan_names}
 
     # Overview:
@@ -296,7 +296,7 @@
     # /sys/class/hwmon/hwmon9/fan*_input.
 
     # Description of argument(s):
-    # max_fan_target_setting  Integer value of maximum fan speed.
+    # max_speed               Integer value of maximum fan speed.
     # min_speed               Integer value of minimum speed.
     # minutes_to_stabilize    Time to wait for fan daemons to
     #                         stabilize fan operation after
@@ -313,7 +313,7 @@
     # For each fan, set a new target speed and wait for the fan to
     # accelerate.  Then check that the fan is running near that speed.
     :FOR  ${fan_name}  IN  @{fan_names}
-    \  Set Fan Target Speed  ${fan_name}  ${max_fan_target_setting}
+    \  Set Fan Target Speed  ${fan_name}  ${max_speed}
     \  Run Key U  Sleep \ 60s
     \  ${target_speed}  ${cw_speed}  ${ccw_speed}=
     ...  Get Target And Blade Speeds  ${fan_name}
@@ -443,9 +443,6 @@
 
     ${wait_after_poweroff}=  Set Variable  15s
 
-    # A previous test may have shutdown the system.
-    REST Power On  stack_mode=skip
-
     # Set fans to be non-functional.
     :FOR  ${fan_name}  IN  @{fan_names}
     \  Set Fan State  ${fan_name}  ${fan_nonfunctional}