diff --git a/tests/test-files/DB25.tap b/tests/test-files/DB25.tap
index fade58b..37f5e47 100644
--- a/tests/test-files/DB25.tap
+++ b/tests/test-files/DB25.tap
@@ -9,87 +9,87 @@ M6 T7(TOOL DIA. 3)
 G43 H7
 M03 S4000
 M7 (Mist On)
-G0  X18.6665 Y-3.1674
-X18.6665 Y-3.1674 Z2
-G1 X18.6665 Y-3.1674 Z-1 F39.6
-G41  D1.5 X20.4013 Y-3.9116 F79.2
-G3  X21.0007 Y-2.3038 R2.46126
-G1 X21.0007 Y-1.6002
-X23.3959 Y-1.6002
-G3  X24.9961 Y0 R1.6002
-X23.3959 Y1.6002 R1.6002
-G1 X21.0007 Y1.6002
-X21.0007 Y2.3241
-G3  X17.8257 Y5.4991 R3.175
-G1 X-17.8257 Y5.4991
-G3  X-21.0007 Y2.3241 R3.175
-G1 X-21.0007 Y1.6002
-X-23.3959 Y1.6002
-G3  X-24.9961 Y0 R1.6002
-X-23.3959 Y-1.6002 R1.6002
-G1 X-21.0007 Y-1.6002
-X-21.0007 Y-2.3241
-G3  X-17.8257 Y-5.4991 R3.175
-G1 X17.8257 Y-5.4991
-G3  X21.0007 Y-2.3241 R3.175
-G1 X21.0007 Y-1.6002
-G3  X21.8491 Y-0.7772 R1.69672
-G1  G40 X20.4241 Y-0.0178
-G0  X20.4241 Y-0.0178 Z2
-G0  X18.6665 Y-3.1674
-X18.6665 Y-3.1674 Z2
-G1 X18.6665 Y-3.1674 Z-2 F39.6
-G41  D1.5 X20.4013 Y-3.9116 F79.2
-G3  X21.0007 Y-2.3038 R2.46126
-G1 X21.0007 Y-1.6002
-X23.3959 Y-1.6002
-G3  X24.9961 Y0 R1.6002
-X23.3959 Y1.6002 R1.6002
-G1 X21.0007 Y1.6002
-X21.0007 Y2.3241
-G3  X17.8257 Y5.4991 R3.175
-G1 X-17.8257 Y5.4991
-G3  X-21.0007 Y2.3241 R3.175
-G1 X-21.0007 Y1.6002
-X-23.3959 Y1.6002
-G3  X-24.9961 Y0 R1.6002
-X-23.3959 Y-1.6002 R1.6002
-G1 X-21.0007 Y-1.6002
-X-21.0007 Y-2.3241
-G3  X-17.8257 Y-5.4991 R3.175
-G1 X17.8257 Y-5.4991
-G3  X21.0007 Y-2.3241 R3.175
-G1 X21.0007 Y-1.6002
-G3  X21.8491 Y-0.7772 R1.69672
-G1  G40 X20.4241 Y-0.0178
-G0  X20.4241 Y-0.0178 Z2
-G0  X18.6665 Y-3.1674
-X18.6665 Y-3.1674 Z2
-G1 X18.6665 Y-3.1674 Z-3 F39.6
-G41  D1.5 X20.4013 Y-3.9116 F79.2
-G3  X21.0007 Y-2.3038 R2.46126
-G1 X21.0007 Y-1.6002
-X23.3959 Y-1.6002
-G3  X24.9961 Y0 R1.6002
-X23.3959 Y1.6002 R1.6002
-G1 X21.0007 Y1.6002
-X21.0007 Y2.3241
-G3  X17.8257 Y5.4991 R3.175
-G1 X-17.8257 Y5.4991
-G3  X-21.0007 Y2.3241 R3.175
-G1 X-21.0007 Y1.6002
-X-23.3959 Y1.6002
-G3  X-24.9961 Y0 R1.6002
-X-23.3959 Y-1.6002 R1.6002
-G1 X-21.0007 Y-1.6002
-X-21.0007 Y-2.3241
-G3  X-17.8257 Y-5.4991 R3.175
-G1 X17.8257 Y-5.4991
-G3  X21.0007 Y-2.3241 R3.175
-G1 X21.0007 Y-1.6002
-G3  X21.8491 Y-0.7772 R1.69672
-G1  G40 X20.4241 Y-0.0178
-G0  X20.4241 Y-0.0178 Z2
+G0  X18.6665 Y-3.1674 
+X18.6665 Y-3.1674 Z2 
+G1 X18.6665 Y-3.1674 Z-1 F39.6 
+G41  D1.5 X20.4013 Y-3.9116 F79.2 
+G3  X21.0007 Y-2.3038 R2.46126 
+G1 X21.0007 Y-1.6002 
+X23.3959 Y-1.6002 
+G3  X24.9961 Y0 R1.6002 
+X23.3959 Y1.6002 R1.6002 
+G1 X21.0007 Y1.6002 
+X21.0007 Y2.3241 
+G3  X17.8257 Y5.4991 R3.175 
+G1 X-17.8257 Y5.4991 
+G3  X-21.0007 Y2.3241 R3.175 
+G1 X-21.0007 Y1.6002 
+X-23.3959 Y1.6002 
+G3  X-24.9961 Y0 R1.6002 
+X-23.3959 Y-1.6002 R1.6002 
+G1 X-21.0007 Y-1.6002 
+X-21.0007 Y-2.3241 
+G3  X-17.8257 Y-5.4991 R3.175 
+G1 X17.8257 Y-5.4991 
+G3  X21.0007 Y-2.3241 R3.175 
+G1 X21.0007 Y-1.6002 
+G3  X21.8491 Y-0.7772 R1.69672 
+G1  G40 X20.4241 Y-0.0178 
+G0  X20.4241 Y-0.0178 Z2 
+G0  X18.6665 Y-3.1674 
+X18.6665 Y-3.1674 Z2 
+G1 X18.6665 Y-3.1674 Z-2 F39.6 
+G41  D1.5 X20.4013 Y-3.9116 F79.2 
+G3  X21.0007 Y-2.3038 R2.46126 
+G1 X21.0007 Y-1.6002 
+X23.3959 Y-1.6002 
+G3  X24.9961 Y0 R1.6002 
+X23.3959 Y1.6002 R1.6002 
+G1 X21.0007 Y1.6002 
+X21.0007 Y2.3241 
+G3  X17.8257 Y5.4991 R3.175 
+G1 X-17.8257 Y5.4991 
+G3  X-21.0007 Y2.3241 R3.175 
+G1 X-21.0007 Y1.6002 
+X-23.3959 Y1.6002 
+G3  X-24.9961 Y0 R1.6002 
+X-23.3959 Y-1.6002 R1.6002 
+G1 X-21.0007 Y-1.6002 
+X-21.0007 Y-2.3241 
+G3  X-17.8257 Y-5.4991 R3.175 
+G1 X17.8257 Y-5.4991 
+G3  X21.0007 Y-2.3241 R3.175 
+G1 X21.0007 Y-1.6002 
+G3  X21.8491 Y-0.7772 R1.69672 
+G1  G40 X20.4241 Y-0.0178 
+G0  X20.4241 Y-0.0178 Z2 
+G0  X18.6665 Y-3.1674 
+X18.6665 Y-3.1674 Z2 
+G1 X18.6665 Y-3.1674 Z-3 F39.6 
+G41  D1.5 X20.4013 Y-3.9116 F79.2 
+G3  X21.0007 Y-2.3038 R2.46126 
+G1 X21.0007 Y-1.6002 
+X23.3959 Y-1.6002 
+G3  X24.9961 Y0 R1.6002 
+X23.3959 Y1.6002 R1.6002 
+G1 X21.0007 Y1.6002 
+X21.0007 Y2.3241 
+G3  X17.8257 Y5.4991 R3.175 
+G1 X-17.8257 Y5.4991 
+G3  X-21.0007 Y2.3241 R3.175 
+G1 X-21.0007 Y1.6002 
+X-23.3959 Y1.6002 
+G3  X-24.9961 Y0 R1.6002 
+X-23.3959 Y-1.6002 R1.6002 
+G1 X-21.0007 Y-1.6002 
+X-21.0007 Y-2.3241 
+G3  X-17.8257 Y-5.4991 R3.175 
+G1 X17.8257 Y-5.4991 
+G3  X21.0007 Y-2.3241 R3.175 
+G1 X21.0007 Y-1.6002 
+G3  X21.8491 Y-0.7772 R1.69672 
+G1  G40 X20.4241 Y-0.0178 
+G0  X20.4241 Y-0.0178 Z2 
 M5 M9
 M30
 %
diff --git a/tests/test-files/Mach4 write.tap b/tests/test-files/Mach4 write.tap
index c3a193f..63c6917 100644
--- a/tests/test-files/Mach4 write.tap	
+++ b/tests/test-files/Mach4 write.tap	
@@ -65,4 +65,4 @@ G00 Z6
 G00 X0 Y0
 M05
 M30
-%
+%
\ No newline at end of file
diff --git a/tests/test-files/Trispokedovetiles(laser).tap b/tests/test-files/Trispokedovetiles(laser).tap
index 88be0ea..b9e73cb 100644
--- a/tests/test-files/Trispokedovetiles(laser).tap
+++ b/tests/test-files/Trispokedovetiles(laser).tap
@@ -28,7 +28,7 @@ G3 Y 84.4093 I 65.8393 J 87.1601
 
 G0 X 93.3399 Y 103.0402
 
-G1 X 86.9010
+G1 X 86.9010 
 G3 X 82.5094 Y 98.3285 I 86.9010 J 98.6384
 G3 X 111.3409 Y 48.3895 I 148.3411 J 103.0402
 G3 X 117.6198 Y 49.8297 I 113.8098 J 52.0294