diff --git a/py-scripts/lf_ftp.py b/py-scripts/lf_ftp.py
index 0ad7f98bc..38fe755e8 100755
--- a/py-scripts/lf_ftp.py
+++ b/py-scripts/lf_ftp.py
@@ -314,8 +314,9 @@ def __init__(self, lfclient_host="localhost", lfclient_port=8080, sta_prefix="st
         self.coordinate = coordinate
         self.rotation = rotation
         self.rotation_enabled = False
-        self.coordinate_list = coordinate.split(',')
-        self.rotation_list = rotation.split(',')
+        if self.robot_test:
+            self.coordinate_list = coordinate.split(',')
+            self.rotation_list = rotation.split(',')
         self.current_coordinate = ""
         self.current_angle = ""
         self.robot_data = {}
@@ -1063,7 +1064,7 @@ def monitor_for_runtime_csv(self):
                 if (datetime.now() - monitor_charge_time).total_seconds() >= 300:
                     pause_start = datetime.now()
                     # Wait for the robot to charge. Returns whether we paused and whether user aborted.
-                    pause, test_stopped_by_user = self.robot_obj.wait_for_battery()
+                    pause, test_stopped_by_user = self.robot_obj.wait_for_battery(stop=self.stop)
                     if test_stopped_by_user:
                         break
                     if pause: