diff --git a/printrun/printcore.py b/printrun/printcore.py
index f0f3da8f5..042c94efa 100644
--- a/printrun/printcore.py
+++ b/printrun/printcore.py
@@ -416,7 +416,7 @@ def startprint(self, gcode, startindex = 0):
             return True
 
         self.clear = False
-        self._send("M110 N-1")
+        self._send("M110 N-1", -1, True)
 
         resuming = (startindex != 0)
         self.print_thread = threading.Thread(target = self._print,
@@ -675,7 +675,7 @@ def _sendnext(self):
             if not self.paused:
                 self.queueindex = 0
                 self.lineno = 0
-                self._send("M110 N-1")
+                self._send("M110 N-1", -1, True)
 
     def _send(self, command, lineno = 0, calcchecksum = False):
         # Only add checksums if over serial (tcp does the flow control itself)
diff --git a/testfiles/arc_test.gcode b/testfiles/arc_test.gcode
new file mode 100644
index 000000000..46364e419
--- /dev/null
+++ b/testfiles/arc_test.gcode
@@ -0,0 +1,21 @@
+; Print this file for a quick test of support for arc movements with 
+; G2 and G3 and z helix movement up and down +- 10 mm, 6 times a full cycle
+; It takes only a half minute and prints above the print bed (z=20 mm)
+; w/o heating and extrusion
+
+G28 ; home
+G0 Z10.0000 S0 ; lift z
+G90 ; absolute mode
+G21	; set unit to mm
+
+G2 X15 Y20 I30 J40 Z20 F8000
+G3 X15 Y20 I30 J40 Z10 F8000
+G2 X15 Y20 I30 J40 Z20 F8000
+G3 X15 Y20 I30 J40 Z10 F8000
+G2 X15 Y20 I30 J40 Z20 F8000
+G3 X15 Y20 I30 J40 Z10 F8000
+
+G0 X5.0000
+G0 Y5.0000
+
+M84; motors off
\ No newline at end of file
diff --git a/testfiles/quicktest.dxf b/testfiles/quicktest.dxf
new file mode 100644
index 000000000..b6110fccd
--- /dev/null
+++ b/testfiles/quicktest.dxf
@@ -0,0 +1,418 @@
+0
+SECTION
+2
+HEADER
+9
+$INSUNITS
+70
+4
+9
+$ACADVER
+1
+AC1014
+9
+$HANDSEED
+5
+FFFF
+0
+ENDSEC
+0
+SECTION
+2
+TABLES
+0
+TABLE
+2
+VPORT
+5
+8
+100
+AcDbSymbolTable
+0
+ENDTAB
+0
+TABLE
+2
+LTYPE
+5
+5
+100
+AcDbSymbolTable
+0
+LTYPE
+5
+14
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+2
+BYBLOCK
+70
+0
+0
+LTYPE
+5
+15
+100
+AcDbSymbolTableRecord
+100
+AcDbLinetypeTableRecord
+2
+BYLAYER
+70
+0
+0
+ENDTAB
+0
+TABLE
+2
+LAYER
+5
+2
+100
+AcDbSymbolTable
+70
+2
+0
+LAYER
+5
+50
+100
+AcDbSymbolTableRecord
+100
+AcDbLayerTableRecord
+2
+0
+70
+0
+6
+CONTINUOUS
+0
+ENDTAB
+0
+TABLE
+2
+STYLE
+5
+3
+100
+AcDbSymbolTable
+70
+1
+0
+STYLE
+5
+11
+100
+AcDbSymbolTableRecord
+100
+AcDbTextStyleTableRecord
+2
+STANDARD
+70
+0
+0
+ENDTAB
+0
+TABLE
+2
+VIEW
+5
+6
+100
+AcDbSymbolTable
+70
+0
+0
+ENDTAB
+0
+TABLE
+2
+UCS
+5
+7
+100
+AcDbSymbolTable
+70
+0
+0
+ENDTAB
+0
+TABLE
+2
+APPID
+5
+9
+100
+AcDbSymbolTable
+70
+2
+0
+APPID
+5
+12
+100
+AcDbSymbolTableRecord
+100
+AcDbRegAppTableRecord
+2
+ACAD
+70
+0
+0
+ENDTAB
+0
+TABLE
+2
+DIMSTYLE
+5
+A
+100
+AcDbSymbolTable
+70
+1
+0
+ENDTAB
+0
+TABLE
+2
+BLOCK_RECORD
+5
+1
+100
+AcDbSymbolTable
+70
+1
+0
+BLOCK_RECORD
+5
+1F
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+2
+*MODEL_SPACE
+0
+BLOCK_RECORD
+5
+1B
+100
+AcDbSymbolTableRecord
+100
+AcDbBlockTableRecord
+2
+*PAPER_SPACE
+0
+ENDTAB
+0
+ENDSEC
+0
+SECTION
+2
+BLOCKS
+0
+BLOCK
+5
+20
+100
+AcDbEntity
+100
+AcDbBlockBegin
+2
+*MODEL_SPACE
+0
+ENDBLK
+5
+21
+100
+AcDbEntity
+100
+AcDbBlockEnd
+0
+BLOCK
+5
+1C
+100
+AcDbEntity
+100
+AcDbBlockBegin
+2
+*PAPER_SPACE
+0
+ENDBLK
+5
+1D
+100
+AcDbEntity
+100
+AcDbBlockEnd
+0
+ENDSEC
+0
+SECTION
+2
+ENTITIES
+0
+LWPOLYLINE
+5
+100
+100
+AcDbEntity
+8
+0
+100
+AcDbPolyline
+90
+12
+70
+1
+43
+0.0
+10
+-20.000000000000007
+20
+50.000000000000007
+10
+19.999999999999989
+20
+50.000000000000007
+10
+20
+20
+5.5511151231257827e-15
+10
+16.999999999999989
+20
+9.8280962319814762e-15
+10
+16.999999999999986
+20
+3.0000000000000098
+10
+14.999999999999984
+20
+3.000000000000008
+10
+14.99999999999998
+20
+-4.9107620221003759e-15
+10
+-14.99999999999998
+20
+4.9107620221003735e-15
+10
+-15.000000000000002
+20
+2.9999999999999893
+10
+-17
+20
+2.9999999999999916
+10
+-17.000000000000004
+20
+-3.655686818890702e-15
+10
+-20.000000000000021
+20
+1.2212453270876722e-14
+0
+LWPOLYLINE
+5
+101
+100
+AcDbEntity
+8
+0
+100
+AcDbPolyline
+90
+4
+70
+1
+43
+0.0
+10
+-38.000000000000028
+20
+40.000000000000007
+10
+-30.000000000000018
+20
+40.000000000000007
+10
+-30
+20
+32.000000000000014
+10
+-38.000000000000028
+20
+32.000000000000014
+0
+LINE
+5
+102
+100
+AcDbEntity
+8
+0
+100
+AcDbLine
+10
+0
+20
+0
+30
+0
+11
+-9.9920072216264089e-15
+21
+50.000000000000007
+31
+0
+0
+ENDSEC
+0
+SECTION
+2
+OBJECTS
+0
+DICTIONARY
+5
+C
+100
+AcDbDictionary
+3
+ACAD_GROUP
+350
+D
+3
+ACAD_MLINESTYLE
+350
+17
+0
+DICTIONARY
+5
+D
+100
+AcDbDictionary
+0
+DICTIONARY
+5
+1A
+330
+C
+100
+AcDbDictionary
+0
+DICTIONARY
+5
+17
+100
+AcDbDictionary
+0
+ENDSEC
+0
+EOF
diff --git a/testfiles/quicktest.gcode b/testfiles/quicktest.gcode
new file mode 100644
index 000000000..643d83bfc
--- /dev/null
+++ b/testfiles/quicktest.gcode
@@ -0,0 +1,45 @@
+; Print this little gcode file for a quick test for repeated prints
+; Area needed from homing position: x78 y70 z10 mm
+; It takes only a half minute and prints above the print bed (z=7 mm)
+; w/o heating and extrusion
+
+G28 ; home
+G0 Z10.0000 S0 ; lift z
+G90 ; absolute mode
+G21	; set unit to mm
+
+G0 F2000
+G0 Z 7.0000
+G0 X 38.0000 Y 70.0000
+G4 P0
+G1 Z5.0000 S0
+G4 P0
+G1 F1000.0000
+G1 X 78.0000 Y 70.0000
+G1 X 78.0000 Y 20.0000
+G1 X 75.0000 Y 20.0000
+G1 X 75.0000 Y 23.0000
+G1 X 73.0000 Y 23.0000
+G1 X 73.0000 Y 20.0000
+G1 X 43.0000 Y 20.0000
+G1 X 43.0000 Y 23.0000
+G1 X 41.0000 Y 23.0000
+G1 X 41.0000 Y 20.0000
+G1 X 38.0000 Y 20.0000
+G1 X 38.0000 Y 70.0000
+G4 P0
+G0 Z10.0000 S0
+G0 Z 7.0000
+G0 X 20.0000 Y 60.0000
+G1 Z 5.0000
+G1 X 28.0000 Y 60.0000
+G1 X 28.0000 Y 52.0000
+G1 X 20.0000 Y 52.0000
+G1 X 20.0000 Y 60.0000
+
+G0 Z10.0000
+G0 X5.0000
+G0 Y5.0000
+
+M84 ; motors off
+