diff --git a/fixture_tests/fixtures/current_tool_test.nc b/fixture_tests/fixtures/current_tool_test.nc
index fe3bfbbda..b991b4eca 100644
--- a/fixture_tests/fixtures/current_tool_test.nc
+++ b/fixture_tests/fixtures/current_tool_test.nc
@@ -1,34 +1,67 @@
-(print, $G)
-$G
-(print, Current tool=%d#<_current_tool>)
-(print, Selected tool=%d#<_selected_tool>)
-(print, T1)
-T1
-(print, $G)
-$G
-(print, Current tool=%d#<_current_tool>)
-(print, Selected tool=%d#<_selected_tool>)
-(print, M6)
-M6
-(print, $G)
-$G
-(print, Current tool=%d#<_current_tool>)
-(print, Selected tool=%d#<_selected_tool>)
-(print, M6T2)
-M6T2
-(print, $G)
-$G
-(print, Current tool=%d#<_current_tool>)
-(print, Selected tool=%d#<_selected_tool>)
-(print, M61Q3)
-M61Q3
-(print, $G)
-$G
-(print, Current tool=%d#<_current_tool>)
-(print, Selected tool=%d#<_selected_tool>)
-(print, M6T0)
-M6T0
-(print, $G)
-$G
-(print, Current tool=%d#<_current_tool>)
-(print, Selected tool=%d#<_selected_tool>)
+-> $X
+<~ [MSG:INFO: Caution: Unlocked]
+<- ok
+-> $G
+<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T0 F0 S0]
+<- ok
+-> (print, Current tool=%d#<_current_tool>)
+<- [MSG:INFO: PRINT, Current tool=-1]
+<- ok
+-> (print, Selected tool=%d#<_selected_tool>)
+<- [MSG:INFO: PRINT, Selected tool=0]
+<- ok
+-> T1
+<- ok
+-> $G
+<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T1 F0 S0]
+<- ok
+-> (print, Current tool=%d#<_current_tool>)
+<- [MSG:INFO: PRINT, Current tool=-1]
+<- ok
+-> (print, Selected tool=%d#<_selected_tool>)
+<- [MSG:INFO: PRINT, Selected tool=1]
+<- ok
+-> M6
+<- ok
+-> $G
+<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T1 F0 S0]
+<- ok
+-> (print, Current tool=%d#<_current_tool>)
+<- [MSG:INFO: PRINT, Current tool=1]
+<- ok
+-> (print, Selected tool=%d#<_selected_tool>)
+<- [MSG:INFO: PRINT, Selected tool=1]
+<- ok
+-> M6T2
+<- ok
+-> $G
+<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T2 F0 S0]
+<- ok
+-> (print, Current tool=%d#<_current_tool>)
+<- [MSG:INFO: PRINT, Current tool=2]
+<- ok
+-> (print, Selected tool=%d#<_selected_tool>)
+<- [MSG:INFO: PRINT, Selected tool=2]
+<- ok
+-> M61Q3
+<- ok
+-> $G
+<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T3 F0 S0]
+<- ok
+-> (print, Current tool=%d#<_current_tool>)
+<- [MSG:INFO: PRINT, Current tool=3]
+<- ok
+-> (print, Selected tool=%d#<_selected_tool>)
+<- [MSG:INFO: PRINT, Selected tool=3]
+<- ok
+-> M6T0
+<- ok
+-> $G
+<- [GC:G0 G54 G17 G21 G90 G94 M5 M9 T0 F0 S0]
+<- ok
+-> (print, Current tool=%d#<_current_tool>)
+<- [MSG:INFO: PRINT, Current tool=0]
+<- ok
+-> (print, Selected tool=%d#<_selected_tool>)
+<- [MSG:INFO: PRINT, Selected tool=0]
+<- ok
\ No newline at end of file