diff --git a/cfgs/TEST_SPEED.cfg b/cfgs/TEST_SPEED.cfg
index bfda9e2..a8f1bd5 100644
--- a/cfgs/TEST_SPEED.cfg
+++ b/cfgs/TEST_SPEED.cfg
@@ -1,4 +1,4 @@
-# NOTE This macro is not ready for use. ☠️☠️☠️
+# NOTE Find how to use instructions here: https://ellis3dp.com/Print-Tuning-Guide/articles/determining_max_speeds_accels.html
 # Home, get position, throw around toolhead, home again.
 # If MCU stepper positions (first line in GET_POSITION) are greater than a full step different (your number of microsteps), then skipping occured.
 # We only measure to a full step to accomodate for endstop variance.
@@ -42,6 +42,7 @@ gcode:
     { action_respond_info("TEST_SPEED: starting %d iterations at speed %d, accel %d" % (iterations, speed, accel)) }
     
     # Home and get position for comparison later:
+        M400 # Finish moves - https://github.com/AndrewEllis93/Print-Tuning-Guide/issues/66
         G28
         # QGL if not already QGLd (only if QGL section exists in config)
         {% if printer.configfile.settings.quad_gantry_level %}
@@ -53,6 +54,7 @@ gcode:
         # Move 50mm away from max position and home again (to help with hall effect endstop accuracy - https://github.com/AndrewEllis93/Print-Tuning-Guide/issues/24)
         G90
         G1 X{printer.toolhead.axis_maximum.x-50} Y{printer.toolhead.axis_maximum.y-50} F{30*60}
+        M400 # Finish moves - https://github.com/AndrewEllis93/Print-Tuning-Guide/issues/66
         G28 X Y
         G0 X{printer.toolhead.axis_maximum.x-1} Y{printer.toolhead.axis_maximum.y-1} F{30*60}
         G4 P1000 
@@ -65,42 +67,41 @@ gcode:
     SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel / 2}
 
     {% for i in range(iterations) %}
-        # Large pattern
-            # Diagonals
-            G0 X{x_min} Y{y_min} F{speed*60}
-            G0 X{x_max} Y{y_max} F{speed*60}
-            G0 X{x_min} Y{y_min} F{speed*60}
-            G0 X{x_max} Y{y_min} F{speed*60}
-            G0 X{x_min} Y{y_max} F{speed*60}
-            G0 X{x_max} Y{y_min} F{speed*60}
-            
-            # Box
-            G0 X{x_min} Y{y_min} F{speed*60}
-            G0 X{x_min} Y{y_max} F{speed*60}
-            G0 X{x_max} Y{y_max} F{speed*60}
-            G0 X{x_max} Y{y_min} F{speed*60}
+        # Large pattern diagonals
+        G0 X{x_min} Y{y_min} F{speed*60}
+        G0 X{x_max} Y{y_max} F{speed*60}
+        G0 X{x_min} Y{y_min} F{speed*60}
+        G0 X{x_max} Y{y_min} F{speed*60}
+        G0 X{x_min} Y{y_max} F{speed*60}
+        G0 X{x_max} Y{y_min} F{speed*60}
         
-        # Small pattern
-            # Small diagonals 
-            G0 X{x_center_min} Y{y_center_min} F{speed*60}
-            G0 X{x_center_max} Y{y_center_max} F{speed*60}
-            G0 X{x_center_min} Y{y_center_min} F{speed*60}
-            G0 X{x_center_max} Y{y_center_min} F{speed*60}
-            G0 X{x_center_min} Y{y_center_max} F{speed*60}
-            G0 X{x_center_max} Y{y_center_min} F{speed*60}
-            
-            # Small box
-            G0 X{x_center_min} Y{y_center_min} F{speed*60}
-            G0 X{x_center_min} Y{y_center_max} F{speed*60}
-            G0 X{x_center_max} Y{y_center_max} F{speed*60}
-            G0 X{x_center_max} Y{y_center_min} F{speed*60}
+        # Large pattern box
+        G0 X{x_min} Y{y_min} F{speed*60}
+        G0 X{x_min} Y{y_max} F{speed*60}
+        G0 X{x_max} Y{y_max} F{speed*60}
+        G0 X{x_max} Y{y_min} F{speed*60}
+        
+        # Small pattern diagonals
+        G0 X{x_center_min} Y{y_center_min} F{speed*60}
+        G0 X{x_center_max} Y{y_center_max} F{speed*60}
+        G0 X{x_center_min} Y{y_center_min} F{speed*60}
+        G0 X{x_center_max} Y{y_center_min} F{speed*60}
+        G0 X{x_center_min} Y{y_center_max} F{speed*60}
+        G0 X{x_center_max} Y{y_center_min} F{speed*60}
+        
+        # Small patternbox
+        G0 X{x_center_min} Y{y_center_min} F{speed*60}
+        G0 X{x_center_min} Y{y_center_max} F{speed*60}
+        G0 X{x_center_max} Y{y_center_max} F{speed*60}
+        G0 X{x_center_max} Y{y_center_min} F{speed*60}
     {% endfor %}
 
     # Restore max speed/accel/accel_to_decel to their configured values
     SET_VELOCITY_LIMIT VELOCITY={printer.configfile.settings.printer.max_velocity} ACCEL={printer.configfile.settings.printer.max_accel} ACCEL_TO_DECEL={printer.configfile.settings.printer.max_accel_to_decel} 
 
     # Re-home and get position again for comparison:
-        G28
+        M400 # Finish moves - https://github.com/AndrewEllis93/Print-Tuning-Guide/issues/66
+        G28 # This is a full G28 to fix an issue with CoreXZ - https://github.com/AndrewEllis93/Print-Tuning-Guide/issues/12
         # Go to XY home positions (in case your homing override leaves it elsewhere)
         G90
         G0 X{printer.toolhead.axis_maximum.x-1} Y{printer.toolhead.axis_maximum.y-1} F{30*60}
diff --git a/osskc.cfg b/osskc.cfg
index f05dfa7..9a303fa 100644
--- a/osskc.cfg
+++ b/osskc.cfg
@@ -3,8 +3,9 @@
 [include ./cfgs/MECHANICAL_GANTRY_CALIBRATION.cfg]
 [include ./cfgs/CALIBRATION.cfg]
 [include ./cfgs/kamp/KAMP_Settings.cfg]
+[include ./cfgs/TEST_SPEED.cfg]
 
 # NOTE Uncomment the ONE of the following lines if you're using an adxl345
 # [include ./cfgs/adxl-rp2040.cfg]
 # [include ./cfgs/adxl-rpi-pico-2x.cfg]
-# [include ./cfgs/adxl-direct.cfg]
\ No newline at end of file
+# [include ./cfgs/adxl-direct.cfg]