diff --git a/.gitattributes b/.gitattributes
index 7b31b7fbb9031f2c532bd2914890c35d0a442bec..bd673f7cb106d0b50f36bfa944ff05bbc4ab53d0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2035,3 +2035,17 @@ test/sweep/397/397.stl filter=lfs diff=lfs merge=lfs -text
 test/sweep/156/156.stl filter=lfs diff=lfs merge=lfs -text
 test/sweep/726/726.stl filter=lfs diff=lfs merge=lfs -text
 test/sweep/42/42.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/126/126.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/186/186.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/187/187.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/196/196.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/216/216.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/245/245.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/293/293.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/465/465.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/500/500.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/544/544.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/661/661.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/824/824.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/856/856.stl filter=lfs diff=lfs merge=lfs -text
+test/extrude/970/970.stl filter=lfs diff=lfs merge=lfs -text
diff --git a/test/extrude/0/0.py b/test/extrude/0/0.py
index 812ce39cd32fe24b630d4da90d0db3ae7327ca1f..aa0850d2750751c30365923a55f568409c4beb79 100644
--- a/test/extrude/0/0.py
+++ b/test/extrude/0/0.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(469,469,681))
-w1=cq.Workplane('YZ',origin=(596,469,469))
-r=w0.workplane(offset=394).moveTo(490,617).cylinder(617,564).union(w0.sketch().segment((224,745),(320,522)).arc((75,394),(245,171)).arc((617,1),(458,373)).segment((745,490)).segment((575,894)).close().assemble().finalize().extrude(341)).union(w0.sketch().segment((267,564),(299,490)).segment((299,373)).segment((671,373)).segment((671,447)).segment((734,426)).segment((798,639)).arc((745,713),(830,756)).segment((862,862)).segment((394,1000)).segment((352,862)).segment((299,862)).segment((299,745)).arc((267,660),(267,564)).assemble().finalize().extrude(415)).union(w1.sketch().arc((596,511),(777,245),(649,532)).segment((649,564)).arc((564,660),(681,607)).segment((724,607)).arc((554,713),(596,511)).assemble().finalize().extrude(437))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(54,71,22))
+r=w0.sketch().segment((1,938),(678,938)).segment((678,280)).segment((1,280)).close().assemble().push([(408,624)]).rect(243,233,mode='s').finalize().extrude(174)
diff --git a/test/extrude/0/0.stl b/test/extrude/0/0.stl
index a3b9765bdbaf087be08f220c411b3e6ad1aeb554..658f8b4a1e165e4e01fba938e6ca6b9be53c16af 100644
Binary files a/test/extrude/0/0.stl and b/test/extrude/0/0.stl differ
diff --git a/test/extrude/1/1.py b/test/extrude/1/1.py
index be702ca261149fb2b17361f6249ec21793e6bdaa..059a286a9ac17947fc73044e94cfabaf3c134699 100644
--- a/test/extrude/1/1.py
+++ b/test/extrude/1/1.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(538,538,747))
-w1=cq.Workplane('YZ',origin=(478,538,538))
-r=w0.sketch().push([(478,448)]).circle(851).circle(821,mode='s').finalize().extrude(1).union(w0.sketch().push([(195,16)]).circle(761).circle(732,mode='s').push([(821,1000)]).circle(821).circle(747,mode='s').finalize().extrude(16)).union(w1.sketch().push([(448,836)]).circle(568).push([(418,836)]).circle(553,mode='s').finalize().extrude(463)).translate((30,208,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(10,15,71))
+r=w0.sketch().segment((284,343),(818,343)).segment((818,811)).segment((284,811)).close().assemble().push([(553,578)]).rect(176,126,mode='s').finalize().extrude(211)
diff --git a/test/extrude/1/1.stl b/test/extrude/1/1.stl
index b04b97bd50ff75e98469fc05e2e671252018a2f5..6189f310fe17501f998a57b5664e9287911482df 100644
--- a/test/extrude/1/1.stl
+++ b/test/extrude/1/1.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:efb7d1b8e02ebcad823f10d067e60a76d6d0b7076e5138f57391401fc13907fa
-size 172984
+oid sha256:2ce0f69a053e145bfbe6949dcaf7ba7308427da52cc8d0c2a65f35f4a381bffb
+size 1684
diff --git a/test/extrude/10/10.py b/test/extrude/10/10.py
index 8a1724cf80a16fce3496402db8e9e7e30f981b8a..6c3957e4fc21c848f00084ca4a4c2de7455fa5b2 100644
--- a/test/extrude/10/10.py
+++ b/test/extrude/10/10.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(361,221,361))
-r=w0.sketch().segment((71,81),(650,81)).segment((650,451)).segment((251,451)).segment((251,640)).segment((71,640)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((181,151),(341,231),(221,361)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(46,73,61))
+r=w0.sketch().segment((397,902),(485,902)).segment((485,198)).segment((397,198)).close().assemble().finalize().extrude(393).union(w0.workplane(offset=220).sketch().segment((758,258),(758,532)).segment((731,558)).segment((731,832)).segment((648,832)).segment((648,704)).segment((668,704)).segment((668,538)).segment((698,538)).segment((698,258)).close().assemble().finalize().extrude(213)).translate((1,361,1))
diff --git a/test/extrude/10/10.stl b/test/extrude/10/10.stl
index 35aadfabae8fd30368ab396c1b84d511e3fe9591..d8216125a8004844c53ac35c33e86180ad7902f4 100644
Binary files a/test/extrude/10/10.stl and b/test/extrude/10/10.stl differ
diff --git a/test/extrude/100/100.py b/test/extrude/100/100.py
index c4f64a1b954e3a3e12e067a1ca4a84fed785075c..56c54d5bbe95fcb72f93d97c805eeb5807d1a554 100644
--- a/test/extrude/100/100.py
+++ b/test/extrude/100/100.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(347,347,670))
-r=w0.workplane(offset=21).moveTo(412,658).box(509,533,1000).union(w0.sketch().push([(476,283)]).circle(621).push([(303,259)]).rect(517,428,mode='s').finalize().extrude(17)).union(w0.workplane(offset=283).moveTo(178,1).box(815,460,476))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(559,500,500))
+w1=cq.Workplane('YZ',origin=(546,501,500))
+r=w0.sketch().segment((1,276),(56,275)).segment((57,470)).segment((171,470)).segment((172,442)).arc((391,330),(591,477)).segment((665,476)).segment((665,631)).segment((600,630)).arc((396,805),(161,681)).segment((160,745)).segment((2,745)).close().assemble().finalize().extrude(36).union(w0.workplane(offset=591).moveTo(839,335).box(819,631,680)).union(w0.sketch().arc((285,504),(282,475),(305,460)).arc((620,626),(285,504)).assemble().push([(455,555)]).rect(730,671,mode='s').circle(510).finalize().extrude(715)).union(w1.workplane(offset=679).moveTo(736,270).cylinder(861,574))
\ No newline at end of file
diff --git a/test/extrude/100/100.stl b/test/extrude/100/100.stl
index 4597063bfde150de8cf881185b737337e6c31bb3..fc80feb2b994c5c8b736ec4465a73123cd3334fc 100644
Binary files a/test/extrude/100/100.stl and b/test/extrude/100/100.stl differ
diff --git a/test/extrude/1000/1000.py b/test/extrude/1000/1000.py
index 142ea89cfb2c22b99a76865aad9cbb57d7204178..aa331431f283ba56512af28f8d8a4996ef321ac6 100644
--- a/test/extrude/1000/1000.py
+++ b/test/extrude/1000/1000.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,261,500))
-r=w0.sketch().segment((1,780),(81,780)).arc((51,850),(51,930)).segment((1,930)).close().assemble().finalize().extrude(610).union(w0.sketch().segment((560,401),(670,271)).arc((690,231),(720,201)).segment((830,71)).segment((1000,211)).segment((890,341)).arc((870,381),(840,411)).segment((730,540)).close().assemble().finalize().extrude(990))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,275,500))
+r=w0.sketch().push([(767,501)]).rect(964,1000).push([(930,670)]).circle(544,mode='s').finalize().extrude(576).union(w0.sketch().segment((1,755),(167,746)).arc((320,584),(495,721)).segment((685,710)).segment((690,805)).segment((491,815)).arc((347,919),(186,841)).segment((6,850)).close().assemble().reset().face(w0.sketch().arc((196,740),(325,614),(465,725)).close().assemble(),mode='s').finalize().extrude(954))
\ No newline at end of file
diff --git a/test/extrude/1000/1000.stl b/test/extrude/1000/1000.stl
index 4113ce60d60cfe86812b6d91c1ad75823dc74cc0..5ae68a016ec1bb46498ec5de3e0f52995e6e434b 100644
Binary files a/test/extrude/1000/1000.stl and b/test/extrude/1000/1000.stl differ
diff --git a/test/extrude/1001/1001.py b/test/extrude/1001/1001.py
index 220c1adc63872712e887cd075c04189e21d3392c..c797a50b6738f1f14017856f97eba63084be5b27 100644
--- a/test/extrude/1001/1001.py
+++ b/test/extrude/1001/1001.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(469,702,469))
-r=w0.sketch().segment((203,469),(203,596)).segment((330,596)).arc((150,660),(203,469)).assemble().reset().face(w0.sketch().segment((766,139),(798,139)).segment((798,224)).arc((1000,437),(798,639)).segment((798,713)).segment((766,713)).segment((766,639)).arc((575,437),(766,224)).close().assemble()).finalize().extrude(1).union(w0.workplane(offset=272).moveTo(107,570).box(809,926,862))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,615))
+w1=cq.Workplane('XY',origin=(501,499,291))
+r=w0.sketch().segment((2,401),(956,277)).segment((979,434)).segment((869,435)).segment((869,570)).segment((994,570)).segment((1000,599)).segment((47,725)).close().assemble().circle(651,mode='s').finalize().extrude(590).union(w1.sketch().arc((799,745),(111,486),(819,280)).arc((735,512),(801,746)).assemble().finalize().extrude(766))
\ No newline at end of file
diff --git a/test/extrude/1001/1001.stl b/test/extrude/1001/1001.stl
index 1425e2c00c29537c4b0de82cc1fc1a9299c390d4..044101489303f398dfd2dba793ec63cf8c40a175 100644
Binary files a/test/extrude/1001/1001.stl and b/test/extrude/1001/1001.stl differ
diff --git a/test/extrude/1002/1002.py b/test/extrude/1002/1002.py
index a7d04d925d08f1adee36093a14b1959fbf503d62..6b13f22491c66b44f2d240d190691896b734c4a4 100644
--- a/test/extrude/1002/1002.py
+++ b/test/extrude/1002/1002.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(444,444,230))
-r=w0.sketch().segment((698,45),(698,376)).arc((581,211),(698,45)).assemble().reset().face(w0.sketch().segment((717,376),(795,376)).arc((756,386),(717,376)).assemble()).reset().face(w0.sketch().segment((756,181),(815,181)).segment((815,45)).arc((932,211),(815,376)).segment((815,298)).segment((756,298)).close().assemble()).finalize().extrude(328).union(w0.sketch().arc((464,610),(561,415),(474,220)).arc((698,425),(464,610)).assemble().finalize().extrude(961)).union(w0.workplane(offset=722).moveTo(1,795).box(532,542,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(415,307,308))
+w1=cq.Workplane('YZ',origin=(372,308,307))
+r=w0.sketch().push([(158,231)]).circle(464).reset().face(w0.sketch().segment((21,186),(55,186)).segment((55,152)).segment((174,151)).segment((174,186)).segment((207,186)).segment((207,232)).segment((174,232)).segment((174,265)).segment((54,265)).segment((54,232)).segment((21,232)).close().assemble(),mode='s').finalize().extrude(433).union(w1.sketch().segment((189,366),(482,365)).segment((481,504)).segment((608,503)).arc((608,509),(610,503)).segment((613,503)).segment((613,540)).segment((326,541)).segment((325,519)).segment((189,519)).close().assemble().finalize().extrude(12))
\ No newline at end of file
diff --git a/test/extrude/1002/1002.stl b/test/extrude/1002/1002.stl
index a41fdca02c784f337e911aac0c927c5280684c77..0cedba0b68a63d819c94535e64c441988b3a1193 100644
Binary files a/test/extrude/1002/1002.stl and b/test/extrude/1002/1002.stl differ
diff --git a/test/extrude/1003/1003.py b/test/extrude/1003/1003.py
index 4a909a3724b76bb8498a70b85efa2c0fd625d14e..eebbe22c9954962d208fa8470fe691a32c0d02a9 100644
--- a/test/extrude/1003/1003.py
+++ b/test/extrude/1003/1003.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(507,507,507))
-w1=cq.Workplane('ZX',origin=(507,631,507))
-r=w0.sketch().segment((343,56),(357,1)).segment((631,28)).segment((631,56)).close().assemble().push([(685,220)]).rect(617,562).finalize().extrude(206).union(w0.sketch().push([(240,986)]).rect(685,699).push([(966,117)]).rect(959,877).finalize().extrude(959)).union(w0.workplane(offset=754).moveTo(56,699).box(973,973,1000)).union(w1.workplane(offset=699).moveTo(754,83).cylinder(891,562))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(566,499,501))
+r=w0.sketch().segment((365,406),(675,215)).segment((905,596)).segment((825,642)).segment((999,639)).segment((1000,655)).segment((800,655)).segment((589,785)).close().assemble().finalize().extrude(367).union(w0.workplane(offset=471).moveTo(186,690).box(871,539,559))
\ No newline at end of file
diff --git a/test/extrude/1003/1003.stl b/test/extrude/1003/1003.stl
index b22c10a0cf80f5ac16ffd048dd157f97f7a0001b..d17c7956d6cdf322d3a900fe57a6f3300f0911ad 100644
Binary files a/test/extrude/1003/1003.stl and b/test/extrude/1003/1003.stl differ
diff --git a/test/extrude/1004/1004.py b/test/extrude/1004/1004.py
index 4feb7aa4bdd5058a609a176830029b0d63dbe63b..f2934a1c7bb8057df82124d3a07b0d9855ab8e8b 100644
--- a/test/extrude/1004/1004.py
+++ b/test/extrude/1004/1004.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(474,369,369))
-r=w0.sketch().arc((316,1000),(40,711),(382,500)).arc((698,790),(316,1000)).assemble().finalize().extrude(146).union(w0.workplane(offset=303).moveTo(415,1).box(908,947,500)).translate((1,1,105))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(749,499,499))
+r=w0.sketch().segment((1,350),(146,110)).segment((665,420)).segment((514,663)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((151,186),(221,141)).segment((490,540)).arc((997,663),(475,610)).segment((444,629)).close().assemble().finalize().extrude(529))
\ No newline at end of file
diff --git a/test/extrude/1004/1004.stl b/test/extrude/1004/1004.stl
index 75a590c14e66a13f97acf8e7f3a4bf75adc0fab6..1ca25cf04222939ec6013329474b5220612b3357 100644
Binary files a/test/extrude/1004/1004.stl and b/test/extrude/1004/1004.stl differ
diff --git a/test/extrude/1005/1005.py b/test/extrude/1005/1005.py
index ad99ab4348682d010392bf2551ce1c054dc946b9..38234d857368c741b89181d38f8bbe765a4f117e 100644
--- a/test/extrude/1005/1005.py
+++ b/test/extrude/1005/1005.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(182,389,389))
-w1=cq.Workplane('YZ',origin=(208,389,389))
-r=w0.sketch().arc((363,389),(389,363),(414,389)).segment((406,380)).segment((389,397)).segment((406,406)).segment((414,397)).arc((397,414),(371,414)).arc((371,397),(363,389)).assemble().finalize().extrude(165).union(w1.sketch().segment((302,1),(475,1)).segment((475,294)).arc((518,389),(475,483)).segment((475,776)).segment((302,776)).segment((302,483)).arc((259,389),(302,294)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(846,501,500))
+w1=cq.Workplane('XY',origin=(499,501,76))
+r=w0.workplane(offset=155).moveTo(574,231).cylinder(1000,731).union(w0.workplane(offset=367).moveTo(578,231).box(1000,770,765)).union(w1.sketch().segment((591,115),(615,115)).segment((615,815)).arc((601,810),(591,804)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/1005/1005.stl b/test/extrude/1005/1005.stl
index 59a9cc449616d95c587945df0ebbc589e7de6c62..18faaa6a100dc6767bb5fed45a86d18bd593042e 100644
Binary files a/test/extrude/1005/1005.stl and b/test/extrude/1005/1005.stl differ
diff --git a/test/extrude/1006/1006.py b/test/extrude/1006/1006.py
index 88a453c09c8e46d2d79421aad0cd8a00d5ba34bc..81d9defb223d62453c8222bd1da40123485ca92a 100644
--- a/test/extrude/1006/1006.py
+++ b/test/extrude/1006/1006.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(569,728,569))
-w1=cq.Workplane('XY',origin=(569,569,455))
-r=w0.sketch().segment((455,466),(466,455)).arc((705,421),(739,183)).segment((921,1)).arc((864,410),(455,466)).assemble().finalize().extrude(69).union(w1.workplane(offset=427).moveTo(1000,904).box(841,580,852))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(596,501,501))
+w1=cq.Workplane('ZX',origin=(501,642,501))
+r=w0.sketch().push([(46,701)]).circle(546).reset().face(w0.sketch().segment((530,297),(685,255)).segment((695,297)).arc((765,380),(741,490)).segment((750,521)).segment((595,556)).segment((586,521)).arc((516,441),(540,330)).close().assemble()).finalize().extrude(235).union(w1.sketch().push([(485,536)]).circle(631).push([(574,539)]).rect(541,516,mode='s').finalize().extrude(861))
\ No newline at end of file
diff --git a/test/extrude/1006/1006.stl b/test/extrude/1006/1006.stl
index 7070e2cef3e1d93ce66e48e509e62adf694eeba4..5d318b465f7d9035c00350fd3cba145dbc0ba795 100644
Binary files a/test/extrude/1006/1006.stl and b/test/extrude/1006/1006.stl differ
diff --git a/test/extrude/1007/1007.py b/test/extrude/1007/1007.py
index 81771707b6c797da8db828c981ec27ddb591f559..b7dd978a7cf96671e32c4ee782b84f3fea18239f 100644
--- a/test/extrude/1007/1007.py
+++ b/test/extrude/1007/1007.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(485,640,485))
-r=w0.sketch().segment((73,372),(382,372)).segment((382,176)).segment((1000,176)).segment((1000,722)).segment((258,722)).arc((1,732),(73,485)).close().assemble().push([(629,475)]).circle(681,mode='s').finalize().extrude(166)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,829,501))
+r=w0.workplane(offset=171).box(601,1000,1000)
\ No newline at end of file
diff --git a/test/extrude/1007/1007.stl b/test/extrude/1007/1007.stl
index bd552f506c0868b5cd007d83fdae53f0e01d8538..fde8d5298d20448717886b7e1d9b624de462d196 100644
Binary files a/test/extrude/1007/1007.stl and b/test/extrude/1007/1007.stl differ
diff --git a/test/extrude/1008/1008.py b/test/extrude/1008/1008.py
index 28ae676bd0bdbc2dcbe6c8854cf94352892d0dc9..e072dd1c6ead1a4b9d65e4aa75b55b9a5d320489 100644
--- a/test/extrude/1008/1008.py
+++ b/test/extrude/1008/1008.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(491,491,412))
-r=w0.sketch().segment((216,1),(344,1)).segment((344,30)).arc((510,246),(344,471)).segment((344,500)).segment((216,500)).segment((216,471)).arc((50,246),(216,30)).close().assemble().reset().face(w0.sketch().segment((216,148),(216,354)).arc((158,246),(216,148)).assemble(),mode='s').reset().face(w0.sketch().arc((344,148),(403,246),(344,354)).close().assemble(),mode='s').finalize().extrude(148).union(w0.sketch().arc((510,843),(882,589),(559,902)).segment((559,980)).segment((510,980)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(575,500,499))
+w1=cq.Workplane('XY',origin=(500,500,646))
+r=w0.sketch().segment((479,216),(481,334)).arc((454,24),(714,195)).segment((716,191)).segment((706,194)).segment((709,206)).segment((715,200)).arc((656,309),(535,349)).segment((535,216)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((451,576),(486,559),(516,531)).segment((515,999)).segment((450,999)).close().assemble().finalize().extrude(421)).union(w1.workplane(offset=597).moveTo(740,486).cylinder(694,699))
\ No newline at end of file
diff --git a/test/extrude/1008/1008.stl b/test/extrude/1008/1008.stl
index b970e68733e759b1abe638df50e28b1cad24f92a..a00dcf5b0d3b6774926afbaa18eb3da85c31fab9 100644
Binary files a/test/extrude/1008/1008.stl and b/test/extrude/1008/1008.stl differ
diff --git a/test/extrude/1009/1009.py b/test/extrude/1009/1009.py
index e481983752755d685d50f7438a18c874b397d493..1cff7e47c1290219c03f6d47d64ec866550c9dfa 100644
--- a/test/extrude/1009/1009.py
+++ b/test/extrude/1009/1009.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(290,290,182))
-r=w0.workplane(offset=43).moveTo(182,157).box(699,507,783).union(w0.sketch().push([(194,1)]).circle(422).circle(314,mode='s').push([(362,470)]).circle(531).finalize().extrude(1000)).translate((1,133,168))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(172,288,287))
+r=w0.workplane(offset=316).moveTo(532,536).box(365,359,342).union(w0.workplane(offset=406).moveTo(203,199).cylinder(524,485))
\ No newline at end of file
diff --git a/test/extrude/1009/1009.stl b/test/extrude/1009/1009.stl
index 76e23f0ad73ee0b7c28a743105f8a09514e0d4a4..9914a8943c10043838a842ca53f6b8716b5d7df2 100644
Binary files a/test/extrude/1009/1009.stl and b/test/extrude/1009/1009.stl differ
diff --git a/test/extrude/101/101.py b/test/extrude/101/101.py
index 164d2cfa7d7c1b989ec587dd92eef46a67be7e1b..a080b601db39968a3ecc46c1154ef6551ac0d016 100644
--- a/test/extrude/101/101.py
+++ b/test/extrude/101/101.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(86,388,388))
-r=w0.sketch().arc((388,327),(488,227),(498,357)).arc((267,869),(388,327)).assemble().finalize().extrude(910).union(w0.sketch().push([(618,1)]).rect(508,618).reset().face(w0.sketch().segment((618,96),(629,76)).segment((649,76)).segment((618,106)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,636,500))
+r=w0.sketch().segment((490,371),(645,372)).segment((645,451)).arc((771,605),(674,781)).segment((675,735)).segment((644,735)).segment((645,741)).segment((635,740)).segment((636,791)).segment((650,791)).arc((440,700),(490,475)).close().assemble().finalize().extrude(230).union(w0.sketch().push([(376,208)]).rect(891,915).push([(809,989)]).circle(511).finalize().extrude(426))
\ No newline at end of file
diff --git a/test/extrude/101/101.stl b/test/extrude/101/101.stl
index fc6389a4e4714898889724a45ffdb1d039c8450d..87da787931d23340766b6d8f56c9700f35b87ef5 100644
Binary files a/test/extrude/101/101.stl and b/test/extrude/101/101.stl differ
diff --git a/test/extrude/1010/1010.py b/test/extrude/1010/1010.py
index 2ede2e8e86f6c4cd91360e14125b70cec31c6be0..3db156009641a88a19979c073e9d3faeec546412 100644
--- a/test/extrude/1010/1010.py
+++ b/test/extrude/1010/1010.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,341,500))
-r=w0.sketch().segment((261,610),(301,391)).segment((411,411)).segment((411,1)).segment((790,1)).segment((790,590)).segment((481,590)).segment((481,630)).arc((331,1000),(261,610)).assemble().finalize().extrude(790).union(w0.sketch().arc((391,630),(790,391),(520,770)).segment((520,630)).close().assemble().finalize().extrude(830))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,285,500))
+r=w0.sketch().segment((1,576),(20,564)).segment((46,636)).segment((41,635)).segment((40,666)).segment((35,670)).close().assemble().finalize().extrude(441).union(w0.workplane(offset=746).moveTo(914,345).box(669,530,990))
\ No newline at end of file
diff --git a/test/extrude/1010/1010.stl b/test/extrude/1010/1010.stl
index d5c166859121d19d0ff77c5367c330f75a445b60..bb9d4411b0b830d4e32a8ffaed495d5146886681 100644
Binary files a/test/extrude/1010/1010.stl and b/test/extrude/1010/1010.stl differ
diff --git a/test/extrude/1011/1011.py b/test/extrude/1011/1011.py
index 1fcac08d2ba4bd4fcb33ec8d2b718c5590241a74..730249b81558de3f37a060e296506eaa9e22845c 100644
--- a/test/extrude/1011/1011.py
+++ b/test/extrude/1011/1011.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(540,500,500))
-r=w0.sketch().segment((1,590),(181,590)).segment((181,680)).segment((51,680)).segment((1,680)).close().assemble().reset().face(w0.sketch().segment((660,281),(920,281)).segment((920,331)).arc((1000,510),(920,670)).segment((920,720)).segment((660,720)).segment((660,670)).arc((580,510),(660,331)).close().assemble()).finalize().extrude(411)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(570,501,501))
+w1=cq.Workplane('XY',origin=(501,500,287))
+r=w0.workplane(offset=514).moveTo(316,530).cylinder(525,814).union(w1.sketch().push([(455,951)]).circle(551).circle(526,mode='s').finalize().extrude(371))
\ No newline at end of file
diff --git a/test/extrude/1011/1011.stl b/test/extrude/1011/1011.stl
index 2958ec331bfb5688d7eeaa8b92bf2bae6a35798a..9579f46f935cfc3e4303b8e8f7cd662ba1b14897 100644
Binary files a/test/extrude/1011/1011.stl and b/test/extrude/1011/1011.stl differ
diff --git a/test/extrude/1012/1012.py b/test/extrude/1012/1012.py
index 5b4f6cc6fe55d3743ae9a385cb518d0ac2385375..8df71f79cf978598451325165988eea745d04db9 100644
--- a/test/extrude/1012/1012.py
+++ b/test/extrude/1012/1012.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(443,169,443))
-r=w0.workplane(offset=576).moveTo(629,726).cylinder(708,602).union(w0.sketch().arc((195,381),(293,1),(434,363)).arc((319,425),(195,381)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,546))
+w1=cq.Workplane('XY',origin=(500,501,10))
+r=w0.sketch().arc((955,37),(999,181),(955,330)).close().assemble().finalize().extrude(946).union(w1.sketch().segment((2,830),(85,830)).segment((86,850)).segment((101,850)).segment((102,831)).segment((292,829)).segment((291,965)).segment((1,966)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/1012/1012.stl b/test/extrude/1012/1012.stl
index 61a6cc90f328d249fd281baef1afab7f3303e574..fb51236a254b76fed827199a39c2a4b4732e628a 100644
Binary files a/test/extrude/1012/1012.stl and b/test/extrude/1012/1012.stl differ
diff --git a/test/extrude/1013/1013.py b/test/extrude/1013/1013.py
index 4470a71bd20eed8a00717514d2fa0843ef5970dc..0a6854a0bac4083d87142085b884349cd20f7252 100644
--- a/test/extrude/1013/1013.py
+++ b/test/extrude/1013/1013.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(550,550,820))
-r=w0.sketch().push([(244,802)]).circle(694).reset().face(w0.sketch().segment((442,424),(766,154)).segment((1000,442)).segment((685,694)).arc((649,757),(595,802)).segment((595,874)).segment((514,874)).segment((514,802)).arc((415,667),(514,541)).segment((514,514)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,1000))
+r=w0.sketch().segment((170,46),(875,45)).segment((875,385)).arc((895,501),(874,615)).segment((875,955)).segment((171,955)).segment((170,615)).arc((155,501),(171,385)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((411,776),(176,281),(705,420)).arc((749,755),(412,775)).assemble().finalize().extrude(246))
\ No newline at end of file
diff --git a/test/extrude/1013/1013.stl b/test/extrude/1013/1013.stl
index abc4b132bbc0524a273a5d9244dd1f5a87904104..57da4d64593a6d99b910b72de8789781dc6cb812 100644
Binary files a/test/extrude/1013/1013.stl and b/test/extrude/1013/1013.stl differ
diff --git a/test/extrude/1014/1014.py b/test/extrude/1014/1014.py
index 604f412a3ccd2d225c2d0e47d222a50e680f4330..e78eceee18bf996c24a03eda5814b2d5d52ae185 100644
--- a/test/extrude/1014/1014.py
+++ b/test/extrude/1014/1014.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(377,584,377))
-w1=cq.Workplane('YZ',origin=(600,377,377))
-r=w0.sketch().arc((137,257),(744,289),(345,760)).arc((1,608),(137,257)).assemble().reset().face(w0.sketch().segment((441,297),(608,297)).segment((608,552)).segment((520,552)).arc((512,417),(441,297)).assemble(),mode='s').finalize().extrude(49).union(w1.workplane(offset=65).moveTo(265,536).cylinder(1000,473))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(220,503,502))
+r=w0.sketch().segment((582,13),(582,165)).segment((703,165)).segment((702,44)).arc((347,975),(613,14)).close().assemble().push([(437,717)]).circle(698,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/1014/1014.stl b/test/extrude/1014/1014.stl
index a205d11e6f75c8ec438eb162fd32bf5d4fac82d6..60020c8dc59a28dd1265a69db656cb9da4416be1 100644
Binary files a/test/extrude/1014/1014.stl and b/test/extrude/1014/1014.stl differ
diff --git a/test/extrude/1015/1015.py b/test/extrude/1015/1015.py
index 1860570fa2d9f94c910aab5522b3946c92ae7e95..c47906db06526c6483dda17e698de915e31b610b 100644
--- a/test/extrude/1015/1015.py
+++ b/test/extrude/1015/1015.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(451,500,500))
-r=w0.sketch().segment((211,1),(660,1)).segment((660,351)).segment((790,351)).segment((790,850)).segment((660,850)).segment((660,1000)).segment((211,1000)).close().assemble().finalize().extrude(610)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,441))
+w1=cq.Workplane('ZX',origin=(500,421,500))
+r=w0.workplane(offset=445).moveTo(856,750).cylinder(610,645).union(w0.workplane(offset=507).moveTo(189,680).box(875,729,515)).union(w1.workplane(offset=342).moveTo(500,620).cylinder(816,711))
\ No newline at end of file
diff --git a/test/extrude/1015/1015.stl b/test/extrude/1015/1015.stl
index f7836c447044bd31faeb6f8bbc9dc528806df39f..331066b4b2658c1d0ff90f210dc0f4191e3f148d 100644
Binary files a/test/extrude/1015/1015.stl and b/test/extrude/1015/1015.stl differ
diff --git a/test/extrude/1016/1016.py b/test/extrude/1016/1016.py
index 8990b6efddb50fb26707e913ac0fc5e2d70393b6..229b717f72cd8897427801c525ec8324ebedcb10 100644
--- a/test/extrude/1016/1016.py
+++ b/test/extrude/1016/1016.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).cylinder(1000,434).translate((101,101,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,427))
+r=w0.sketch().arc((515,775),(434,416),(799,471)).arc((836,482),(871,495)).segment((996,496)).segment((996,655)).arc((1000,709),(995,770)).segment((994,925)).segment((870,925)).arc((756,955),(639,924)).segment((516,924)).close().assemble().push([(756,711)]).rect(700,809,mode='s').finalize().extrude(431).union(w0.workplane(offset=578).moveTo(195,444).cylinder(655,695)).union(w0.sketch().segment((201,262),(246,260)).arc((495,45),(750,261)).segment((796,262)).segment((795,336)).segment((749,337)).arc((495,550),(245,335)).segment((200,336)).close().assemble().finalize().extrude(721))
\ No newline at end of file
diff --git a/test/extrude/1016/1016.stl b/test/extrude/1016/1016.stl
index c4a9782d5d7a350663edf172751860b5b10eb850..fc5b6c8d308ddea3af8780e4b51b05ff6f58ad71 100644
Binary files a/test/extrude/1016/1016.stl and b/test/extrude/1016/1016.stl differ
diff --git a/test/extrude/1017/1017.py b/test/extrude/1017/1017.py
index 776c91c0440433c6b6ed1a4f91d8b8429f12493e..44b0787b7b128d5169c27c3c8838aa4c7a15aa22 100644
--- a/test/extrude/1017/1017.py
+++ b/test/extrude/1017/1017.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,526))
-r=w0.sketch().segment((320,1),(650,1)).segment((650,258)).arc((938,372),(794,650)).arc((660,753),(485,722)).arc((11,856),(392,547)).arc((392,506),(403,475)).segment((320,475)).close().assemble().push([(609,547)]).circle(557,mode='s').push([(1000,238)]).circle(506).finalize().extrude(320).union(w0.sketch().segment((670,547),(804,547)).arc((743,567),(670,547)).assemble().finalize().extrude(609))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(651,499,500))
+r=w0.sketch().segment((147,685),(231,1)).segment((581,41)).segment((536,426)).segment((856,425)).segment((856,999)).segment((410,999)).segment((412,715)).close().assemble().finalize().extrude(195)
\ No newline at end of file
diff --git a/test/extrude/1017/1017.stl b/test/extrude/1017/1017.stl
index 2e6ddc0aff686a04424e1b67c70ec0a8eff49844..cc3d5cc249a74eedf14542efd273f1a70e7d7392 100644
Binary files a/test/extrude/1017/1017.stl and b/test/extrude/1017/1017.stl differ
diff --git a/test/extrude/1018/1018.py b/test/extrude/1018/1018.py
index 27f53bc9daf4547da6f2e1cfc12c5c697988dba8..eb6fa04b4109b7816d7e23ef7c7a5218bc7c37bd 100644
--- a/test/extrude/1018/1018.py
+++ b/test/extrude/1018/1018.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(154,495,495))
-w1=cq.Workplane('XY',origin=(495,495,342))
-r=w0.sketch().push([(271,859)]).circle(718).push([(166,847)]).circle(530,mode='s').reset().face(w0.sketch().arc((577,424),(318,1),(777,177)).arc((1000,565),(577,424)).assemble()).finalize().extrude(1000).union(w1.sketch().push([(636,130)]).circle(694).push([(642,130)]).rect(694,518,mode='s').finalize().extrude(859)).translate((1,71,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,301))
+w1=cq.Workplane('XY',origin=(499,501,237))
+r=w0.sketch().segment((315,471),(520,470)).segment((521,546)).arc((631,735),(520,919)).segment((522,1000)).segment((317,1000)).segment((315,921)).arc((205,736),(315,544)).close().assemble().finalize().extrude(966).union(w1.sketch().arc((205,396),(241,216),(416,160)).segment((415,2)).segment((596,1)).segment((595,261)).segment((546,262)).arc((560,331),(550,400)).segment((550,491)).arc((701,510),(774,641)).segment((805,639)).segment((806,671)).segment((776,671)).arc((686,804),(519,810)).segment((205,811)).close().assemble().finalize().extrude(810))
\ No newline at end of file
diff --git a/test/extrude/1018/1018.stl b/test/extrude/1018/1018.stl
index 523f502e5d98b2aac3615866a69c4a7b81077b18..cb2363a0392fa86641ae63dd4eda2d1e4c20af07 100644
--- a/test/extrude/1018/1018.stl
+++ b/test/extrude/1018/1018.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1e8632b5446461121978345702f299732cca6ddea168a1ebad163bde4fa70b77
-size 113784
+oid sha256:6a7481df444190dc431783e4053a1b5a85d3571ef552ae12bcdfe2874c7c8a6c
+size 47184
diff --git a/test/extrude/1019/1019.py b/test/extrude/1019/1019.py
index b1359c9c63906fb71e0af56d0e6b1ae66beec0d3..a30eec8388b12417277ba3c7ef220c238d15de76 100644
--- a/test/extrude/1019/1019.py
+++ b/test/extrude/1019/1019.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(582,582,245))
-w1=cq.Workplane('XY',origin=(582,582,500))
-r=w0.workplane(offset=698).moveTo(954,582).cylinder(814,791).union(w1.sketch().segment((1,547),(24,547)).segment((24,524)).segment((570,524)).segment((570,547)).segment((593,547)).segment((593,686)).segment((570,686)).segment((570,698)).segment((24,698)).segment((24,686)).segment((1,686)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,625))
+r=w0.sketch().segment((120,485),(370,486)).arc((335,676),(502,760)).segment((502,850)).segment((121,849)).close().assemble().push([(179,720)]).rect(586,512,mode='s').push([(193,806)]).rect(565,549,mode='s').reset().face(w0.sketch().segment((261,809),(266,756)).segment((336,771)).segment((330,819)).close().assemble(),mode='s').finalize().extrude(107).union(w0.sketch().segment((2,469),(410,469)).arc((422,375),(446,286)).segment((447,141)).segment((665,141)).arc((705,131),(740,140)).segment((959,140)).segment((961,286)).arc((1000,431),(959,576)).segment((959,721)).segment((740,720)).arc((705,724),(665,722)).segment((619,719)).segment((620,871)).segment((1,869)).close().assemble().finalize().extrude(641))
\ No newline at end of file
diff --git a/test/extrude/1019/1019.stl b/test/extrude/1019/1019.stl
index 91f7d33c198f150de8003acb58b2c257b818dcdd..a239d7995139f9398a36e9b0d8eaf37e46a9c337 100644
Binary files a/test/extrude/1019/1019.stl and b/test/extrude/1019/1019.stl differ
diff --git a/test/extrude/102/102.py b/test/extrude/102/102.py
index d17336dc335105f0e56f8826726a30f4865afa32..37357b396168029a308c6a94392e6a3b69be800d 100644
--- a/test/extrude/102/102.py
+++ b/test/extrude/102/102.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(481,481,720))
-r=w0.sketch().push([(247,907)]).rect(1000,667).reset().face(w0.sketch().segment((108,907),(374,840)).segment((387,907)).segment((121,973)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().push([(294,880)]).circle(747).reset().face(w0.sketch().arc((867,441),(294,14),(960,281)).arc((814,307),(867,441)).assemble()).finalize().extrude(121))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,1,500))
+r=w0.sketch().segment((91,422),(107,422)).arc((526,456),(445,40)).segment((765,41)).segment((765,421)).segment((911,421)).segment((909,581)).segment((766,579)).segment((766,959)).segment((236,961)).segment((236,581)).segment((90,580)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/102/102.stl b/test/extrude/102/102.stl
index 7f8911ac1c21d4fb9c7b9fbd4a910ee6763a6586..8a392ae651b9ec1d2d30a6e01d7db8e9a4d5d251 100644
Binary files a/test/extrude/102/102.stl and b/test/extrude/102/102.stl differ
diff --git a/test/extrude/1020/1020.py b/test/extrude/1020/1020.py
index 9b3c8d9cc11f626288ded3fe09914e5628adc35e..ce4947ac07275cfcf7fab5008a9992f34be9f29a 100644
--- a/test/extrude/1020/1020.py
+++ b/test/extrude/1020/1020.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(309,532,532))
-r=w0.sketch().segment((1,724),(150,437)).segment((352,543)).arc((415,554),(458,586)).arc((724,596),(639,841)).segment((554,1000)).segment((341,894)).arc((267,872),(214,830)).close().assemble().push([(426,214)]).circle(681).finalize().extrude(798).union(w0.workplane(offset=761).moveTo(926,315).box(809,862,989))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,656,501))
+r=w0.sketch().segment((1,855),(6,345)).segment((255,350)).segment((256,335)).segment((290,337)).segment((291,350)).segment((376,351)).segment((375,281)).segment((999,281)).segment((1000,465)).segment((560,466)).segment((556,860)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((86,560),(421,252),(344,699)).arc((186,695),(87,559)).assemble().finalize().extrude(350)).union(w0.workplane(offset=601).moveTo(177,291).cylinder(700,651))
\ No newline at end of file
diff --git a/test/extrude/1020/1020.stl b/test/extrude/1020/1020.stl
index 57f1f5a884c78f6529df15d24bf5cccb29aada92..e2f4186a3581a722bdab4dd26ad8c8b898b5a884 100644
Binary files a/test/extrude/1020/1020.stl and b/test/extrude/1020/1020.stl differ
diff --git a/test/extrude/1021/1021.py b/test/extrude/1021/1021.py
index b0e3ecdc6099b1acecbbca23345120a3465e7b29..12416e228784772de4067632b10e7eb395120a08 100644
--- a/test/extrude/1021/1021.py
+++ b/test/extrude/1021/1021.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(556,767,556))
-r=w0.sketch().push([(234,989)]).circle(678).push([(445,811)]).circle(656).circle(589,mode='s').reset().face(w0.sketch().segment((689,534),(745,1)).segment((1000,23)).segment((944,567)).close().assemble()).finalize().extrude(134)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,581))
+w1=cq.Workplane('XY',origin=(500,500,576))
+r=w0.sketch().arc((521,900),(276,481),(642,803)).arc((687,977),(520,902)).assemble().push([(641,196)]).circle(697).push([(730,236)]).circle(572,mode='s').finalize().extrude(1).union(w0.workplane(offset=676).moveTo(329,411).box(826,531,851)).union(w1.workplane(offset=639).moveTo(442,756).cylinder(776,512))
\ No newline at end of file
diff --git a/test/extrude/1021/1021.stl b/test/extrude/1021/1021.stl
index cf3cf0367686c3304ab8b7118701ad4ede6fa2a5..83f0d1bc118b27dfb1d39cca4666c6d2f0a2457e 100644
Binary files a/test/extrude/1021/1021.stl and b/test/extrude/1021/1021.stl differ
diff --git a/test/extrude/1022/1022.py b/test/extrude/1022/1022.py
index 9e6135faa1f307428fdedb9ef64c55a6d14e89e7..1ab4e18cbd8aa8e8d1af428999a18e8eb2ccda8f 100644
--- a/test/extrude/1022/1022.py
+++ b/test/extrude/1022/1022.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,332,332))
-r=w0.workplane(offset=460).cylinder(588,541).union(w0.sketch().circle(669).rect(939,359,mode='s').finalize().extrude(1000)).translate((1,338,338))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,648,498))
+r=w0.sketch().arc((719,86),(965,76),(805,262)).segment((804,328)).segment((869,329)).arc((487,397),(720,87)).assemble().finalize().extrude(196).union(w0.sketch().segment((317,317),(578,318)).segment((579,514)).segment((640,504)).segment((659,620)).segment((323,678)).arc((17,528),(319,362)).close().assemble().reset().face(w0.sketch().segment((497,995),(500,1000)).arc((468,740),(510,1000)).segment((503,995)).close().assemble()).finalize().extrude(294))
\ No newline at end of file
diff --git a/test/extrude/1022/1022.stl b/test/extrude/1022/1022.stl
index b665d979fa0b87052e6eeaf1e05e4bf32acf98af..04645d592307a4bb3d4948c5f904201cbcd61447 100644
Binary files a/test/extrude/1022/1022.stl and b/test/extrude/1022/1022.stl differ
diff --git a/test/extrude/1023/1023.py b/test/extrude/1023/1023.py
index 3ac29c103aa4a09b11287afe9bfbabe8f3658a4f..818635f4a6bf08799dbbb5208d5f5b7ec9a40c12 100644
--- a/test/extrude/1023/1023.py
+++ b/test/extrude/1023/1023.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(347,347,174))
-r=w0.sketch().segment((395,424),(491,750)).arc((87,1),(693,597)).segment((606,328)).segment((433,385)).arc((280,289),(395,424)).assemble().finalize().extrude(39).union(w0.workplane(offset=673).box(558,808,1000)).translate((1,58,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,499,500))
+r=w0.sketch().push([(271,506)]).circle(695).reset().face(w0.sketch().arc((460,400),(450,156),(691,131)).arc((866,520),(461,401)).assemble()).reset().face(w0.sketch().arc((685,415),(719,380),(746,341)).segment((811,371)).segment((765,455)).close().assemble(),mode='s').push([(605,705)]).circle(571).finalize().extrude(1).union(w0.workplane(offset=751).moveTo(301,687).box(581,935,999))
\ No newline at end of file
diff --git a/test/extrude/1023/1023.stl b/test/extrude/1023/1023.stl
index 2d7e875f349aa787953112e3247a9acb5eea96e8..92af0b8493c4fe4f0660adacca0f1f551056c79b 100644
Binary files a/test/extrude/1023/1023.stl and b/test/extrude/1023/1023.stl differ
diff --git a/test/extrude/1024/1024.py b/test/extrude/1024/1024.py
index da1d412fdb6e38b9825ab4626c850ad4d9d954e6..ea8a3f1054282e44b668b98eb0c04c880a79ff52 100644
--- a/test/extrude/1024/1024.py
+++ b/test/extrude/1024/1024.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).moveTo(646,147).cylinder(1000,386).union(w0.workplane(offset=6).moveTo(646,147).cylinder(990,542)).union(w0.sketch().push([(69,573)]).rect(844,646).push([(63,573)]).circle(396,mode='s').finalize().extrude(313)).translate((62,1,20))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,509,501))
+w1=cq.Workplane('XY',origin=(501,500,515))
+r=w0.workplane(offset=246).moveTo(556,540).cylinder(1000,694).union(w0.workplane(offset=315).moveTo(245,320).cylinder(870,556)).union(w0.sketch().segment((300,285),(502,287)).arc((370,360),(300,490)).close().assemble().reset().face(w0.sketch().segment((614,286),(815,286)).segment((816,489)).arc((804,450),(790,415)).arc((779,361),(725,341)).arc((676,305),(616,287)).assemble()).finalize().extrude(990)).union(w1.workplane(offset=336).moveTo(434,403).box(679,585,830))
\ No newline at end of file
diff --git a/test/extrude/1024/1024.stl b/test/extrude/1024/1024.stl
index 31bf6b865e433ce8e87c281fc986aee7ef1cd062..c5c944c1549d2c6ce3171172e348257149b221bf 100644
Binary files a/test/extrude/1024/1024.stl and b/test/extrude/1024/1024.stl differ
diff --git a/test/extrude/1025/1025.py b/test/extrude/1025/1025.py
index eb76c7ca15e87a745e476d1f5cab024f30cc6543..e1155e1326cb07912bbd37e85a0ecae9f1f0e3f5 100644
--- a/test/extrude/1025/1025.py
+++ b/test/extrude/1025/1025.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(260,506,506))
-r=w0.workplane(offset=665).moveTo(483,794).box(812,683,824).union(w0.sketch().segment((612,565),(612,589)).segment((636,589)).segment((636,553)).arc((765,753),(612,565)).assemble().finalize().extrude(953)).union(w0.sketch().push([(1,835)]).circle(589).push([(859,330)]).circle(741).circle(518,mode='s').finalize().extrude(1000)).translate((1,83,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(340,501,501))
+w1=cq.Workplane('YZ',origin=(372,502,502))
+r=w0.sketch().segment((316,445),(451,446)).arc((807,40),(835,575)).segment((835,975)).segment((316,976)).close().assemble().finalize().extrude(856).union(w1.workplane(offset=468).moveTo(225,409).box(951,727,567))
\ No newline at end of file
diff --git a/test/extrude/1025/1025.stl b/test/extrude/1025/1025.stl
index c48a46388468e7f5c3f6dcd1d3906a7d6c76a17d..ed0db73defb07646c5045c24fec491b04d1944d8 100644
Binary files a/test/extrude/1025/1025.stl and b/test/extrude/1025/1025.stl differ
diff --git a/test/extrude/1026/1026.py b/test/extrude/1026/1026.py
index 3ba446b0fe48f7a60b5c73bd80c01805dd4dd0de..4d0c76b69332fa7f1452a19c1ad8c7ffb2f1089d 100644
--- a/test/extrude/1026/1026.py
+++ b/test/extrude/1026/1026.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(468,468,206))
-r=w0.sketch().push([(323,631)]).rect(981,1000).push([(253,580)]).rect(785,823,mode='s').push([(248,580)]).rect(627,729).push([(253,580)]).circle(496,mode='s').finalize().extrude(767).union(w0.sketch().segment((384,505),(421,505)).segment((421,935)).segment((384,935)).segment((384,701)).arc((234,627),(384,561)).close().assemble().reset().face(w0.sketch().segment((440,48),(505,1)).segment((515,10)).segment((804,10)).segment((804,374)).segment((869,449)).segment((804,505)).segment((795,496)).segment((505,496)).segment((505,132)).close().assemble()).reset().face(w0.sketch().segment((561,206),(683,356)).arc((571,318),(561,206)).assemble(),mode='s').reset().face(w0.sketch().arc((627,150),(739,188),(748,300)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,404))
+w1=cq.Workplane('XY',origin=(500,499,545))
+r=w0.sketch().segment((300,100),(490,101)).segment((490,407)).segment((316,406)).segment((315,525)).segment((301,526)).close().assemble().finalize().extrude(96).union(w0.sketch().segment((290,816),(440,586)).segment((570,670)).segment((420,899)).close().assemble().finalize().extrude(430)).union(w1.sketch().segment((495,681),(711,681)).segment((711,725)).arc((600,760),(546,860)).segment((496,861)).close().assemble().finalize().extrude(956))
\ No newline at end of file
diff --git a/test/extrude/1026/1026.stl b/test/extrude/1026/1026.stl
index 975c8d1c7de614869be3481ae1de811618d0273c..31d2855c5246d755676bd68af87ceb7eb8f2bbc2 100644
Binary files a/test/extrude/1026/1026.stl and b/test/extrude/1026/1026.stl differ
diff --git a/test/extrude/1027/1027.py b/test/extrude/1027/1027.py
index 0bb4c1c413d24bde833f55c198493b9bddc1e992..62b7cb6a3452664fc62c72d863a540cc55dcf7ed 100644
--- a/test/extrude/1027/1027.py
+++ b/test/extrude/1027/1027.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().arc((281,474),(327,341),(294,194)).segment((387,194)).segment((387,474)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,999))
+r=w0.sketch().segment((495,496),(506,495)).segment((500,505)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/1027/1027.stl b/test/extrude/1027/1027.stl
index 441e747b3d0168c40940e8c5fa9944b039521261..465ac196965b71c539f479a9cc7947b1da545b69 100644
Binary files a/test/extrude/1027/1027.stl and b/test/extrude/1027/1027.stl differ
diff --git a/test/extrude/1028/1028.py b/test/extrude/1028/1028.py
index 7a6012e67e2f29bc39d5756339ddaf6a76467025..09ade17bc51367382783ae7ce215331250c7af40 100644
--- a/test/extrude/1028/1028.py
+++ b/test/extrude/1028/1028.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(429,429,229))
-r=w0.sketch().push([(1,443)]).rect(1000,686).reset().face(w0.sketch().segment((187,643),(700,629)).segment((715,900)).segment((187,914)).close().assemble()).finalize().extrude(386).union(w0.sketch().push([(857,229)]).circle(715).push([(872,301)]).circle(615,mode='s').finalize().extrude(872)).translate((71,58,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(90,501,501))
+w1=cq.Workplane('YZ',origin=(160,500,500))
+r=w0.sketch().segment((47,285),(431,287)).arc((475,231),(520,285)).segment((954,286)).segment((954,999)).segment((45,1000)).close().assemble().finalize().extrude(1000).union(w1.sketch().segment((82,116),(250,116)).arc((475,1),(700,115)).segment((871,117)).segment((871,436)).segment((701,436)).arc((474,551),(251,435)).segment((82,436)).close().assemble().finalize().extrude(701))
\ No newline at end of file
diff --git a/test/extrude/1028/1028.stl b/test/extrude/1028/1028.stl
index 7b5a9ee5f8365f56fc30caafd7d6f83473aeeae3..265049a8cb368ff3c834c1340100b0864d24e7e8 100644
Binary files a/test/extrude/1028/1028.stl and b/test/extrude/1028/1028.stl differ
diff --git a/test/extrude/1029/1029.py b/test/extrude/1029/1029.py
index 6934e6e22baeaf69b823839281a810b8bf045504..b96bfab1fb1f067043806588a5c6086c72998e51 100644
--- a/test/extrude/1029/1029.py
+++ b/test/extrude/1029/1029.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(319,561,319))
-w1=cq.Workplane('YZ',origin=(308,319,319))
-r=w0.workplane(offset=1).moveTo(111,319).box(1000,912,956).union(w1.sketch().arc((407,144),(704,495),(407,868)).close().assemble().finalize().extrude(297)).translate((1,1,71))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,145))
+r=w0.sketch().arc((455,395),(550,416),(575,324)).arc((834,918),(454,395)).assemble().finalize().extrude(705).union(w0.sketch().push([(405,441)]).circle(904).reset().face(w0.sketch().segment((42,339),(354,339)).segment((355,321)).segment((455,316)).segment((455,340)).segment((770,339)).segment((769,543)).segment((459,544)).segment((460,565)).segment((356,564)).segment((355,545)).segment((41,545)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/1029/1029.stl b/test/extrude/1029/1029.stl
index b8a981a6f8e7af7e5e5996c05e9bb827846754c0..74cbfb9517e28f1c58bb3dd256cdfdcc006ac030 100644
Binary files a/test/extrude/1029/1029.stl and b/test/extrude/1029/1029.stl differ
diff --git a/test/extrude/103/103.py b/test/extrude/103/103.py
index b09c40e400c0c252489f3ae3ed7d75109d660b4c..591b354a20db07e5f4e51885a70565c5ec126bd5 100644
--- a/test/extrude/103/103.py
+++ b/test/extrude/103/103.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(316,261,316))
-w1=cq.Workplane('ZX',origin=(316,1,316))
-r=w0.sketch().segment((767,152),(1000,152)).segment((1000,412)).arc((877,439),(767,535)).close().assemble().finalize().extrude(685).union(w1.workplane(offset=514).moveTo(28,316).cylinder(713,713)).translate((82,1,370))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,691))
+r=w0.workplane(offset=310).moveTo(725,705).box(670,1000,879).union(w0.sketch().segment((191,110),(280,112)).arc((446,1),(606,112)).segment((695,111)).segment((696,240)).segment((661,242)).arc((526,170),(546,321)).arc((395,345),(281,240)).segment((192,241)).close().assemble().finalize().extrude(380))
\ No newline at end of file
diff --git a/test/extrude/103/103.stl b/test/extrude/103/103.stl
index ed97e9dac5603293b9905d77b2bd3d79d44fc66d..279af670d5addb4c01e60de8b5850b1a86f1f2c5 100644
Binary files a/test/extrude/103/103.stl and b/test/extrude/103/103.stl differ
diff --git a/test/extrude/1030/1030.py b/test/extrude/1030/1030.py
index 40a815c90e251230c090cf4c0bc118cc149297a3..a11ddbcc7dfddd498b8f2fbd4da10ae630a8c94c 100644
--- a/test/extrude/1030/1030.py
+++ b/test/extrude/1030/1030.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(627,627,940))
-r=w0.sketch().segment((299,396),(478,254)).segment((955,858)).segment((776,1000)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,401))
+r=w0.workplane(offset=437).moveTo(650,140).cylinder(625,640).union(w0.sketch().segment((210,260),(456,260)).segment((456,375)).arc((556,650),(266,596)).segment((212,596)).close().assemble().push([(340,589)]).circle(535,mode='s').push([(418,932)]).rect(626,636).finalize().extrude(829))
\ No newline at end of file
diff --git a/test/extrude/1030/1030.stl b/test/extrude/1030/1030.stl
index 0f3ea93c43688bb96403d335ee2b8d00c5545e8d..01a0a64911e6278fa97f23f1064ef357cb6f3c59 100644
Binary files a/test/extrude/1030/1030.stl and b/test/extrude/1030/1030.stl differ
diff --git a/test/extrude/1031/1031.py b/test/extrude/1031/1031.py
index 909e161c473e1c3e3bfff3cafb25b14226db34bc..0dab7b8bb4884cdeb63b435cc949893f179e35fe 100644
--- a/test/extrude/1031/1031.py
+++ b/test/extrude/1031/1031.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,381))
-r=w0.sketch().segment((161,970),(181,870)).segment((321,910)).segment((301,1000)).close().assemble().finalize().extrude(590).union(w0.sketch().segment((451,1),(800,1)).segment((800,151)).arc((840,291),(800,431)).segment((800,580)).segment((451,580)).segment((451,431)).arc((401,291),(451,151)).close().assemble().finalize().extrude(740))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,371,499))
+r=w0.workplane(offset=624).moveTo(191,169).box(591,835,749).union(w0.sketch().push([(256,636)]).circle(624).push([(150,640)]).circle(517,mode='s').push([(730,773)]).rect(780,954).finalize().extrude(766))
\ No newline at end of file
diff --git a/test/extrude/1031/1031.stl b/test/extrude/1031/1031.stl
index c02cac0f0cd142ad27693cc258ab01a3ab2f99d2..e3dd932c5bde9c4b4155ad2aa8428026b0281b47 100644
Binary files a/test/extrude/1031/1031.stl and b/test/extrude/1031/1031.stl differ
diff --git a/test/extrude/1032/1032.py b/test/extrude/1032/1032.py
index 11df887b0231727c28edf2ae98ab44512fc0d066..b00a9cf064953c7344a7ade671c42e28d18f5fbc 100644
--- a/test/extrude/1032/1032.py
+++ b/test/extrude/1032/1032.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(480,553,480))
-r=w0.sketch().arc((157,844),(282,1),(896,584)).segment((1000,584)).segment((1000,990)).segment((157,990)).close().assemble().finalize().extrude(324)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,510,501))
+r=w0.sketch().push([(620,487)]).rect(871,834).push([(462,441)]).circle(515,mode='s').push([(618,485)]).rect(555,671,mode='s').finalize().extrude(100).union(w0.workplane(offset=461).moveTo(90,810).box(681,641,581)).union(w0.sketch().push([(705,351)]).circle(519).reset().face(w0.sketch().segment((761,150),(919,120)).segment((924,151)).segment((1000,150)).segment((999,297)).segment((939,296)).segment((794,326)).close().assemble()).finalize().extrude(876))
\ No newline at end of file
diff --git a/test/extrude/1032/1032.stl b/test/extrude/1032/1032.stl
index e3813968856176789e6f329976c8bed8ea1be7a0..9e50bf8722351f65f74231b6512cc6cd17ad4904 100644
Binary files a/test/extrude/1032/1032.stl and b/test/extrude/1032/1032.stl differ
diff --git a/test/extrude/1033/1033.py b/test/extrude/1033/1033.py
index 293993b350e8fa05307f891623334e06ac011038..bddd14ea81ce8768262be3518961285f276a7ec3 100644
--- a/test/extrude/1033/1033.py
+++ b/test/extrude/1033/1033.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(643,429,429))
-r=w0.sketch().arc((156,536),(263,560),(251,441)).arc((429,726),(156,536)).assemble().push([(744,269)]).rect(988,679).finalize().extrude(1).union(w0.workplane(offset=269).moveTo(120,340).box(1000,941,750))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(421,501,502))
+r=w0.sketch().segment((90,161),(136,161)).arc((500,1),(866,161)).segment((910,160)).segment((909,217)).arc((999,501),(911,786)).segment((911,841)).segment((864,841)).arc((500,1000),(137,839)).segment((91,839)).segment((91,786)).arc((1,500),(90,215)).close().assemble().finalize().extrude(666)
\ No newline at end of file
diff --git a/test/extrude/1033/1033.stl b/test/extrude/1033/1033.stl
index 0b4dff214c9d8d56b1a922afc35925633812d3c1..7609dc4d9c3b2bf64b2c29011abab2b3114d1b41 100644
Binary files a/test/extrude/1033/1033.stl and b/test/extrude/1033/1033.stl differ
diff --git a/test/extrude/1034/1034.py b/test/extrude/1034/1034.py
index ac9142da0485ea1b91fd1c76fbfab8dca160cf40..42bc4ded2fc2ac5753b15caa0c994b29330cb40b 100644
--- a/test/extrude/1034/1034.py
+++ b/test/extrude/1034/1034.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(517,682,517))
-r=w0.sketch().push([(517,824)]).rect(780,1000).push([(594,1)]).circle(550).finalize().extrude(177).translate((34,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,104,501))
+r=w0.workplane(offset=548).moveTo(906,133).cylinder(595,595).union(w0.sketch().arc((147,816),(177,845),(173,885)).arc((8,909),(148,815)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/1034/1034.stl b/test/extrude/1034/1034.stl
index 600b0c20fae9c59533f42c0867333566e5644080..2ed6e5e52755fb3eb2ca34164648adbebc2d0cdc 100644
Binary files a/test/extrude/1034/1034.stl and b/test/extrude/1034/1034.stl differ
diff --git a/test/extrude/1035/1035.py b/test/extrude/1035/1035.py
index ca0486606f70fd03a12b2bbc4175e846e657b0f0..25fd3bcd71d784fa1dc53267acb9a2e699ae4916 100644
--- a/test/extrude/1035/1035.py
+++ b/test/extrude/1035/1035.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(541,454,454))
-r=w0.workplane(offset=243).moveTo(1,7).box(789,504,876).union(w0.sketch().push([(926,715)]).rect(752,876).push([(839,895)]).rect(479,491,mode='s').push([(1000,628)]).circle(479,mode='s').finalize().extrude(702))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,411,500))
+w1=cq.Workplane('XY',origin=(501,501,146))
+r=w0.workplane(offset=724).moveTo(182,85).cylinder(945,566).union(w0.workplane(offset=796).moveTo(804,790).cylinder(1000,690)).union(w1.workplane(offset=430).moveTo(86,349).box(540,1000,641))
\ No newline at end of file
diff --git a/test/extrude/1035/1035.stl b/test/extrude/1035/1035.stl
index 5f01e2b02dd2835e94aaad0fc0a6fa0cfca39b24..396ead8a73662ed5d7a29ecc941a210e4bf5a5ad 100644
Binary files a/test/extrude/1035/1035.stl and b/test/extrude/1035/1035.stl differ
diff --git a/test/extrude/1036/1036.py b/test/extrude/1036/1036.py
index 8e6273410182c47ff4ba33394ddc3e012226fa6a..8c1131a0a93ea7cd728e77a4a7fd3fa6920c957e 100644
--- a/test/extrude/1036/1036.py
+++ b/test/extrude/1036/1036.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(357,483,483))
-w1=cq.Workplane('YZ',origin=(357,483,483))
-r=w0.sketch().push([(168,472)]).rect(1000,598).push([(1,437)]).circle(495,mode='s').push([(874,323)]).circle(667).finalize().extrude(460).union(w0.workplane(offset=701).moveTo(380,610).cylinder(920,701)).union(w1.sketch().arc((300,460),(460,759),(300,495)).close().assemble().finalize().extrude(300))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(498,265,498))
+r=w0.sketch().arc((24,34),(195,24),(254,184)).close().assemble().reset().face(w0.sketch().segment((279,3),(324,5)).segment((323,119)).arc((344,160),(324,194)).segment((326,309)).segment((280,309)).segment((279,194)).arc((258,160),(280,118)).close().assemble()).push([(301,158)]).rect(556,544,mode='s').push([(679,706)]).circle(796).finalize().extrude(969)
\ No newline at end of file
diff --git a/test/extrude/1036/1036.stl b/test/extrude/1036/1036.stl
index e1b609a12176d1fe186ea0540fcb7d3fb006421a..8e30361a8a376a67ea0302f856df65dc13a2300c 100644
Binary files a/test/extrude/1036/1036.stl and b/test/extrude/1036/1036.stl differ
diff --git a/test/extrude/1037/1037.py b/test/extrude/1037/1037.py
index 5c3e492a25e6f6a0623c53279887bfaf8e6c15bb..6cb191f54a728fdf3a9ab4e55e1ad9d47c191935 100644
--- a/test/extrude/1037/1037.py
+++ b/test/extrude/1037/1037.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(456,179,456))
-r=w0.sketch().segment((505,70),(644,565)).segment((862,515)).segment((862,842)).arc((60,515),(743,1)).close().assemble().finalize().extrude(921).union(w0.workplane(offset=728).moveTo(555,446).cylinder(1000,575))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,181,500))
+r=w0.sketch().segment((1,575),(424,1)).segment((1000,432)).segment((585,999)).close().assemble().push([(525,771)]).circle(565,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/1037/1037.stl b/test/extrude/1037/1037.stl
index 964b24269b3efb45f574f959c41e67deeab44d44..632baead420c80572de1c18d2e2ff0b8fe2fda50 100644
Binary files a/test/extrude/1037/1037.stl and b/test/extrude/1037/1037.stl differ
diff --git a/test/extrude/1038/1038.py b/test/extrude/1038/1038.py
index 41093414af783b774d632df5c0ad91eb81d46a48..af4333a5f1c385f57afcc2296536b49744d0dbe9 100644
--- a/test/extrude/1038/1038.py
+++ b/test/extrude/1038/1038.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(693,550,550))
-w1=cq.Workplane('ZX',origin=(550,791,550))
-r=w0.workplane(offset=325).moveTo(319,616).cylinder(1000,748).union(w0.workplane(offset=753).moveTo(857,330).cylinder(956,671)).union(w1.sketch().segment((649,1),(791,1)).segment((791,23)).arc((890,166),(791,308)).segment((791,495)).segment((649,495)).segment((649,297)).arc((583,166),(649,34)).close().assemble().finalize().extrude(297))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(215,502,501))
+r=w0.sketch().segment((1,627),(47,625)).segment((46,596)).segment((235,597)).segment((237,876)).segment((47,877)).segment((45,841)).segment((2,842)).close().assemble().finalize().extrude(896).union(w0.sketch().segment((842,302),(990,126)).arc((965,262),(841,302)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/1038/1038.stl b/test/extrude/1038/1038.stl
index 618206ba153b82dbbb0fb6aa04a7752731b9638e..65f33888f987a5e2ac9ff5c4aabc3f5cd67608a7 100644
Binary files a/test/extrude/1038/1038.stl and b/test/extrude/1038/1038.stl differ
diff --git a/test/extrude/1039/1039.py b/test/extrude/1039/1039.py
index 21c8d5977c0aa2f3b0956053707a043e553a68cc..7505620d172fdfe45965bb654f36d6155825651d 100644
--- a/test/extrude/1039/1039.py
+++ b/test/extrude/1039/1039.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(660,500,500))
-r=w0.sketch().push([(640,670)]).circle(820).reset().face(w0.sketch().segment((500,540),(790,441)).segment((880,700)).segment((600,800)).close().assemble(),mode='s').finalize().extrude(171).union(w0.workplane(offset=366).moveTo(111,361).cylinder(770,570)).union(w0.sketch().segment((1,281),(241,281)).arc((291,221),(371,181)).arc((1000,321),(411,580)).arc((371,570),(321,560)).segment((1,560)).close().assemble().finalize().extrude(341))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,836,501))
+w1=cq.Workplane('ZX',origin=(500,871,500))
+r=w0.sketch().segment((62,311),(430,312)).segment((431,295)).segment((849,297)).segment((850,321)).segment((940,315)).segment((939,350)).segment((850,352)).segment((850,490)).segment((551,491)).segment((549,1000)).segment((60,1000)).close().assemble().finalize().extrude(1).union(w1.sketch().segment((221,2),(551,1)).segment((551,171)).arc((735,665),(489,195)).segment((221,197)).close().assemble().push([(414,174)]).rect(540,534,mode='s').push([(516,79)]).rect(511,525,mode='s').finalize().extrude(262))
\ No newline at end of file
diff --git a/test/extrude/1039/1039.stl b/test/extrude/1039/1039.stl
index 9d5f5a0aa16825e553c22e7552bcbc6c157996b0..df57a2bc184e3afcfcfabba8b8f6d9fe43ddfe35 100644
Binary files a/test/extrude/1039/1039.stl and b/test/extrude/1039/1039.stl differ
diff --git a/test/extrude/104/104.py b/test/extrude/104/104.py
index fa64717364c3a41ab5f23b0e73f9e6508b8a35c5..43c68a5edf18328a67e19f1d1ab0f9d44b6f6075 100644
--- a/test/extrude/104/104.py
+++ b/test/extrude/104/104.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(569,569,693))
-r=w0.sketch().segment((1,239),(205,239)).segment((205,387)).arc((103,342),(1,387)).close().assemble().reset().face(w0.sketch().arc((1,580),(103,625),(205,580)).segment((205,728)).segment((1,728)).close().assemble()).push([(364,728)]).circle(614).push([(398,705)]).circle(580,mode='s').finalize().extrude(35).union(w0.sketch().push([(921,824)]).rect(1000,716).push([(921,818)]).circle(591,mode='s').finalize().extrude(841))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(476,500,501))
+r=w0.sketch().segment((480,156),(480,577)).segment((484,576)).arc((105,375),(482,155)).assemble().finalize().extrude(27).union(w0.sketch().segment((481,601),(585,530)).segment((581,525)).arc((520,522),(545,471)).segment((600,385)).segment((705,451)).segment((711,445)).segment((721,461)).segment((866,550)).segment((824,619)).segment((896,724)).segment((659,881)).close().assemble().push([(700,523)]).rect(540,524,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/104/104.stl b/test/extrude/104/104.stl
index 4e9fafb91653e1a45187778e70a673dcf0e141ac..4ed525a33f505e492ba4a926631891b17372a3e0 100644
Binary files a/test/extrude/104/104.stl and b/test/extrude/104/104.stl differ
diff --git a/test/extrude/1040/1040.py b/test/extrude/1040/1040.py
index a91de14c04a3fcaab3c692f5369d3bbac324c3fe..c375f39bdcbc87a36733df6ce7e037bf3915a0a8 100644
--- a/test/extrude/1040/1040.py
+++ b/test/extrude/1040/1040.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(617,617,658))
-r=w0.sketch().segment((302,275),(329,275)).arc((726,1),(494,425)).arc((507,480),(494,535)).segment((535,685)).segment((439,713)).segment((425,685)).arc((453,631),(412,603)).segment((398,562)).arc((343,507),(357,425)).close().assemble().finalize().extrude(425).union(w0.workplane(offset=672).moveTo(631,1000).cylinder(726,918))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,689))
+r=w0.sketch().push([(106,582)]).circle(606).push([(101,519)]).circle(504,mode='s').finalize().extrude(117).union(w0.sketch().segment((660,380),(746,380)).segment((745,317)).segment((915,316)).segment((915,380)).segment((999,380)).segment((1000,619)).segment((914,620)).segment((914,687)).segment((744,685)).segment((744,621)).segment((660,620)).close().assemble().finalize().extrude(175))
\ No newline at end of file
diff --git a/test/extrude/1040/1040.stl b/test/extrude/1040/1040.stl
index 78b693b984adeaa4059371a52f7dda6549f9ddfd..7086df36851ac9be59062445338067c3f352847e 100644
Binary files a/test/extrude/1040/1040.stl and b/test/extrude/1040/1040.stl differ
diff --git a/test/extrude/1041/1041.py b/test/extrude/1041/1041.py
index 9691bffb96ee5d9b364b217439659c48b6a3dc77..c8ac7e27a7c562c566035bf8c04c5c509d4c4579 100644
--- a/test/extrude/1041/1041.py
+++ b/test/extrude/1041/1041.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,337,337))
-r=w0.workplane(offset=639).moveTo(41,298).cylinder(941,535).union(w0.sketch().segment((387,614),(387,624)).arc((515,50),(683,614)).close().assemble().finalize().extrude(1000)).translate((1,158,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,207))
+w1=cq.Workplane('YZ',origin=(195,501,500))
+r=w0.sketch().segment((46,621),(85,621)).segment((86,771)).arc((92,784),(87,801)).segment((86,951)).segment((45,951)).segment((46,801)).arc((42,785),(46,771)).close().assemble().push([(664,705)]).circle(796).finalize().extrude(471).union(w0.sketch().segment((670,66),(819,1)).segment((876,131)).segment((725,195)).close().assemble().reset().face(w0.sketch().segment((745,85),(780,71)).segment((801,110)).segment((765,126)).close().assemble(),mode='s').finalize().extrude(1000)).union(w1.sketch().arc((436,350),(472,320),(456,282)).arc((710,400),(436,352)).assemble().finalize().extrude(580))
\ No newline at end of file
diff --git a/test/extrude/1041/1041.stl b/test/extrude/1041/1041.stl
index 9e0626562351adc5d3c124e0741496eb79a80dfe..171f625b96c3895de0ac04ab2cf72b445f1327d5 100644
Binary files a/test/extrude/1041/1041.stl and b/test/extrude/1041/1041.stl differ
diff --git a/test/extrude/1042/1042.py b/test/extrude/1042/1042.py
index ee2d446e2c179a8bd5b8d4613e655e315a2c17d7..607b932b028e4cd7138fa2f84db6106edc306d76 100644
--- a/test/extrude/1042/1042.py
+++ b/test/extrude/1042/1042.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(75,1,75))
-r=w0.workplane(offset=158).cylinder(242,1000).translate((926,1,926))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(885,501,502))
+r=w0.sketch().segment((172,252),(484,250)).segment((521,200)).segment((581,250)).segment((786,251)).segment((786,406)).segment((831,440)).segment((785,501)).segment((786,1000)).segment((171,999)).close().assemble().push([(477,626)]).rect(784,651,mode='s').finalize().extrude(1).union(w0.workplane(offset=209).moveTo(626,22).cylinder(1000,520))
\ No newline at end of file
diff --git a/test/extrude/1042/1042.stl b/test/extrude/1042/1042.stl
index 593dd0e503dbbc32cb590852e407253b27a6ea9e..7b18739283ca49461bac07d76f16b53b6fb92c78 100644
Binary files a/test/extrude/1042/1042.stl and b/test/extrude/1042/1042.stl differ
diff --git a/test/extrude/1043/1043.py b/test/extrude/1043/1043.py
index 40a651a792195126424d18164cab6c46ccfe938a..96cfdf288413e9048538a2911f4914202274c9cb 100644
--- a/test/extrude/1043/1043.py
+++ b/test/extrude/1043/1043.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(360,360,39))
-r=w0.sketch().segment((52,744),(219,744)).segment((219,795)).arc((257,872),(219,949)).segment((219,1000)).segment((52,1000)).segment((52,949)).arc((27,872),(52,795)).close().assemble().finalize().extrude(1000).union(w0.sketch().push([(635,1)]).rect(475,923).rect(372,436,mode='s').finalize().extrude(1000)).translate((1,102,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,360))
+r=w0.sketch().push([(501,177)]).circle(676).push([(560,896)]).circle(606).finalize().extrude(779)
\ No newline at end of file
diff --git a/test/extrude/1043/1043.stl b/test/extrude/1043/1043.stl
index c6496874d34112e8c959dc83d749f116006bd4cc..bae7a13006d7603c70b7f81f91ea1d4b2733d6a9 100644
Binary files a/test/extrude/1043/1043.stl and b/test/extrude/1043/1043.stl differ
diff --git a/test/extrude/1044/1044.py b/test/extrude/1044/1044.py
index a42dad0a679fa72254ee376d68f41025dbe21fdf..720918c5b48a57c78e959c1233265086c1db3331 100644
--- a/test/extrude/1044/1044.py
+++ b/test/extrude/1044/1044.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,491,500))
-r=w0.sketch().segment((331,321),(710,321)).segment((710,451)).segment((780,471)).segment((730,620)).arc((750,760),(630,860)).segment((580,1000)).segment((441,950)).segment((500,800)).arc((471,660),(590,560)).segment((331,560)).close().assemble().finalize().extrude(101).union(w0.sketch().segment((221,1),(251,91)).segment((221,101)).close().assemble().finalize().extrude(920))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,511,501))
+r=w0.sketch().segment((25,340),(511,1)).segment((665,221)).segment((941,220)).segment((939,522)).segment((875,521)).segment((975,661)).segment((491,1000)).close().assemble().push([(830,674)]).circle(570,mode='s').finalize().extrude(475)
\ No newline at end of file
diff --git a/test/extrude/1044/1044.stl b/test/extrude/1044/1044.stl
index 6b236cf8b0d9f907a70d739dd40235fec5eef908..a4ab5e4fa0f577de864806f42bbfba916e4653de 100644
Binary files a/test/extrude/1044/1044.stl and b/test/extrude/1044/1044.stl differ
diff --git a/test/extrude/1045/1045.py b/test/extrude/1045/1045.py
index f14bf134086a18984e779515d37174a9a270fcab..56bfe7e6d6c8fde2667886276c544d08fecd0022 100644
--- a/test/extrude/1045/1045.py
+++ b/test/extrude/1045/1045.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,467).translate((134,1,134))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,689,502))
+r=w0.sketch().segment((25,691),(202,700)).arc((110,741),(26,690)).assemble().finalize().extrude(1).union(w0.sketch().push([(732,827)]).rect(984,725).push([(556,90)]).circle(531).push([(551,93)]).rect(531,526,mode='s').finalize().extrude(810))
\ No newline at end of file
diff --git a/test/extrude/1045/1045.stl b/test/extrude/1045/1045.stl
index 8e02af18212cd0dd14671c60414a32c57af9b5f0..2f6bc961f7467fc9b33714a3c1032bcfeef91f32 100644
Binary files a/test/extrude/1045/1045.stl and b/test/extrude/1045/1045.stl differ
diff --git a/test/extrude/1046/1046.py b/test/extrude/1046/1046.py
index 740c3aa48a9e3ea9b6f01e9b45d388fb4cbf9aaa..2aaa4305d87c9ac6cbb1ff328f917981eb25e352 100644
--- a/test/extrude/1046/1046.py
+++ b/test/extrude/1046/1046.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=494).moveTo(121,461).cylinder(654,374).union(w0.sketch().arc((421,321),(474,241),(547,187)).segment((547,168)).segment((587,168)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,535,501))
+r=w0.sketch().segment((136,246),(756,245)).segment((756,595)).segment((381,596)).segment((245,755)).segment((211,726)).segment((325,596)).segment((136,594)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=733).moveTo(578,581).box(1000,530,964))
\ No newline at end of file
diff --git a/test/extrude/1046/1046.stl b/test/extrude/1046/1046.stl
index df7b25e31b591d2f7362feb94e6d25732d02ec83..44e64844df1ed99b4d51ca9540c8ea1cb96d8615 100644
Binary files a/test/extrude/1046/1046.stl and b/test/extrude/1046/1046.stl differ
diff --git a/test/extrude/1047/1047.py b/test/extrude/1047/1047.py
index bd21104cce0a60dc8beb3a2e105b05f75ca5b5af..3408610a822dbf2325944178bbacb4322ffeeaa6 100644
--- a/test/extrude/1047/1047.py
+++ b/test/extrude/1047/1047.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(606,606,853))
-r=w0.sketch().push([(285,450)]).circle(743).push([(899,734)]).circle(771).finalize().extrude(1).union(w0.workplane(offset=661).moveTo(775,546).box(1000,743,716))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,502,500))
+r=w0.sketch().arc((441,510),(500,496),(560,490)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/1047/1047.stl b/test/extrude/1047/1047.stl
index b8271ae5bdf541ba95edb9d5edd8a3bd05303877..9c40edc93828dfcce2ed5972acb810153d4bf427 100644
Binary files a/test/extrude/1047/1047.stl and b/test/extrude/1047/1047.stl differ
diff --git a/test/extrude/1048/1048.py b/test/extrude/1048/1048.py
index b0f6177db58ad339ccbb20a755865f33632a5e0f..f3a3398c491b6a0676d432f3dc163bb40c7b221e 100644
--- a/test/extrude/1048/1048.py
+++ b/test/extrude/1048/1048.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(510,500,500))
-r=w0.sketch().arc((890,491),(930,600),(1000,680)).arc((880,620),(890,491)).assemble().finalize().extrude(421).union(w0.sketch().segment((1,451),(61,141)).segment((560,241)).segment((550,331)).arc((431,850),(71,461)).close().assemble().finalize().extrude(550))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,466,500))
+w1=cq.Workplane('XY',origin=(500,501,636))
+r=w0.sketch().segment((1,166),(16,35)).segment((392,77)).segment((381,207)).arc((202,71),(1,165)).assemble().reset().face(w0.sketch().segment((510,865),(565,819)).arc((630,595),(869,591)).segment((925,544)).segment((1000,646)).segment((944,685)).arc((879,916),(641,921)).segment((586,964)).close().assemble()).finalize().extrude(296).union(w1.workplane(offset=386).moveTo(755,611).cylinder(730,631))
\ No newline at end of file
diff --git a/test/extrude/1048/1048.stl b/test/extrude/1048/1048.stl
index 005a229193904e200483eba173a9322d29f6a354..f53594bb75f9240dc386e87df006b745a363e1dc 100644
Binary files a/test/extrude/1048/1048.stl and b/test/extrude/1048/1048.stl differ
diff --git a/test/extrude/1049/1049.py b/test/extrude/1049/1049.py
index b24021a960d8f375d1e05367bce4de761e49a7de..49c7d0c3ec86b6cc21bfc8b9cc1147c39705b036 100644
--- a/test/extrude/1049/1049.py
+++ b/test/extrude/1049/1049.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.workplane(offset=667).cylinder(1000,974).translate((641,1,641))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,715,501))
+r=w0.sketch().segment((516,188),(656,187)).segment((655,61)).segment((834,63)).segment((834,187)).segment((999,187)).segment((1000,567)).segment((835,565)).segment((836,691)).segment((751,692)).arc((36,715),(515,188)).assemble().finalize().extrude(67)
\ No newline at end of file
diff --git a/test/extrude/1049/1049.stl b/test/extrude/1049/1049.stl
index d120c69498d251a9563cc415338e1c22c858041d..221ca4a2744f0602d6f3511f77601418a2952235 100644
Binary files a/test/extrude/1049/1049.stl and b/test/extrude/1049/1049.stl differ
diff --git a/test/extrude/105/105.py b/test/extrude/105/105.py
index 85be345ea382fa785f28e95f79263bf70861fc33..1cf9b8006b4503d7136fb6c59ef78a83de332239 100644
--- a/test/extrude/105/105.py
+++ b/test/extrude/105/105.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().arc((241,54),(334,227),(341,421)).segment((427,421)).segment((427,454)).segment((327,454)).arc((294,540),(241,614)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,556,501))
+r=w0.sketch().push([(560,271)]).circle(714).reset().face(w0.sketch().segment((641,851),(670,850)).segment((684,770)).segment((725,775)).segment((717,839)).segment((839,825)).segment((851,900)).segment((700,921)).segment((686,999)).segment((641,991)).segment((654,926)).segment((652,926)).arc((649,890),(641,851)).assemble()).finalize().extrude(385).union(w0.workplane(offset=459).moveTo(361,212).cylinder(586,711))
\ No newline at end of file
diff --git a/test/extrude/105/105.stl b/test/extrude/105/105.stl
index f72922699fda40d04f69e6a890b65e10709ba701..72128a7173c8406218fe70edacb8697dc321ed5d 100644
Binary files a/test/extrude/105/105.stl and b/test/extrude/105/105.stl differ
diff --git a/test/extrude/1050/1050.py b/test/extrude/1050/1050.py
index 739a78fec147b730c30d14907e8e8d341ca14d0a..e312ed71228b48144ca831b5ed5da3c64d990139 100644
--- a/test/extrude/1050/1050.py
+++ b/test/extrude/1050/1050.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(116,116,1))
-r=w0.workplane(offset=231).box(1000,965,346).translate((385,368,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(357,501,500))
+w1=cq.Workplane('ZX',origin=(502,725,500))
+r=w0.workplane(offset=547).moveTo(535,501).cylinder(594,554).union(w1.sketch().segment((1,301),(42,301)).arc((157,330),(270,300)).segment((1000,301)).segment((1000,701)).segment((1,699)).close().assemble().finalize().extrude(45))
\ No newline at end of file
diff --git a/test/extrude/1050/1050.stl b/test/extrude/1050/1050.stl
index fbeecce5ef7ad5186622b2e769479109ac9e764f..a03f0023ce37a3ed01eb5e2990e2332af7a301bd 100644
Binary files a/test/extrude/1050/1050.stl and b/test/extrude/1050/1050.stl differ
diff --git a/test/extrude/1051/1051.py b/test/extrude/1051/1051.py
index f2992ea3c7bcdc9a4b724026bf7315d246d9beb0..03b51549d63b74d3e2951baa7e231a5e3fc03730 100644
--- a/test/extrude/1051/1051.py
+++ b/test/extrude/1051/1051.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(416,416,158))
-r=w0.sketch().segment((1,652),(573,652)).segment((573,697)).segment((68,697)).arc((46,674),(23,697)).segment((1,697)).close().assemble().finalize().extrude(349).union(w0.sketch().segment((68,674),(214,472)).segment((506,686)).segment((349,888)).close().assemble().push([(557,130)]).rect(966,966).push([(562,124)]).circle(484,mode='s').reset().face(w0.sketch().segment((753,899),(764,888)).segment((787,978)).segment((776,978)).close().assemble()).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,465,500))
+w1=cq.Workplane('YZ',origin=(181,500,501))
+r=w0.sketch().push([(484,701)]).circle(799).push([(488,697)]).rect(1000,606,mode='s').reset().face(w0.sketch().segment((786,210),(785,236)).arc((556,56),(795,221)).segment((794,210)).close().assemble()).finalize().extrude(455).union(w1.sketch().arc((495,651),(531,570),(566,650)).arc((556,656),(560,666)).arc((514,709),(496,651)).assemble().finalize().extrude(560))
\ No newline at end of file
diff --git a/test/extrude/1051/1051.stl b/test/extrude/1051/1051.stl
index a83ea9648c10d35cbf966591e84a722592a56c7a..1b046f39e5805c04c67ecc8374b537878b6929df 100644
Binary files a/test/extrude/1051/1051.stl and b/test/extrude/1051/1051.stl differ
diff --git a/test/extrude/1052/1052.py b/test/extrude/1052/1052.py
index 78ebf5f1f84614ed4ba85a7b4e5ca3807e549032..474f80640b586eafd48c8445c1a5ac455936eea2 100644
--- a/test/extrude/1052/1052.py
+++ b/test/extrude/1052/1052.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(388,86,388))
-r=w0.sketch().segment((1,667),(9,86)).segment((202,86)).segment((202,63)).segment((373,86)).segment((775,102)).segment((768,690)).segment((574,690)).segment((574,713)).segment((404,675)).close().assemble().push([(388,380)]).circle(450,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(359,232,360))
+r=w0.sketch().segment((77,330),(325,78)).segment((642,389)).segment((396,643)).close().assemble().finalize().extrude(131).union(w0.sketch().rect(654,718).rect(554,633,mode='s').finalize().extrude(718))
\ No newline at end of file
diff --git a/test/extrude/1052/1052.stl b/test/extrude/1052/1052.stl
index bcddb97ea79f3e0260d36c710969bcba83cd1466..9de78f23f4f17f39129884523f20b2b4e049bb16 100644
Binary files a/test/extrude/1052/1052.stl and b/test/extrude/1052/1052.stl differ
diff --git a/test/extrude/1053/1053.py b/test/extrude/1053/1053.py
index 3ef124da3d1eacbea1880f3a9f415c4094384579..970086c24aa6cf785e74ae2753917b1d353904db 100644
--- a/test/extrude/1053/1053.py
+++ b/test/extrude/1053/1053.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,249,249))
-r=w0.workplane(offset=497).box(1000,985,745).translate((1,252,245))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,580))
+w1=cq.Workplane('ZX',origin=(501,584,501))
+r=w0.sketch().segment((391,306),(581,305)).segment((581,724)).segment((536,725)).arc((262,875),(390,589)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(291,514)]).rect(539,630).push([(681,516)]).rect(541,629).finalize().extrude(665)).union(w0.sketch().segment((290,211),(346,212)).arc((530,82),(711,210)).segment((766,210)).segment((766,331)).segment((709,331)).arc((530,460),(347,332)).segment((291,332)).close().assemble().finalize().extrude(704)).union(w1.sketch().arc((729,610),(850,704),(1000,684)).arc((826,791),(730,611)).assemble().finalize().extrude(621))
\ No newline at end of file
diff --git a/test/extrude/1053/1053.stl b/test/extrude/1053/1053.stl
index 978ad0f00c9719291fafa36950e2b1f02351018f..278a64a4de37ec03e26612068d7f4274763e4e62 100644
Binary files a/test/extrude/1053/1053.stl and b/test/extrude/1053/1053.stl differ
diff --git a/test/extrude/1054/1054.py b/test/extrude/1054/1054.py
index 8904c2011fc8fd209046717085ad354f7f308613..ab8f42ebb074553517b0643f9b19f5dae60c8684 100644
--- a/test/extrude/1054/1054.py
+++ b/test/extrude/1054/1054.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(69,379,379))
-r=w0.sketch().segment((1,213),(62,198)).segment((62,364)).segment((236,364)).segment((236,160)).segment((652,69)).segment((758,546)).segment((107,690)).close().assemble().reset().face(w0.sketch().segment((311,591),(372,152)).segment((448,168)).segment((387,606)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,365,500))
+r=w0.sketch().segment((644,185),(645,200)).segment((670,200)).arc((306,269),(669,185)).close().assemble().finalize().extrude(249).union(w0.sketch().segment((255,674),(315,676)).arc((500,569),(686,674)).segment((746,674)).segment((744,896)).segment((686,895)).arc((500,999),(315,895)).segment((254,894)).close().assemble().reset().face(w0.sketch().arc((380,674),(500,621),(619,675)).close().assemble(),mode='s').reset().face(w0.sketch().segment((381,896),(619,896)).arc((500,946),(380,895)).assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/1054/1054.stl b/test/extrude/1054/1054.stl
index 5954c363186b449372827df1c0660936c3ce856d..0d00e40696d794debd7e3a7402f46a668a43e032 100644
Binary files a/test/extrude/1054/1054.stl and b/test/extrude/1054/1054.stl differ
diff --git a/test/extrude/1055/1055.py b/test/extrude/1055/1055.py
index dc101d66e90a254ab0837d752d090d9e5ff013e5..64d6f53ab3048ba34097ee8222f52344dd135e80 100644
--- a/test/extrude/1055/1055.py
+++ b/test/extrude/1055/1055.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(520,500,500))
-r=w0.sketch().segment((1,590),(321,500)).segment((271,500)).segment((271,141)).segment((570,141)).segment((570,431)).arc((660,520),(530,500)).segment((341,500)).segment((411,770)).segment((71,860)).close().assemble().reset().face(w0.sketch().segment((550,500),(570,500)).segment((570,451)).arc((650,510),(550,500)).assemble(),mode='s').finalize().extrude(211).union(w0.sketch().segment((980,660),(990,660)).segment((1000,690)).arc((990,690),(990,680)).arc((980,670),(980,660)).assemble().finalize().extrude(351)).union(w0.workplane(offset=620).moveTo(600,491).cylinder(740,650))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,816))
+r=w0.sketch().segment((1,401),(536,400)).arc((582,352),(637,315)).arc((887,222),(986,466)).arc((721,795),(526,420)).segment((2,422)).close().assemble().reset().face(w0.sketch().arc((666,520),(737,570),(822,587)).arc((712,622),(666,521)).assemble(),mode='s').finalize().extrude(1).union(w0.sketch().push([(876,245)]).circle(532).reset().face(w0.sketch().segment((886,231),(902,230)).segment((901,250)).segment((891,250)).arc((861,247),(886,230)).assemble(),mode='s').finalize().extrude(146))
\ No newline at end of file
diff --git a/test/extrude/1055/1055.stl b/test/extrude/1055/1055.stl
index 488b223bffe6d2a5fa025e23cffc6ebb81fe1c4f..0d267da557376898ea42ab67bef526344723424e 100644
Binary files a/test/extrude/1055/1055.stl and b/test/extrude/1055/1055.stl differ
diff --git a/test/extrude/1056/1056.py b/test/extrude/1056/1056.py
index d3384b340cd46968126f038f30d2971f09957204..2867d21ad7236819bec25d3024a655dc70634d99 100644
--- a/test/extrude/1056/1056.py
+++ b/test/extrude/1056/1056.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(297,490,490))
-r=w0.sketch().segment((1,735),(11,602)).arc((32,337),(286,266)).arc((337,276),(368,317)).arc((419,592),(174,715)).segment((164,755)).close().assemble().finalize().extrude(500).union(w0.workplane(offset=602).moveTo(460,266).cylinder(715,541)).union(w0.sketch().segment((694,592),(745,521)).segment((827,572)).segment((827,521)).segment((878,521)).segment((878,602)).segment((1000,694)).segment((949,766)).segment((878,715)).segment((878,766)).segment((827,766)).segment((827,684)).close().assemble().finalize().extrude(888))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,360))
+w1=cq.Workplane('ZX',origin=(501,340,502))
+r=w0.sketch().segment((177,171),(562,171)).arc((564,195),(561,221)).segment((176,221)).close().assemble().reset().face(w0.sketch().segment((265,72),(431,47)).segment((435,95)).arc((351,77),(275,122)).close().assemble(),mode='s').reset().face(w0.sketch().arc((301,295),(391,316),(466,271)).segment((475,321)).segment((311,345)).close().assemble(),mode='s').finalize().extrude(420).union(w0.workplane(offset=762).moveTo(831,864).box(839,680,1000)).union(w1.sketch().segment((117,436),(452,435)).segment((450,1)).arc((504,85),(524,180)).segment((625,182)).segment((626,556)).segment((155,556)).segment((156,451)).arc((136,445),(116,437)).assemble().finalize().extrude(865))
\ No newline at end of file
diff --git a/test/extrude/1056/1056.stl b/test/extrude/1056/1056.stl
index 562927a551a514cd89bbfebe2948c27897b66753..48efc2b8379935653a8a242caeab82427b953d54 100644
Binary files a/test/extrude/1056/1056.stl and b/test/extrude/1056/1056.stl differ
diff --git a/test/extrude/1057/1057.py b/test/extrude/1057/1057.py
index 7d056747ea4bc50c18eb50e0f4edc2c66430e33b..8b483ca804e24088b9826e59778ebcfa95cb594f 100644
--- a/test/extrude/1057/1057.py
+++ b/test/extrude/1057/1057.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(411,411,550))
-r=w0.sketch().push([(411,615)]).rect(730,1000).push([(421,1)]).circle(500).finalize().extrude(131).translate((1,89,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,407))
+w1=cq.Workplane('ZX',origin=(502,430,501))
+r=w0.workplane(offset=577).moveTo(372,78).box(1000,654,655).union(w0.sketch().segment((42,341),(261,160)).segment((600,587)).segment((380,759)).segment((236,586)).arc((120,532),(97,406)).close().assemble().push([(772,901)]).rect(874,699).finalize().extrude(740)).union(w1.workplane(offset=774).moveTo(499,432).cylinder(1000,671))
\ No newline at end of file
diff --git a/test/extrude/1057/1057.stl b/test/extrude/1057/1057.stl
index 3fbb5e8242773d28112e9e5b87d78cf9b72f779a..a830c799f342eb76675143e33edbdf8164a21b93 100644
Binary files a/test/extrude/1057/1057.stl and b/test/extrude/1057/1057.stl differ
diff --git a/test/extrude/1058/1058.py b/test/extrude/1058/1058.py
index bb006942aae63772995eaebf35a7822d5348885e..ebbf332b804bf1254b46e20eeed788be2076f198 100644
--- a/test/extrude/1058/1058.py
+++ b/test/extrude/1058/1058.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(610,610,1000))
-w1=cq.Workplane('XY',origin=(610,610,828))
-r=w0.sketch().arc((391,797),(469,383),(813,625)).segment((852,649)).segment((860,649)).segment((860,657)).segment((914,696)).segment((860,774)).segment((860,820)).segment((820,820)).segment((797,852)).segment((797,820)).segment((446,820)).segment((438,820)).segment((438,844)).arc((422,836),(407,820)).segment((391,820)).close().assemble().reset().face(w0.sketch().segment((438,555),(547,555)).arc((485,594),(446,649)).segment((438,649)).close().assemble(),mode='s').reset().face(w0.sketch().segment((688,555),(797,555)).segment((797,649)).arc((750,594),(688,555)).assemble(),mode='s').finalize().extrude(79).union(w1.sketch().segment((602,563),(602,633)).segment((657,633)).arc((469,641),(641,563)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(630,499,499))
+r=w0.sketch().segment((441,689),(569,831)).segment((681,729)).segment((680,1000)).segment((490,1000)).segment((489,856)).arc((120,450),(664,370)).segment((681,370)).segment((681,395)).arc((724,520),(709,655)).segment((599,541)).close().assemble().finalize().extrude(246).union(w0.sketch().arc((655,289),(776,6),(750,314)).arc((689,366),(655,289)).assemble().finalize().extrude(331))
\ No newline at end of file
diff --git a/test/extrude/1058/1058.stl b/test/extrude/1058/1058.stl
index 096a18b6503643c977ae8320249c0726eb477d90..8972121c6420fda4c11efc247bbd4be18d473de8 100644
Binary files a/test/extrude/1058/1058.stl and b/test/extrude/1058/1058.stl differ
diff --git a/test/extrude/1059/1059.py b/test/extrude/1059/1059.py
index d9f57189bfe568c1b6f42b2f019412eaa34c020b..eca2c4d9b062ffc26310ca6fb960c353f623113c 100644
--- a/test/extrude/1059/1059.py
+++ b/test/extrude/1059/1059.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().segment((287,634),(354,34)).segment((381,34)).segment((314,634)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(224,272,271))
+r=w0.sketch().rect(542,542).reset().face(w0.sketch().segment((393,275),(431,243)).segment((493,315)).segment((456,348)).close().assemble(),mode='s').finalize().extrude(343).union(w0.workplane(offset=322).moveTo(445,377).cylinder(372,286))
\ No newline at end of file
diff --git a/test/extrude/1059/1059.stl b/test/extrude/1059/1059.stl
index bbb489d49f66d68c6e4c91207fcce8be57279bbb..43db3a1cdc9759dc50f1e43778a4f6fe3a6f7a08 100644
Binary files a/test/extrude/1059/1059.stl and b/test/extrude/1059/1059.stl differ
diff --git a/test/extrude/106/106.py b/test/extrude/106/106.py
index 29a1c60b1aa41ef9b211cb4e1d76780a2e84dd9e..252d364cb13632dfda5a3cb12ee1b6dba2bce293 100644
--- a/test/extrude/106/106.py
+++ b/test/extrude/106/106.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(532,532,426))
-r=w0.sketch().segment((320,12),(330,1)).segment((341,1)).close().assemble().push([(745,362)]).circle(596).finalize().extrude(288).union(w0.workplane(offset=718).moveTo(857,400).box(947,607,904)).union(w0.sketch().push([(203,862)]).circle(734).reset().face(w0.sketch().segment((607,394),(671,394)).arc((745,277),(830,394)).segment((926,394)).segment((926,405)).segment((989,405)).segment((989,500)).segment((607,500)).close().assemble()).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,654,501))
+r=w0.sketch().push([(190,315)]).circle(691).reset().face(w0.sketch().segment((155,191),(216,186)).segment((231,442)).segment((167,445)).segment((160,275)).arc((41,250),(156,217)).close().assemble(),mode='s').push([(934,290)]).circle(565).finalize().extrude(82).union(w0.sketch().segment((51,521),(370,361)).segment((385,395)).arc((590,290),(595,522)).arc((301,537),(326,831)).segment((230,874)).close().assemble().finalize().extrude(610))
\ No newline at end of file
diff --git a/test/extrude/106/106.stl b/test/extrude/106/106.stl
index 164fa4a6aab64589cf9c1fead895aa23e22b3de2..1f15455c7fcaa53ba54f30ff6fe84d615e4b4773 100644
Binary files a/test/extrude/106/106.stl and b/test/extrude/106/106.stl differ
diff --git a/test/extrude/1060/1060.py b/test/extrude/1060/1060.py
index e5a9067a511f17e26b5395433ccc546fdc993fec..15b3047c42920f91402cb9ce8605c18e979aac16 100644
--- a/test/extrude/1060/1060.py
+++ b/test/extrude/1060/1060.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(351,351,313))
-r=w0.workplane(offset=65).moveTo(249,7).cylinder(924,567).union(w0.sketch().push([(580,898)]).circle(440).push([(529,911)]).circle(364,mode='s').finalize().extrude(249)).union(w0.workplane(offset=675).moveTo(249,1).box(427,924,1000)).translate((1,210,85))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,900,501))
+w1=cq.Workplane('YZ',origin=(469,501,499))
+r=w0.sketch().segment((220,575),(374,429)).segment((300,630)).segment((399,669)).segment((523,600)).segment((541,630)).segment((434,685)).segment((524,716)).segment((434,806)).close().assemble().reset().face(w0.sketch().segment((379,426),(470,335)).segment((685,565)).segment((529,711)).segment((610,511)).close().assemble()).finalize().extrude(1).union(w0.sketch().segment((233,248),(414,249)).segment((414,193)).segment((550,194)).segment((550,248)).segment((740,249)).segment((741,605)).segment((235,604)).close().assemble().finalize().extrude(599)).union(w1.sketch().arc((75,475),(54,189),(344,198)).arc((649,770),(75,473)).assemble().finalize().extrude(410))
\ No newline at end of file
diff --git a/test/extrude/1060/1060.stl b/test/extrude/1060/1060.stl
index 2ecaa9260291f4fcfc511d6983645072ad73b183..a35b1d5cdfd8af9389119fd8234423dba67b7363 100644
Binary files a/test/extrude/1060/1060.stl and b/test/extrude/1060/1060.stl differ
diff --git a/test/extrude/1061/1061.py b/test/extrude/1061/1061.py
index adf0e282bb304b19d9c181b32f4685384f7de64e..df4d9583a1ec61ac704fb536e121ce6133aeb085 100644
--- a/test/extrude/1061/1061.py
+++ b/test/extrude/1061/1061.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(169,443,443))
-r=w0.sketch().segment((257,523),(284,1)).segment((540,19)).segment((514,531)).segment((461,531)).segment((461,523)).segment((275,470)).close().assemble().push([(399,266)]).circle(478,mode='s').push([(536,766)]).rect(629,682).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(596,499,499))
+w1=cq.Workplane('XY',origin=(500,500,297))
+r=w0.sketch().segment((311,1),(690,1)).segment((691,661)).arc((482,726),(312,854)).close().assemble().reset().face(w0.sketch().segment((421,475),(492,420)).segment((581,540)).segment((510,597)).close().assemble(),mode='s').finalize().extrude(20).union(w1.workplane(offset=852).moveTo(714,502).cylinder(1000,665))
\ No newline at end of file
diff --git a/test/extrude/1061/1061.stl b/test/extrude/1061/1061.stl
index b7ca4cc78957da33198140f9b7110d2b1daa603d..3ad9ade69740840daf3db6e21f00dcc4a45163f1 100644
Binary files a/test/extrude/1061/1061.stl and b/test/extrude/1061/1061.stl differ
diff --git a/test/extrude/1062/1062.py b/test/extrude/1062/1062.py
index 35f569c9834d6944c5dd142c640b740d9b9c2e9a..87e114c03a58bf51f9fc9df1a12c97c3594a9695 100644
--- a/test/extrude/1062/1062.py
+++ b/test/extrude/1062/1062.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,556,506))
-r=w0.sketch().segment((62,627),(72,627)).arc((223,374),(506,334)).segment((516,324)).segment((526,344)).arc((697,475),(758,687)).segment((768,707)).segment((758,707)).arc((606,950),(314,1000)).segment((304,990)).arc((122,859),(72,637)).close().assemble().reset().face(w0.sketch().segment((606,112),(717,72)).segment((717,1)).segment((839,1)).segment((839,31)).segment((919,11)).segment((950,102)).segment((839,132)).segment((839,203)).segment((717,203)).segment((717,173)).segment((637,203)).close().assemble()).finalize().extrude(405)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,576,502))
+r=w0.workplane(offset=372).moveTo(173,745).box(846,557,762).union(w0.sketch().push([(542,463)]).circle(651).push([(446,448)]).rect(513,561,mode='s').reset().face(w0.sketch().segment((707,325),(896,326)).arc((983,246),(918,341)).segment((918,497)).segment((706,496)).close().assemble()).finalize().extrude(612))
\ No newline at end of file
diff --git a/test/extrude/1062/1062.stl b/test/extrude/1062/1062.stl
index f73d4f4fd13fd141b15bd854d8ecc750bbf88c6f..6af1d767a3657764d8809e55059e73d43899ee3e 100644
Binary files a/test/extrude/1062/1062.stl and b/test/extrude/1062/1062.stl differ
diff --git a/test/extrude/1063/1063.py b/test/extrude/1063/1063.py
index 77ff8d315e0d0dc6269cc1a1f793944eefd796ba..683140b5f802afab114f5d2ff450df2b1a485d17 100644
--- a/test/extrude/1063/1063.py
+++ b/test/extrude/1063/1063.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(643,511,511))
-r=w0.sketch().segment((317,1),(460,1)).segment((460,297)).arc((582,337),(684,419)).segment((776,419)).segment((776,1)).segment((969,1)).segment((969,460)).segment((715,460)).arc((286,1000),(317,307)).close().assemble().finalize().extrude(235)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,2))
+r=w0.sketch().arc((574,357),(671,441),(644,560)).arc((336,555),(576,355)).assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/1063/1063.stl b/test/extrude/1063/1063.stl
index 0d3b8d702af8267846d99ccd5d230235f893cb42..42db0072499a3a5c66582cf4e8010a7f98c7ea0b 100644
Binary files a/test/extrude/1063/1063.stl and b/test/extrude/1063/1063.stl differ
diff --git a/test/extrude/1064/1064.py b/test/extrude/1064/1064.py
index 60ad801f5765375e91313962222fd05419a32b79..e98e76515289d845319279657433a86524ba62c9 100644
--- a/test/extrude/1064/1064.py
+++ b/test/extrude/1064/1064.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(419,887,419))
-w1=cq.Workplane('XY',origin=(419,419,291))
-r=w0.workplane(offset=263).moveTo(433,894).box(646,887,731).union(w1.workplane(offset=447).moveTo(1,235).box(1000,986,476)).translate((81,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(736,501,501))
+r=w0.workplane(offset=181).moveTo(513,385).box(1000,870,1000).union(w0.sketch().push([(489,500)]).circle(989).push([(332,286)]).circle(692,mode='s').finalize().extrude(670))
\ No newline at end of file
diff --git a/test/extrude/1064/1064.stl b/test/extrude/1064/1064.stl
index 4b4fdc0873c8343271efa789178fdfdb58758da4..92deec1a6ce368a1b1b1f037d28405458bb0bfc1 100644
Binary files a/test/extrude/1064/1064.stl and b/test/extrude/1064/1064.stl differ
diff --git a/test/extrude/1065/1065.py b/test/extrude/1065/1065.py
index 3ba1a6285f6b318f2e795c0328aefa550eb1f9e6..afcbad7be5d0734767a3c3bae40882e933c9cf78 100644
--- a/test/extrude/1065/1065.py
+++ b/test/extrude/1065/1065.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(401,401,101))
-r=w0.sketch().arc((159,734),(517,1),(442,809)).arc((292,809),(159,734)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(39,20,7))
+r=w0.sketch().segment((1000,532),(658,532)).segment((544,312)).segment((237,110)).segment((1000,110)).close().assemble().finalize().extrude(313).union(w0.workplane(offset=146).sketch().segment((756,259),(305,259)).segment((304,497)).segment((755,497)).close().assemble().finalize().extrude(242))
diff --git a/test/extrude/1065/1065.stl b/test/extrude/1065/1065.stl
index db76344fb9338bd02e386dfe40ae5527cdcd57d0..a82630c4d09ce1e8d332c8e23e4d2e8ab24a5a59 100644
Binary files a/test/extrude/1065/1065.stl and b/test/extrude/1065/1065.stl differ
diff --git a/test/extrude/1066/1066.py b/test/extrude/1066/1066.py
index 33870482863c99485f8d846fe0452737eb9d43a9..3fc733a62b24bebe80e52de55e9704cde8350115 100644
--- a/test/extrude/1066/1066.py
+++ b/test/extrude/1066/1066.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(575,575,851))
-r=w0.sketch().segment((173,116),(598,116)).segment((633,116)).segment((839,1)).segment((897,116)).segment((977,116)).segment((977,621)).segment((598,621)).segment((598,805)).segment((173,805)).close().assemble().finalize().extrude(24).union(w0.workplane(offset=546).moveTo(633,1000).cylinder(633,724))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(27,69,60))
+r=w0.sketch().segment((788,170),(182,170)).segment((182,776)).segment((788,776)).close().assemble().push([(615,326)]).rect(63,49,mode='s').push([(727,280)]).rect(45,36,mode='s').finalize().extrude(193)
diff --git a/test/extrude/1066/1066.stl b/test/extrude/1066/1066.stl
index 177377411e7c27965ef86b1e2de89eb91c6d11fb..bfc9ef0b8b7b842900e5faa2cd37f41d094ce844 100644
Binary files a/test/extrude/1066/1066.stl and b/test/extrude/1066/1066.stl differ
diff --git a/test/extrude/1067/1067.py b/test/extrude/1067/1067.py
index e3550db69d8acb8690e71537721ded359a2b195e..aa47f8a709edf0db52d70484c53d52d080d844f4 100644
--- a/test/extrude/1067/1067.py
+++ b/test/extrude/1067/1067.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,334))
-r=w0.workplane(offset=1).cylinder(1000,467).union(w0.workplane(offset=667).cylinder(1000,520)).translate((187,187,166))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(47,27,22))
+r=w0.sketch().segment((471,91),(425,91)).segment((425,841)).arc((448,836),(471,841)).close().assemble().finalize().extrude(147).union(w0.workplane(offset=44).sketch().segment((524,515),(542,515)).segment((542,521)).segment((541,522)).arc((532,531),(528,543)).segment((458,923)).segment((448,923)).close().assemble().finalize().extrude(219))
diff --git a/test/extrude/1067/1067.stl b/test/extrude/1067/1067.stl
index f8177b95e3ac7a5075b9d6479f92cde4168dcfb8..0545289b31e2fa4d61e035b6fe98b9b34b59690f 100644
Binary files a/test/extrude/1067/1067.stl and b/test/extrude/1067/1067.stl differ
diff --git a/test/extrude/1068/1068.py b/test/extrude/1068/1068.py
index 9078eae86ba8bab276dc5b0a0e3cf3f55727e2ed..b80ba6f0e4dc9e424c7da7d3a91acddf071a4d7d 100644
--- a/test/extrude/1068/1068.py
+++ b/test/extrude/1068/1068.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(475,485,485))
-r=w0.sketch().segment((248,516),(310,516)).arc((372,423),(413,516)).segment((413,1000)).segment((248,1000)).close().assemble().push([(356,743)]).rect(557,567,mode='s').finalize().extrude(361).union(w0.sketch().arc((258,279),(650,1),(670,475)).arc((310,701),(258,279)).assemble().finalize().extrude(619))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(3,72,27))
+r=w0.sketch().segment((110,976),(600,976)).segment((600,583)).arc((355,339),(110,583)).close().assemble().push([(377,841)]).rect(153,142,mode='s').finalize().extrude(226)
diff --git a/test/extrude/1068/1068.stl b/test/extrude/1068/1068.stl
index 24562f1fa9d98a6b322e46579f40c86257471e48..4988bddf48df8b7b150a163b418259fd0b2ffb01 100644
Binary files a/test/extrude/1068/1068.stl and b/test/extrude/1068/1068.stl differ
diff --git a/test/extrude/1069/1069.py b/test/extrude/1069/1069.py
index 269b258baac516fb748fc00bc2a89e1885b21c0b..51d5875634a24e1904609c3bd760573e4cff8f95 100644
--- a/test/extrude/1069/1069.py
+++ b/test/extrude/1069/1069.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(248,477,477))
-w1=cq.Workplane('YZ',origin=(220,477,477))
-r=w0.sketch().segment((657,629),(715,743)).segment((952,638)).arc((943,705),(914,762)).segment((686,762)).arc((657,696),(657,629)).assemble().finalize().extrude(933).union(w1.sketch().segment((1,191),(58,191)).arc((30,248),(58,305)).segment((1,305)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,490))
+r=w0.sketch().segment((440,375),(745,221)).segment((851,422)).segment((860,420)).segment((861,445)).segment((890,506)).segment((584,659)).segment((480,460)).segment((470,461)).segment((472,435)).close().assemble().reset().face(w0.sketch().arc((605,421),(665,375),(725,421)).close().assemble(),mode='s').reset().face(w0.sketch().segment((605,461),(724,460)).arc((666,501),(606,462)).assemble(),mode='s').finalize().extrude(10).union(w0.workplane(offset=725).moveTo(282,301).box(844,900,951)).union(w0.workplane(offset=755).moveTo(625,692).box(911,914,1000))
\ No newline at end of file
diff --git a/test/extrude/1069/1069.stl b/test/extrude/1069/1069.stl
index c4972b8b02b8751b0bcee9d03b91dc740c874d55..796d3c18d6cd99161668e8016f75f5b70d23a88a 100644
Binary files a/test/extrude/1069/1069.stl and b/test/extrude/1069/1069.stl differ
diff --git a/test/extrude/107/107.py b/test/extrude/107/107.py
index 8c4b71c3cc91ef1f4255948113fa5dfb9c7e5120..da01a6f2e9468989da54d0ee97ee6fecfabdd1a9 100644
--- a/test/extrude/107/107.py
+++ b/test/extrude/107/107.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,746,500))
-r=w0.sketch().segment((224,331),(662,285)).segment((662,485)).segment((531,623)).segment((378,639)).arc((139,654),(232,439)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=251).moveTo(866,554).box(539,516,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(831,501,501))
+w1=cq.Workplane('ZX',origin=(501,547,500))
+r=w0.sketch().segment((240,525),(272,602)).arc((227,576),(241,525)).assemble().reset().face(w0.sketch().arc((261,521),(306,545),(287,595)).close().assemble()).finalize().extrude(467).union(w0.workplane(offset=587).moveTo(657,430).box(806,556,671)).union(w1.sketch().arc((435,417),(380,10),(576,370)).segment((676,372)).segment((674,447)).arc((766,621),(674,791)).segment((675,870)).segment((436,870)).segment((435,790)).arc((341,622),(437,446)).close().assemble().finalize().extrude(146))
\ No newline at end of file
diff --git a/test/extrude/107/107.stl b/test/extrude/107/107.stl
index 92f6a92821ee5693dc24536dbba3fb3028fdc01d..748f203b042e1c96a10da5c2d96d098c4d62620f 100644
Binary files a/test/extrude/107/107.stl and b/test/extrude/107/107.stl differ
diff --git a/test/extrude/1070/1070.py b/test/extrude/1070/1070.py
index 99ff16ca8820caf58b5eb0c23759935a6595ebe0..2085c0ae9aa33ec04e07ab144e9c9b39f8bb5c1d 100644
--- a/test/extrude/1070/1070.py
+++ b/test/extrude/1070/1070.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(790,527,527))
-r=w0.sketch().push([(440,632)]).rect(616,758).reset().face(w0.sketch().segment((458,537),(469,522)).segment((479,532)).segment((469,543)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().push([(527,403)]).rect(1000,721).push([(327,395)]).circle(537,mode='s').finalize().extrude(69))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(5,70,55))
+r=w0.sketch().segment((1000,166),(339,166)).segment((339,868)).segment((1000,868)).close().assemble().finalize().extrude(324).union(w0.sketch().segment((287,649),(745,649)).segment((745,471)).segment((287,471)).close().assemble().finalize().extrude(110)).union(w0.sketch().segment((527,337),(527,679)).segment((506,679)).segment((506,358)).segment((185,358)).segment((185,337)).close().assemble().finalize().extrude(181)).translate((1,255,1))
diff --git a/test/extrude/1070/1070.stl b/test/extrude/1070/1070.stl
index 9d03aed35bb1c74f6131b2606c3e6bc5625a5de4..276becc6fbde908c489f0546d031fbc9e243a698 100644
Binary files a/test/extrude/1070/1070.stl and b/test/extrude/1070/1070.stl differ
diff --git a/test/extrude/1071/1071.py b/test/extrude/1071/1071.py
index 826e299b0d0c05ef23321b628d0d25057bd5b1d4..a50d8fc3b436d5e3f4f34c4250286f127a719c40 100644
--- a/test/extrude/1071/1071.py
+++ b/test/extrude/1071/1071.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(569,569,854))
-r=w0.sketch().push([(569,496)]).rect(707,836).reset().face(w0.sketch().segment((509,440),(630,440)).segment((630,552)).segment((569,552)).arc((535,595),(509,552)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().segment((147,569),(337,139)).segment((811,345)).arc((931,268),(966,406)).segment((991,423)).segment((974,457)).arc((948,500),(931,544)).segment((802,854)).segment((742,828)).segment((742,1000)).segment((466,1000)).segment((466,707)).close().assemble().finalize().extrude(242))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(29,66,29))
+r=w0.sketch().segment((491,32),(803,32)).segment((803,666)).segment((491,666)).close().assemble().push([(602,334)]).circle(96,mode='s').finalize().extrude(316).union(w0.workplane(offset=276).sketch().segment((942,663),(362,663)).segment((362,699)).segment((942,699)).close().assemble().finalize().extrude(162))
diff --git a/test/extrude/1071/1071.stl b/test/extrude/1071/1071.stl
index ca492a07a1cc1a753b2e26bd28c07008336cac49..f9417601c196d1c916ffb0665e1c8fff652cf1a9 100644
Binary files a/test/extrude/1071/1071.stl and b/test/extrude/1071/1071.stl differ
diff --git a/test/extrude/1072/1072.py b/test/extrude/1072/1072.py
index 7ba601f50685dd94b8cd2a253e4342268a3e7710..b32d6e1d023467ead96833ca046543a3486efece 100644
--- a/test/extrude/1072/1072.py
+++ b/test/extrude/1072/1072.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(432,455,432))
-r=w0.sketch().segment((262,251),(421,251)).segment((421,273)).arc((784,614),(421,966)).segment((421,1000)).segment((262,1000)).segment((262,921)).arc((80,614),(262,319)).close().assemble().finalize().extrude(376).union(w0.workplane(offset=410).moveTo(353,1).cylinder(478,569)).translate((137,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(62,69,5))
+r=w0.sketch().segment((53,175),(516,175)).arc((864,523),(516,871)).segment((53,871)).close().assemble().finalize().extrude(278).union(w0.sketch().segment((646,488),(646,1)).segment((672,1)).segment((672,487)).close().assemble().finalize().extrude(206)).translate((1,210,1))
diff --git a/test/extrude/1072/1072.stl b/test/extrude/1072/1072.stl
index 1a015030f61b9cd473bf94b248db297edc2b529c..4fa66ec716341fe9b131ff1a2d543f726b00c9f5 100644
Binary files a/test/extrude/1072/1072.stl and b/test/extrude/1072/1072.stl differ
diff --git a/test/extrude/1073/1073.py b/test/extrude/1073/1073.py
index 87e823214b8e70f41be0771166f5ac91a6d49f05..4500655513daae66d51c479055b22e117e961418 100644
--- a/test/extrude/1073/1073.py
+++ b/test/extrude/1073/1073.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().circle(800).push([(714,680)]).circle(720,mode='s').finalize().extrude(1).translate((134,134,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(27,8,6))
+r=w0.sketch().segment((457,876),(811,876)).segment((811,1)).segment((457,1)).close().assemble().push([(704,436)]).rect(272,245,mode='s').finalize().extrude(219)
diff --git a/test/extrude/1073/1073.stl b/test/extrude/1073/1073.stl
index 9b28e0a89cd60d1032b33664b71752c917504d5f..7521822657cb1a3eb1a7137bf94d7999bb533b13 100644
Binary files a/test/extrude/1073/1073.stl and b/test/extrude/1073/1073.stl differ
diff --git a/test/extrude/1074/1074.py b/test/extrude/1074/1074.py
index 0399d555d991c412981cb3c61b3056baa550d1b9..23490aed14fca53ac436e8b0c94abdefae165c24 100644
--- a/test/extrude/1074/1074.py
+++ b/test/extrude/1074/1074.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(417,480,480))
-w1=cq.Workplane('YZ',origin=(407,480,480))
-r=w0.workplane(offset=355).moveTo(417,553).cylinder(729,542).union(w0.sketch().segment((344,969),(688,834)).segment((698,865)).segment((355,1000)).close().assemble().finalize().extrude(844)).union(w1.sketch().segment((261,261),(344,261)).arc((625,1),(396,313)).segment((261,313)).close().assemble().finalize().extrude(709))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(15,34,45))
+r=w0.sketch().segment((1,775),(805,775)).segment((805,365)).segment((1,365)).close().assemble().push([(416,581)]).rect(185,144,mode='s').finalize().extrude(395)
diff --git a/test/extrude/1074/1074.stl b/test/extrude/1074/1074.stl
index 1f522d2646c49e72844918606da3971d03b7291c..43b50cb6cfbbd3c777ff42b0f4a12716f2111937 100644
Binary files a/test/extrude/1074/1074.stl and b/test/extrude/1074/1074.stl differ
diff --git a/test/extrude/1075/1075.py b/test/extrude/1075/1075.py
index 79e51050e126eb396342cf4a5c95a3f837d870a8..7bf5e881813a0507b0c85bb215c462dde5088b9c 100644
--- a/test/extrude/1075/1075.py
+++ b/test/extrude/1075/1075.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(593,618,618))
-r=w0.sketch().push([(618,852)]).circle(1000).reset().face(w0.sketch().arc((963,50),(938,1),(975,38)).arc((963,38),(963,50)).assemble()).finalize().extrude(679)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(30,52,50))
+r=w0.sketch().segment((144,698),(896,698)).segment((896,322)).segment((144,322)).close().assemble().finalize().extrude(310).union(w0.workplane(offset=119).sketch().segment((127,779),(356,779)).segment((356,321)).segment((127,321)).segment((128,779)).close().assemble().finalize().extrude(63)).union(w0.workplane(offset=25).sketch().segment((414,225),(414,203)).segment((397,203)).arc((379,224),(360,203)).segment((246,203)).arc((227,224),(209,203)).segment((192,203)).segment((192,287)).segment((214,287)).segment((214,225)).close().assemble().finalize().extrude(39))
diff --git a/test/extrude/1075/1075.stl b/test/extrude/1075/1075.stl
index 3ce508fd01d5e66e8ffe70c3b7ed707a3581cec6..b2263b5d3e82f6db226343e7b20304c0abaff43c 100644
Binary files a/test/extrude/1075/1075.stl and b/test/extrude/1075/1075.stl differ
diff --git a/test/extrude/1076/1076.py b/test/extrude/1076/1076.py
index 5a889b25c8a28d062c25bba92085bf4c96f16901..bdf75176c3cc08fc02a479a4ebef72bfea00b948 100644
--- a/test/extrude/1076/1076.py
+++ b/test/extrude/1076/1076.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(365,365,226))
-r=w0.sketch().push([(105,804)]).rect(1000,619).push([(752,1)]).rect(746,769).finalize().extrude(642).translate((31,20,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(37,80,48))
+r=w0.sketch().segment((211,427),(562,630)).segment((854,799)).segment((905,711)).segment((613,542)).segment((587,586)).segment((236,383)).close().assemble().finalize().extrude(368).union(w0.sketch().segment((468,524),(812,524)).segment((812,180)).segment((468,180)).close().assemble().finalize().extrude(133))
diff --git a/test/extrude/1076/1076.stl b/test/extrude/1076/1076.stl
index c9cd915044ecf7a0dd586554bfaca7b8f207f233..9e91fdfe12dd42a414b78b433a89dd129f4e4ddf 100644
Binary files a/test/extrude/1076/1076.stl and b/test/extrude/1076/1076.stl differ
diff --git a/test/extrude/1077/1077.py b/test/extrude/1077/1077.py
index f937839c0f3ed7353942289c8d40a095d909aa35..b096044651baddcc193f9cf75923c658865deb38 100644
--- a/test/extrude/1077/1077.py
+++ b/test/extrude/1077/1077.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(471,471,570))
-r=w0.sketch().segment((401,371),(640,371)).arc((730,351),(820,371)).segment((900,371)).segment((900,421)).arc((850,800),(510,670)).segment((401,670)).close().assemble().finalize().extrude(191).union(w0.sketch().segment((341,321),(411,281)).arc((910,311),(500,580)).arc((1,700),(341,321)).assemble().push([(660,371)]).circle(690,mode='s').finalize().extrude(271)).union(w0.workplane(offset=510).moveTo(525,386).box(800,1000,550))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,570))
+r=w0.sketch().segment((86,614),(560,1)).segment((870,240)).segment((721,435)).segment((915,551)).segment((645,999)).segment((396,851)).segment((395,855)).segment((375,840)).segment((285,785)).segment((290,774)).close().assemble().finalize().extrude(356)
\ No newline at end of file
diff --git a/test/extrude/1077/1077.stl b/test/extrude/1077/1077.stl
index 2b5f1375214cfa8387f0e02fffe1ba22c9e2e35e..c172522e1f432ff0f32dccc517d0dc9ef5afb538 100644
Binary files a/test/extrude/1077/1077.stl and b/test/extrude/1077/1077.stl differ
diff --git a/test/extrude/1078/1078.py b/test/extrude/1078/1078.py
index 4ca12e45707d700cf68651f4d080673ca930078e..75cc450aaba8f28bc0cc46ab69c35f89ca5251ae 100644
--- a/test/extrude/1078/1078.py
+++ b/test/extrude/1078/1078.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,500,500))
-r=w0.sketch().segment((141,1),(441,1)).arc((381,481),(830,650)).segment((750,1000)).segment((291,900)).segment((371,530)).segment((141,530)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=745).moveTo(670,241).cylinder(990,690))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(221,502,501))
+w1=cq.Workplane('YZ',origin=(241,501,500))
+r=w0.sketch().push([(291,705)]).circle(571).reset().face(w0.sketch().segment((436,375),(506,376)).segment((505,195)).segment((1000,197)).segment((1000,497)).segment((436,497)).close().assemble()).push([(750,233)]).rect(550,535,mode='s').finalize().extrude(1000).union(w1.workplane(offset=659).moveTo(158,538).box(815,1000,816))
\ No newline at end of file
diff --git a/test/extrude/1078/1078.stl b/test/extrude/1078/1078.stl
index 6af84dd2d44dd6482ba3010e6485fe094d35496e..798846fceed145f337efd0fcb925734c1013a1c0 100644
Binary files a/test/extrude/1078/1078.stl and b/test/extrude/1078/1078.stl differ
diff --git a/test/extrude/1079/1079.py b/test/extrude/1079/1079.py
index d06637bf9c222f51f9f1c9bb0d38310f2a2817bb..d4a981ddbd6c590f015f184ab69c3090e484c5ca 100644
--- a/test/extrude/1079/1079.py
+++ b/test/extrude/1079/1079.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(442,442,218))
-r=w0.sketch().arc((181,590),(32,181),(466,268)).segment((578,268)).segment((578,764)).segment((181,764)).close().assemble().finalize().extrude(330).union(w0.workplane(offset=708).moveTo(659,851).box(826,863,975)).union(w0.workplane(offset=721).moveTo(876,1).box(516,801,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(48,58,32))
+r=w0.sketch().segment((511,619),(357,619)).segment((357,5)).segment((511,5)).close().assemble().push([(481,270)]).rect(124,171,mode='s').finalize().extrude(379).translate((1,322,1))
diff --git a/test/extrude/1079/1079.stl b/test/extrude/1079/1079.stl
index d72beb08fa5c20fabe6b9be2fd35dacf6299b1b1..f12c841f4915cb88fae0d2eb986b7957470b60b9 100644
Binary files a/test/extrude/1079/1079.stl and b/test/extrude/1079/1079.stl differ
diff --git a/test/extrude/108/108.py b/test/extrude/108/108.py
index f6a5a308a4e5f2ffe117785cfa96457a4f0db726..287a0db0a4ed38fe117dfbe67dfd306499541311 100644
--- a/test/extrude/108/108.py
+++ b/test/extrude/108/108.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(488,538,488))
-w1=cq.Workplane('ZX',origin=(488,625,488))
-r=w0.sketch().push([(313,1)]).circle(625).push([(550,975)]).circle(625).finalize().extrude(213).union(w1.sketch().segment((376,650),(426,650)).segment((426,538)).segment((600,538)).segment((600,438)).segment((700,438)).segment((700,538)).segment((750,538)).segment((750,650)).segment((800,650)).segment((800,888)).segment((750,888)).segment((750,1000)).segment((426,1000)).segment((426,888)).segment((376,888)).close().assemble().finalize().extrude(563)).translate((137,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,500,500))
+r=w0.sketch().segment((200,186),(232,186)).segment((290,455)).segment((361,441)).segment((201,520)).close().assemble().reset().face(w0.sketch().segment((751,725),(800,724)).segment((799,816)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/108/108.stl b/test/extrude/108/108.stl
index 6fc25e240f0af032152a71695ee6d629e585ca05..253b4638006a72739028e56bf263f26cba513062 100644
Binary files a/test/extrude/108/108.stl and b/test/extrude/108/108.stl differ
diff --git a/test/extrude/1080/1080.py b/test/extrude/1080/1080.py
index dc62298b4453a66e74ff74abc507aeb5848f139d..2ebaa7729b8eae7b8845bf9d24e92aba169b4314 100644
--- a/test/extrude/1080/1080.py
+++ b/test/extrude/1080/1080.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(542,319,542))
-r=w0.sketch().push([(1,632)]).rect(576,676).push([(911,542)]).circle(732).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(45,43,13))
+r=w0.sketch().segment((166,816),(920,816)).segment((920,62)).segment((920,1)).arc((1000,154),(784,74)).arc((341,333),(166,815)).close().assemble().push([(676,324)]).rect(276,175,mode='s').finalize().extrude(131).translate((1,89,1))
diff --git a/test/extrude/1080/1080.stl b/test/extrude/1080/1080.stl
index a8d0225fee83ec7b79281c70faea142892c063af..2e6e8f99142b345d30685d1ea87a87a5cef84f82 100644
Binary files a/test/extrude/1080/1080.stl and b/test/extrude/1080/1080.stl differ
diff --git a/test/extrude/1081/1081.py b/test/extrude/1081/1081.py
index 90d9d9c6570bd192d5cb05554d6f922f50a6283a..45826cd29273842bb95fffbf4fadbfec8204029b 100644
--- a/test/extrude/1081/1081.py
+++ b/test/extrude/1081/1081.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(511,511,562))
-w1=cq.Workplane('ZX',origin=(511,460,511))
-r=w0.sketch().segment((307,246),(327,1)).segment((715,42)).segment((684,297)).arc((511,113),(307,246)).assemble().finalize().extrude(470).union(w0.workplane(offset=684).moveTo(490,312).box(959,562,857)).union(w0.sketch().arc((286,551),(184,256),(388,21)).segment((388,205)).segment((786,205)).arc((776,439),(613,602)).arc((582,735),(460,806)).arc((256,1000),(297,725)).arc((276,633),(286,551)).assemble().push([(342,669)]).rect(623,582,mode='s').finalize().extrude(939)).union(w1.sketch().segment((32,286),(164,286)).segment((164,256)).segment((460,256)).arc((908,399),(633,786)).segment((633,847)).segment((32,847)).close().assemble().finalize().extrude(317))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(51,30,4))
+r=w0.sketch().segment((482,897),(226,898)).segment((380,423)).segment((226,470)).segment((662,338)).close().assemble().push([(417,607)]).circle(109,mode='s').finalize().extrude(194)
diff --git a/test/extrude/1081/1081.stl b/test/extrude/1081/1081.stl
index 7b8e9aff01b9735b74b221d17bb3229e92fce525..7cf629e4602b269f2e92a0d58213bafdb32aab33 100644
Binary files a/test/extrude/1081/1081.stl and b/test/extrude/1081/1081.stl differ
diff --git a/test/extrude/1082/1082.py b/test/extrude/1082/1082.py
index 3a4f689383668744f079fdccce07f0b2c064fd9d..c977240863402fdb22ae07f04b76ca37539cad47 100644
--- a/test/extrude/1082/1082.py
+++ b/test/extrude/1082/1082.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,261))
-r=w0.sketch().segment((431,970),(580,970)).arc((500,1000),(431,970)).assemble().finalize().extrude(940).union(w0.sketch().segment((211,181),(231,181)).arc((251,141),(281,101)).segment((281,1)).segment((690,1)).segment((690,101)).arc((710,141),(740,181)).segment((750,181)).segment((750,211)).arc((790,391),(690,530)).segment((690,590)).segment((281,590)).segment((281,491)).arc((251,451),(231,411)).segment((211,411)).segment((211,371)).arc((201,301),(211,221)).close().assemble().finalize().extrude(990))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(6,66,20))
+r=w0.sketch().segment((1,539),(804,539)).segment((804,89)).segment((1,89)).close().assemble().push([(354,259)]).rect(224,231,mode='s').finalize().extrude(85)
diff --git a/test/extrude/1082/1082.stl b/test/extrude/1082/1082.stl
index 95838a0a711280edb64653fd79b9d71664a25b7b..165ebd676dd25e50b3f1a4e8426d85cb548d484d 100644
Binary files a/test/extrude/1082/1082.stl and b/test/extrude/1082/1082.stl differ
diff --git a/test/extrude/1083/1083.py b/test/extrude/1083/1083.py
index b9fd2dc0ac2f6ce6d6549d8e38de6c91784a8891..f64b36fe9c53e9b760c7bac958e1029981e4b646 100644
--- a/test/extrude/1083/1083.py
+++ b/test/extrude/1083/1083.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(510,500,500))
-r=w0.sketch().segment((301,1),(700,1)).segment((700,1000)).arc((500,910),(301,1000)).close().assemble().finalize().extrude(471)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(8,42,11))
+r=w0.sketch().segment((203,1),(879,1)).arc((401,167),(202,646)).close().assemble().push([(495,169)]).rect(182,171,mode='s').finalize().extrude(140).translate((1,99,1))
diff --git a/test/extrude/1083/1083.stl b/test/extrude/1083/1083.stl
index fe1dc28cdf08e36a3da47d176b3c9ddbf5a78a2d..9d25c81e3c2902b0e8010450c73a32ed5979a293 100644
Binary files a/test/extrude/1083/1083.stl and b/test/extrude/1083/1083.stl differ
diff --git a/test/extrude/1084/1084.py b/test/extrude/1084/1084.py
index a075d7724fb175503612b30f6dea27c6c6eea09f..ad41b188404977caaf23b6bbf2f40989b60c77ff 100644
--- a/test/extrude/1084/1084.py
+++ b/test/extrude/1084/1084.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,411))
-r=w0.sketch().segment((71,800),(231,670)).segment((401,870)).segment((241,1000)).close().assemble().push([(241,830)]).circle(550,mode='s').reset().face(w0.sketch().arc((441,31),(600,101),(740,1)).segment((930,1)).segment((930,161)).segment((720,161)).segment((720,221)).segment((650,221)).segment((650,161)).segment((441,161)).close().assemble()).finalize().extrude(690)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(50,53,49))
+r=w0.sketch().segment((331,612),(966,612)).segment((966,574)).segment((331,574)).close().assemble().finalize().extrude(137).union(w0.sketch().segment((958,247),(514,247)).segment((514,339)).segment((625,339)).arc((680,395),(625,451)).segment((514,451)).segment((514,543)).segment((958,543)).close().assemble().finalize().extrude(131)).union(w0.sketch().segment((548,615),(824,615)).segment((827,610)).segment((834,610)).segment((844,604)).segment((844,588)).segment((785,588)).segment((785,577)).segment((733,577)).segment((696,591)).segment((696,561)).segment((628,561)).segment((628,537)).segment((607,537)).segment((607,555)).segment((548,555)).close().assemble().finalize().extrude(71))
diff --git a/test/extrude/1084/1084.stl b/test/extrude/1084/1084.stl
index eb62baffa8d1fe9279ba61a8cbc880c240d6a238..23e91b94bb513e67b8285e9d641de3369a40d65c 100644
Binary files a/test/extrude/1084/1084.stl and b/test/extrude/1084/1084.stl differ
diff --git a/test/extrude/1085/1085.py b/test/extrude/1085/1085.py
index 22d6d07b2066bb31aee40d3aebc03abf3814b6c6..7184d4995c160ead821b90c38d3314cebd88aa15 100644
--- a/test/extrude/1085/1085.py
+++ b/test/extrude/1085/1085.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(488,334,334))
-r=w0.workplane(offset=1).moveTo(303,600).cylinder(1000,354).union(w0.workplane(offset=314).moveTo(298,606).box(406,447,375)).union(w0.sketch().push([(303,600)]).circle(467).push([(339,144)]).rect(652,754).finalize().extrude(693)).translate((12,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(3,59,72))
+r=w0.sketch().segment((994,1000),(994,368)).segment((277,368)).segment((277,1000)).segment((356,1000)).segment((356,846)).segment((914,846)).segment((914,1000)).close().assemble().push([(658,755)]).rect(148,214,mode='s').finalize().extrude(243)
diff --git a/test/extrude/1085/1085.stl b/test/extrude/1085/1085.stl
index 9f7a2a71463cd0235b099ced9b91b7ca2452bc8c..54433d8d7f467fd4a12d2eb9ec5d9ac72ebc6ffd 100644
Binary files a/test/extrude/1085/1085.stl and b/test/extrude/1085/1085.stl differ
diff --git a/test/extrude/1086/1086.py b/test/extrude/1086/1086.py
index f13f9236ada9a9707b7597ee550299f6a139f898..6ae7cb07f2ba03aba27ef94692540f6c8c934b64 100644
--- a/test/extrude/1086/1086.py
+++ b/test/extrude/1086/1086.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-w1=cq.Workplane('XY',origin=(334,334,650))
-r=w0.workplane(offset=667).moveTo(1,573).cylinder(1000,428).union(w1.workplane(offset=10).moveTo(283,701).cylinder(983,394)).translate((1,95,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(31,29,63))
+r=w0.sketch().segment((306,706),(819,706)).arc((859,690),(876,649)).segment((876,536)).segment((306,536)).close().assemble().push([(676,617)]).circle(86,mode='s').finalize().extrude(82)
diff --git a/test/extrude/1086/1086.stl b/test/extrude/1086/1086.stl
index 7da1966a9e5414e35886b23c0bd5adf9e92191e8..0d50ceb610a5de10ae0055ea51f5b44235eb2434 100644
Binary files a/test/extrude/1086/1086.stl and b/test/extrude/1086/1086.stl differ
diff --git a/test/extrude/1087/1087.py b/test/extrude/1087/1087.py
index 6ff247ddffc8ce147bcf7fb2b4520683d3285a34..17209b6bf6139daa2e0971fc71b8894959b19713 100644
--- a/test/extrude/1087/1087.py
+++ b/test/extrude/1087/1087.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(405,524,524))
-r=w0.sketch().segment((393,524),(917,524)).segment((917,964)).segment((643,964)).arc((179,1000),(393,584)).close().assemble().push([(417,1)]).circle(596).finalize().extrude(762).translate((1,1,72))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(42,26,56))
+r=w0.sketch().segment((176,196),(838,196)).segment((838,638)).segment((176,638)).close().assemble().push([(496,441)]).circle(115,mode='s').finalize().extrude(176)
diff --git a/test/extrude/1087/1087.stl b/test/extrude/1087/1087.stl
index 3fee46b91e280db65289445121297649fdaf4c4f..77d512595974c29aedf92c4eea854d102f08e175 100644
Binary files a/test/extrude/1087/1087.stl and b/test/extrude/1087/1087.stl differ
diff --git a/test/extrude/1088/1088.py b/test/extrude/1088/1088.py
index 694cc023e259c2be8a9e28799b7f8fc8229dafb7..6531c2e8e91e8f5938ae6f30ff398e8f9615e135 100644
--- a/test/extrude/1088/1088.py
+++ b/test/extrude/1088/1088.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().segment((620,620),(660,620)).segment((660,514)).segment((674,514)).segment((674,620)).segment((714,620)).segment((714,714)).segment((674,714)).segment((674,820)).segment((660,820)).segment((660,714)).segment((620,714)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(64,57,6))
+r=w0.sketch().segment((375,870),(529,870)).segment((529,151)).arc((452,74),(375,151)).close().assemble().push([(445,103)]).circle(53,mode='s').push([(422,404)]).circle(71,mode='s').push([(459,636)]).rect(52,108,mode='s').finalize().extrude(270)
diff --git a/test/extrude/1088/1088.stl b/test/extrude/1088/1088.stl
index d2ecdc4d5578fe3ffc2da43a5d5bf4eb4fe154b0..7176af371afc2e329e11786576351b0ecb1a82c6 100644
Binary files a/test/extrude/1088/1088.stl and b/test/extrude/1088/1088.stl differ
diff --git a/test/extrude/1089/1089.py b/test/extrude/1089/1089.py
index 3c78ec1970008d2c7cbb22a78e4b9fe155257b23..8497a5dc8c8fe208824a2861955198258a1bbaaa 100644
--- a/test/extrude/1089/1089.py
+++ b/test/extrude/1089/1089.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,291,500))
-r=w0.sketch().arc((540,311),(530,261),(570,211)).segment((570,1)).segment((650,1)).segment((650,241)).arc((660,271),(660,291)).arc((650,530),(540,311)).assemble().finalize().extrude(600).union(w0.sketch().segment((251,1000),(311,550)).segment((321,550)).segment((261,1000)).close().assemble().finalize().extrude(920))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(6,34,26))
+r=w0.sketch().segment((808,198),(314,198)).segment((314,433)).segment((479,433)).segment((479,603)).segment((380,724)).segment((479,804)).segment((479,926)).segment((534,926)).segment((534,817)).segment((753,817)).segment((753,926)).segment((808,926)).close().assemble().finalize().extrude(257).union(w0.workplane(offset=79).sketch().segment((224,393),(584,393)).segment((558,553)).segment((286,579)).close().assemble().finalize().extrude(91)).union(w0.workplane(offset=21).sketch().segment((294,528),(676,528)).segment((676,504)).segment((294,504)).close().assemble().finalize().extrude(74))
diff --git a/test/extrude/1089/1089.stl b/test/extrude/1089/1089.stl
index fe18febd02b76dde58a86ee76b05bdb0f28f0205..cbcad01d72ca864bf4dcf2a7185034b064daf470 100644
Binary files a/test/extrude/1089/1089.stl and b/test/extrude/1089/1089.stl differ
diff --git a/test/extrude/109/109.py b/test/extrude/109/109.py
index f49869a94e58164b00a60805b5446b475817b8da..d022102a8f68dfc1ea3197141b9bba7560805210 100644
--- a/test/extrude/109/109.py
+++ b/test/extrude/109/109.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(516,516,701))
-r=w0.sketch().arc((1,32),(11,32),(11,22)).arc((32,42),(1,32)).assemble().finalize().extrude(155).union(w0.sketch().arc((310,567),(537,310),(876,351)).arc((856,434),(938,413)).arc((753,1000),(310,578)).segment((310,660)).segment((876,660)).segment((876,567)).close().assemble().push([(743,403)]).circle(557,mode='s').finalize().extrude(207))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,481,502))
+r=w0.sketch().push([(399,171)]).rect(896,840).push([(400,170)]).circle(659,mode='s').push([(686,465)]).circle(550).finalize().extrude(165).union(w0.sketch().segment((481,710),(676,625)).segment((799,920)).segment((601,999)).close().assemble().push([(684,465)]).circle(525).reset().face(w0.sketch().segment((676,485),(694,442)).segment((681,486)).close().assemble(),mode='s').finalize().extrude(875))
\ No newline at end of file
diff --git a/test/extrude/109/109.stl b/test/extrude/109/109.stl
index 58d24d352053b026c7a11d4eda842420585b2ec8..bd55cbd2af2354e194f00657977faec86d5ab36b 100644
Binary files a/test/extrude/109/109.stl and b/test/extrude/109/109.stl differ
diff --git a/test/extrude/1090/1090.py b/test/extrude/1090/1090.py
index 2b9d3bd338abfc50fbf138a17a9ab629d0c06e56..a8325695afa7b68902dbf26d4d023e5a82ed1ede 100644
--- a/test/extrude/1090/1090.py
+++ b/test/extrude/1090/1090.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(52,368,368))
-r=w0.sketch().segment((1,96),(383,96)).segment((383,280)).arc((287,354),(383,434)).segment((383,500)).segment((581,500)).segment((581,96)).segment((736,96)).segment((736,640)).segment((1,640)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(44,36,26))
+r=w0.sketch().segment((175,153),(473,153)).segment((574,254)).segment((574,552)).segment((473,654)).segment((175,654)).segment((74,552)).segment((74,254)).close().assemble().push([(325,357)]).rect(153,77,mode='s').finalize().extrude(199).translate((1,164,1))
diff --git a/test/extrude/1090/1090.stl b/test/extrude/1090/1090.stl
index 9ca78655bbcf14585fbaf620674f49f6f3290189..c78507191f33b79705ae630c52d5f5b61f7abd6d 100644
Binary files a/test/extrude/1090/1090.stl and b/test/extrude/1090/1090.stl differ
diff --git a/test/extrude/1091/1091.py b/test/extrude/1091/1091.py
index 53e4052cc497aa7ba35f78e7eab4dee1b7e7a4c3..eadfbce4e3afce007a61c3f06314f16bf217250d 100644
--- a/test/extrude/1091/1091.py
+++ b/test/extrude/1091/1091.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(760,520,520))
-r=w0.sketch().segment((260,731),(779,731)).arc((520,866),(260,731)).assemble().finalize().extrude(1).union(w0.sketch().segment((39,769),(212,107)).segment((1000,318)).segment((981,395)).arc((693,587),(645,933)).close().assemble().finalize().extrude(549))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,302))
+r=w0.workplane(offset=567).moveTo(395,499).box(1000,821,635).union(w0.sketch().segment((62,736),(122,735)).segment((120,820)).segment((141,820)).segment((142,735)).segment((336,734)).segment((336,351)).arc((386,280),(334,211)).segment((336,96)).segment((730,97)).segment((731,905)).segment((60,906)).close().assemble().push([(889,557)]).rect(721,620).finalize().extrude(906))
\ No newline at end of file
diff --git a/test/extrude/1091/1091.stl b/test/extrude/1091/1091.stl
index 0352646569d8a675ecadc4b1896a8f6ab55ba1a4..bb19c21c9cfa5c38d9e53ebc359ec1b1c12b6adb 100644
Binary files a/test/extrude/1091/1091.stl and b/test/extrude/1091/1091.stl differ
diff --git a/test/extrude/1092/1092.py b/test/extrude/1092/1092.py
index 2af98392ef6dddc8a11c14c2d6b266afdbb9a075..a49967db10c5d759862decd50404fb97d2288a36 100644
--- a/test/extrude/1092/1092.py
+++ b/test/extrude/1092/1092.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(423,423,700))
-r=w0.workplane(offset=140).moveTo(806,340).box(767,789,989).union(w0.workplane(offset=151).moveTo(1,423).box(689,1000,967))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,60,15))
+r=w0.sketch().segment((684,791),(684,764)).arc((822,463),(684,162)).segment((684,135)).segment((166,135)).segment((166,162)).arc((28,463),(166,764)).segment((166,791)).close().assemble().push([(199,394)]).circle(53,mode='s').push([(478,231)]).circle(44,mode='s').finalize().extrude(140)
diff --git a/test/extrude/1092/1092.stl b/test/extrude/1092/1092.stl
index c31b1c8b3660193b899e3da55c14979878499112..08061afc37bc4a5bc338e27288f7491d444826de 100644
Binary files a/test/extrude/1092/1092.stl and b/test/extrude/1092/1092.stl differ
diff --git a/test/extrude/1093/1093.py b/test/extrude/1093/1093.py
index fee2236ae00324283b9e2d99a2fb713a713708ee..745bf8137765bd31222f3649c62767049171448a 100644
--- a/test/extrude/1093/1093.py
+++ b/test/extrude/1093/1093.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(767,515,515))
-r=w0.sketch().segment((30,806),(738,806)).arc((389,913),(30,806)).assemble().reset().face(w0.sketch().arc((971,117),(1000,302),(971,486)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(72,4,49))
+r=w0.sketch().segment((227,429),(985,429)).segment((985,303)).segment((227,303)).close().assemble().push([(564,375)]).circle(141,mode='s').finalize().extrude(348)
diff --git a/test/extrude/1093/1093.stl b/test/extrude/1093/1093.stl
index 9e1b167aa95d1ee3d89f79856a4810a7ddea7ba5..2373cc550efbfff3285fc3a6edf1609f748ad2ae 100644
Binary files a/test/extrude/1093/1093.stl and b/test/extrude/1093/1093.stl differ
diff --git a/test/extrude/1094/1094.py b/test/extrude/1094/1094.py
index f8089972415a8cebc1a4aeeab030b92fcd9dbc99..527840b33f5f791dd095ef8ddb00102f18eaf93c 100644
--- a/test/extrude/1094/1094.py
+++ b/test/extrude/1094/1094.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().segment((407,853),(527,381)).segment((927,481)).segment((807,953)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(22,70,46))
+r=w0.sketch().segment((317,769),(829,769)).segment((829,1)).segment((317,1)).close().assemble().push([(594,439)]).circle(98,mode='s').finalize().extrude(144).translate((1,75,1))
diff --git a/test/extrude/1094/1094.stl b/test/extrude/1094/1094.stl
index fa0cbe35d9a3a34686cbc5caf9da67ac84413ba6..88f0acce876422100f4ebbcf2ae0ec434f1b46d5 100644
Binary files a/test/extrude/1094/1094.stl and b/test/extrude/1094/1094.stl differ
diff --git a/test/extrude/1095/1095.py b/test/extrude/1095/1095.py
index 5140f2fa4dad4cda4aab163f49711a9127d4dc67..c3afdeefaa03d2b3e7df8fe086e5ebda4c566854 100644
--- a/test/extrude/1095/1095.py
+++ b/test/extrude/1095/1095.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(806,538,538))
-r=w0.sketch().push([(288,838)]).rect(963,565).reset().face(w0.sketch().segment((556,325),(852,223)).segment((889,334)).arc((954,426),(963,538)).segment((1000,658)).segment((704,760)).segment((658,639)).arc((593,547),(593,436)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(69,30,38))
+r=w0.sketch().segment((529,818),(391,818)).segment((391,1)).segment((529,1)).close().assemble().reset().segment((505,256),(277,256)).segment((277,560)).segment((505,560)).close().assemble(mode='s').finalize().extrude(370)
diff --git a/test/extrude/1095/1095.stl b/test/extrude/1095/1095.stl
index 1f119e8096901986cfe19d2d46ba3ef401ac81d9..0b0e6b5cfa5201ff43db1293505d3db3f6ba0fdb 100644
Binary files a/test/extrude/1095/1095.stl and b/test/extrude/1095/1095.stl differ
diff --git a/test/extrude/1096/1096.py b/test/extrude/1096/1096.py
index a752f96d28d27a91b00d0593fb6a2824883d22f8..e2ae5d6d6708209435d967020a86f6f67acedced 100644
--- a/test/extrude/1096/1096.py
+++ b/test/extrude/1096/1096.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(542,542,808))
-r=w0.sketch().arc((83,762),(670,569),(129,285)).segment((221,285)).segment((157,762)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((349,450),(551,450)).arc((679,395),(808,450)).segment((1000,450)).segment((1000,698)).segment((808,698)).arc((679,753),(551,698)).segment((349,698)).close().assemble().finalize().extrude(56))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(526,502,501))
+w1=cq.Workplane('YZ',origin=(545,500,500))
+r=w0.sketch().push([(311,228)]).rect(631,956).push([(251,180)]).rect(510,511,mode='s').push([(394,771)]).circle(517).finalize().extrude(1).union(w1.sketch().segment((345,441),(834,439)).segment((835,850)).segment((611,851)).arc((220,920),(345,547)).close().assemble().finalize().extrude(950))
\ No newline at end of file
diff --git a/test/extrude/1096/1096.stl b/test/extrude/1096/1096.stl
index cb7076bdfddf70f05aeeb0a81d9cf017408c1d67..2d0937b7a828258c90e0a6467b4ec35cc614d41b 100644
Binary files a/test/extrude/1096/1096.stl and b/test/extrude/1096/1096.stl differ
diff --git a/test/extrude/1097/1097.py b/test/extrude/1097/1097.py
index 6cec779fc8cc23ad4ac213410cfa75ad5fa01c33..79fca371f842937ed86910c9975aeadcfd27c4de 100644
--- a/test/extrude/1097/1097.py
+++ b/test/extrude/1097/1097.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(491,491,236))
-r=w0.sketch().segment((70,79),(128,79)).arc((324,1),(520,79)).segment((579,79)).segment((579,158)).arc((608,295),(579,422)).segment((579,432)).arc((853,912),(422,559)).arc((265,569),(128,500)).segment((70,500)).segment((70,422)).arc((30,295),(70,158)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(80,20,74))
+r=w0.sketch().segment((617,842),(671,842)).segment((671,92)).segment((617,92)).close().assemble().push([(618,520)]).rect(243,254,mode='s').finalize().extrude(232)
diff --git a/test/extrude/1097/1097.stl b/test/extrude/1097/1097.stl
index c1d521462ec2a73f2ddaf2280c59a2b40fc0eb4c..b7f902a1090042fb39c18cbc60977679d55868a8 100644
Binary files a/test/extrude/1097/1097.stl and b/test/extrude/1097/1097.stl differ
diff --git a/test/extrude/1098/1098.py b/test/extrude/1098/1098.py
index b048ee1a128258848fc14ee7d1b27cb0e4da7cfa..226b07c0edf80562fdd281911fcce804bc523a31 100644
--- a/test/extrude/1098/1098.py
+++ b/test/extrude/1098/1098.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(241,241,185))
-w1=cq.Workplane('ZX',origin=(241,453,241))
-r=w0.sketch().arc((319,576),(219,330),(453,263)).segment((699,263)).segment((699,799)).segment((319,799)).close().assemble().push([(319,442)]).circle(308,mode='s').finalize().extrude(687).union(w0.sketch().push([(241,141)]).circle(699).push([(241,135)]).rect(263,877,mode='s').finalize().extrude(833)).union(w1.workplane(offset=1).moveTo(96,442).box(1000,554,721)).translate((218,318,164))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(37,72,35))
+r=w0.sketch().segment((75,743),(763,743)).segment((763,583)).segment((75,583)).close().assemble().push([(405,695)]).rect(123,169,mode='s').finalize().extrude(93).union(w0.workplane(offset=8).sketch().segment((309,635),(737,635)).segment((737,207)).segment((309,207)).close().assemble().finalize().extrude(124))
diff --git a/test/extrude/1098/1098.stl b/test/extrude/1098/1098.stl
index ed037368e57724f72cb98e43ac2084dc8a82d45a..450100ed1e12eea987a1f10cf3fe5c6c3453acfa 100644
Binary files a/test/extrude/1098/1098.stl and b/test/extrude/1098/1098.stl differ
diff --git a/test/extrude/1099/1099.py b/test/extrude/1099/1099.py
index c0c5b475b0ffc1b0c7e47e997c25521e974a604e..011ae1536cce76ce9c4fdc13498e26f77170d57b 100644
--- a/test/extrude/1099/1099.py
+++ b/test/extrude/1099/1099.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(349,562,562))
-r=w0.sketch().segment((1,136),(192,136)).segment((192,203)).arc((315,327),(192,450)).segment((192,573)).segment((1,573)).close().assemble().push([(276,321)]).rect(618,663,mode='s').push([(865,798)]).circle(820).finalize().extrude(596).union(w0.sketch().push([(517,248)]).circle(742).reset().face(w0.sketch().segment((383,360),(450,158)).segment((506,181)).segment((439,371)).close().assemble(),mode='s').push([(529,674)]).circle(742).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(65,32,6))
+r=w0.sketch().segment((116,838),(116,290)).segment((370,290)).arc((644,564),(370,838)).close().assemble().push([(233,567)]).circle(83,mode='s').finalize().extrude(74)
diff --git a/test/extrude/1099/1099.stl b/test/extrude/1099/1099.stl
index 2956c11804f9f5985f88069b497d288c483b0888..9d2f3473872d5486b8708983a90445fd96438014 100644
Binary files a/test/extrude/1099/1099.stl and b/test/extrude/1099/1099.stl differ
diff --git a/test/extrude/11/11.py b/test/extrude/11/11.py
index 90948cd8295a96eefde81e44ca26459bf28ffcb3..00098aa1305d5b19614811b52aca9e47504119d6 100644
--- a/test/extrude/11/11.py
+++ b/test/extrude/11/11.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(470,470,675))
-w1=cq.Workplane('YZ',origin=(470,470,470))
-r=w0.sketch().push([(362,507)]).circle(591).push([(338,555)]).circle(482,mode='s').finalize().extrude(398).union(w0.workplane(offset=507).moveTo(735,1).box(711,543,543)).union(w0.workplane(offset=669).moveTo(362,507).box(976,1000,868)).union(w1.sketch().push([(735,109)]).circle(711).circle(482,mode='s').finalize().extrude(85)).translate((1,1,134))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(23,47,7))
+r=w0.sketch().segment((1,297),(152,603)).segment((592,603)).segment((735,297)).close().assemble().push([(378,407)]).circle(63,mode='s').push([(79,369)]).circle(30,mode='s').push([(277,545)]).circle(32,mode='s').finalize().extrude(68).translate((1,22,1))
diff --git a/test/extrude/11/11.stl b/test/extrude/11/11.stl
index c4479ce99880e10831b4f2da11d05740fc4be2c5..24fbf6afa5ecd7d5b2b46fdcb4c908fb8063d0a1 100644
Binary files a/test/extrude/11/11.stl and b/test/extrude/11/11.stl differ
diff --git a/test/extrude/110/110.py b/test/extrude/110/110.py
index a85e5b7019ff27c7ee96302af0761f7bc1274b95..84a3154234c42df85ae1f74bf06c7024572af836 100644
--- a/test/extrude/110/110.py
+++ b/test/extrude/110/110.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(481,481,731))
-r=w0.workplane(offset=227).moveTo(702,390).box(1000,952,990).union(w0.sketch().segment((1,308),(270,241)).segment((385,741)).segment((116,808)).close().assemble().finalize().extrude(270))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(281,310,280))
+r=w0.workplane(offset=240).moveTo(431,255).cylinder(362,291).union(w0.sketch().push([(240,468)]).rect(525,461).push([(286,113)]).circle(392).push([(287,113)]).rect(411,441,mode='s').finalize().extrude(297))
\ No newline at end of file
diff --git a/test/extrude/110/110.stl b/test/extrude/110/110.stl
index 279562756bcbc89d0eb31fc0d2e7ed0669468676..5a0eea8f68453c57cf044b7eec2c228111af086b 100644
Binary files a/test/extrude/110/110.stl and b/test/extrude/110/110.stl differ
diff --git a/test/extrude/1100/1100.py b/test/extrude/1100/1100.py
index b9cc82d491d55ccfc35dd9fdb5f3a505d9c440f1..fb022f72cbc8dc1177450a34347d7324a134d03b 100644
--- a/test/extrude/1100/1100.py
+++ b/test/extrude/1100/1100.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,680))
-r=w0.sketch().segment((1,740),(141,530)).arc((171,590),(241,600)).segment((101,800)).close().assemble().reset().face(w0.sketch().segment((191,451),(331,251)).segment((401,291)).arc((590,201),(790,281)).segment((910,201)).segment((1000,341)).segment((870,421)).arc((750,700),(451,700)).segment((451,331)).segment((421,331)).segment((291,520)).arc((261,461),(191,451)).assemble()).finalize().extrude(131).union(w0.sketch().segment((391,520),(401,520)).segment((401,491)).segment((890,491)).segment((890,520)).segment((900,520)).segment((900,580)).segment((890,580)).segment((890,610)).segment((401,610)).segment((401,580)).segment((391,580)).close().assemble().finalize().extrude(251))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(42,4,77))
+r=w0.sketch().segment((932,341),(328,341)).segment((328,825)).segment((932,825)).close().assemble().push([(674,578)]).rect(208,203,mode='s').finalize().extrude(235).translate((1,232,1))
diff --git a/test/extrude/1100/1100.stl b/test/extrude/1100/1100.stl
index f29b38f449467b2ac44ac991df55626b8e29d39f..3fc17b8d6c8cca59785c945f5c60e168de089a32 100644
Binary files a/test/extrude/1100/1100.stl and b/test/extrude/1100/1100.stl differ
diff --git a/test/extrude/1101/1101.py b/test/extrude/1101/1101.py
index c3afebe472527ac22f88b6cf94f6b9803d052be2..8173ecc37533a32cd34eaeb5586949c415a848f3 100644
--- a/test/extrude/1101/1101.py
+++ b/test/extrude/1101/1101.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(507,507,760))
-r=w0.sketch().push([(414,1000)]).circle(680).push([(654,68)]).circle(734).finalize().extrude(1).union(w0.sketch().segment((134,307),(600,307)).segment((600,347)).segment((747,347)).segment((747,760)).segment((600,760)).segment((600,827)).segment((134,827)).close().assemble().reset().face(w0.sketch().segment((174,414),(307,414)).segment((307,347)).segment((427,347)).segment((427,414)).segment((560,414)).segment((560,734)).segment((427,734)).segment((427,800)).segment((307,800)).segment((307,734)).segment((174,734)).close().assemble(),mode='s').finalize().extrude(467)).translate((1,161,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(31,2,3))
+r=w0.sketch().segment((139,808),(511,808)).segment((511,214)).segment((139,214)).close().assemble().finalize().extrude(315).union(w0.workplane(offset=39).sketch().segment((581,752),(343,752)).segment((343,344)).segment((581,344)).close().assemble().finalize().extrude(82)).union(w0.workplane(offset=144).sketch().segment((288,526),(384,526)).segment((384,268)).segment((288,268)).close().assemble().finalize().extrude(177))
diff --git a/test/extrude/1101/1101.stl b/test/extrude/1101/1101.stl
index b810c7e8af2ec58f83c570782dedbfe08aeba7b9..d258c947c10d6a5a6c38ce31933105fc54fe3859 100644
Binary files a/test/extrude/1101/1101.stl and b/test/extrude/1101/1101.stl differ
diff --git a/test/extrude/1102/1102.py b/test/extrude/1102/1102.py
index 6018aaae1b5efc2c9cbe06f9bdc75be44045e9ca..103201c73b7cf287e890c444b2e8694933321d1b 100644
--- a/test/extrude/1102/1102.py
+++ b/test/extrude/1102/1102.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,401))
-r=w0.sketch().segment((261,1),(740,1)).segment((740,1000)).segment((261,1000)).segment((261,421)).segment((391,600)).segment((600,461)).segment((471,261)).segment((261,401)).close().assemble().finalize().extrude(700)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(35,78,56))
+r=w0.sketch().segment((672,522),(672,534)).segment((1,534)).segment((1,522)).close().assemble().finalize().extrude(193).union(w0.sketch().segment((782,346),(782,28)).segment((406,28)).segment((406,346)).segment((406,378)).segment((782,378)).close().assemble().finalize().extrude(72)).union(w0.sketch().segment((542,689),(586,689)).segment((586,393)).segment((542,393)).close().assemble().finalize().extrude(102))
diff --git a/test/extrude/1102/1102.stl b/test/extrude/1102/1102.stl
index aa00f2d54bcdf67370fb79162fc9726170d246f4..b3441afa87077c9e38017246cb3da34358ca33da 100644
Binary files a/test/extrude/1102/1102.stl and b/test/extrude/1102/1102.stl differ
diff --git a/test/extrude/1103/1103.py b/test/extrude/1103/1103.py
index 7fee41afb9723c369c9e2f2545b386ef72a75d2f..b6f5ecc26c4417048c3e3221f8c3a29067a99219 100644
--- a/test/extrude/1103/1103.py
+++ b/test/extrude/1103/1103.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(351,516,516))
-r=w0.sketch().segment((1,526),(392,392)).segment((454,588)).segment((289,609)).segment((310,825)).segment((506,794)).segment((495,681)).segment((557,876)).segment((166,1000)).close().assemble().push([(753,310)]).circle(794).circle(629,mode='s').finalize().extrude(846)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(78,33,10))
+r=w0.sketch().segment((312,868),(1000,868)).segment((1000,512)).segment((1000,216)).segment((312,216)).segment((312,512)).segment((1000,512)).segment((312,512)).close().assemble().push([(649,588)]).rect(228,203,mode='s').finalize().extrude(145)
diff --git a/test/extrude/1103/1103.stl b/test/extrude/1103/1103.stl
index 7beb270fdbd54f6fc891509d72750ac5a07c8201..bc8d4a1958d01350b8bf91de69dbb21aab380705 100644
Binary files a/test/extrude/1103/1103.stl and b/test/extrude/1103/1103.stl differ
diff --git a/test/extrude/1104/1104.py b/test/extrude/1104/1104.py
index 337654115f82db4923c3b20e261b507c9f547e17..ced30a5d0de20696ecc6c211c7df7f59cbce2402 100644
--- a/test/extrude/1104/1104.py
+++ b/test/extrude/1104/1104.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,680,500))
-r=w0.workplane(offset=316).moveTo(421,500).cylinder(870,720).union(w0.sketch().segment((1,271),(291,271)).arc((481,241),(630,341)).segment((730,341)).segment((730,411)).segment((1000,411)).segment((1000,471)).segment((730,471)).segment((730,570)).segment((670,570)).arc((610,680),(500,750)).segment((500,760)).segment((1,760)).close().assemble().finalize().extrude(201))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(38,71,59))
+r=w0.sketch().segment((146,719),(938,719)).segment((938,21)).segment((146,21)).close().assemble().push([(536,307)]).rect(175,174,mode='s').finalize().extrude(93)
diff --git a/test/extrude/1104/1104.stl b/test/extrude/1104/1104.stl
index b59a67ba5afbec0b1a3bba1dfc5b9ba836086e23..51d8ac7bfb29a100dfc24926c0d2b33088d51541 100644
Binary files a/test/extrude/1104/1104.stl and b/test/extrude/1104/1104.stl differ
diff --git a/test/extrude/1105/1105.py b/test/extrude/1105/1105.py
index 45c6bf6ca221cc7d4149f07af5ed2df5427fa740..2eac66a00351e9aec3742f9ced9dfd20c1236b09 100644
--- a/test/extrude/1105/1105.py
+++ b/test/extrude/1105/1105.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,403,495))
-w1=cq.Workplane('ZX',origin=(495,392,495))
-r=w0.sketch().arc((495,588),(773,794),(495,1000)).arc((217,794),(495,588)).assemble().reset().face(w0.sketch().segment((248,743),(320,743)).segment((248,794)).close().assemble(),mode='s').reset().face(w0.sketch().segment((248,815),(279,856)).segment((248,856)).close().assemble(),mode='s').reset().face(w0.sketch().arc((526,856),(526,846),(537,846)).segment((598,804)).segment((598,856)).close().assemble(),mode='s').reset().face(w0.sketch().segment((578,743),(598,743)).segment((598,773)).close().assemble(),mode='s').push([(537,1)]).rect(640,537).push([(516,6)]).rect(537,506,mode='s').finalize().extrude(629).union(w1.workplane(offset=598).moveTo(547,279).cylinder(701,712))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(287,287,476))
+w1=cq.Workplane('ZX',origin=(287,248,288))
+r=w0.sketch().segment((45,52),(294,51)).segment((294,53)).arc((419,225),(242,339)).segment((45,339)).close().assemble().reset().face(w0.sketch().arc((293,77),(402,199),(293,319)).close().assemble(),mode='s').finalize().extrude(133).union(w0.workplane(offset=252).moveTo(556,345).box(319,339,358)).union(w1.sketch().push([(202,105)]).circle(390).circle(294,mode='s').finalize().extrude(566))
\ No newline at end of file
diff --git a/test/extrude/1105/1105.stl b/test/extrude/1105/1105.stl
index 4b56b29b0d7afc140b7a13d34b9970487860e04d..bad41b8b0fd803ee970f43763aefac6fbd74a5f5 100644
Binary files a/test/extrude/1105/1105.stl and b/test/extrude/1105/1105.stl differ
diff --git a/test/extrude/1106/1106.py b/test/extrude/1106/1106.py
index 4f4e9a48640cc7aa6ef39fc64a30774cb3a1222d..cc7efb76d64eb05eec229e30aade0c25dabcbf44 100644
--- a/test/extrude/1106/1106.py
+++ b/test/extrude/1106/1106.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(130,306,306))
-r=w0.workplane(offset=136).moveTo(270,1).box(462,524,648).union(w0.workplane(offset=508).moveTo(161,317).cylinder(710,482)).union(w0.workplane(offset=653).moveTo(570,379).box(420,990,1000)).translate((59,16,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(305,499,500))
+w1=cq.Workplane('ZX',origin=(499,325,501))
+r=w0.sketch().push([(205,146)]).rect(909,591).push([(238,167)]).rect(526,519,mode='s').finalize().extrude(392).union(w0.sketch().push([(755,370)]).circle(744).circle(636,mode='s').finalize().extrude(1000)).union(w1.sketch().segment((509,25),(876,25)).segment((876,225)).arc((900,315),(876,411)).segment((874,606)).segment((735,604)).arc((526,631),(511,422)).segment((511,412)).arc((484,315),(512,227)).close().assemble().finalize().extrude(215))
\ No newline at end of file
diff --git a/test/extrude/1106/1106.stl b/test/extrude/1106/1106.stl
index 012c44741b0705c69fb0909eb5670fc036ac92a1..9b3a76653c5f8e3593535cd04e7f14b035e56df3 100644
Binary files a/test/extrude/1106/1106.stl and b/test/extrude/1106/1106.stl differ
diff --git a/test/extrude/1107/1107.py b/test/extrude/1107/1107.py
index 9cbfb987b49a6ee6a3186fb076da2981e4bc63c1..5129acd3357d86654a60f1e68e2394c446f2982f 100644
--- a/test/extrude/1107/1107.py
+++ b/test/extrude/1107/1107.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(351,500,500))
-r=w0.sketch().segment((790,500),(930,231)).arc((980,421),(790,500)).assemble().finalize().extrude(321).union(w0.sketch().segment((261,71),(321,71)).segment((321,491)).arc((381,1000),(271,500)).segment((261,500)).close().assemble().finalize().extrude(960)).union(w0.sketch().segment((11,281),(21,301)).segment((21,41)).segment((151,41)).arc((261,1),(361,11)).segment((321,41)).arc((51,241),(231,530)).segment((21,530)).segment((21,351)).arc((11,321),(11,281)).assemble().finalize().extrude(990))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(61,33,56))
+r=w0.sketch().segment((80,879),(792,879)).segment((792,115)).segment((80,115)).close().assemble().push([(381,524)]).circle(159,mode='s').finalize().extrude(121)
diff --git a/test/extrude/1107/1107.stl b/test/extrude/1107/1107.stl
index 729c4706b0a1b9695fd00479bd6a995b06a09f9f..b573c929966c187c464dff950e8b81aac6ddbb65 100644
Binary files a/test/extrude/1107/1107.stl and b/test/extrude/1107/1107.stl differ
diff --git a/test/extrude/1108/1108.py b/test/extrude/1108/1108.py
index 0d97cf71e5613ad26c61f76afaf345d57da86342..b244cc8876d80647c71d7626d166753a0d140de6 100644
--- a/test/extrude/1108/1108.py
+++ b/test/extrude/1108/1108.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(527,527,485))
-r=w0.sketch().arc((1,285),(33,359),(1,432)).close().assemble().finalize().extrude(316).union(w0.workplane(offset=679).moveTo(1000,716).cylinder(832,579))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(47,62,11))
+r=w0.sketch().segment((608,601),(14,601)).segment((14,263)).segment((608,263)).close().assemble().push([(325,406)]).rect(198,139,mode='s').finalize().extrude(157)
diff --git a/test/extrude/1108/1108.stl b/test/extrude/1108/1108.stl
index 9222c2078e9188c3780438561579fb09b9f6f3f9..4c4c3c91a00275f24226469a18fd622d5251e952 100644
Binary files a/test/extrude/1108/1108.stl and b/test/extrude/1108/1108.stl differ
diff --git a/test/extrude/1109/1109.py b/test/extrude/1109/1109.py
index 3c1d4140619368a877b2e9f885681f637c2a89a6..9bc8ac48a3e7caa1837386a29053702fd367097f 100644
--- a/test/extrude/1109/1109.py
+++ b/test/extrude/1109/1109.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(221,500,500))
-w1=cq.Workplane('ZX',origin=(500,550,500))
-r=w0.sketch().segment((61,161),(191,1)).segment((550,281)).segment((481,371)).segment((510,371)).segment((510,840)).segment((401,840)).segment((381,1000)).segment((141,980)).segment((151,840)).segment((151,371)).segment((331,371)).close().assemble().finalize().extrude(660).union(w1.sketch().segment((261,590),(351,590)).arc((361,570),(361,560)).segment((361,471)).segment((570,471)).segment((570,530)).segment((570,560)).arc((580,570),(580,590)).segment((670,590)).segment((670,670)).segment((580,670)).arc((580,690),(570,700)).segment((570,780)).segment((361,780)).segment((361,700)).arc((361,690),(351,670)).segment((261,670)).close().assemble().finalize().extrude(890))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(18,20,55))
+r=w0.sketch().segment((210,101),(210,461)).arc((498,749),(786,461)).segment((786,221)).segment((565,221)).segment((234,40)).close().assemble().finalize().extrude(166).union(w0.sketch().segment((769,670),(769,706)).segment((769,737)).segment((501,737)).segment((501,667)).segment((491,667)).segment((491,747)).segment((779,747)).segment((779,706)).segment((779,670)).close().assemble().finalize().extrude(58)).union(w0.workplane(offset=204).sketch().segment((547,792),(806,792)).segment((806,533)).segment((547,533)).close().assemble().finalize().extrude(131))
diff --git a/test/extrude/1109/1109.stl b/test/extrude/1109/1109.stl
index 2498b61630bdf83723351304f1a469fabc5dc039..a806ec13742acacc416080fdef41c5f3d7059f39 100644
Binary files a/test/extrude/1109/1109.stl and b/test/extrude/1109/1109.stl differ
diff --git a/test/extrude/111/111.py b/test/extrude/111/111.py
index 3e077e7ec0831631502b2c1325a60cf0fc9fce69..ff5c6f6d931dd0b62ed124b5f1aff44bbf7106e7 100644
--- a/test/extrude/111/111.py
+++ b/test/extrude/111/111.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(530,500,500))
-r=w0.workplane(offset=426).cylinder(650,560).union(w0.sketch().segment((81,61),(261,61)).arc((500,1),(740,61)).segment((920,61)).segment((920,221)).arc((1000,500),(920,780)).segment((920,940)).segment((740,940)).arc((500,1000),(261,940)).segment((81,940)).segment((81,780)).arc((1,500),(81,221)).close().assemble().reset().face(w0.sketch().segment((411,411),(530,381)).segment((590,590)).segment((471,620)).close().assemble(),mode='s').finalize().extrude(590)).translate((1,61,61))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(517,500,500))
+w1=cq.Workplane('XY',origin=(501,502,509))
+r=w0.sketch().arc((232,67),(314,55),(355,135)).arc((105,442),(230,65)).assemble().push([(827,276)]).rect(845,572).finalize().extrude(115).union(w0.workplane(offset=678).moveTo(494,775).cylinder(856,674)).union(w1.sketch().push([(420,550)]).rect(649,639).push([(422,579)]).rect(524,550,mode='s').finalize().extrude(350))
\ No newline at end of file
diff --git a/test/extrude/111/111.stl b/test/extrude/111/111.stl
index ebdeb33f43aeac4a73752ac8f3ad2433f20276f1..0ec908c32165e29bbbfd95b9508c7b60ac82d322 100644
Binary files a/test/extrude/111/111.stl and b/test/extrude/111/111.stl differ
diff --git a/test/extrude/1110/1110.py b/test/extrude/1110/1110.py
index 98a3d576e6f07fc829ffbb903017f36c84507128..60599cd248511f2056ce3239f51900a74e700c76 100644
--- a/test/extrude/1110/1110.py
+++ b/test/extrude/1110/1110.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=520).moveTo(334,627).cylinder(707,367).union(w0.workplane(offset=667).moveTo(334,78).box(361,474,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(39,43,59))
+r=w0.sketch().segment((668,708),(353,708)).segment((353,443)).segment((369,420)).segment((705,312)).segment((748,312)).segment((920,499)).segment((920,708)).segment((943,708)).segment((943,866)).segment((900,910)).segment((712,909)).segment((668,866)).close().assemble().finalize().extrude(110).union(w0.sketch().segment((395,169),(103,169)).segment((103,637)).segment((395,637)).close().assemble().finalize().extrude(103))
diff --git a/test/extrude/1110/1110.stl b/test/extrude/1110/1110.stl
index 077e372175413e1bf025a250371119841471f953..b7136ff5f372de695abf0bf8a38627a2e1bf414e 100644
Binary files a/test/extrude/1110/1110.stl and b/test/extrude/1110/1110.stl differ
diff --git a/test/extrude/1111/1111.py b/test/extrude/1111/1111.py
index 22e7558876919d3e35cf0c2e6f7b766d05e8897c..ac8ff36c886719cac00c237a111d0fb6d565b036 100644
--- a/test/extrude/1111/1111.py
+++ b/test/extrude/1111/1111.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(507,309,507))
-r=w0.sketch().arc((63,297),(457,63),(408,519)).arc((1,753),(63,297)).assemble().finalize().extrude(679).union(w0.workplane(offset=698).moveTo(1000,864).cylinder(889,630))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(12,16,6))
+r=w0.sketch().segment((760,512),(10,512)).segment((10,98)).segment((760,98)).close().assemble().push([(101,324)]).circle(73,mode='s').push([(253,160)]).rect(101,103,mode='s').finalize().extrude(223)
diff --git a/test/extrude/1111/1111.stl b/test/extrude/1111/1111.stl
index 46f71ab539bfa9fa772a948d14d9dff596f72afd..4dd8c26a1085123e9cfc1dc6e678b5fa2e3102c1 100644
Binary files a/test/extrude/1111/1111.stl and b/test/extrude/1111/1111.stl differ
diff --git a/test/extrude/1112/1112.py b/test/extrude/1112/1112.py
index f9c33611d4219d364487fe422eb471a11d2d8dff..7d6f496308b2d90ba90dac021d21149a227838c5 100644
--- a/test/extrude/1112/1112.py
+++ b/test/extrude/1112/1112.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(342,342,157))
-w1=cq.Workplane('ZX',origin=(342,607,342))
-r=w0.workplane(offset=307).moveTo(781,1).box(365,815,411).union(w0.workplane(offset=423).moveTo(105,590).box(769,1000,503)).union(w1.sketch().arc((480,526),(446,330),(503,526)).segment((503,723)).segment((480,723)).close().assemble().finalize().extrude(596)).translate((1,66,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(44,10,43))
+r=w0.sketch().segment((1,236),(756,236)).segment((756,1000)).segment((1,1000)).close().assemble().push([(367,694)]).rect(221,246,mode='s').finalize().extrude(282)
diff --git a/test/extrude/1112/1112.stl b/test/extrude/1112/1112.stl
index 71a1f659677533a6c1c684489e84b363f5017aec..6bc5a2518e81aaedd483afb7ae5fb6e3c756c5d6 100644
Binary files a/test/extrude/1112/1112.stl and b/test/extrude/1112/1112.stl differ
diff --git a/test/extrude/1113/1113.py b/test/extrude/1113/1113.py
index 1597433b9f707bca755478cfb40523c0e04be039..f648946c1401497e51349acf7cbe7fbe8d4f57ce 100644
--- a/test/extrude/1113/1113.py
+++ b/test/extrude/1113/1113.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(318,353,353))
-r=w0.workplane(offset=202).box(409,972,655).union(w0.sketch().segment((1,29),(705,29)).segment((705,676)).segment((515,676)).segment((564,648)).segment((515,557)).segment((451,592)).segment((500,676)).segment((1,676)).close().assemble().finalize().extrude(550)).union(w0.sketch().rect(944,1000).reset().face(w0.sketch().arc((163,339),(240,402),(346,395)).segment((543,395)).segment((543,451)).segment((163,451)).close().assemble(),mode='s').push([(409,532)]).rect(508,388,mode='s').push([(578,258)]).rect(367,599,mode='s').finalize().extrude(733)).translate((1,120,148))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(51,55,11))
+r=w0.sketch().segment((768,975),(568,975)).segment((568,367)).segment((768,367)).close().assemble().push([(610,666)]).rect(62,67,mode='s').push([(641,690)]).circle(57,mode='s').finalize().extrude(389).translate((1,335,1))
diff --git a/test/extrude/1113/1113.stl b/test/extrude/1113/1113.stl
index 902db8d935ec09eb0ab1fcfd198e53936f93a7da..e6836db312b52fba9c12e0daf80707381acfb700 100644
Binary files a/test/extrude/1113/1113.stl and b/test/extrude/1113/1113.stl differ
diff --git a/test/extrude/1114/1114.py b/test/extrude/1114/1114.py
index b1e5782233673b3140d9bcda120a827c7847df91..bb052efde1f09a78b222bf4b3975d74640e55160 100644
--- a/test/extrude/1114/1114.py
+++ b/test/extrude/1114/1114.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(391,391,391))
-r=w0.workplane(offset=86).moveTo(561,379).cylinder(1000,732).union(w0.sketch().arc((1,744),(13,196),(549,318)).close().assemble().finalize().extrude(1000)).translate((1,1,24))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(17,45,9))
+r=w0.sketch().segment((675,389),(675,824)).segment((675,991)).segment((475,992)).segment((475,824)).segment((541,824)).segment((541,389)).close().assemble().finalize().extrude(193).union(w0.workplane(offset=149).sketch().segment((163,86),(657,86)).segment((657,488)).segment((163,488)).close().assemble().finalize().extrude(89)).union(w0.workplane(offset=60).sketch().segment((413,158),(413,572)).segment((441,572)).segment((441,186)).segment((661,186)).segment((661,544)).segment((551,544)).segment((551,572)).segment((689,572)).segment((689,158)).close().assemble().finalize().extrude(143)).translate((1,194,1))
diff --git a/test/extrude/1114/1114.stl b/test/extrude/1114/1114.stl
index 33ad5f7f7bd4a7795ad713a3c185178b4d1d0966..0ce0fbcb1ab54ecf2ccd099be962f87763bf281a 100644
Binary files a/test/extrude/1114/1114.stl and b/test/extrude/1114/1114.stl differ
diff --git a/test/extrude/1115/1115.py b/test/extrude/1115/1115.py
index 6dcb317408a902522123f367ba50cfa7d85abfe8..4000968bdbe5828d854e01c703a89e0eaea32387 100644
--- a/test/extrude/1115/1115.py
+++ b/test/extrude/1115/1115.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(313,168,313))
-r=w0.workplane(offset=256).moveTo(115,147).cylinder(428,636).union(w0.sketch().segment((1,615),(105,521)).segment((188,615)).segment((84,709)).segment((53,677)).segment((53,625)).segment((11,625)).close().assemble().push([(490,781)]).rect(1000,355).finalize().extrude(729)).translate((177,1,209))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(5,27,61))
+r=w0.sketch().segment((933,428),(933,772)).segment((545,772)).arc((324,681),(233,460)).segment((233,428)).close().assemble().push([(538,472)]).circle(64,mode='s').push([(734,626)]).circle(65,mode='s').finalize().extrude(140).translate((1,114,1))
diff --git a/test/extrude/1115/1115.stl b/test/extrude/1115/1115.stl
index 87e60d61106f967804282b1c828a8825437e2e31..c618089b7ef008425c29a6d40aa7f982fb50116e 100644
Binary files a/test/extrude/1115/1115.stl and b/test/extrude/1115/1115.stl differ
diff --git a/test/extrude/1116/1116.py b/test/extrude/1116/1116.py
index 73e8222d2c090f33e992f45eac8ae8a4146962b2..9c087a3ccd73e36d20606d4f3d258e9f2f54c051 100644
--- a/test/extrude/1116/1116.py
+++ b/test/extrude/1116/1116.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(468,160,468))
-w1=cq.Workplane('ZX',origin=(468,244,468))
-r=w0.workplane(offset=510).moveTo(477,841).cylinder(552,561).union(w1.sketch().arc((290,505),(346,1),(533,477)).segment((813,477)).segment((813,608)).segment((290,608)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,13,47))
+r=w0.sketch().segment((134,656),(704,656)).segment((704,274)).segment((134,274)).close().assemble().finalize().extrude(235).union(w0.workplane(offset=52).sketch().segment((318,665),(764,665)).segment((764,541)).segment((318,541)).close().assemble().finalize().extrude(173))
diff --git a/test/extrude/1116/1116.stl b/test/extrude/1116/1116.stl
index 55aae57167b1aec6b9f3b65583655e5fb159cecf..2cde0a740c020e9acb5b1958f8ad60b05a2e1270 100644
Binary files a/test/extrude/1116/1116.stl and b/test/extrude/1116/1116.stl differ
diff --git a/test/extrude/1117/1117.py b/test/extrude/1117/1117.py
index 4869e46db7880b8a1c82cf83befcb1be502fbb83..32ff9b2bd0f60a7bc4fd8a4d90638f19ad6c8e35 100644
--- a/test/extrude/1117/1117.py
+++ b/test/extrude/1117/1117.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(439,159,439))
-r=w0.sketch().segment((19,869),(27,62)).segment((404,62)).segment((404,1)).segment((781,1)).segment((781,159)).arc((860,352),(781,536)).segment((781,693)).segment((632,693)).segment((632,877)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(46,58,68))
+r=w0.sketch().segment((184,887),(978,887)).segment((978,385)).segment((184,385)).close().assemble().push([(589,578)]).rect(268,272,mode='s').finalize().extrude(274).translate((1,217,1))
diff --git a/test/extrude/1117/1117.stl b/test/extrude/1117/1117.stl
index 8666a3b1fb3bdb995072382b3dd171c3c9b8a175..1e95e5420eb2a7e06041adb1e507dbd3769589de 100644
Binary files a/test/extrude/1117/1117.stl and b/test/extrude/1117/1117.stl differ
diff --git a/test/extrude/1118/1118.py b/test/extrude/1118/1118.py
index b82b16853d4cefbc3bb569ec424106779446de56..2b203bcf1df732d5a274f2c78e931dd51258909e 100644
--- a/test/extrude/1118/1118.py
+++ b/test/extrude/1118/1118.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(553,279,279))
-r=w0.workplane(offset=1).box(1000,913,834).translate((1,222,179))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(77,50,1))
+r=w0.sketch().segment((750,629),(630,629)).segment((630,733)).segment((578,733)).segment((578,629)).segment((578,1)).segment((612,1)).arc((710,1),(750,77)).segment((750,151)).arc((716,284),(750,418)).close().assemble().push([(590,386)]).rect(133,255,mode='s').finalize().extrude(243)
diff --git a/test/extrude/1118/1118.stl b/test/extrude/1118/1118.stl
index f212eef045fb3999316fd25f8b5bb8b9a8888249..dc31c5ac9bd32c760f062cfa0fbc490994ca6470 100644
Binary files a/test/extrude/1118/1118.stl and b/test/extrude/1118/1118.stl differ
diff --git a/test/extrude/1119/1119.py b/test/extrude/1119/1119.py
index f2c4b6a0d1ff22dc85d69b36ad7a6deae3d44b57..919021887ebcf017c05f1e849b5acc34b8b3c6ff 100644
--- a/test/extrude/1119/1119.py
+++ b/test/extrude/1119/1119.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,131,500))
-w1=cq.Workplane('XY',origin=(500,500,540))
-r=w0.sketch().segment((1,570),(441,1)).segment((600,121)).segment((960,121)).segment((960,311)).segment((840,311)).segment((990,431)).segment((550,1000)).close().assemble().finalize().extrude(441).union(w1.workplane(offset=730).moveTo(341,760).box(660,840,960))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(12,37,14))
+r=w0.sketch().segment((462,509),(836,275)).arc((220,139),(97,759)).close().assemble().push([(423,541)]).rect(136,232,mode='s').finalize().extrude(356)
diff --git a/test/extrude/1119/1119.stl b/test/extrude/1119/1119.stl
index 1ad16ca88b23bf98b94529dcec0d9b0711bf1189..cec23df85c45c24e961ac2ab4f2ed913aa41b3f1 100644
Binary files a/test/extrude/1119/1119.stl and b/test/extrude/1119/1119.stl differ
diff --git a/test/extrude/112/112.py b/test/extrude/112/112.py
index 97e1592d173dcd53d2fc7cac35b048320e13a847..f2894c6b3cbda17ca3939dfc59b4abd281d2500a 100644
--- a/test/extrude/112/112.py
+++ b/test/extrude/112/112.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,461,500))
-r=w0.sketch().segment((1,251),(441,251)).segment((441,291)).segment((550,291)).segment((550,71)).segment((500,71)).segment((500,11)).segment((930,11)).segment((930,131)).arc((1000,221),(930,301)).segment((930,680)).segment((700,680)).segment((700,990)).segment((1,990)).close().assemble().finalize().extrude(301).union(w0.workplane(offset=645).moveTo(690,221).cylinder(790,510))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,436,500))
+r=w0.sketch().arc((517,257),(745,502),(516,746)).segment((515,675)).arc((532,675),(541,665)).segment((566,665)).segment((566,635)).segment((541,634)).arc((530,629),(516,629)).close().assemble().finalize().extrude(65).union(w0.workplane(offset=783).box(1000,900,1000))
\ No newline at end of file
diff --git a/test/extrude/112/112.stl b/test/extrude/112/112.stl
index 9b76f385c7b8c71ff82bd67c786f550e15611d74..161a1872c5f343a9fc2f0634ed44e76a69391668 100644
Binary files a/test/extrude/112/112.stl and b/test/extrude/112/112.stl differ
diff --git a/test/extrude/1120/1120.py b/test/extrude/1120/1120.py
index cf6626fbca7f05e905f568676316259f6faa994e..a72e66f0068ecd03cb5f1526c2706288f1fce9b1 100644
--- a/test/extrude/1120/1120.py
+++ b/test/extrude/1120/1120.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(630,390,390))
-w1=cq.Workplane('XY',origin=(390,390,316))
-r=w0.workplane(offset=84).moveTo(464,316).cylinder(1000,454).union(w0.workplane(offset=121).moveTo(269,491).cylinder(926,732)).union(w0.sketch().arc((158,538),(260,1),(796,140)).segment((852,140)).segment((852,834)).segment((593,834)).segment((593,676)).arc((565,676),(538,686)).segment((538,648)).segment((473,648)).arc((334,547),(158,538)).assemble().push([(459,320)]).rect(473,732,mode='s').reset().face(w0.sketch().segment((593,371),(593,602)).arc((547,491),(593,371)).assemble(),mode='s').finalize().extrude(325)).union(w1.sketch().push([(676,464)]).rect(556,500).push([(681,464)]).rect(491,408,mode='s').finalize().extrude(464)).translate((1,74,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(56,17,2))
+r=w0.sketch().segment((818,275),(818,540)).segment((607,593)).segment((183,593)).segment((1,540)).segment((1,275)).segment((130,275)).segment((130,434)).segment((660,434)).segment((660,275)).close().assemble().finalize().extrude(352).union(w0.sketch().segment((944,450),(553,450)).segment((552,840)).segment((943,840)).close().assemble().finalize().extrude(137))
diff --git a/test/extrude/1120/1120.stl b/test/extrude/1120/1120.stl
index 4071c6f31f2a51d078eb45ba3ab91c78a449793f..bc849f7ebdad961de55fdff019f302735e2ea08f 100644
Binary files a/test/extrude/1120/1120.stl and b/test/extrude/1120/1120.stl differ
diff --git a/test/extrude/1121/1121.py b/test/extrude/1121/1121.py
index ca7966851825495c47e8c21fb7f93f12e96125a6..2b4faa0d72be438eabf671c1ec04bc6138c50a5a 100644
--- a/test/extrude/1121/1121.py
+++ b/test/extrude/1121/1121.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(456,456,478))
-r=w0.sketch().segment((68,201),(90,145)).segment((112,156)).segment((101,201)).arc((23,556),(68,201)).assemble().reset().face(w0.sketch().segment((1,345),(23,345)).segment((23,356)).segment((45,356)).segment((56,345)).segment((112,345)).segment((112,423)).segment((1,423)).close().assemble(),mode='s').reset().face(w0.sketch().segment((56,245),(56,267)).arc((45,256),(56,245)).assemble(),mode='s').reset().face(w0.sketch().segment((79,278),(90,256)).arc((90,267),(79,278)).assemble(),mode='s').finalize().extrude(34).union(w0.sketch().segment((600,634),(612,634)).arc((667,378),(944,390)).segment((1000,456)).segment((989,456)).arc((933,722),(656,711)).close().assemble().finalize().extrude(745)).union(w0.workplane(offset=650).moveTo(612,667).cylinder(845,545))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(6,66,47))
+r=w0.sketch().segment((100,896),(880,896)).segment((880,116)).segment((100,116)).close().assemble().finalize().extrude(82).union(w0.sketch().segment((494,593),(754,593)).segment((754,97)).segment((494,97)).close().assemble().finalize().extrude(135)).union(w0.sketch().segment((309,13),(189,13)).segment((189,73)).segment((219,73)).arc((240,81),(249,103)).segment((249,404)).segment((309,404)).close().assemble().finalize().extrude(137))
diff --git a/test/extrude/1121/1121.stl b/test/extrude/1121/1121.stl
index 7b91f958ed02db4a4592754eaf48e0be54f8880c..7ec5a876581ee1e34f5a844cccd0d97ffecd7148 100644
Binary files a/test/extrude/1121/1121.stl and b/test/extrude/1121/1121.stl differ
diff --git a/test/extrude/1122/1122.py b/test/extrude/1122/1122.py
index 7d65834e370ae33cc9585594ee5e269f9dc3507c..b63eac3426566350cf5b89a30ca28198cbe7ddc1 100644
--- a/test/extrude/1122/1122.py
+++ b/test/extrude/1122/1122.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(359,457,359))
-r=w0.workplane(offset=39).moveTo(685,653).cylinder(1000,392).union(w0.sketch().segment((1,34),(110,34)).segment((110,99)).arc((55,110),(1,131)).close().assemble().finalize().extrude(805)).translate((1,5,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(27,72,42))
+r=w0.sketch().segment((186,622),(906,622)).segment((906,600)).segment((208,600)).segment((208,284)).segment((906,284)).segment((906,262)).segment((186,262)).close().assemble().finalize().extrude(208).union(w0.sketch().segment((402,370),(266,370)).segment((266,680)).segment((402,680)).close().assemble().finalize().extrude(159))
diff --git a/test/extrude/1122/1122.stl b/test/extrude/1122/1122.stl
index b03ba354b2615cb54d0d4756c35ad4d3af131ab0..29e609e2aa5413eb51b0acd796c81ed4359a8a04 100644
Binary files a/test/extrude/1122/1122.stl and b/test/extrude/1122/1122.stl differ
diff --git a/test/extrude/1123/1123.py b/test/extrude/1123/1123.py
index 941d2d298db333e82a666453cd21629594e530bb..878ec4ca13341c3b6f6f66f71b9bf78a26fd5df8 100644
--- a/test/extrude/1123/1123.py
+++ b/test/extrude/1123/1123.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(436,354,354))
-w1=cq.Workplane('XY',origin=(354,354,788))
-r=w0.workplane(offset=312).moveTo(589,694).cylinder(436,483).union(w0.workplane(offset=595).moveTo(42,207).box(906,1000,835)).union(w1.workplane(offset=307).moveTo(1,912).box(777,412,448)).translate((35,58,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(10,14,66))
+r=w0.sketch().segment((949,373),(357,373)).segment((357,965)).segment((949,965)).close().assemble().finalize().extrude(100).union(w0.sketch().segment((78,907),(1,907)).segment((1,461)).segment((78,461)).segment((78,615)).segment((457,615)).segment((457,720)).segment((78,720)).close().assemble().finalize().extrude(189))
diff --git a/test/extrude/1123/1123.stl b/test/extrude/1123/1123.stl
index 926d13540cdc7e83b0b17028b366c782dd4d8cb7..3a3de4f508153d3ebf0e9fba9527b55b5cd625af 100644
Binary files a/test/extrude/1123/1123.stl and b/test/extrude/1123/1123.stl differ
diff --git a/test/extrude/1124/1124.py b/test/extrude/1124/1124.py
index 29a581ae3862c0c7b6e2cc97dfe39663478352e9..883d6c161a16cdfd70a7b9b20c07f085f1888857 100644
--- a/test/extrude/1124/1124.py
+++ b/test/extrude/1124/1124.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(849,566,566))
-r=w0.sketch().segment((435,378),(783,378)).segment((783,548)).segment((651,548)).segment((651,708)).segment((783,708)).segment((783,802)).segment((435,802)).close().assemble().push([(1000,218)]).circle(604).finalize().extrude(1).union(w0.sketch().segment((95,783),(133,746)).segment((133,566)).segment((312,566)).segment((312,680)).segment((359,717)).segment((312,755)).segment((312,953)).segment((133,953)).segment((133,830)).close().assemble().finalize().extrude(444))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(77,3,29))
+r=w0.sketch().segment((16,424),(588,424)).segment((588,860)).segment((16,860)).close().assemble().push([(317,681)]).rect(123,106,mode='s').finalize().extrude(326).translate((1,324,1))
diff --git a/test/extrude/1124/1124.stl b/test/extrude/1124/1124.stl
index 16f4e200c6bdbbf5aa7efa53bd93a2c663ca66f6..2af4ba5f9a9feeaa8d673e7f81c852f135302c44 100644
Binary files a/test/extrude/1124/1124.stl and b/test/extrude/1124/1124.stl differ
diff --git a/test/extrude/1125/1125.py b/test/extrude/1125/1125.py
index a9f417f1bee46b4ecb0b98049f468da31942b75c..6bd051a78b316fe27841c5aa08879d9301d19ca2 100644
--- a/test/extrude/1125/1125.py
+++ b/test/extrude/1125/1125.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=657).cylinder(980,401).union(w0.sketch().rect(734,667).push([(417,294)]).rect(500,520,mode='s').finalize().extrude(1000)).translate((68,68,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(35,7,27))
+r=w0.sketch().segment((775,1),(491,1)).segment((491,686)).segment((775,686)).close().assemble().finalize().extrude(142).union(w0.sketch().segment((653,442),(861,442)).segment((861,928)).segment((653,928)).close().assemble().finalize().extrude(44)).union(w0.sketch().segment((456,947),(872,947)).segment((872,573)).segment((456,573)).close().assemble().finalize().extrude(180))
diff --git a/test/extrude/1125/1125.stl b/test/extrude/1125/1125.stl
index 7973f5f21dca5ef699b7a7f9e4345dfcadf8e597..601fe8cda136b27b791fdbc312515ce32971a519 100644
Binary files a/test/extrude/1125/1125.stl and b/test/extrude/1125/1125.stl differ
diff --git a/test/extrude/1126/1126.py b/test/extrude/1126/1126.py
index 81d08010b0c4e73d5e0e31be0e2f5f0e0d3dfeed..549d8e86e19b5fd4f1f4dd494b0cc7ba4fc351c5 100644
--- a/test/extrude/1126/1126.py
+++ b/test/extrude/1126/1126.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(338,653,338))
-w1=cq.Workplane('YZ',origin=(359,338,338))
-r=w0.workplane(offset=6).moveTo(653,598).cylinder(1000,566).union(w0.sketch().segment((34,359),(44,359)).segment((77,392)).segment((66,392)).close().assemble().finalize().extrude(316)).union(w1.workplane(offset=82).moveTo(533,1).box(642,750,848)).translate((1,1,37))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(79,5,73))
+r=w0.sketch().segment((249,540),(415,540)).segment((472,618)).segment((822,618)).segment((822,457)).segment((662,427)).segment((518,376)).segment((420,376)).segment((402,391)).segment((250,391)).close().assemble().push([(495,445)]).rect(178,198,mode='s').finalize().extrude(268).translate((1,264,1))
diff --git a/test/extrude/1126/1126.stl b/test/extrude/1126/1126.stl
index e5c7fe5d6861a2aa72d352628bd53d12ec1547a7..6f3afcc6b3e3460ca22210e203baa48cda94154f 100644
Binary files a/test/extrude/1126/1126.stl and b/test/extrude/1126/1126.stl differ
diff --git a/test/extrude/1127/1127.py b/test/extrude/1127/1127.py
index cb7d8bdb850d40eb3cfe65737cfac48e4b32220f..31f692259a2ba07cfe5485cd77ef3e5a00e649a5 100644
--- a/test/extrude/1127/1127.py
+++ b/test/extrude/1127/1127.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,401,500))
-r=w0.sketch().arc((1,510),(131,431),(271,491)).arc((500,381),(301,550)).arc((301,660),(231,750)).segment((231,510)).close().assemble().reset().face(w0.sketch().segment((51,750),(231,750)).arc((141,770),(51,750)).assemble()).finalize().extrude(481).union(w0.sketch().segment((51,331),(121,331)).segment((121,231)).segment((251,231)).segment((251,331)).segment((321,331)).segment((321,441)).segment((251,441)).segment((251,550)).segment((121,550)).segment((121,441)).segment((51,441)).close().assemble().reset().face(w0.sketch().segment((560,481),(690,311)).segment((1000,540)).segment((860,720)).close().assemble()).finalize().extrude(720))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,21,28))
+r=w0.sketch().segment((42,318),(804,318)).segment((804,856)).segment((42,856)).segment((22,856)).segment((22,876)).segment((42,876)).segment((42,856)).close().assemble().push([(205,802)]).rect(174,268,mode='s').finalize().extrude(112)
diff --git a/test/extrude/1127/1127.stl b/test/extrude/1127/1127.stl
index 66e4b19ed17f7f3a7595e454fca10a89349d0ac3..46e0ab08e7cdd165b4e9e1878562de4a966f7fb6 100644
Binary files a/test/extrude/1127/1127.stl and b/test/extrude/1127/1127.stl differ
diff --git a/test/extrude/1128/1128.py b/test/extrude/1128/1128.py
index 57e88a4c7be53e805bc7c79ec6fae83b7ed55aed..e4e0980c27e75151fe5ca6116cd323069165baaf 100644
--- a/test/extrude/1128/1128.py
+++ b/test/extrude/1128/1128.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,617,506))
-r=w0.sketch().arc((495,142),(627,1),(687,183)).arc((415,1000),(495,142)).assemble().finalize().extrude(273)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(23,21,7))
+r=w0.sketch().segment((58,164),(774,164)).segment((774,881)).segment((58,881)).segment((774,881)).segment((774,1000)).segment((58,1000)).segment((58,881)).close().assemble().push([(470,737)]).rect(190,238,mode='s').finalize().extrude(332)
diff --git a/test/extrude/1128/1128.stl b/test/extrude/1128/1128.stl
index 0d886d86de0f276996897cd5d208173de9686563..0beb3864c730c4160fdbb3714b84930e528315f4 100644
Binary files a/test/extrude/1128/1128.stl and b/test/extrude/1128/1128.stl differ
diff --git a/test/extrude/1129/1129.py b/test/extrude/1129/1129.py
index 1d6eb2f5566660554d42cf6909b54b6916a4e475..8f71e4262612648a6c41816bc78efc9f2d66273a 100644
--- a/test/extrude/1129/1129.py
+++ b/test/extrude/1129/1129.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(468,272,468))
-w1=cq.Workplane('XY',origin=(468,468,113))
-r=w0.workplane(offset=416).moveTo(248,468).box(515,767,571).union(w0.sketch().segment((1,104),(496,104)).segment((496,384)).segment((935,384)).segment((935,580)).segment((496,580)).segment((496,832)).segment((1,832)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=538).moveTo(468,169).cylinder(608,505))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(42,49,78))
+r=w0.sketch().segment((293,822),(643,705)).segment((293,180)).close().assemble().push([(358,590)]).circle(67,mode='s').finalize().extrude(212).translate((1,164,1))
diff --git a/test/extrude/1129/1129.stl b/test/extrude/1129/1129.stl
index 78cc28b8a1fd4d3065c9fa61455d88cfb6a211ef..ae4ff820a535f08f04f1ebbdb6fd82fae1c79056 100644
Binary files a/test/extrude/1129/1129.stl and b/test/extrude/1129/1129.stl differ
diff --git a/test/extrude/113/113.py b/test/extrude/113/113.py
index d6e5745d001fb02eafbbe6431e8dffa7707c46e2..406095991f73730d08beb5b45486008a34022aa5 100644
--- a/test/extrude/113/113.py
+++ b/test/extrude/113/113.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(181,1,181))
-r=w0.workplane(offset=361).cylinder(541,1000).translate((820,1,820))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,462,500))
+w1=cq.Workplane('ZX',origin=(500,382,501))
+r=w0.workplane(offset=547).moveTo(765,182).cylinder(595,680).union(w0.sketch().push([(237,820)]).rect(866,859).push([(575,919)]).circle(516).finalize().extrude(645)).union(w0.sketch().arc((361,667),(394,231),(541,641)).arc((472,766),(361,665)).assemble().push([(335,337)]).circle(539,mode='s').push([(457,670)]).circle(586,mode='s').finalize().extrude(730)).union(w1.sketch().arc((525,489),(540,565),(525,646)).close().assemble().finalize().extrude(435))
\ No newline at end of file
diff --git a/test/extrude/113/113.stl b/test/extrude/113/113.stl
index f9c024457c63e95df7262d211db7db987d36ee56..9287cba3194aa39aed8f9f77908aa4d8200df5ca 100644
Binary files a/test/extrude/113/113.stl and b/test/extrude/113/113.stl differ
diff --git a/test/extrude/1130/1130.py b/test/extrude/1130/1130.py
index 2743de190f72c3336fcf89a1466fda29d0c29381..9192cd74fc153b7715728a17331ea3d3ee321784 100644
--- a/test/extrude/1130/1130.py
+++ b/test/extrude/1130/1130.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(621,557,621))
-r=w0.sketch().arc((1,621),(292,772),(545,557)).arc((317,987),(1,621)).assemble().finalize().extrude(709).union(w0.sketch().segment((165,456),(406,456)).segment((406,785)).segment((216,785)).segment((216,962)).segment((165,962)).close().assemble().reset().face(w0.sketch().arc((709,785),(1000,254),(722,798)).segment((722,785)).close().assemble()).finalize().extrude(734))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(26,5,38))
+r=w0.sketch().segment((340,538),(340,412)).segment((393,361)).segment((534,412)).segment((1000,412)).segment((1000,538)).segment((534,538)).segment((393,577)).close().assemble().push([(904,516)]).circle(45,mode='s').push([(470,454)]).circle(41,mode='s').push([(864,499)]).circle(67,mode='s').push([(902,505)]).rect(49,43,mode='s').finalize().extrude(343)
diff --git a/test/extrude/1130/1130.stl b/test/extrude/1130/1130.stl
index e23429fdf37d20723becff6aeca56047aa7b6b83..60d9b24eba8a89774b8d44d730be716a3f412ce1 100644
Binary files a/test/extrude/1130/1130.stl and b/test/extrude/1130/1130.stl differ
diff --git a/test/extrude/1131/1131.py b/test/extrude/1131/1131.py
index f6138dd1bf8649b1c0580b84686b324cf9f873b8..01e0156447422e54f1eb556610d4c517278b3022 100644
--- a/test/extrude/1131/1131.py
+++ b/test/extrude/1131/1131.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(270,435,435))
-r=w0.sketch().segment((348,62),(427,1)).segment((653,1)).arc((574,62),(479,36)).segment((383,114)).close().assemble().finalize().extrude(192).union(w0.sketch().segment((201,401),(209,392)).arc((262,340),(331,305)).segment((340,296)).arc((670,401),(670,748)).segment((670,757)).segment((661,765)).arc((609,818),(540,852)).segment((531,861)).segment((531,852)).arc((201,748),(201,401)).assemble().reset().face(w0.sketch().arc((262,774),(183,505),(392,314)).close().assemble(),mode='s').reset().face(w0.sketch().segment((270,783),(470,844)).arc((366,835),(270,783)).assemble(),mode='s').reset().face(w0.sketch().arc((401,314),(505,322),(600,375)).close().assemble(),mode='s').reset().face(w0.sketch().segment((479,835),(609,383)).arc((687,653),(479,835)).assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(23,20,19))
+r=w0.sketch().segment((183,978),(479,978)).segment((479,639)).segment((183,639)).segment((479,639)).segment((479,300)).segment((183,300)).segment((183,639)).close().assemble().finalize().extrude(222).union(w0.workplane(offset=148).sketch().segment((349,894),(515,894)).segment((515,532)).segment((349,532)).close().assemble().finalize().extrude(101)).union(w0.workplane(offset=214).sketch().segment((890,157),(626,157)).segment((626,323)).segment((890,323)).close().assemble().finalize().extrude(86)).translate((1,281,1))
diff --git a/test/extrude/1131/1131.stl b/test/extrude/1131/1131.stl
index 90be791e315187aa1f4322ec27f076bc5514d692..ae5a02c35b34fa67d59bfd9c10f1ec67a51e4dba 100644
Binary files a/test/extrude/1131/1131.stl and b/test/extrude/1131/1131.stl differ
diff --git a/test/extrude/1132/1132.py b/test/extrude/1132/1132.py
index 68c17b071bd3628019a7f50547aafd26c8938081..61fbec5856ae32a43785b7362d799b9a13b0d558 100644
--- a/test/extrude/1132/1132.py
+++ b/test/extrude/1132/1132.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(648,1000,648))
-w1=cq.Workplane('ZX',origin=(648,944,648))
-r=w0.sketch().push([(543,648)]).circle(803).circle(761,mode='s').finalize().extrude(627).union(w1.sketch().segment((817,690),(909,690)).arc((902,697),(909,705)).segment((817,705)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(51,71,59))
+r=w0.sketch().segment((488,961),(488,556)).segment((488,221)).segment((568,221)).segment((568,803)).close().assemble().finalize().extrude(212).union(w0.workplane(offset=257).sketch().segment((446,284),(446,68)).segment((640,68)).segment((914,530)).close().assemble().finalize().extrude(46)).translate((1,233,1))
diff --git a/test/extrude/1132/1132.stl b/test/extrude/1132/1132.stl
index f9efb3497845abb9158c7b75e21c5fbdb5069818..2a18de4b1a0c0a30d4947584106ae07feedc28e2 100644
Binary files a/test/extrude/1132/1132.stl and b/test/extrude/1132/1132.stl differ
diff --git a/test/extrude/1133/1133.py b/test/extrude/1133/1133.py
index c7547a44bb123f03aeb541c3fec6e48e3dd7720c..886e323ffe9f738406408d005c5a6cde787ad5c8 100644
--- a/test/extrude/1133/1133.py
+++ b/test/extrude/1133/1133.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(993,662,662))
-r=w0.sketch().segment((325,507),(406,507)).segment((406,608)).segment((541,608)).arc((507,561),(494,507)).segment((831,507)).arc((818,561),(784,608)).segment((919,608)).segment((919,507)).segment((1000,507)).arc((818,784),(487,770)).arc((514,676),(433,730)).arc((359,629),(325,507)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(77,27,61))
+r=w0.sketch().segment((429,345),(467,345)).segment((609,100)).segment((807,100)).segment((807,912)).segment((580,912)).segment((580,607)).close().assemble().push([(653,485)]).rect(108,50,mode='s').push([(584,439)]).circle(74,mode='s').push([(571,618)]).rect(90,65,mode='s').finalize().extrude(345)
diff --git a/test/extrude/1133/1133.stl b/test/extrude/1133/1133.stl
index 519486c9d00738c1fcc5f5706a83dff5b8ff5947..972b7d58515f6928022d19d5563a4dbff536a416 100644
Binary files a/test/extrude/1133/1133.stl and b/test/extrude/1133/1133.stl differ
diff --git a/test/extrude/1134/1134.py b/test/extrude/1134/1134.py
index fc1944dc14fd889b73fd1337f70593005640a357..86a9b04d1319e2e8e57e2579fe3e4d0b2dfd1e7c 100644
--- a/test/extrude/1134/1134.py
+++ b/test/extrude/1134/1134.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().push([(540,807)]).circle(814).push([(824,444)]).rect(900,794).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(7,13,72))
+r=w0.sketch().segment((216,881),(1000,881)).segment((1000,293)).segment((216,293)).close().assemble().push([(618,665)]).rect(149,210,mode='s').finalize().extrude(318)
diff --git a/test/extrude/1134/1134.stl b/test/extrude/1134/1134.stl
index f3fe4d907a3858f01036d75b7fb058ef54c8e9b9..2d5a369a484f559b42e76127cabadab692b00742 100644
Binary files a/test/extrude/1134/1134.stl and b/test/extrude/1134/1134.stl differ
diff --git a/test/extrude/1135/1135.py b/test/extrude/1135/1135.py
index db932696d049c3867e0e32c9dac3c37568641327..3c1c2c945cfaa83590b1a8284037979aa3492444 100644
--- a/test/extrude/1135/1135.py
+++ b/test/extrude/1135/1135.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,311,311))
-r=w0.sketch().segment((194,215),(332,215)).segment((359,187)).segment((407,215)).segment((428,215)).segment((428,407)).segment((290,407)).segment((263,442)).segment((215,407)).segment((194,407)).close().assemble().circle(318,mode='s').finalize().extrude(780).union(w0.workplane(offset=621).box(1000,986,931)).translate((1,190,183))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(27,29,16))
+r=w0.sketch().segment((2,932),(2,192)).segment((742,192)).segment((742,932)).segment((2,912)).close().assemble().finalize().extrude(232).union(w0.workplane(offset=141).sketch().segment((890,890),(678,890)).segment((678,576)).segment((890,576)).close().assemble().finalize().extrude(107)).union(w0.sketch().segment((884,274),(564,274)).segment((564,326)).segment((884,326)).close().assemble().finalize().extrude(122))
diff --git a/test/extrude/1135/1135.stl b/test/extrude/1135/1135.stl
index d2c09f03b2db795070151d2bc499a5774f2c05b0..3577af443d521cb24b0564533e88df3823288373 100644
Binary files a/test/extrude/1135/1135.stl and b/test/extrude/1135/1135.stl differ
diff --git a/test/extrude/1136/1136.py b/test/extrude/1136/1136.py
index f4d2785e67ff8d45b070f89f3c47cd662d589219..7795bb3e7debffb3880b425f6bed20112c6daa47 100644
--- a/test/extrude/1136/1136.py
+++ b/test/extrude/1136/1136.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(445,445,445))
-r=w0.sketch().segment((467,556),(489,334)).segment((623,334)).segment((623,312)).segment((1000,312)).segment((1000,778)).segment((623,778)).segment((623,556)).close().assemble().push([(556,467)]).rect(512,578,mode='s').finalize().extrude(1).union(w0.sketch().push([(101,323)]).circle(656).reset().face(w0.sketch().segment((489,134),(512,134)).segment((512,123)).segment((856,123)).segment((856,134)).segment((878,134)).segment((878,212)).segment((856,212)).segment((856,223)).segment((512,223)).segment((512,212)).segment((489,212)).close().assemble()).finalize().extrude(900)).translate((1,1,111))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,270,500))
+w1=cq.Workplane('XY',origin=(501,501,551))
+r=w0.sketch().push([(436,242)]).circle(511).push([(435,236)]).circle(506,mode='s').finalize().extrude(556).union(w0.sketch().push([(177,257)]).rect(850,660).push([(438,238)]).rect(626,715).finalize().extrude(966)).union(w1.workplane(offset=726).moveTo(675,525).box(891,769,950))
\ No newline at end of file
diff --git a/test/extrude/1136/1136.stl b/test/extrude/1136/1136.stl
index 94208b10a48bff40be9754dbd8763bb64c0c5156..1f2f4cd8e17363c79f33f71f9201cf6f5972e2f7 100644
Binary files a/test/extrude/1136/1136.stl and b/test/extrude/1136/1136.stl differ
diff --git a/test/extrude/1137/1137.py b/test/extrude/1137/1137.py
index a83b202b570fef1554e8b3ba7154363f20fbca7a..767abcff12cba4441c027654287badf1e139d9cb 100644
--- a/test/extrude/1137/1137.py
+++ b/test/extrude/1137/1137.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().circle(987).circle(794,mode='s').finalize().extrude(1).translate((321,1,321))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(43,50,62))
+r=w0.sketch().segment((165,36),(983,36)).segment((983,854)).segment((165,854)).close().assemble().finalize().extrude(130).union(w0.sketch().segment((565,676),(931,676)).segment((931,570)).segment((565,570)).close().assemble().finalize().extrude(237))
diff --git a/test/extrude/1137/1137.stl b/test/extrude/1137/1137.stl
index 94dd183b946b1577aa4e097a32a8d98daba225bc..0efd69f7937871f871ae2f8b7be132446f04df1c 100644
Binary files a/test/extrude/1137/1137.stl and b/test/extrude/1137/1137.stl differ
diff --git a/test/extrude/1138/1138.py b/test/extrude/1138/1138.py
index ec575144388b9675ddf91cd7221c516a5dcb72af..eea0be30fc367ee26344dff099fc7d64b72950ee 100644
--- a/test/extrude/1138/1138.py
+++ b/test/extrude/1138/1138.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().arc((594,667),(627,640),(640,600)).segment((740,667)).segment((694,734)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(51,26,25))
+r=w0.sketch().segment((77,496),(48,526)).segment((640,526)).segment((611,496)).close().assemble().push([(311,531)]).rect(90,100,mode='s').finalize().extrude(387)
diff --git a/test/extrude/1138/1138.stl b/test/extrude/1138/1138.stl
index 1ef980ef1eb26bf1488f2ffa913bace58b206698..4a13461021bb88899ae8113e057b488f97baef5f 100644
Binary files a/test/extrude/1138/1138.stl and b/test/extrude/1138/1138.stl differ
diff --git a/test/extrude/1139/1139.py b/test/extrude/1139/1139.py
index 4d2efa0dcaeb97af024399bb6b07180b08a3d3f8..a187c495b4ee10826661a1c85b855c1f474aec40 100644
--- a/test/extrude/1139/1139.py
+++ b/test/extrude/1139/1139.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(451,297,451))
-r=w0.sketch().segment((67,517),(78,506)).arc((45,12),(550,23)).segment((572,1)).segment((769,188)).arc((824,232),(868,286)).segment((945,363)).arc((912,495),(934,627)).segment((901,660)).arc((835,758),(737,824)).segment((572,1000)).segment((374,813)).arc((319,769),(275,715)).close().assemble().finalize().extrude(715).union(w0.sketch().segment((506,253),(550,253)).segment((550,166)).segment((594,166)).segment((594,253)).segment((638,253)).segment((638,374)).arc((704,495),(638,627)).segment((638,748)).segment((594,748)).segment((594,835)).segment((550,835)).segment((550,748)).segment((506,748)).segment((506,627)).arc((429,495),(506,374)).close().assemble().finalize().extrude(748))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(63,12,14))
+r=w0.sketch().segment((82,1000),(600,1000)).segment((600,273)).segment((82,273)).close().assemble().push([(370,651)]).circle(82,mode='s').finalize().extrude(251)
diff --git a/test/extrude/1139/1139.stl b/test/extrude/1139/1139.stl
index 77bce1af2e903f18918b0bcf7470097f3ad07376..c0d8fead8597864ed01f6275865b141274c8f749 100644
Binary files a/test/extrude/1139/1139.stl and b/test/extrude/1139/1139.stl differ
diff --git a/test/extrude/114/114.py b/test/extrude/114/114.py
index 694f125232b8a229d07ba68314a50ad9e4419ec4..65e0e7a884ebe75b2aa38deebc625c609f808f77 100644
--- a/test/extrude/114/114.py
+++ b/test/extrude/114/114.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(353,29,353))
-r=w0.workplane(offset=493).moveTo(603,286).box(557,909,634).union(w0.sketch().segment((1,564),(43,564)).segment((1,697)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(251,252,173))
+w1=cq.Workplane('YZ',origin=(204,251,251))
+r=w0.sketch().segment((136,27),(253,26)).segment((253,4)).segment((271,4)).segment((271,27)).segment((393,27)).segment((393,161)).segment((276,162)).segment((286,139)).segment((386,139)).segment((385,34)).segment((226,35)).segment((226,99)).segment((137,57)).close().assemble().finalize().extrude(338).union(w0.sketch().push([(172,376)]).circle(375).push([(422,201)]).rect(319,366).push([(420,201)]).circle(268,mode='s').finalize().extrude(470)).union(w1.workplane(offset=178).moveTo(94,201).cylinder(398,344))
\ No newline at end of file
diff --git a/test/extrude/114/114.stl b/test/extrude/114/114.stl
index 10755965562ab4de89d046042220339aa6cfa17c..094063db622bc67b6f39fe3d1ee395aac6acf58b 100644
Binary files a/test/extrude/114/114.stl and b/test/extrude/114/114.stl differ
diff --git a/test/extrude/1140/1140.py b/test/extrude/1140/1140.py
index 8569c1215777bb22aa132b537cdde88e2b2efbb5..811dba653e7581737ab548fa740d3bbb0c9715aa 100644
--- a/test/extrude/1140/1140.py
+++ b/test/extrude/1140/1140.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(610,610,914))
-r=w0.sketch().segment((220,461),(298,461)).segment((298,266)).segment((1000,266)).segment((1000,953)).segment((298,953)).segment((298,883)).segment((220,883)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(28,33,2))
+r=w0.sketch().segment((798,1),(478,1)).segment((478,758)).segment((798,758)).close().assemble().push([(673,101)]).rect(75,66,mode='s').push([(572,442)]).rect(58,64,mode='s').finalize().extrude(63)
diff --git a/test/extrude/1140/1140.stl b/test/extrude/1140/1140.stl
index 6614fdbaf3e957e5be23dfa8159fc15eb8e341d7..06c245371e8c108a879827c437ab5475a6f8a85c 100644
Binary files a/test/extrude/1140/1140.stl and b/test/extrude/1140/1140.stl differ
diff --git a/test/extrude/1141/1141.py b/test/extrude/1141/1141.py
index 70b257d148e94b4caf3a80166378b8150ed0bec5..fdfda76fe03b1be37b1b5acf027e2c317c3df0e7 100644
--- a/test/extrude/1141/1141.py
+++ b/test/extrude/1141/1141.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(619,596,596))
-w1=cq.Workplane('YZ',origin=(489,596,596))
-r=w0.sketch().push([(976,536)]).circle(810).circle(798,mode='s').finalize().extrude(405).union(w1.sketch().segment((120,548),(144,548)).segment((144,393)).segment((263,393)).segment((263,370)).segment((215,370)).segment((215,358)).segment((263,358)).segment((263,191)).segment((441,191)).segment((441,358)).segment((489,358)).segment((489,370)).segment((441,370)).segment((441,536)).segment((405,536)).segment((405,608)).arc((465,798),(358,964)).segment((358,988)).segment((334,988)).arc((239,1000),(156,988)).segment((120,988)).segment((120,964)).arc((1,774),(120,572)).close().assemble().finalize().extrude(869))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,115))
+r=w0.sketch().segment((112,471),(302,470)).arc((317,337),(450,305)).segment((449,1)).segment((884,1)).segment((886,469)).segment((890,470)).segment((891,1000)).segment((110,999)).close().assemble().reset().face(w0.sketch().arc((501,470),(516,431),(516,385)).arc((636,411),(741,470)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/1141/1141.stl b/test/extrude/1141/1141.stl
index 4ef1d683806d7ed76718e0a99df151ff3abe55bc..5d33d8d3c0912dcb2edafeb03f9e03b952fdfa79 100644
Binary files a/test/extrude/1141/1141.stl and b/test/extrude/1141/1141.stl differ
diff --git a/test/extrude/1142/1142.py b/test/extrude/1142/1142.py
index e7979fc98fb267eb5d61c123e3ab2b9baa99ff03..b9399d70702ae5fa4dd3a2d49c8154e88838b175 100644
--- a/test/extrude/1142/1142.py
+++ b/test/extrude/1142/1142.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().segment((88,261),(94,214)).segment((254,234)).arc((387,94),(481,267)).segment((580,281)).segment((574,327)).segment((441,307)).arc((354,334),(274,287)).close().assemble().push([(414,487)]).circle(421).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,491))
+r=w0.sketch().segment((880,156),(1000,157)).segment((1000,750)).segment((881,749)).segment((880,326)).segment((946,325)).segment((945,295)).segment((881,295)).close().assemble().finalize().extrude(299).union(w0.workplane(offset=483).moveTo(373,433).box(896,814,535)).union(w0.sketch().push([(142,438)]).rect(786,716).push([(460,740)]).circle(605).reset().face(w0.sketch().segment((420,681),(456,642)).segment((506,689)).segment((471,729)).close().assemble(),mode='s').finalize().extrude(725))
\ No newline at end of file
diff --git a/test/extrude/1142/1142.stl b/test/extrude/1142/1142.stl
index a6aa54e7a2a05a6df691cb1022cbfec5638c7dba..11e1d614a6b9b9839e6b0611307c538ece3bcaea 100644
Binary files a/test/extrude/1142/1142.stl and b/test/extrude/1142/1142.stl differ
diff --git a/test/extrude/1143/1143.py b/test/extrude/1143/1143.py
index f7fa4a8789c5bbd692078dab892aef64a1b7e714..1aaabc632545170738d102677c30909d10ad159b 100644
--- a/test/extrude/1143/1143.py
+++ b/test/extrude/1143/1143.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(399,399,399))
-r=w0.sketch().push([(190,664)]).rect(1000,684).push([(286,664)]).circle(511,mode='s').finalize().extrude(21).union(w0.workplane(offset=404).moveTo(898,1).cylinder(409,409)).union(w0.workplane(offset=592).moveTo(195,664).cylinder(786,531)).translate((1,10,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(75,63,52))
+r=w0.sketch().segment((334,621),(954,621)).segment((954,233)).segment((334,233)).close().assemble().push([(685,454)]).rect(138,157,mode='s').finalize().extrude(345).union(w0.workplane(offset=28).sketch().segment((558,629),(245,666)).segment((245,677)).segment((558,640)).close().assemble().finalize().extrude(52))
diff --git a/test/extrude/1143/1143.stl b/test/extrude/1143/1143.stl
index 626be43f4899e03613ea753bd11b2da8d8b6a71b..b0e1739edd644cfb7a41bafaf5f284b8f8b429ce 100644
Binary files a/test/extrude/1143/1143.stl and b/test/extrude/1143/1143.stl differ
diff --git a/test/extrude/1144/1144.py b/test/extrude/1144/1144.py
index 31732f92f102b119c5fb0627643c05f50874b3dd..a951d452220cb9c9314cedcc576ac8405c14a3a6 100644
--- a/test/extrude/1144/1144.py
+++ b/test/extrude/1144/1144.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(211,474,474))
-w1=cq.Workplane('XY',origin=(474,474,619))
-r=w0.sketch().segment((297,678),(448,599)).segment((507,599)).segment((507,606)).segment((527,599)).segment((560,599)).segment((599,678)).segment((362,803)).close().assemble().finalize().extrude(1000).union(w1.sketch().arc((277,652),(244,612),(284,652)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(34,52,72))
+r=w0.sketch().segment((114,799),(946,799)).segment((946,1)).segment((114,1)).close().assemble().push([(585,464)]).circle(139,mode='s').finalize().extrude(195)
diff --git a/test/extrude/1144/1144.stl b/test/extrude/1144/1144.stl
index 571af0979b8cd0f734a7704c250f92979b79e024..104a2b4515d1d1f47c73d8191edf65724130c4d0 100644
Binary files a/test/extrude/1144/1144.stl and b/test/extrude/1144/1144.stl differ
diff --git a/test/extrude/1145/1145.py b/test/extrude/1145/1145.py
index 39e6d534da526ed07e8c38ee716ad9cf9a2ac89a..d98782c9babc8b8d6d53e0bb6e52e6646a1d6a26 100644
--- a/test/extrude/1145/1145.py
+++ b/test/extrude/1145/1145.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,461,500))
-r=w0.sketch().segment((461,381),(600,351)).segment((690,980)).segment((550,1000)).segment((510,760)).arc((441,690),(491,600)).close().assemble().push([(525,376)]).rect(530,510,mode='s').finalize().extrude(580).union(w0.sketch().segment((221,21),(441,21)).segment((441,1)).segment((560,1)).segment((560,21)).segment((780,21)).segment((780,351)).segment((560,351)).segment((560,371)).segment((441,371)).segment((441,351)).segment((221,351)).close().assemble().finalize().extrude(590))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(46,71,46))
+r=w0.sketch().segment((130,557),(880,557)).segment((880,459)).segment((130,459)).close().assemble().reset().segment((364,596),(622,596)).segment((622,336)).segment((364,336)).close().assemble(mode='s').finalize().extrude(245)
diff --git a/test/extrude/1145/1145.stl b/test/extrude/1145/1145.stl
index 6981e808728df132b1199faf4c17293fa1cc4202..57b1d7e68b3a8c1dc34b13149ce4e3eb04e2e87e 100644
Binary files a/test/extrude/1145/1145.stl and b/test/extrude/1145/1145.stl differ
diff --git a/test/extrude/1146/1146.py b/test/extrude/1146/1146.py
index 6e08d36f3a09e3242feaac3d8d929d23e60c05ad..0c384c9322aae2bb1e56d69bce12bc0fbdb0c101 100644
--- a/test/extrude/1146/1146.py
+++ b/test/extrude/1146/1146.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(516,506,506))
-w1=cq.Workplane('ZX',origin=(506,647,506))
-r=w0.workplane(offset=364).moveTo(758,223).cylinder(788,546).union(w0.sketch().segment((637,41),(667,41)).arc((647,51),(637,62)).close().assemble().finalize().extrude(586)).union(w0.sketch().segment((213,395),(667,395)).segment((667,516)).arc((717,667),(667,808)).segment((667,919)).segment((213,919)).close().assemble().finalize().extrude(1000)).union(w1.sketch().segment((516,31),(647,31)).arc((748,1),(839,31)).segment((970,31)).segment((970,344)).segment((839,344)).arc((748,364),(647,344)).segment((516,344)).close().assemble().push([(546,309)]).rect(546,516,mode='s').finalize().extrude(122))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(63,12,18))
+r=w0.sketch().segment((342,226),(510,226)).segment((510,897)).arc((426,938),(342,897)).close().assemble().push([(366,334)]).rect(78,85,mode='s').push([(375,905)]).rect(97,69,mode='s').push([(479,396)]).circle(35,mode='s').push([(432,812)]).circle(29,mode='s').finalize().extrude(139)
diff --git a/test/extrude/1146/1146.stl b/test/extrude/1146/1146.stl
index 443da12907578e9ed66458ff7e135bc13f7a0ecb..8b6e9608a475e7d4583079f656b75f92b5fd2869 100644
Binary files a/test/extrude/1146/1146.stl and b/test/extrude/1146/1146.stl differ
diff --git a/test/extrude/1147/1147.py b/test/extrude/1147/1147.py
index 49b34505c3ea47b53f859388e941589064fb67c0..1989846bdf36c3d4b66b4f3f530d12faeaefc7d1 100644
--- a/test/extrude/1147/1147.py
+++ b/test/extrude/1147/1147.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(404,404,230))
-r=w0.workplane(offset=285).moveTo(230,349).cylinder(643,468).union(w0.sketch().segment((65,175),(258,175)).segment((258,102)).segment((468,102)).segment((468,597)).segment((496,597)).arc((47,698),(65,239)).close().assemble().finalize().extrude(753)).union(w0.sketch().push([(230,349)]).circle(661).reset().face(w0.sketch().segment((1,267),(157,267)).arc((230,239),(294,267)).segment((459,267)).segment((459,432)).segment((294,432)).arc((230,459),(157,432)).segment((1,432)).close().assemble(),mode='s').push([(743,212)]).rect(643,734).finalize().extrude(1000)).translate((28,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(28,37,9))
+r=w0.sketch().segment((277,223),(867,223)).segment((867,1000)).segment((277,1000)).close().assemble().push([(564,634)]).rect(227,193,mode='s').finalize().extrude(271)
diff --git a/test/extrude/1147/1147.stl b/test/extrude/1147/1147.stl
index 8c0d7e4d8e7b35dc624c6ed2402b7d4bf1c6e9fe..d58c4e79045a8b2839619b4b7391268981e9b997 100644
Binary files a/test/extrude/1147/1147.stl and b/test/extrude/1147/1147.stl differ
diff --git a/test/extrude/1148/1148.py b/test/extrude/1148/1148.py
index 75336e25ecf970c745058067007121ca5a85ac12..2dc2085e28213e0658d4090d8a71f83e3773e9d5 100644
--- a/test/extrude/1148/1148.py
+++ b/test/extrude/1148/1148.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,590,500))
-r=w0.sketch().arc((461,161),(610,261),(620,451)).close().assemble().finalize().extrude(121).union(w0.sketch().segment((1,331),(141,331)).segment((141,321)).segment((191,301)).segment((201,331)).segment((271,331)).arc((431,191),(600,331)).arc((880,241),(880,540)).segment((1000,670)).segment((810,840)).segment((590,600)).segment((660,540)).arc((610,481),(590,421)).arc((431,520),(281,421)).segment((231,421)).segment((231,431)).segment((181,441)).segment((171,421)).segment((1,421)).close().assemble().reset().face(w0.sketch().arc((321,331),(550,341),(331,421)).segment((371,421)).segment((371,331)).close().assemble(),mode='s').finalize().extrude(700))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(41,76,53))
+r=w0.sketch().segment((940,715),(308,715)).segment((308,82)).segment((940,82)).close().assemble().push([(623,367)]).rect(189,198,mode='s').finalize().extrude(303)
diff --git a/test/extrude/1148/1148.stl b/test/extrude/1148/1148.stl
index 5ca204ccd72274c3498cdd55083ab302d025e8f6..00ba8f29677326dbeaa4ccf54d0454c9c9bd758f 100644
Binary files a/test/extrude/1148/1148.stl and b/test/extrude/1148/1148.stl differ
diff --git a/test/extrude/1149/1149.py b/test/extrude/1149/1149.py
index 048d68e0096cbd0e41f7eca14f2acd972c3ff77c..3cab23996bb19a24a3cdef0f4c10535b0d9ba513 100644
--- a/test/extrude/1149/1149.py
+++ b/test/extrude/1149/1149.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(480,480,355))
-w1=cq.Workplane('YZ',origin=(500,480,480))
-r=w0.sketch().segment((448,407),(761,407)).segment((761,958)).segment((448,958)).segment((448,667)).arc((199,542),(448,407)).assemble().reset().face(w0.sketch().segment((500,480),(625,459)).segment((646,553)).segment((511,563)).arc((511,521),(500,480)).assemble(),mode='s').finalize().extrude(84).union(w1.sketch().segment((1,813),(168,813)).segment((168,553)).segment((500,553)).segment((500,615)).arc((521,657),(500,709)).segment((500,1000)).segment((168,1000)).segment((168,969)).segment((1,969)).close().assemble().finalize().extrude(272))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(75,38,63))
+r=w0.sketch().segment((413,292),(413,962)).segment((529,962)).arc((476,927),(442,873)).arc((421,583),(413,293)).close().assemble().push([(481,708)]).rect(131,150,mode='s').finalize().extrude(110)
diff --git a/test/extrude/1149/1149.stl b/test/extrude/1149/1149.stl
index 46f233ae11bb794488d6437453eb7ba4117214a3..740c7ba2c6b97e8128b82e64f365433adfb84edd 100644
Binary files a/test/extrude/1149/1149.stl and b/test/extrude/1149/1149.stl differ
diff --git a/test/extrude/115/115.py b/test/extrude/115/115.py
index 4f6af6f3eb55c72ee66071b5186e82f45e5d76fc..31465e360eb39b45f5df83f8aec9876f127dbdc8 100644
--- a/test/extrude/115/115.py
+++ b/test/extrude/115/115.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(558,390,558))
-w1=cq.Workplane('XY',origin=(558,558,779))
-r=w0.sketch().segment((646,116),(797,116)).segment((797,611)).arc((682,1000),(646,602)).close().assemble().push([(620,960)]).rect(576,567,mode='s').finalize().extrude(319).union(w0.sketch().arc((505,912),(240,558),(664,655)).arc((346,629),(505,912)).assemble().finalize().extrude(664)).union(w1.sketch().push([(726,867)]).circle(655).push([(722,898)]).rect(655,584,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,146))
+w1=cq.Workplane('ZX',origin=(501,474,500))
+r=w0.sketch().arc((97,195),(102,190),(100,187)).arc((196,245),(95,195)).assemble().push([(148,216)]).rect(555,529,mode='s').push([(596,280)]).rect(580,1000).finalize().extrude(770).union(w1.sketch().segment((312,469),(856,471)).segment((855,594)).segment((596,595)).arc((350,900),(311,510)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/115/115.stl b/test/extrude/115/115.stl
index 1b4f0d59add45373981500e4ab9b85684d59e2ec..1ca98a2750d0e125611b5b50ac8f1fa22d2b484e 100644
Binary files a/test/extrude/115/115.stl and b/test/extrude/115/115.stl differ
diff --git a/test/extrude/1150/1150.py b/test/extrude/1150/1150.py
index abd373621ae296eee942b8d4e08aa0c0835e32d6..2878cbe3ce442660b4447d3b61b314368b984ade 100644
--- a/test/extrude/1150/1150.py
+++ b/test/extrude/1150/1150.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((334,467),(514,427)).segment((514,507)).segment((940,507)).segment((1000,567)).segment((940,620)).segment((973,794)).segment((427,907)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(12,4,6))
+r=w0.sketch().segment((994,1),(358,633)).segment((994,633)).close().assemble().push([(808,433)]).circle(71,mode='s').finalize().extrude(395)
diff --git a/test/extrude/1150/1150.stl b/test/extrude/1150/1150.stl
index 0ca77622a3ac2ee815e04c535263b7b897318b8b..34a7937634fd79f15426152c9f23ba5e35eecfdf 100644
Binary files a/test/extrude/1150/1150.stl and b/test/extrude/1150/1150.stl differ
diff --git a/test/extrude/1151/1151.py b/test/extrude/1151/1151.py
index 9892ee8d4869ac9b7a6cb27425fa62bea8d6ac17..070bcf94a5197bcad70f16571fd88f11a378845f 100644
--- a/test/extrude/1151/1151.py
+++ b/test/extrude/1151/1151.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(439,439,238))
-w1=cq.Workplane('YZ',origin=(422,439,439))
-r=w0.sketch().segment((1,728),(27,728)).segment((19,763)).segment((19,737)).segment((1,737)).close().assemble().finalize().extrude(1000).union(w1.sketch().segment((220,89),(378,89)).segment((378,194)).arc((474,343),(378,492)).segment((378,588)).segment((220,588)).segment((220,492)).arc((124,343),(220,194)).close().assemble().finalize().extrude(895))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,404,500))
+r=w0.sketch().segment((30,585),(62,585)).arc((126,451),(195,586)).segment((306,585)).segment((307,625)).segment((31,626)).close().assemble().push([(710,911)]).circle(590).finalize().extrude(175).union(w0.sketch().segment((200,355),(320,131)).segment((440,197)).arc((446,185),(457,181)).segment((427,86)).segment((725,1)).segment((801,255)).segment((794,260)).arc((696,496),(444,441)).segment((425,480)).close().assemble().finalize().extrude(775)).union(w0.sketch().segment((456,382),(566,381)).arc((711,332),(861,380)).segment((969,382)).segment((971,784)).segment((860,785)).arc((710,836),(566,785)).segment((455,786)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/1151/1151.stl b/test/extrude/1151/1151.stl
index 0e24bda4c7e72417ee6306f7c88ac2de9297f429..3fb87e5e6c2b351f9418e8e81c0e034a2999f87f 100644
Binary files a/test/extrude/1151/1151.stl and b/test/extrude/1151/1151.stl differ
diff --git a/test/extrude/1152/1152.py b/test/extrude/1152/1152.py
index 1cdec609468fc7f0df2a615937216fe2ad1c831c..f6d4b29856a981dd7826ca805cf36381f7920f91 100644
--- a/test/extrude/1152/1152.py
+++ b/test/extrude/1152/1152.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(748,474,474))
-w1=cq.Workplane('XY',origin=(474,474,727))
-r=w0.sketch().segment((64,327),(106,327)).arc((232,243),(127,348)).segment((64,348)).close().assemble().push([(138,727)]).rect(621,495).finalize().extrude(75).union(w1.sketch().segment((411,96),(464,96)).segment((464,22)).segment((947,22)).segment((947,96)).segment((1000,96)).segment((1000,579)).segment((947,579)).segment((947,653)).segment((685,653)).arc((1,737),(411,180)).close().assemble().finalize().extrude(127))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(5,6,64))
+r=w0.sketch().segment((919,343),(374,343)).segment((374,707)).segment((919,707)).close().assemble().finalize().extrude(277).union(w0.sketch().segment((483,466),(607,466)).segment((607,86)).segment((483,86)).close().assemble().finalize().extrude(235))
diff --git a/test/extrude/1152/1152.stl b/test/extrude/1152/1152.stl
index 348ef0715922cefde120513e3a0c772e80ee25ae..69947a14c289bb3ad2e2bb4014af3799a4e2e4a0 100644
Binary files a/test/extrude/1152/1152.stl and b/test/extrude/1152/1152.stl differ
diff --git a/test/extrude/1153/1153.py b/test/extrude/1153/1153.py
index 1fbdda497856ae8d0af42f08037c91796bf7a5ee..836bd938c2e589bc364b74d8d31f74f741c022b9 100644
--- a/test/extrude/1153/1153.py
+++ b/test/extrude/1153/1153.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,391,500))
-r=w0.sketch().segment((1,341),(431,341)).segment((990,81)).segment((1000,111)).segment((510,341)).segment((520,341)).segment((520,920)).segment((1,920)).close().assemble().push([(261,630)]).circle(700,mode='s').finalize().extrude(491).union(w0.workplane(offset=615).moveTo(451,151).cylinder(730,530))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(49,79,54))
+r=w0.sketch().segment((671,791),(521,791)).segment((506,791)).segment((506,896)).segment((521,896)).segment((671,896)).segment((746,896)).segment((746,296)).segment((671,296)).close().assemble().push([(636,724)]).circle(132,mode='s').finalize().extrude(77)
diff --git a/test/extrude/1153/1153.stl b/test/extrude/1153/1153.stl
index 77aafd1abbfb8a4f017949399cd77b1102fb19b6..a330ae861623e331ac6746766b712861851d375c 100644
Binary files a/test/extrude/1153/1153.stl and b/test/extrude/1153/1153.stl differ
diff --git a/test/extrude/1154/1154.py b/test/extrude/1154/1154.py
index afbaac5632d25bb450a5d8920780f2757fd0df91..5ae7425d73d0bd1a396894c310799dd599382d65 100644
--- a/test/extrude/1154/1154.py
+++ b/test/extrude/1154/1154.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(304,506,506))
-r=w0.sketch().segment((788,576),(839,536)).segment((1000,758)).segment((950,788)).arc((960,970),(788,980)).arc((950,778),(788,576)).assemble().finalize().extrude(405).union(w0.sketch().segment((11,1),(31,1)).arc((21,11),(11,11)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(68,71,33))
+r=w0.sketch().segment((774,525),(1,696)).segment((1,795)).segment((794,624)).close().assemble().push([(353,689)]).rect(233,206,mode='s').finalize().extrude(391).translate((1,321,1))
diff --git a/test/extrude/1154/1154.stl b/test/extrude/1154/1154.stl
index 61c28ecbba35681a35d6b1bab400f0986646e85e..8390e7aa17eb197a29a7c0c9833e06172589e8a2 100644
Binary files a/test/extrude/1154/1154.stl and b/test/extrude/1154/1154.stl differ
diff --git a/test/extrude/1155/1155.py b/test/extrude/1155/1155.py
index a94a46d4aca2c80a63c511b121d33d8b096592b6..6fe78c976b97dce8bc9249ea354b2b8d81e27123 100644
--- a/test/extrude/1155/1155.py
+++ b/test/extrude/1155/1155.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,550))
-r=w0.sketch().segment((151,1),(710,1)).segment((710,171)).segment((850,171)).segment((850,441)).segment((710,441)).segment((710,790)).segment((680,790)).segment((730,870)).segment((461,1000)).segment((401,890)).segment((441,930)).segment((630,790)).segment((441,790)).segment((371,830)).segment((361,790)).segment((151,790)).close().assemble().finalize().extrude(401)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,55,8))
+r=w0.sketch().segment((714,1),(714,270)).segment((552,551)).segment((552,775)).segment((506,775)).segment((506,539)).segment((668,258)).segment((668,1)).close().assemble().reset().segment((459,350),(851,350)).segment((851,440)).segment((459,440)).close().assemble(mode='s').finalize().extrude(57)
diff --git a/test/extrude/1155/1155.stl b/test/extrude/1155/1155.stl
index ba289e69e72f73d1cff84ae3507ffaa025a2b618..f2ac5d3cbc306e53fe2c2e8f3e5e7ce14c2f61e0 100644
Binary files a/test/extrude/1155/1155.stl and b/test/extrude/1155/1155.stl differ
diff --git a/test/extrude/1156/1156.py b/test/extrude/1156/1156.py
index c04ea16d8dae81f26f13cf5dc9672e15e4fb238c..e20ce3b44563bc63cf57d297de8754dd110b60ac 100644
--- a/test/extrude/1156/1156.py
+++ b/test/extrude/1156/1156.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,550))
-w1=cq.Workplane('XY',origin=(500,500,500))
-r=w0.sketch().segment((301,1),(520,1)).segment((520,171)).segment((491,171)).segment((530,351)).segment((520,351)).segment((520,461)).segment((301,461)).close().assemble().reset().face(w0.sketch().segment((351,71),(381,51)).segment((411,101)).segment((381,121)).close().assemble(),mode='s').finalize().extrude(11).union(w0.sketch().push([(530,735)]).rect(840,730).push([(525,735)]).rect(550,530,mode='s').finalize().extrude(880)).union(w1.sketch().segment((520,471),(530,471)).segment((530,720)).arc((540,730),(530,750)).segment((530,840)).arc((610,910),(530,990)).segment((530,1000)).segment((520,1000)).segment((520,980)).arc((461,910),(520,840)).segment((520,750)).arc((510,730),(520,720)).close().assemble().finalize().extrude(620))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(25,71,19))
+r=w0.sketch().segment((803,438),(129,439)).segment((129,775)).segment((803,776)).close().assemble().finalize().extrude(183).union(w0.sketch().segment((392,754),(92,754)).segment((92,454)).segment((392,454)).close().assemble().finalize().extrude(105)).union(w0.sketch().segment((109,474),(292,474)).segment((292,503)).segment((306,503)).segment((306,784)).segment((321,784)).segment((321,798)).segment((109,798)).segment((109,784)).segment((109,475)).close().assemble().finalize().extrude(107))
diff --git a/test/extrude/1156/1156.stl b/test/extrude/1156/1156.stl
index ed62f85b33b9e3358c4d0c1c35c46b967dc4782e..ef8e65255148a2937dde64ec117309c2e1a800b6 100644
Binary files a/test/extrude/1156/1156.stl and b/test/extrude/1156/1156.stl differ
diff --git a/test/extrude/1157/1157.py b/test/extrude/1157/1157.py
index 4f71e9288a2a377640112ca99e78399657ea4f78..de65b6380deeeee3a76f8a289f4910faf19e27eb 100644
--- a/test/extrude/1157/1157.py
+++ b/test/extrude/1157/1157.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(485,547,485))
-r=w0.workplane(offset=279).moveTo(217,269).cylinder(897,495).union(w0.workplane(offset=598).moveTo(547,1).cylinder(712,516)).union(w0.sketch().segment((114,588),(145,557)).segment((258,712)).segment((289,485)).segment((454,516)).arc((403,382),(434,248)).arc((300,73),(485,186)).arc((856,310),(588,588)).segment((526,1000)).segment((217,959)).segment((248,763)).close().assemble().push([(392,722)]).circle(516,mode='s').finalize().extrude(773)).translate((31,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(42,48,9))
+r=w0.sketch().segment((348,814),(996,814)).segment((996,28)).segment((348,28)).close().assemble().push([(452,491)]).rect(52,57,mode='s').push([(525,361)]).circle(71,mode='s').push([(749,727)]).circle(44,mode='s').push([(723,346)]).rect(99,82,mode='s').finalize().extrude(145)
diff --git a/test/extrude/1157/1157.stl b/test/extrude/1157/1157.stl
index 9f020d9b328c66648507be6ade43f4a680d088c0..64589a1f0c1830581540e1ff517ccacb6e52238d 100644
Binary files a/test/extrude/1157/1157.stl and b/test/extrude/1157/1157.stl differ
diff --git a/test/extrude/1158/1158.py b/test/extrude/1158/1158.py
index d2c5103db33fd24e39f5fa79b2aa1e77b8a64ff2..4ddd813435a6f3ab01ac7c17244b0034a9b0f8e7 100644
--- a/test/extrude/1158/1158.py
+++ b/test/extrude/1158/1158.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(600,600,825))
-w1=cq.Workplane('YZ',origin=(888,600,600))
-r=w0.sketch().push([(426,1000)]).circle(825).reset().face(w0.sketch().segment((625,351),(1000,351)).segment((1000,688)).segment((875,688)).arc((838,488),(813,688)).segment((625,688)).close().assemble()).finalize().extrude(900).union(w1.sketch().arc((126,351),(363,113),(238,426)).arc((38,600),(126,351)).assemble().reset().face(w1.sketch().segment((1,476),(13,476)).arc((13,451),(26,426)).segment((26,388)).segment((63,388)).arc((113,376),(163,388)).segment((201,413)).segment((201,426)).arc((213,451),(213,476)).segment((213,500)).segment((13,500)).segment((1,500)).close().assemble(),mode='s').push([(269,257)]).rect(763,688,mode='s').finalize().extrude(700))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(33,38,68))
+r=w0.sketch().segment((111,182),(617,182)).segment((617,856)).segment((111,856)).close().assemble().push([(356,500)]).circle(148,mode='s').finalize().extrude(225)
diff --git a/test/extrude/1158/1158.stl b/test/extrude/1158/1158.stl
index 3fd634ff7ce5a1ff7096bcaa64ad7f75997c4f94..16a677b75061b15c3ff34eb349c23b7dcfe66f6f 100644
Binary files a/test/extrude/1158/1158.stl and b/test/extrude/1158/1158.stl differ
diff --git a/test/extrude/1159/1159.py b/test/extrude/1159/1159.py
index 540027547e75a76bfb6923e69c170b17cc51cd03..5fa0a59ad8b0dd33a9d46b9d45da3bdc76cb8149 100644
--- a/test/extrude/1159/1159.py
+++ b/test/extrude/1159/1159.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().segment((294,327),(321,267)).segment((374,301)).segment((374,401)).segment((321,307)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(33,20,10))
+r=w0.sketch().segment((140,792),(140,1)).segment((674,1)).arc((417,336),(294,792)).close().assemble().push([(252,455)]).rect(284,223,mode='s').finalize().extrude(71)
diff --git a/test/extrude/1159/1159.stl b/test/extrude/1159/1159.stl
index aed4607da10baa38f1aaee66bd262f1d702a1535..d67c8cec183773b8a5e629b3437efa97909d86de 100644
Binary files a/test/extrude/1159/1159.stl and b/test/extrude/1159/1159.stl differ
diff --git a/test/extrude/116/116.py b/test/extrude/116/116.py
index 514fd8d4dff227b7606296ba065f8fc117148bba..d90987ee04206ffb75154c4cd8e21799bd95b38d 100644
--- a/test/extrude/116/116.py
+++ b/test/extrude/116/116.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(260,260,408))
-r=w0.workplane(offset=112).box(1000,408,556).union(w0.sketch().segment((1,149),(149,149)).arc((260,105),(371,149)).segment((452,149)).segment((452,245)).segment((519,245)).segment((519,371)).segment((371,371)).arc((260,415),(149,371)).segment((1,371)).close().assemble().finalize().extrude(105)).translate((241,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,434))
+r=w0.sketch().arc((596,75),(591,114),(631,109)).arc((201,544),(594,74)).assemble().push([(704,789)]).circle(709).finalize().extrude(205).union(w0.workplane(offset=711).moveTo(704,791).cylinder(925,664))
\ No newline at end of file
diff --git a/test/extrude/116/116.stl b/test/extrude/116/116.stl
index aeef589bf19587243a9b9f8c33f73d3dcf11dcee..6b9bb75638500c4e71287496756816f230235622 100644
Binary files a/test/extrude/116/116.stl and b/test/extrude/116/116.stl differ
diff --git a/test/extrude/1160/1160.py b/test/extrude/1160/1160.py
index 2adf8cdae3e3a95fc78cd173f934f629b219119c..9d1b2f06ec70a4a5f65a610e7e5e8705a38ed99b 100644
--- a/test/extrude/1160/1160.py
+++ b/test/extrude/1160/1160.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(439,439,308))
-r=w0.workplane(offset=290).moveTo(579,308).cylinder(737,737).union(w0.sketch().segment((1,728),(27,720)).arc((115,465),(378,483)).segment((404,465)).segment((474,571)).segment((448,579)).arc((360,834),(97,816)).segment((71,834)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,660))
+r=w0.sketch().segment((91,176),(93,206)).segment((181,206)).arc((176,227),(167,240)).segment((131,240)).segment((133,282)).segment((157,280)).arc((151,307),(153,336)).arc((18,131),(257,116)).arc((222,145),(197,186)).segment((197,177)).close().assemble().finalize().extrude(121).union(w0.sketch().segment((92,450),(335,396)).arc((422,87),(734,36)).arc((1000,270),(781,551)).arc((680,591),(575,594)).segment((579,621)).segment((654,620)).segment((654,754)).segment((610,756)).segment((646,889)).segment((220,989)).close().assemble().reset().face(w0.sketch().arc((764,51),(983,276),(804,529)).arc((909,281),(764,52)).assemble(),mode='s').finalize().extrude(560))
\ No newline at end of file
diff --git a/test/extrude/1160/1160.stl b/test/extrude/1160/1160.stl
index 2876dbf53f1a3591d079423d3e22aa68c5bc493b..80c7c2001977241e72e12ba6fe64a76a530690e3 100644
Binary files a/test/extrude/1160/1160.stl and b/test/extrude/1160/1160.stl differ
diff --git a/test/extrude/1161/1161.py b/test/extrude/1161/1161.py
index e2d82d90eebeff8aef613c1e0831472040c7101a..7c12aa632e2e74d72e9039b7d9df6a35691c82d0 100644
--- a/test/extrude/1161/1161.py
+++ b/test/extrude/1161/1161.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(443,443,169))
-r=w0.sketch().arc((195,372),(240,302),(319,275)).segment((257,231)).segment((452,1)).segment((646,160)).segment((461,390)).segment((461,452)).arc((443,452),(452,470)).arc((337,549),(213,487)).arc((284,417),(195,372)).assemble().finalize().extrude(850).union(w0.workplane(offset=722).moveTo(452,646).cylinder(1000,682))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(5,9,14))
+r=w0.sketch().segment((693,659),(383,659)).segment((328,482)).segment((184,482)).segment((288,814)).segment((788,814)).segment((892,482)).segment((748,482)).close().assemble().finalize().extrude(166).union(w0.workplane(offset=168).sketch().segment((410,694),(410,602)).segment((561,602)).segment((561,694)).segment((830,694)).segment((830,604)).segment((561,604)).segment((561,694)).close().assemble().finalize().extrude(74)).union(w0.workplane(offset=71).sketch().segment((403,753),(43,753)).segment((43,417)).segment((403,417)).close().assemble().finalize().extrude(45)).translate((1,234,1))
diff --git a/test/extrude/1161/1161.stl b/test/extrude/1161/1161.stl
index 6d596c071edd903e194040c6e87c108ef5e2e2fb..dd68bcedf44702a63a9e5bd4ce38313357e450ed 100644
Binary files a/test/extrude/1161/1161.stl and b/test/extrude/1161/1161.stl differ
diff --git a/test/extrude/1162/1162.py b/test/extrude/1162/1162.py
index 64faa984e1bff3284b76b842318c524824e2cd36..2fb9c5d3231af7dfa9eb3a1ffc9041b555c8b921 100644
--- a/test/extrude/1162/1162.py
+++ b/test/extrude/1162/1162.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().arc((654,567),(680,667),(654,767)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(40,18,40))
+r=w0.sketch().segment((318,567),(363,649)).segment((377,567)).segment((446,684)).segment((501,606)).segment((501,572)).segment((564,635)).segment((644,554)).segment((644,701)).segment((783,539)).segment((783,684)).segment((887,550)).segment((744,439)).segment((310,535)).close().assemble().push([(602,591)]).circle(90,mode='s').finalize().extrude(353)
diff --git a/test/extrude/1162/1162.stl b/test/extrude/1162/1162.stl
index 98f3e3787a31ed36aaf04f33f7dedc000f4fea03..7997f41a6cc6e60b25cc9e2977987cb84ccfe3c0 100644
Binary files a/test/extrude/1162/1162.stl and b/test/extrude/1162/1162.stl differ
diff --git a/test/extrude/1163/1163.py b/test/extrude/1163/1163.py
index 91f7581851c3bf635e553fc75a99dc535a9e7143..9c69c6e4884940595d5c340cea68e8d8ddf3098d 100644
--- a/test/extrude/1163/1163.py
+++ b/test/extrude/1163/1163.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().rect(734,720).rect(454,694,mode='s').push([(467,387)]).circle(387,mode='s').push([(327,334)]).circle(347).finalize().extrude(1000).translate((1,34,27))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(71,58,36))
+r=w0.sketch().segment((259,1),(515,1)).segment((515,394)).segment((259,394)).segment((515,394)).segment((515,800)).segment((259,800)).segment((259,394)).close().assemble().push([(414,449)]).circle(150,mode='s').finalize().extrude(170)
diff --git a/test/extrude/1163/1163.stl b/test/extrude/1163/1163.stl
index f95783714a611e991c3f921257cc0c77eda827de..1d74cd8cb7e7e2cd86e5784f7f683d04c5bd687d 100644
Binary files a/test/extrude/1163/1163.stl and b/test/extrude/1163/1163.stl differ
diff --git a/test/extrude/1164/1164.py b/test/extrude/1164/1164.py
index 856986aaac2966f239cff68cc96d6ef86510ef18..9ca1d9e4ba178c08e0ce36f55a8a1488aa934e86 100644
--- a/test/extrude/1164/1164.py
+++ b/test/extrude/1164/1164.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(242,432,432))
-w1=cq.Workplane('XY',origin=(432,432,397))
-r=w0.sketch().segment((604,389),(742,389)).arc((673,569),(604,389)).assemble().finalize().extrude(363).union(w0.sketch().segment((79,328),(113,242)).segment((130,242)).segment((130,130)).segment((259,130)).arc((345,1),(423,130)).segment((432,130)).segment((432,285)).arc((363,277),(302,311)).segment((337,320)).segment((302,406)).segment((285,406)).arc((302,440),(328,466)).segment((130,466)).segment((130,345)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=664).moveTo(225,277).cylinder(897,595))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(67,41,1))
+r=w0.sketch().segment((742,206),(608,206)).segment((608,1000)).segment((742,1000)).close().assemble().reset().segment((596,809),(596,469)).segment((908,469)).segment((908,809)).close().assemble(mode='s').finalize().extrude(113)
diff --git a/test/extrude/1164/1164.stl b/test/extrude/1164/1164.stl
index 677239f9bf7ca88d109f46f7c0b4dd4ed72cf7dc..eb076e554f226c30b7201edd218f70f4e03946cb 100644
Binary files a/test/extrude/1164/1164.stl and b/test/extrude/1164/1164.stl differ
diff --git a/test/extrude/1165/1165.py b/test/extrude/1165/1165.py
index 8d0dfb2a3ebfc52e3df29d8237bf61e526e8831f..1c7a1d0bcd37905a824a799c3c712d5aa8e0eca6 100644
--- a/test/extrude/1165/1165.py
+++ b/test/extrude/1165/1165.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(470,470,362))
-r=w0.sketch().push([(145,25)]).circle(627).reset().face(w0.sketch().segment((1,25),(109,25)).segment((121,85)).segment((13,97)).close().assemble(),mode='s').finalize().extrude(482).union(w0.sketch().push([(121,1000)]).circle(519).push([(868,994)]).rect(639,627).finalize().extrude(699)).translate((13,133,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(31,4,71))
+r=w0.sketch().segment((112,351),(112,333)).segment((912,333)).segment((912,351)).close().assemble().push([(532,355)]).circle(118,mode='s').finalize().extrude(96)
diff --git a/test/extrude/1165/1165.stl b/test/extrude/1165/1165.stl
index f66f6f5e43f3b092e2ece10ef9ebc7b8c1064f54..eb2944dfd397c1e1efc5bceef960229768a5afc4 100644
Binary files a/test/extrude/1165/1165.stl and b/test/extrude/1165/1165.stl differ
diff --git a/test/extrude/1166/1166.py b/test/extrude/1166/1166.py
index e1b13c2ce81829f0d881d6801e8b52c35d9091fe..061512f63b06739c98c9db330174c23387cfa691 100644
--- a/test/extrude/1166/1166.py
+++ b/test/extrude/1166/1166.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(398,398,494))
-r=w0.sketch().circle(1000).push([(1,494)]).rect(470,687,mode='s').finalize().extrude(206).translate((603,603,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(17,58,31))
+r=w0.sketch().segment((143,930),(789,930)).segment((789,608)).segment((789,554)).segment((789,469)).segment((789,458)).segment((143,458)).segment((143,731)).segment((143,734)).segment((143,818)).close().assemble().finalize().extrude(242).union(w0.workplane(offset=250).sketch().segment((600,62),(748,62)).segment((748,420)).segment((600,419)).close().assemble().finalize().extrude(191)).translate((1,384,1))
diff --git a/test/extrude/1166/1166.stl b/test/extrude/1166/1166.stl
index 63747a8c6399d2124b9c7ebca89ebeb35d5abbbb..6c44c0cf3b6d6ec568aa51ab8318b4dcc7fda7ad 100644
Binary files a/test/extrude/1166/1166.stl and b/test/extrude/1166/1166.stl differ
diff --git a/test/extrude/1167/1167.py b/test/extrude/1167/1167.py
index 9cc1e0cc01d237280d34e6845277892e2b9edf50..053fdce139f982bc050d3d76f8996cc14b10c968 100644
--- a/test/extrude/1167/1167.py
+++ b/test/extrude/1167/1167.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(426,426,277))
-r=w0.sketch().arc((621,667),(311,345),(690,598)).segment((1000,598)).segment((1000,667)).close().assemble().finalize().extrude(288).union(w0.workplane(offset=650).moveTo(1,300).cylinder(874,575)).translate((149,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(61,44,49))
+r=w0.sketch().segment((924,246),(519,650)).segment((250,650)).segment((250,246)).close().assemble().push([(481,493)]).rect(169,181,mode='s').finalize().extrude(388)
diff --git a/test/extrude/1167/1167.stl b/test/extrude/1167/1167.stl
index 322b40bae271c8781796439a8f166449a7c3d74c..f659b53d974c11ce7968200f33cad3eb671cb9a5 100644
Binary files a/test/extrude/1167/1167.stl and b/test/extrude/1167/1167.stl differ
diff --git a/test/extrude/1168/1168.py b/test/extrude/1168/1168.py
index a7682d90ab46f63bea26089df667ac905938db25..f8778c99d7f481c007eea27b983361c1b9d9cec4 100644
--- a/test/extrude/1168/1168.py
+++ b/test/extrude/1168/1168.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(325,353,353))
-r=w0.sketch().push([(353,620)]).rect(1000,522).reset().face(w0.sketch().segment((184,212),(205,212)).arc((240,135),(304,92)).segment((304,451)).segment((289,451)).segment((296,360)).arc((233,318),(205,247)).segment((184,247)).close().assemble()).reset().face(w0.sketch().segment((381,1),(395,1)).segment((388,99)).arc((444,142),(479,212)).segment((500,212)).segment((500,247)).segment((479,247)).arc((444,318),(381,360)).close().assemble()).finalize().extrude(416)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,999,502))
+r=w0.sketch().push([(452,390)]).circle(890).push([(446,394)]).rect(1000,815,mode='s').finalize().extrude(1).union(w0.sketch().push([(781,840)]).circle(660).circle(525,mode='s').finalize().extrude(137))
\ No newline at end of file
diff --git a/test/extrude/1168/1168.stl b/test/extrude/1168/1168.stl
index 762ba6a23eb9ae039a2330a5c29c0360339244ce..3369196a0f0e52afd550520387c5d5afffe7317b 100644
Binary files a/test/extrude/1168/1168.stl and b/test/extrude/1168/1168.stl differ
diff --git a/test/extrude/1169/1169.py b/test/extrude/1169/1169.py
index 32fd011ec88fe8e1f14ac4a71e8b0b8e822cdc9c..83c2041f681d02b1d9e35f14606d48bb46ce4ef2 100644
--- a/test/extrude/1169/1169.py
+++ b/test/extrude/1169/1169.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(661,515,515))
-w1=cq.Workplane('ZX',origin=(515,544,515))
-r=w0.sketch().arc((544,651),(583,593),(631,544)).arc((719,806),(1000,777)).arc((806,971),(554,855)).arc((593,748),(544,651)).assemble().finalize().extrude(214).union(w0.workplane(offset=491).moveTo(515,205).cylinder(564,670)).union(w1.sketch().push([(205,515)]).circle(573).push([(205,525)]).rect(573,554,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(8,44,34))
+r=w0.sketch().segment((826,632),(184,632)).segment((184,444)).segment((826,444)).close().assemble().push([(283,474)]).rect(46,76,mode='s').push([(228,545)]).rect(71,73,mode='s').push([(417,536)]).circle(40,mode='s').push([(299,548)]).rect(88,47,mode='s').finalize().extrude(180)
diff --git a/test/extrude/1169/1169.stl b/test/extrude/1169/1169.stl
index dea69019975301566105c0747c78985641fc5fc4..5631265cc93660c55961881f903301aa7236ebd7 100644
Binary files a/test/extrude/1169/1169.stl and b/test/extrude/1169/1169.stl differ
diff --git a/test/extrude/117/117.py b/test/extrude/117/117.py
index 8c96d3b2831cd6bcaaa3b252fbe9aed66f228530..498e07bdbb5684b43d6b9b73872227f78ca8d14a 100644
--- a/test/extrude/117/117.py
+++ b/test/extrude/117/117.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(620,560,560))
-r=w0.sketch().segment((221,471),(401,471)).segment((401,211)).segment((451,211)).segment((451,181)).segment((670,181)).segment((670,211)).segment((720,211)).segment((720,471)).segment((900,471)).segment((900,650)).segment((720,650)).segment((720,910)).segment((670,910)).segment((670,940)).segment((451,940)).segment((451,910)).segment((401,910)).segment((401,650)).segment((221,650)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=780).moveTo(560,550).cylinder(1000,900))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,556))
+r=w0.sketch().segment((36,953),(35,959)).segment((46,959)).arc((52,978),(61,998)).arc((31,988),(37,953)).assemble().finalize().extrude(325).union(w0.workplane(offset=531).moveTo(758,99).box(934,695,564))
\ No newline at end of file
diff --git a/test/extrude/117/117.stl b/test/extrude/117/117.stl
index 746e02268804055acf82853151c2ea6cbb330209..52b29fc9d65ce208f3bf970d26a0e862b6a7484c 100644
Binary files a/test/extrude/117/117.stl and b/test/extrude/117/117.stl differ
diff --git a/test/extrude/1170/1170.py b/test/extrude/1170/1170.py
index 319b4b2feba1fd8de17ad0ba5b7bde119f923eda..8ce12250c3f2a5b5f1e52e27655cbe924e42fc24 100644
--- a/test/extrude/1170/1170.py
+++ b/test/extrude/1170/1170.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(466,466,220))
-r=w0.sketch().push([(1,541)]).rect(605,808).push([(1,535)]).rect(583,605,mode='s').reset().face(w0.sketch().segment((177,476),(701,476)).arc((669,562),(733,647)).segment((733,669)).segment((177,669)).close().assemble()).finalize().extrude(519).union(w0.sketch().push([(583,327)]).circle(722).rect(594,722,mode='s').reset().face(w0.sketch().segment((936,498),(947,498)).segment((1000,850)).segment((989,861)).close().assemble()).finalize().extrude(957))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(55,1,2))
+r=w0.sketch().segment((456,242),(662,242)).segment((662,860)).segment((868,860)).segment((868,1000)).segment((456,1000)).close().assemble().push([(777,668)]).rect(66,86,mode='s').push([(746,624)]).circle(56,mode='s').push([(661,674)]).rect(121,58,mode='s').push([(638,859)]).rect(121,52,mode='s').finalize().extrude(215).translate((1,215,1))
diff --git a/test/extrude/1170/1170.stl b/test/extrude/1170/1170.stl
index aeecd4418f56ee2c6e69100c1740333426f54e1c..e2e138764844539ee10916334de3eb1a36b9a753 100644
Binary files a/test/extrude/1170/1170.stl and b/test/extrude/1170/1170.stl differ
diff --git a/test/extrude/1171/1171.py b/test/extrude/1171/1171.py
index 1bd009d8b8964c24de6f965b6d1152871a376006..713c069acbe3b98d3d7e1905128dab14fdbe6fb1 100644
--- a/test/extrude/1171/1171.py
+++ b/test/extrude/1171/1171.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(412,412,224))
-r=w0.sketch().push([(260,553)]).circle(647).push([(506,1)]).circle(589).finalize().extrude(718).union(w0.sketch().push([(706,971)]).rect(600,471).reset().face(w0.sketch().segment((636,953),(683,953)).arc((706,941),(730,953)).segment((765,953)).segment((765,988)).segment((730,988)).arc((706,1000),(683,988)).segment((636,988)).close().assemble(),mode='s').finalize().extrude(800)).translate((1,177,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(53,31,68))
+r=w0.sketch().segment((1,538),(1,100)).segment((740,100)).segment((740,674)).close().assemble().push([(610,258)]).circle(68,mode='s').push([(375,452)]).rect(70,73,mode='s').push([(489,404)]).circle(47,mode='s').finalize().extrude(261)
diff --git a/test/extrude/1171/1171.stl b/test/extrude/1171/1171.stl
index 44f8bb4d3bf61e4261e8c42fa7e0bb51ebf55047..85dd80d91f645b10f897b3357d94d688bb9eea9e 100644
Binary files a/test/extrude/1171/1171.stl and b/test/extrude/1171/1171.stl differ
diff --git a/test/extrude/1172/1172.py b/test/extrude/1172/1172.py
index 1091138ea1118f752e16247200123b72b2a513a5..eacb41cb65070f9cfd272f7a3bd9fd69a92e7427 100644
--- a/test/extrude/1172/1172.py
+++ b/test/extrude/1172/1172.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,463))
-r=w0.workplane(offset=1).moveTo(334,452).cylinder(1000,420).union(w0.workplane(offset=538).moveTo(334,157).box(441,388,742)).translate((1,1,37))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,34,66))
+r=w0.sketch().segment((754,72),(1,72)).segment((1,894)).segment((754,894)).close().assemble().push([(347,466)]).circle(194,mode='s').finalize().extrude(293)
diff --git a/test/extrude/1172/1172.stl b/test/extrude/1172/1172.stl
index 3c0c0172bda0fd87c053f8692021da475e1d060f..7236e93a260fe775a1e564f78442dafd96140867 100644
Binary files a/test/extrude/1172/1172.stl and b/test/extrude/1172/1172.stl differ
diff --git a/test/extrude/1173/1173.py b/test/extrude/1173/1173.py
index ad91e8826dee2c1182ffa627c3470bbffac558a9..d7638230d7facb467b7f17c836c6a422044ec8e2 100644
--- a/test/extrude/1173/1173.py
+++ b/test/extrude/1173/1173.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(475,475,360))
-w1=cq.Workplane('YZ',origin=(360,475,475))
-r=w0.sketch().segment((52,488),(244,488)).segment((244,193)).arc((629,641),(52,488)).assemble().finalize().extrude(283).union(w0.workplane(offset=552).moveTo(987,962).cylinder(629,603)).union(w1.workplane(offset=212).moveTo(1,654).cylinder(1000,616)).translate((1,142,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(44,42,61))
+r=w0.sketch().segment((266,50),(518,50)).segment((392,758)).segment((266,758)).close().assemble().push([(389,441)]).rect(222,130,mode='s').finalize().extrude(97)
diff --git a/test/extrude/1173/1173.stl b/test/extrude/1173/1173.stl
index c03dca87122a02a58a9f6698bfcb0b1ca2d7be49..970171f8bb2691bd0d5ef1ee3169da62944cbf73 100644
Binary files a/test/extrude/1173/1173.stl and b/test/extrude/1173/1173.stl differ
diff --git a/test/extrude/1174/1174.py b/test/extrude/1174/1174.py
index 73949a9c78295af0c3b0b08e161c1f2fc6bad060..1406352d2099490205cc4b1f24a1cbc69b1fba23 100644
--- a/test/extrude/1174/1174.py
+++ b/test/extrude/1174/1174.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(531,310,531))
-r=w0.workplane(offset=547).moveTo(868,1).box(719,575,564).union(w0.sketch().arc((454,509),(23,178),(531,365)).arc((586,387),(619,443)).segment((685,443)).segment((685,476)).segment((619,476)).arc((542,542),(454,509)).assemble().push([(989,1000)]).rect(719,696).finalize().extrude(972))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(71,72,18))
+r=w0.sketch().segment((740,547),(93,547)).segment((1,547)).arc((1,767),(100,715)).segment((740,715)).close().assemble().push([(156,688)]).circle(49,mode='s').push([(247,634)]).circle(82,mode='s').finalize().extrude(100).translate((34,29,1))
diff --git a/test/extrude/1174/1174.stl b/test/extrude/1174/1174.stl
index 6813e4bc6b5481e0e75dd643a862078aed13ee20..8d1f8f71acb679f3aa2776889b0fad99338000aa 100644
Binary files a/test/extrude/1174/1174.stl and b/test/extrude/1174/1174.stl differ
diff --git a/test/extrude/1175/1175.py b/test/extrude/1175/1175.py
index 8ead83dadf7342d9612efe316ee9a437f7d8a37e..09a91f3d80fe4678148186a2911a7fe3309bbf96 100644
--- a/test/extrude/1175/1175.py
+++ b/test/extrude/1175/1175.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(304,506,506))
-r=w0.workplane(offset=702).moveTo(294,273).cylinder(899,516).union(w0.sketch().segment((1,627),(92,627)).segment((92,606)).segment((223,606)).segment((223,627)).segment((273,627)).segment((273,647)).segment((1,647)).close().assemble().push([(1000,738)]).circle(516).finalize().extrude(919))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(310,282,309))
+r=w0.sketch().segment((448,214),(617,214)).segment((617,482)).segment((586,482)).segment((614,319)).segment((448,288)).close().assemble().finalize().extrude(110).union(w0.sketch().segment((162,196),(180,195)).segment((181,156)).segment((248,155)).arc((303,137),(359,156)).segment((427,156)).segment((426,195)).segment((445,196)).segment((445,279)).segment((426,279)).segment((427,319)).segment((359,320)).arc((303,334),(248,318)).segment((180,319)).segment((180,279)).segment((162,279)).close().assemble().finalize().extrude(187)).union(w0.workplane(offset=438).moveTo(51,285).cylinder(565,359))
\ No newline at end of file
diff --git a/test/extrude/1175/1175.stl b/test/extrude/1175/1175.stl
index 0258cd2b6d92df916cc7505bacb7e7f46d4cd9e5..00d4faf905eb7994d8b2788c70ecdff975e04773 100644
Binary files a/test/extrude/1175/1175.stl and b/test/extrude/1175/1175.stl differ
diff --git a/test/extrude/1176/1176.py b/test/extrude/1176/1176.py
index 33703b7d66dc0a743625854097cc994fd8f5a1c7..4d76c4052f1ab59605640a03e86cb53b7d10affa 100644
--- a/test/extrude/1176/1176.py
+++ b/test/extrude/1176/1176.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,506))
-r=w0.sketch().segment((405,374),(445,374)).segment((465,374)).segment((637,364)).segment((647,606)).segment((415,617)).close().assemble().finalize().extrude(445).union(w0.workplane(offset=480).moveTo(1,122).cylinder(526,506)).union(w0.sketch().segment((62,415),(445,294)).segment((637,51)).segment((778,173)).segment((849,152)).segment((899,263)).segment((939,304)).segment((919,334)).segment((1000,576)).segment((617,697)).segment((425,939)).segment((273,818)).segment((203,839)).segment((162,728)).segment((122,687)).segment((142,657)).close().assemble().finalize().extrude(526)).translate((11,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(6,46,41))
+r=w0.sketch().segment((603,294),(261,522)).arc((477,637),(261,752)).segment((603,980)).segment((199,980)).segment((199,293)).close().assemble().push([(363,652)]).rect(201,158,mode='s').finalize().extrude(302).translate((1,257,1))
diff --git a/test/extrude/1176/1176.stl b/test/extrude/1176/1176.stl
index c239d72c3ec80687e5913f65430c704d1c958d9b..81b2560f7154eff1681c8bb6b763b071b7c15971 100644
Binary files a/test/extrude/1176/1176.stl and b/test/extrude/1176/1176.stl differ
diff --git a/test/extrude/1177/1177.py b/test/extrude/1177/1177.py
index 863daa4072b106098e5e9272ac48ebd98d2501c7..139ec27058cd1f3710b9e953ef21146b71ca36ac 100644
--- a/test/extrude/1177/1177.py
+++ b/test/extrude/1177/1177.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(569,569,750))
-w1=cq.Workplane('ZX',origin=(569,512,569))
-r=w0.sketch().push([(376,580)]).circle(682).push([(807,1000)]).circle(580).finalize().extrude(659).union(w0.sketch().segment((1,421),(69,364)).segment((69,126)).segment((217,126)).segment((217,353)).segment((296,432)).segment((217,500)).segment((217,739)).segment((69,739)).segment((69,512)).close().assemble().finalize().extrude(932)).union(w1.sketch().push([(319,841)]).circle(864).circle(659,mode='s').finalize().extrude(830))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(76,38,35))
+r=w0.sketch().segment((782,898),(224,898)).segment((224,48)).segment((782,48)).close().assemble().finalize().extrude(317).union(w0.sketch().segment((491,647),(1000,647)).segment((1000,765)).segment((491,765)).close().assemble().finalize().extrude(113))
diff --git a/test/extrude/1177/1177.stl b/test/extrude/1177/1177.stl
index b5ca14eaa4e622f60f0067240e58408e5441409a..9e571afaa7dbb2b747243f2a8e2d4792a7e9790a 100644
Binary files a/test/extrude/1177/1177.stl and b/test/extrude/1177/1177.stl differ
diff --git a/test/extrude/1178/1178.py b/test/extrude/1178/1178.py
index b29a2d9ceec90808f11bba8ff18a397298adf414..3ea468ff1af20132e2dcd680eaef1bb09a3ae477 100644
--- a/test/extrude/1178/1178.py
+++ b/test/extrude/1178/1178.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(439,439,159))
-w1=cq.Workplane('YZ',origin=(579,439,439))
-r=w0.sketch().segment((1,246),(36,238)).segment((36,89)).segment((273,89)).segment((273,203)).segment((281,203)).segment((308,387)).segment((273,387)).segment((273,544)).segment((229,544)).segment((229,790)).segment((159,790)).segment((159,544)).segment((36,544)).segment((36,422)).segment((27,422)).close().assemble().finalize().extrude(623).union(w0.workplane(offset=720).moveTo(606,316).box(982,527,1000)).union(w1.workplane(offset=444).moveTo(316,299).cylinder(448,536))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(2,46,43))
+r=w0.sketch().segment((287,1),(287,744)).segment((455,744)).segment((455,1)).close().assemble().reset().segment((317,197),(317,567)).segment((493,567)).segment((493,197)).segment((452,197)).segment((452,239)).segment((324,239)).segment((324,197)).close().assemble(mode='s').finalize().extrude(230)
diff --git a/test/extrude/1178/1178.stl b/test/extrude/1178/1178.stl
index 9ffcb4becd4fe900929247055c0cc89891c8400c..1187e538adb9e6006377c790571c94f48793fbd6 100644
Binary files a/test/extrude/1178/1178.stl and b/test/extrude/1178/1178.stl differ
diff --git a/test/extrude/1179/1179.py b/test/extrude/1179/1179.py
index 0e7eece5db246fe1ede54c4b389e7183602b2502..1b6417e240979307936b719efc73716c631d0286 100644
--- a/test/extrude/1179/1179.py
+++ b/test/extrude/1179/1179.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,494).translate((1,161,161))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,62,63))
+r=w0.sketch().segment((265,850),(1000,850)).segment((1000,218)).segment((265,218)).close().assemble().finalize().extrude(397).union(w0.workplane(offset=47).sketch().segment((650,307),(264,307)).segment((264,291)).segment((650,291)).close().assemble().finalize().extrude(238))
diff --git a/test/extrude/1179/1179.stl b/test/extrude/1179/1179.stl
index a8b1bfe76a4e0cd7960bf0c6f563478725b53342..dc9535a81b18b93c7b0c8ed00b8f0e145df4f5df 100644
Binary files a/test/extrude/1179/1179.stl and b/test/extrude/1179/1179.stl differ
diff --git a/test/extrude/118/118.py b/test/extrude/118/118.py
index 2ac6058c4499d023de31f12892f222da3532659a..33d43e155436e99d83bba91e2765dbe432b4b129 100644
--- a/test/extrude/118/118.py
+++ b/test/extrude/118/118.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(446,446,174))
-r=w0.workplane(offset=709).moveTo(219,1).cylinder(973,455).union(w0.sketch().arc((673,864),(682,882),(673,900)).close().assemble().finalize().extrude(1000)).translate((1,9,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,784,500))
+r=w0.sketch().push([(502,761)]).circle(739).circle(651,mode='s').finalize().extrude(1).union(w0.workplane(offset=357).moveTo(523,196).box(546,889,785))
\ No newline at end of file
diff --git a/test/extrude/118/118.stl b/test/extrude/118/118.stl
index 25f27c39d9f8cbaf3067c1135aa513f9e8b5e986..91e9dd1ad5458929e3585e24d2c8a2c8fb4021f8 100644
Binary files a/test/extrude/118/118.stl and b/test/extrude/118/118.stl differ
diff --git a/test/extrude/1180/1180.py b/test/extrude/1180/1180.py
index 12545e0090d4e0f158464515ec7aa8f7cc5047f6..e8b84fd77af5af3edc41582d30f29008d1ec076b 100644
--- a/test/extrude/1180/1180.py
+++ b/test/extrude/1180/1180.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(485,567,485))
-r=w0.sketch().segment((1,475),(11,475)).segment((11,361)).segment((186,361)).segment((238,341)).segment((238,176)).segment((897,176)).segment((897,876)).segment((238,876)).segment((238,794)).arc((1,763),(32,537)).close().assemble().reset().face(w0.sketch().segment((145,495),(186,475)).segment((238,475)).segment((238,526)).arc((186,506),(145,495)).assemble(),mode='s').finalize().extrude(310).union(w0.sketch().segment((629,454),(650,567)).arc((640,125),(1000,392)).close().assemble().finalize().extrude(372))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(8,33,62))
+r=w0.sketch().segment((1,742),(760,742)).segment((760,268)).segment((1,268)).close().assemble().push([(332,444)]).rect(279,124,mode='s').finalize().extrude(124).translate((1,92,1))
diff --git a/test/extrude/1180/1180.stl b/test/extrude/1180/1180.stl
index 0b9838c96f56e6c11f1fdab1a47d1027c2a915c1..4498278844755c0661b9a74701bbf7e322701af9 100644
Binary files a/test/extrude/1180/1180.stl and b/test/extrude/1180/1180.stl differ
diff --git a/test/extrude/1181/1181.py b/test/extrude/1181/1181.py
index b57b2b0883aa9be662d1740b20a1a78cf2dbfb9e..1d2846528818c5814b93a86eda3758c73e9d1301 100644
--- a/test/extrude/1181/1181.py
+++ b/test/extrude/1181/1181.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(514,581,514))
-w1=cq.Workplane('XY',origin=(514,514,360))
-r=w0.workplane(offset=674).moveTo(426,360).cylinder(834,569).union(w0.sketch().arc((260,404),(437,404),(569,294)).arc((558,448),(415,525)).segment((415,492)).segment((338,492)).arc((294,459),(260,404)).assemble().finalize().extrude(1000)).union(w1.workplane(offset=719).moveTo(724,1).box(536,592,923))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(43,63,31))
+r=w0.sketch().segment((252,351),(252,430)).segment((158,430)).segment((158,505)).arc((531,475),(904,505)).segment((904,430)).segment((810,430)).segment((810,351)).close().assemble().push([(551,444)]).rect(137,119,mode='s').finalize().extrude(188).translate((1,126,1))
diff --git a/test/extrude/1181/1181.stl b/test/extrude/1181/1181.stl
index 9423ad773c8543f954ca24e570e15bb24d2de64d..b468f620d990b8847f257a4cf9b9d209c3167b79 100644
Binary files a/test/extrude/1181/1181.stl and b/test/extrude/1181/1181.stl differ
diff --git a/test/extrude/1182/1182.py b/test/extrude/1182/1182.py
index 49667e77842cfac9c30077c07cdd088d68abef48..2a5e8ae19258f2aa5e79a9ab7dd38099402765ae 100644
--- a/test/extrude/1182/1182.py
+++ b/test/extrude/1182/1182.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(331,427,427))
-r=w0.sketch().push([(40,427)]).rect(522,1000).reset().face(w0.sketch().segment((1,566),(27,540)).segment((27,548)).close().assemble(),mode='s').push([(765,353)]).rect(618,852).push([(765,348)]).circle(514,mode='s').finalize().extrude(626)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(36,39,70))
+r=w0.sketch().segment((374,792),(520,792)).segment((520,94)).segment((374,94)).close().assemble().reset().segment((520,473),(520,385)).segment((415,385)).segment((310,385)).segment((310,473)).segment((415,473)).segment((415,385)).segment((415,473)).close().assemble(mode='s').finalize().extrude(138).translate((1,100,1))
diff --git a/test/extrude/1182/1182.stl b/test/extrude/1182/1182.stl
index 32ed58b69669708c52880f6f9bbbc9f88d7e818c..910f998bb837750e247ea4fb6407efe500ff36fb 100644
Binary files a/test/extrude/1182/1182.stl and b/test/extrude/1182/1182.stl differ
diff --git a/test/extrude/1183/1183.py b/test/extrude/1183/1183.py
index e48440063bf6074817179660c21a1d19e924e6bb..777afc047e03ec22714eb0f35fc24cbab0fc1b27 100644
--- a/test/extrude/1183/1183.py
+++ b/test/extrude/1183/1183.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(623,445,445))
-r=w0.sketch().push([(112,1)]).circle(556).reset().face(w0.sketch().segment((434,545),(545,545)).segment((545,356)).arc((700,578),(434,545)).assemble()).reset().face(w0.sketch().segment((467,889),(756,845)).segment((711,845)).segment((711,623)).segment((778,623)).segment((778,845)).segment((867,822)).segment((889,944)).segment((478,1000)).close().assemble()).finalize().extrude(79).translate((1,1,111))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(53,8,51))
+r=w0.sketch().segment((908,738),(216,738)).segment((216,45)).segment((908,45)).close().assemble().push([(600,371)]).rect(146,238,mode='s').finalize().extrude(76).translate((1,69,1))
diff --git a/test/extrude/1183/1183.stl b/test/extrude/1183/1183.stl
index c32c797fe36eb0f24782793abacd69eb85928ec2..a12509935578311c79198e7f6c030bc9df39a2ac 100644
Binary files a/test/extrude/1183/1183.stl and b/test/extrude/1183/1183.stl differ
diff --git a/test/extrude/1184/1184.py b/test/extrude/1184/1184.py
index 724e451dae930a71d14af947f33f82b2fcdf443e..92e9ef151f22ae1ff263ea663a8a4ba69fb215b6 100644
--- a/test/extrude/1184/1184.py
+++ b/test/extrude/1184/1184.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,554,334))
-w1=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=297).moveTo(537,334).box(367,933,407).union(w1.workplane(offset=1).moveTo(184,227).box(474,667,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(22,52,3))
+r=w0.sketch().segment((371,897),(903,897)).segment((903,9)).segment((371,9)).close().assemble().push([(596,526)]).rect(147,157,mode='s').finalize().extrude(357)
diff --git a/test/extrude/1184/1184.stl b/test/extrude/1184/1184.stl
index 3cd04f6c037a9938e88ede148d0416d883988d8c..6a5ef77dc1a53ec4c882c4e77783f880e4bb6e9b 100644
Binary files a/test/extrude/1184/1184.stl and b/test/extrude/1184/1184.stl differ
diff --git a/test/extrude/1185/1185.py b/test/extrude/1185/1185.py
index 9d60385d9843d25e3834cce6feacb080a6759e0f..947d66e86b83eaa2087ebd82e1f3b4bdd943443a 100644
--- a/test/extrude/1185/1185.py
+++ b/test/extrude/1185/1185.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(205,470,470))
-r=w0.sketch().arc((1,969),(307,878),(368,551)).arc((439,562),(511,602)).segment((592,602)).segment((592,755)).segment((511,755)).arc((470,786),(429,806)).segment((429,980)).segment((1,980)).close().assemble().push([(715,184)]).circle(694).finalize().extrude(1000).translate((1,1,41))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(17,76,72))
+r=w0.sketch().segment((507,203),(617,203)).segment((617,1000)).segment((507,1000)).segment((507,202)).close().assemble().push([(595,590)]).rect(247,140,mode='s').finalize().extrude(159)
diff --git a/test/extrude/1185/1185.stl b/test/extrude/1185/1185.stl
index 65d90154761230a46e18ea2a1dd3a8cc3e0405e2..226b07e9292b63577314d318b818cc756530ad24 100644
Binary files a/test/extrude/1185/1185.stl and b/test/extrude/1185/1185.stl differ
diff --git a/test/extrude/1186/1186.py b/test/extrude/1186/1186.py
index 81fdc97bef704c4788f3a387c67f5bf975231e57..ce87b513fc5767e14b1562b4464133bb660c650c 100644
--- a/test/extrude/1186/1186.py
+++ b/test/extrude/1186/1186.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(600,401,401))
-r=w0.sketch().segment((390,489),(390,845)).segment((545,845)).arc((212,778),(390,489)).assemble().finalize().extrude(1).union(w0.workplane(offset=306).moveTo(395,140).box(567,989,589)).union(w0.workplane(offset=373).moveTo(401,695).box(1000,922,456))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,444,500))
+r=w0.workplane(offset=357).moveTo(52,415).cylinder(786,551).union(w0.workplane(offset=701).moveTo(671,500).cylinder(900,830))
\ No newline at end of file
diff --git a/test/extrude/1186/1186.stl b/test/extrude/1186/1186.stl
index b949abd835e903cc27a7c4594fc22fd337d526f5..cc3bbba0ac5cec03a5d0c869ba4bb0a673aa7908 100644
Binary files a/test/extrude/1186/1186.stl and b/test/extrude/1186/1186.stl differ
diff --git a/test/extrude/1187/1187.py b/test/extrude/1187/1187.py
index bdbd2205d902aa6b968f6d2ff60bda6915f91b13..0fffb49492f35386cc299a2e46f381f6e97a1270 100644
--- a/test/extrude/1187/1187.py
+++ b/test/extrude/1187/1187.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,381,500))
-r=w0.sketch().segment((1,161),(491,161)).segment((491,421)).segment((760,421)).segment((760,431)).segment((920,331)).segment((1000,471)).segment((820,570)).segment((760,471)).segment((760,840)).segment((391,840)).segment((391,491)).segment((1,491)).close().assemble().reset().face(w0.sketch().segment((21,411),(241,421)).segment((241,411)).segment((281,421)).segment((271,431)).segment((391,431)).segment((391,481)).segment((261,471)).segment((261,491)).segment((221,481)).segment((221,471)).segment((21,451)).close().assemble(),mode='s').finalize().extrude(740)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(39,43,51))
+r=w0.sketch().segment((688,1),(264,1)).segment((264,676)).segment((688,676)).close().assemble().finalize().extrude(341).union(w0.workplane(offset=102).sketch().segment((208,323),(544,323)).segment((544,491)).segment((208,491)).close().assemble().finalize().extrude(63)).union(w0.sketch().segment((503,110),(208,110)).segment((209,334)).segment((504,334)).close().assemble().finalize().extrude(58))
diff --git a/test/extrude/1187/1187.stl b/test/extrude/1187/1187.stl
index 060e62a39a8e3798756d11fa3eb1e49ccef189f1..345bb1f7a8e2805aa0d55dfcbf5ffdbae90935c3 100644
Binary files a/test/extrude/1187/1187.stl and b/test/extrude/1187/1187.stl differ
diff --git a/test/extrude/1188/1188.py b/test/extrude/1188/1188.py
index 806c68e10ec1f7f676d78bb2b1fcf55fdcc5f70c..3a84adeb766335767c25484ad805752560d721aa 100644
--- a/test/extrude/1188/1188.py
+++ b/test/extrude/1188/1188.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(600,600,725))
-r=w0.sketch().push([(76,788)]).rect(800,850).push([(1,825)]).circle(613,mode='s').push([(1000,513)]).circle(825).finalize().extrude(338)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(39,36,49))
+r=w0.sketch().segment((1,598),(898,598)).segment((898,202)).segment((1,202)).close().assemble().push([(404,489)]).rect(283,266,mode='s').finalize().extrude(276)
diff --git a/test/extrude/1188/1188.stl b/test/extrude/1188/1188.stl
index 6f92b70ff58da8adf90e2b7ac2538f663678500e..8b278a290ff9361c6f0b50e3b3c859b71f45afe8 100644
Binary files a/test/extrude/1188/1188.stl and b/test/extrude/1188/1188.stl differ
diff --git a/test/extrude/1189/1189.py b/test/extrude/1189/1189.py
index 3f21172040df1a6dd33fee23e4074a703fbbc8c8..69fd242d76c482dea43c204b8d5f2d4427c653ee 100644
--- a/test/extrude/1189/1189.py
+++ b/test/extrude/1189/1189.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(506,506,395))
-w1=cq.Workplane('XY',origin=(506,506,374))
-r=w0.sketch().push([(475,465)]).circle(697).push([(1000,384)]).circle(516).finalize().extrude(465).union(w0.sketch().segment((1,657),(162,233)).segment((354,304)).arc((263,495),(384,667)).segment((344,778)).close().assemble().finalize().extrude(768)).union(w1.sketch().push([(218,591)]).rect(778,617).push([(273,606)]).circle(546,mode='s').finalize().extrude(495))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(251,359,252))
+r=w0.sketch().push([(182,109)]).circle(359).circle(256,mode='s').push([(335,295)]).rect(329,344).push([(363,436)]).circle(316).finalize().extrude(34).union(w0.workplane(offset=230).moveTo(280,390).box(378,270,295))
\ No newline at end of file
diff --git a/test/extrude/1189/1189.stl b/test/extrude/1189/1189.stl
index df7a04070fef3b28820099a0c30b2737c9bd3998..d1f13e2850f288cd9399cb97ecf8d3d9e4cb101e 100644
Binary files a/test/extrude/1189/1189.stl and b/test/extrude/1189/1189.stl differ
diff --git a/test/extrude/119/119.py b/test/extrude/119/119.py
index 12baed7efdc21bdb7b21491d81c2baf1901fba0b..2450dce15baba8d482317113a313cd2c00de9c54 100644
--- a/test/extrude/119/119.py
+++ b/test/extrude/119/119.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(550,605,550))
-w1=cq.Workplane('XY',origin=(550,550,671))
-r=w0.sketch().segment((1,34),(12,253)).segment((1,253)).close().assemble().finalize().extrude(363).union(w0.sketch().segment((155,297),(495,297)).segment((495,352)).arc((649,297),(769,396)).arc((1000,967),(429,737)).arc((418,704),(429,671)).segment((155,671)).close().assemble().reset().face(w0.sketch().arc((561,462),(594,407),(660,418)).arc((605,440),(561,462)).assemble(),mode='s').finalize().extrude(671)).union(w1.sketch().push([(698,435)]).rect(605,671).push([(693,435)]).rect(572,561,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,2))
+r=w0.workplane(offset=999).box(1000,860,1000)
\ No newline at end of file
diff --git a/test/extrude/119/119.stl b/test/extrude/119/119.stl
index 7111337b6847318040093232249045f694a52d4a..9177b56f1dae0cc77d08af152b535b0cab42cb61 100644
Binary files a/test/extrude/119/119.stl and b/test/extrude/119/119.stl differ
diff --git a/test/extrude/1190/1190.py b/test/extrude/1190/1190.py
index 88368e0f9225f2ad9cf6d79444a9f2ee6ad2b5b3..8b3cae1a09d7d405cc39f20e441bc6cbfb78a9dc 100644
--- a/test/extrude/1190/1190.py
+++ b/test/extrude/1190/1190.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,704).translate((1,371,371))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(56,50,75))
+r=w0.sketch().segment((820,193),(820,429)).segment((110,429)).segment((110,193)).close().assemble().push([(478,328)]).circle(94,mode='s').finalize().extrude(256).translate((1,207,1))
diff --git a/test/extrude/1190/1190.stl b/test/extrude/1190/1190.stl
index abb3297866ce0ea1369065f6f13ec11365cef58a..0b019234d6ae11a720a439f7aee99ac33787a118 100644
Binary files a/test/extrude/1190/1190.stl and b/test/extrude/1190/1190.stl differ
diff --git a/test/extrude/1191/1191.py b/test/extrude/1191/1191.py
index 47e7ff9250de770f2973877ff3b7a9adf344a3ba..4f153dbe8ea4b704bcb2a0bbc505e409a69949d5 100644
--- a/test/extrude/1191/1191.py
+++ b/test/extrude/1191/1191.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(448,448,172))
-r=w0.sketch().segment((315,772),(324,629)).segment((334,629)).arc((324,553),(334,467)).segment((353,296)).segment((467,305)).arc((638,267),(810,324)).segment((924,334)).segment((914,477)).segment((905,477)).arc((914,562),(895,638)).segment((886,819)).segment((772,810)).arc((600,848),(429,781)).close().assemble().finalize().extrude(553).union(w0.sketch().arc((363,448),(1,391),(372,439)).arc((353,439),(363,448)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(56,20,46))
+r=w0.sketch().segment((481,370),(629,370)).segment((629,936)).segment((481,936)).close().assemble().push([(576,698)]).circle(69,mode='s').finalize().extrude(327)
diff --git a/test/extrude/1191/1191.stl b/test/extrude/1191/1191.stl
index ef2be74d41dd67f284e37f98572def0b505edfd3..40ad3915496d5dc753a1ad3847df51e0e0a5cad8 100644
Binary files a/test/extrude/1191/1191.stl and b/test/extrude/1191/1191.stl differ
diff --git a/test/extrude/1192/1192.py b/test/extrude/1192/1192.py
index 4c7927ae19fa763453829f1d1350b8df2860d276..93b6fdf934540cd955675e0d1f60d00e18f9af00 100644
--- a/test/extrude/1192/1192.py
+++ b/test/extrude/1192/1192.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(570,500,500))
-r=w0.sketch().arc((381,491),(710,391),(550,700)).arc((500,640),(441,650)).arc((411,620),(391,580)).arc((1,590),(381,491)).assemble().finalize().extrude(301).union(w0.sketch().push([(296,700)]).rect(810,700).reset().face(w0.sketch().segment((680,241),(790,241)).segment((810,201)).segment((920,241)).segment((1000,241)).segment((1000,271)).segment((1000,281)).segment((1000,560)).segment((890,560)).segment((870,600)).segment((850,590)).segment((850,680)).segment((760,680)).segment((760,560)).segment((750,560)).segment((680,560)).segment((680,530)).segment((680,520)).close().assemble()).finalize().extrude(560))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(70,29,63))
+r=w0.sketch().segment((778,423),(894,423)).segment((894,749)).segment((196,749)).segment((196,633)).segment((778,633)).segment((778,493)).segment((755,493)).arc((720,458),(755,423)).close().assemble().push([(717,491)]).rect(180,104,mode='s').finalize().extrude(130)
diff --git a/test/extrude/1192/1192.stl b/test/extrude/1192/1192.stl
index a1caf20c9631eed53bd566d5ae7238c6b315a7a6..3467872fcac1b55394c6da82542861ce2ff8e8c3 100644
Binary files a/test/extrude/1192/1192.stl and b/test/extrude/1192/1192.stl differ
diff --git a/test/extrude/1193/1193.py b/test/extrude/1193/1193.py
index 38f9a5904e4f042d87f8fd88df25d7562e648cac..0bb818dcf3cbb2586f567242e8194c364e747ea7 100644
--- a/test/extrude/1193/1193.py
+++ b/test/extrude/1193/1193.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(435,435,157))
-r=w0.sketch().segment((27,166),(670,1)).segment((844,705)).segment((201,870)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(25,34,68))
+r=w0.sketch().segment((218,723),(1000,723)).segment((1000,417)).segment((218,417)).close().assemble().push([(660,584)]).rect(213,267,mode='s').finalize().extrude(340)
diff --git a/test/extrude/1193/1193.stl b/test/extrude/1193/1193.stl
index c0b475d945cf3d689de6cc52255d86626bf11ddc..d133ad315090fad8ac8595cd92cd868c02838c3e 100644
Binary files a/test/extrude/1193/1193.stl and b/test/extrude/1193/1193.stl differ
diff --git a/test/extrude/1194/1194.py b/test/extrude/1194/1194.py
index c4590663f22435cd9ba60b29d6b59d5322a2d361..70b78397be48b5222d26ef1308050777fad07874 100644
--- a/test/extrude/1194/1194.py
+++ b/test/extrude/1194/1194.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().circle(367).push([(327,334)]).circle(354,mode='s').finalize().extrude(1000).translate((1,34,34))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,471))
+r=w0.sketch().segment((1,251),(107,252)).arc((510,71),(420,505)).segment((421,670)).segment((1,669)).close().assemble().push([(885,871)]).circle(616).finalize().extrude(566)
\ No newline at end of file
diff --git a/test/extrude/1194/1194.stl b/test/extrude/1194/1194.stl
index 261bbb19e89010099ca02bcd6e24f5f540886bee..41a1c0eaff7efb8001fa5fc3fd4ba277eec27b84 100644
Binary files a/test/extrude/1194/1194.stl and b/test/extrude/1194/1194.stl differ
diff --git a/test/extrude/1195/1195.py b/test/extrude/1195/1195.py
index 4ca04764228535dd05d520d4386b5c54c92674d1..c114c31281c052c3b76319919676ebf427428637 100644
--- a/test/extrude/1195/1195.py
+++ b/test/extrude/1195/1195.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(569,569,784))
-r=w0.sketch().push([(597,546)]).rect(693,841).push([(756,994)]).rect(784,852).push([(762,1000)]).circle(580,mode='s').finalize().extrude(137).union(w0.sketch().arc((330,478),(273,353),(342,228)).segment((342,80)).segment((410,80)).segment((410,217)).segment((500,217)).segment((500,160)).segment((421,160)).segment((421,1)).segment((716,1)).segment((716,421)).segment((557,421)).arc((466,500),(342,489)).segment((330,489)).close().assemble().finalize().extrude(308))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(27,65,52))
+r=w0.sketch().segment((79,865),(757,865)).segment((757,187)).segment((79,187)).close().assemble().finalize().extrude(292).union(w0.workplane(offset=141).sketch().segment((65,216),(585,216)).segment((585,810)).segment((65,810)).close().assemble().finalize().extrude(118))
diff --git a/test/extrude/1195/1195.stl b/test/extrude/1195/1195.stl
index 3710a23fe44a2d9e618af2731e55ed20440948cd..0677b7ae5ddae5d4860465c051349d6994b85ee5 100644
Binary files a/test/extrude/1195/1195.stl and b/test/extrude/1195/1195.stl differ
diff --git a/test/extrude/1196/1196.py b/test/extrude/1196/1196.py
index 3965a1fbf6000c66854771f8e7320f17c23a3eef..7a770c16bcdb3d63448eb1e70fa7eb34e77b3fae 100644
--- a/test/extrude/1196/1196.py
+++ b/test/extrude/1196/1196.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(361,500,500))
-r=w0.sketch().segment((1,670),(21,381)).segment((231,391)).arc((1000,461),(261,690)).close().assemble().finalize().extrude(790)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(48,54,29))
+r=w0.sketch().segment((512,1000),(738,1000)).segment((738,273)).segment((512,272)).close().assemble().reset().segment((452,666),(452,583)).segment((397,583)).segment((397,500)).segment((729,500)).segment((729,583)).segment((674,583)).segment((674,666)).close().assemble(mode='s').finalize().extrude(255)
diff --git a/test/extrude/1196/1196.stl b/test/extrude/1196/1196.stl
index a74d771b7bd0d9bdfadd79004838c728c4e8de7b..74548441652d9959f3ffe4052f5a204b9f541d4d 100644
Binary files a/test/extrude/1196/1196.stl and b/test/extrude/1196/1196.stl differ
diff --git a/test/extrude/1197/1197.py b/test/extrude/1197/1197.py
index 03ada6e1433e8b2014c203290debadfda15c094e..4422ff1324d2e607fd738828c0b90a4a791c43fc 100644
--- a/test/extrude/1197/1197.py
+++ b/test/extrude/1197/1197.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(500,500,500))
-r=w0.sketch().segment((570,101),(940,101)).segment((940,500)).segment((1000,560)).segment((890,680)).segment((730,530)).segment((570,530)).segment((570,451)).arc((600,361),(570,271)).close().assemble().finalize().extrude(161).union(w0.sketch().arc((1,780),(31,840),(81,900)).arc((21,850),(1,780)).assemble().finalize().extrude(850))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(13,46,47))
+r=w0.sketch().segment((247,117),(247,601)).segment((284,601)).segment((368,456)).segment((368,166)).segment((489,166)).segment((489,117)).segment((470,117)).segment((470,98)).segment((489,98)).segment((489,69)).segment((368,69)).segment((368,117)).close().assemble().push([(414,221)]).circle(75,mode='s').finalize().extrude(270).union(w0.sketch().segment((125,1000),(373,1000)).segment((373,522)).segment((125,522)).close().assemble().finalize().extrude(51))
diff --git a/test/extrude/1197/1197.stl b/test/extrude/1197/1197.stl
index 8eb7aa9cfa8509af12ba1c3df2553d8824c9ad8a..59e9665ee78fa2356063b33f4c7a12150d963ec0 100644
Binary files a/test/extrude/1197/1197.stl and b/test/extrude/1197/1197.stl differ
diff --git a/test/extrude/1198/1198.py b/test/extrude/1198/1198.py
index 27579220e8c6e6498a0139180433e72cc3056e1b..3824a87b7d5c702c6e07b5e58179df530cc82e50 100644
--- a/test/extrude/1198/1198.py
+++ b/test/extrude/1198/1198.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(61,374,374))
-r=w0.sketch().segment((1,225),(61,105)).segment((747,523)).segment((665,642)).close().assemble().push([(366,381)]).circle(411,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(1,7,69))
+r=w0.sketch().segment((109,574),(475,208)).segment((841,574)).close().assemble().reset().segment((378,298),(468,298)).segment((468,616)).segment((378,616)).close().assemble(mode='s').finalize().extrude(212)
diff --git a/test/extrude/1198/1198.stl b/test/extrude/1198/1198.stl
index 541795234b43c4e571ea37d7d7e18f9fe0a01f9a..b8fbcc254d4ce90f534debaa632fcb6106462a5a 100644
Binary files a/test/extrude/1198/1198.stl and b/test/extrude/1198/1198.stl differ
diff --git a/test/extrude/1199/1199.py b/test/extrude/1199/1199.py
index b0ae5eac12fb73d8ce0cf44d60da27cc99e6cbe7..dd9bdb4a32cda1b268b4918f316a8c9395ca8d50 100644
--- a/test/extrude/1199/1199.py
+++ b/test/extrude/1199/1199.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(455,285,455))
-r=w0.sketch().push([(1,1000)]).rect(478,500).push([(671,137)]).circle(705).finalize().extrude(807).translate((114,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(60,4,66))
+r=w0.sketch().segment((958,468),(824,468)).segment((438,385)).segment((240,385)).segment((240,348)).segment((438,348)).segment((825,431)).segment((958,431)).close().assemble().finalize().extrude(354).union(w0.workplane(offset=41).sketch().segment((321,258),(273,258)).segment((273,544)).segment((859,544)).segment((859,258)).segment((818,258)).close().assemble().finalize().extrude(157))
diff --git a/test/extrude/1199/1199.stl b/test/extrude/1199/1199.stl
index 5dfe28b72e9f30b7354576f2792c73e8573fea50..57554aaa8eb5ef15feecd9ebe3ec531f2a71c9f9 100644
Binary files a/test/extrude/1199/1199.stl and b/test/extrude/1199/1199.stl differ
diff --git a/test/extrude/12/12.py b/test/extrude/12/12.py
index 09836d0c8c5d080d354a68d3772b8bd46f3d9d6f..98e24c1032005ac8fcfeadf6f9e8d4c2e91dedd3 100644
--- a/test/extrude/12/12.py
+++ b/test/extrude/12/12.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(427,610,610))
-r=w0.sketch().segment((1,622),(781,622)).segment((793,647)).segment((1,647)).close().assemble().reset().face(w0.sketch().arc((269,354),(403,415),(269,464)).arc((293,415),(269,354)).assemble()).finalize().extrude(915).union(w0.sketch().push([(1000,671)]).circle(829).circle(756,mode='s').finalize().extrude(976))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(13,5,72))
+r=w0.sketch().segment((22,923),(602,923)).segment((602,393)).segment((22,393)).close().assemble().finalize().extrude(295).union(w0.workplane(offset=295).sketch().segment((213,819),(712,819)).segment((712,575)).segment((213,575)).close().assemble().finalize().extrude(245)).translate((1,536,1))
diff --git a/test/extrude/12/12.stl b/test/extrude/12/12.stl
index 520e78501cbfcb930571bf41efb67eaeb16fe572..81bf852d52809c41b12ceb48d6c9aba226aea022 100644
Binary files a/test/extrude/12/12.stl and b/test/extrude/12/12.stl differ
diff --git a/test/extrude/120/120.py b/test/extrude/120/120.py
index d2397eae4bfdf1983e7d06ef8e9a1cfd3ff0ca8d..c3529f0a7bc800592a1a70191a8af02b38beeb04 100644
--- a/test/extrude/120/120.py
+++ b/test/extrude/120/120.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(537,622,537))
-r=w0.sketch().arc((1,488),(13,50),(440,1)).arc((1000,939),(1,488)).assemble().finalize().extrude(354)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,6,501))
+r=w0.sketch().segment((405,979),(425,750)).segment((581,764)).segment((561,994)).close().assemble().finalize().extrude(1000).union(w0.sketch().segment((1,865),(36,7)).segment((999,46)).segment((964,906)).segment((171,874)).arc((121,890),(76,871)).close().assemble().push([(125,815)]).circle(539,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/120/120.stl b/test/extrude/120/120.stl
index 7b6ccbc680a87db344023cd12f2ec8a3546844cc..d73c4b40ad2974f379d7ed06d94e66782faccfb0 100644
Binary files a/test/extrude/120/120.stl and b/test/extrude/120/120.stl differ
diff --git a/test/extrude/1200/1200.py b/test/extrude/1200/1200.py
index ea37e2d5548bf794e47712d27ab12756b03db6e4..be2bdf1005b7c0c3f44d44506e634fb14d93b831 100644
--- a/test/extrude/1200/1200.py
+++ b/test/extrude/1200/1200.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(932,622,622))
-r=w0.sketch().segment((243,448),(576,448)).segment((546,735)).segment((629,743)).segment((659,448)).segment((1000,448)).arc((622,796),(243,448)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(26,39,58))
+r=w0.sketch().segment((806,371),(216,371)).segment((216,962)).segment((806,962)).close().assemble().push([(567,666)]).rect(116,172,mode='s').finalize().extrude(92)
diff --git a/test/extrude/1200/1200.stl b/test/extrude/1200/1200.stl
index 0aa936c158d197ed8046ae7a3e1742c889b4fe36..48f4cbfdfb598bd2821c6a1af8e5431cdf74f974 100644
Binary files a/test/extrude/1200/1200.stl and b/test/extrude/1200/1200.stl differ
diff --git a/test/extrude/1201/1201.py b/test/extrude/1201/1201.py
index 3599073cca5c59383294f7314e85e39097e8fea4..ef8fb8cbe60927e32711f4a37e5d5ef9f3d3bfea 100644
--- a/test/extrude/1201/1201.py
+++ b/test/extrude/1201/1201.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(481,720,481))
-r=w0.sketch().segment((780,670),(920,670)).segment((920,570)).segment((980,570)).segment((980,780)).segment((780,780)).segment((780,770)).arc((750,730),(780,690)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(241,740)]).rect(1000,960).push([(371,221)]).circle(720).circle(600,mode='s').finalize().extrude(421)).translate((19,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,70,50))
+r=w0.sketch().segment((649,223),(649,595)).segment((998,595)).segment((997,790)).segment((727,913)).segment((679,818)).segment((240,818)).segment((240,223)).close().assemble().push([(641,673)]).rect(135,185,mode='s').finalize().extrude(252)
diff --git a/test/extrude/1201/1201.stl b/test/extrude/1201/1201.stl
index ca474dcc0295e2a5f0ad2aa9e0e926c0d3012215..1b50d18a3891c82fe23da2cc0572d2a83b8f64a5 100644
Binary files a/test/extrude/1201/1201.stl and b/test/extrude/1201/1201.stl differ
diff --git a/test/extrude/1202/1202.py b/test/extrude/1202/1202.py
index e428fc5bda5e35a51eb84a04fd252671050f9ea2..36fe5a4f796dee1617ced03eaa7c11933f49509b 100644
--- a/test/extrude/1202/1202.py
+++ b/test/extrude/1202/1202.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().circle(893).push([(574,710)]).rect(893,700,mode='s').finalize().extrude(1).translate((1,227,228))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(19,41,27))
+r=w0.sketch().segment((212,586),(994,586)).segment((994,540)).segment((212,540)).close().assemble().push([(663,560)]).circle(128,mode='s').finalize().extrude(59)
diff --git a/test/extrude/1202/1202.stl b/test/extrude/1202/1202.stl
index 7fd0ebb8d7a7d5cc9b54652c2952e1be995559ed..5e411c620585d6170a6ad8ec9cf58bb5c4751ba4 100644
Binary files a/test/extrude/1202/1202.stl and b/test/extrude/1202/1202.stl differ
diff --git a/test/extrude/1203/1203.py b/test/extrude/1203/1203.py
index 85a321df6d1d824b673e1fd399871e93c2f5db4b..e7399a8d2d48781847bef9daed4985096019c137 100644
--- a/test/extrude/1203/1203.py
+++ b/test/extrude/1203/1203.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(477,258,477))
-w1=cq.Workplane('ZX',origin=(477,334,477))
-r=w0.sketch().arc((382,391),(391,296),(448,210)).segment((448,315)).close().assemble().finalize().extrude(591).union(w0.workplane(offset=738).moveTo(553,914).cylinder(1000,515)).union(w1.sketch().segment((305,39),(344,39)).segment((344,1)).segment((610,1)).segment((610,39)).segment((648,39)).segment((648,182)).arc((610,172),(572,172)).arc((372,201),(524,344)).arc((581,372),(648,363)).segment((648,429)).segment((610,429)).segment((610,467)).segment((344,467)).segment((344,429)).segment((305,429)).close().assemble().finalize().extrude(315))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(315,500,501))
+r=w0.sketch().push([(441,232)]).circle(731).reset().face(w0.sketch().segment((306,82),(500,77)).segment((512,406)).segment((317,410)).close().assemble(),mode='s').finalize().extrude(655).union(w0.workplane(offset=687).moveTo(501,620).box(1000,1000,876))
\ No newline at end of file
diff --git a/test/extrude/1203/1203.stl b/test/extrude/1203/1203.stl
index 7f2f3cc4cd50b923b28687fff663b011cf6b6e22..dcb698550d912391859951c1509e3706e06760ab 100644
Binary files a/test/extrude/1203/1203.stl and b/test/extrude/1203/1203.stl differ
diff --git a/test/extrude/1204/1204.py b/test/extrude/1204/1204.py
index b2d80e99e3f30bda8c97a21b994f309f4aa1764f..90abad809e3fd6347dff46613d33411211d95762 100644
--- a/test/extrude/1204/1204.py
+++ b/test/extrude/1204/1204.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).moveTo(61,428).cylinder(1000,488).union(w0.sketch().segment((291,257),(488,257)).segment((488,86)).segment((667,86)).segment((667,257)).segment((761,257)).segment((761,334)).segment((667,334)).segment((667,505)).segment((488,505)).segment((488,334)).segment((291,334)).close().assemble().finalize().extrude(86)).translate((1,1,94))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(66,54,15))
+r=w0.sketch().segment((390,912),(693,912)).segment((996,912)).segment((996,609)).segment((996,160)).segment((390,160)).close().assemble().finalize().extrude(186).union(w0.sketch().segment((379,530),(390,530)).segment((106,530)).segment((106,519)).segment((390,519)).segment((390,530)).segment((390,675)).segment((379,675)).close().assemble().finalize().extrude(139)).union(w0.sketch().segment((45,657),(435,657)).segment((435,579)).segment((45,579)).close().assemble().finalize().extrude(71)).translate((1,133,1))
diff --git a/test/extrude/1204/1204.stl b/test/extrude/1204/1204.stl
index c7e5de01a2d65c59cd16d5d87e44a9b31accb5b8..95219452b4d68eabfd8db04b31b1aaa6b380a3c3 100644
Binary files a/test/extrude/1204/1204.stl and b/test/extrude/1204/1204.stl differ
diff --git a/test/extrude/1205/1205.py b/test/extrude/1205/1205.py
index 85a16eb99c8d57d5cebccb01ef46ef5a613ae5c2..d53ccae78d6ecc0aa2daa6731f1a4cc639d3e94c 100644
--- a/test/extrude/1205/1205.py
+++ b/test/extrude/1205/1205.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(574,686,574))
-r=w0.sketch().arc((380,519),(760,621),(380,538)).segment((390,538)).segment((390,528)).segment((390,519)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((870,269),(982,380),(1000,528)).arc((186,760),(870,269)).assemble().finalize().extrude(926))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(54,13,23))
+r=w0.sketch().segment((338,932),(862,932)).segment((862,406)).segment((338,406)).close().assemble().finalize().extrude(178).union(w0.workplane(offset=310).sketch().segment((1000,261),(530,261)).segment((530,321)).segment((710,441)).segment((1000,441)).close().assemble().finalize().extrude(140))
diff --git a/test/extrude/1205/1205.stl b/test/extrude/1205/1205.stl
index 5857a6370433ce54505f57bab8d3f87f06b99c4f..ddc1c4006bf2563ebe0d4adb3706edb5eae1f73d 100644
Binary files a/test/extrude/1205/1205.stl and b/test/extrude/1205/1205.stl differ
diff --git a/test/extrude/1206/1206.py b/test/extrude/1206/1206.py
index e03ac7c218810f381f6d034ea3a942fe28e61b5a..67c15d6f2ab4933f12941260462d3f3ca8b80371 100644
--- a/test/extrude/1206/1206.py
+++ b/test/extrude/1206/1206.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(506,506,445))
-r=w0.sketch().arc((990,778),(899,728),(1000,768)).close().assemble().reset().face(w0.sketch().arc((970,728),(1000,738),(980,768)).arc((909,758),(970,728)).assemble(),mode='s').finalize().extrude(223).union(w0.sketch().segment((1,294),(273,294)).segment((273,223)).segment((687,223)).segment((687,294)).segment((960,294)).segment((960,354)).segment((687,354)).segment((687,425)).segment((273,425)).segment((273,354)).segment((1,354)).close().assemble().finalize().extrude(909))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(67,71,61))
+r=w0.sketch().segment((354,460),(952,460)).segment((952,698)).segment((354,698)).close().assemble().finalize().extrude(223).union(w0.sketch().segment((576,873),(576,676)).segment((102,676)).segment((102,705)).segment((576,902)).close().assemble().finalize().extrude(182)).union(w0.sketch().segment((199,404),(433,404)).segment((433,287)).segment((199,287)).close().assemble().finalize().extrude(189)).translate((1,153,1))
diff --git a/test/extrude/1206/1206.stl b/test/extrude/1206/1206.stl
index e6e40360851c92d51d66f9992444379d1c42edc2..e2873ff13f5a4849dd542369925e75453ecf01b2 100644
Binary files a/test/extrude/1206/1206.stl and b/test/extrude/1206/1206.stl differ
diff --git a/test/extrude/1207/1207.py b/test/extrude/1207/1207.py
index 4feb3b54c95ea36b8e023585992e0bf50417506f..440bea10f9b12fe867cb140c6603360e1bfb5841 100644
--- a/test/extrude/1207/1207.py
+++ b/test/extrude/1207/1207.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(562,562,349))
-r=w0.workplane(offset=557).moveTo(506,865).cylinder(573,686).union(w0.sketch().segment((753,214),(764,214)).arc((843,158),(944,147)).segment((978,136)).segment((989,158)).arc((978,551),(753,225)).close().assemble().finalize().extrude(787)).union(w0.sketch().segment((1,719),(23,652)).arc((80,596),(68,506)).segment((102,439)).segment((181,461)).segment((181,472)).arc((124,495),(147,540)).segment((80,742)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(56,9,57))
+r=w0.sketch().segment((278,758),(830,550)).segment((95,550)).segment((95,758)).close().assemble().push([(362,628)]).circle(146,mode='s').finalize().extrude(52)
diff --git a/test/extrude/1207/1207.stl b/test/extrude/1207/1207.stl
index e7260121915eb2317603fcef52b5c3045cb1c19f..14e7595502febf5fabc2b0e1c341aad43844b84c 100644
Binary files a/test/extrude/1207/1207.stl and b/test/extrude/1207/1207.stl differ
diff --git a/test/extrude/1208/1208.py b/test/extrude/1208/1208.py
index efa9aeb0eb1fc54bc99ce6b8177c3e243adb25ee..d74c6193fb89509010d23622948b0c75cee371b2 100644
--- a/test/extrude/1208/1208.py
+++ b/test/extrude/1208/1208.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,560).translate((227,1,227))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(5,59,43))
+r=w0.sketch().segment((520,673),(210,673)).segment((210,11)).segment((520,11)).close().assemble().push([(446,289)]).rect(62,85,mode='s').push([(409,162)]).rect(68,98,mode='s').push([(403,235)]).circle(54,mode='s').push([(301,52)]).circle(27,mode='s').finalize().extrude(58)
diff --git a/test/extrude/1208/1208.stl b/test/extrude/1208/1208.stl
index c46bd4589b1c7865ef169eb93b45cd7fb8884b93..417e21f3136b00bcf7746c8687dee490347aa57e 100644
Binary files a/test/extrude/1208/1208.stl and b/test/extrude/1208/1208.stl differ
diff --git a/test/extrude/1209/1209.py b/test/extrude/1209/1209.py
index 4136935d43d347339f66999946be456d80749b8d..42541816769b6121b4acaa835b2be983d94c8680 100644
--- a/test/extrude/1209/1209.py
+++ b/test/extrude/1209/1209.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,311,500))
-r=w0.sketch().segment((81,131),(301,1)).segment((680,650)).segment((461,780)).close().assemble().finalize().extrude(670).union(w0.sketch().segment((41,441),(91,441)).arc((500,141),(910,441)).segment((960,441)).segment((960,690)).segment((910,690)).arc((500,1000),(81,690)).segment((41,690)).close().assemble().finalize().extrude(890))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(61,48,59))
+r=w0.sketch().segment((286,666),(1000,666)).segment((1000,322)).arc((662,386),(286,322)).close().assemble().push([(577,429)]).rect(113,130,mode='s').finalize().extrude(86).translate((1,39,1))
diff --git a/test/extrude/1209/1209.stl b/test/extrude/1209/1209.stl
index 86926a3409459fffcadb18ff0566eb06686a5ecf..a5c3ef1fff18bad41b5818fe799e29e677572ae6 100644
Binary files a/test/extrude/1209/1209.stl and b/test/extrude/1209/1209.stl differ
diff --git a/test/extrude/121/121.py b/test/extrude/121/121.py
index 2a2328a67bfc07bc3e8f85946241e1dd75fa3fe1..6512e92a4248d2434e897efbbcd6498703b1c433 100644
--- a/test/extrude/121/121.py
+++ b/test/extrude/121/121.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(444,444,648))
-w1=cq.Workplane('ZX',origin=(444,606,444))
-r=w0.workplane(offset=166).moveTo(444,634).cylinder(1000,529).union(w1.sketch().push([(662,444)]).circle(578).circle(479,mode='s').push([(697,381)]).circle(458,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,786,499))
+r=w0.sketch().arc((635,131),(701,12),(835,46)).segment((739,47)).segment((739,226)).arc((680,205),(641,156)).arc((671,135),(634,131)).assemble().finalize().extrude(1).union(w0.sketch().segment((165,761),(325,580)).segment((596,819)).segment((430,1000)).segment((251,840)).arc((244,826),(232,820)).close().assemble().finalize().extrude(169))
\ No newline at end of file
diff --git a/test/extrude/121/121.stl b/test/extrude/121/121.stl
index 0da72c2f6bd623ef1f4c98ae8be2919394233cc3..cdced6e80b42432ce66d3980541013eb573a6219 100644
Binary files a/test/extrude/121/121.stl and b/test/extrude/121/121.stl differ
diff --git a/test/extrude/1210/1210.py b/test/extrude/1210/1210.py
index 51ce8472dfc3c4f973a9de42c454b415689c58d9..47984f4c2878cecd2be813b99e5b10fe993ecfea 100644
--- a/test/extrude/1210/1210.py
+++ b/test/extrude/1210/1210.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(532,532,628))
-r=w0.sketch().segment((203,490),(564,1)).segment((862,235)).segment((490,724)).close().assemble().push([(490,1000)]).circle(596).finalize().extrude(330)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(4,10,5))
+r=w0.sketch().segment((192,350),(947,350)).segment((947,740)).segment((192,740)).close().assemble().finalize().extrude(167).union(w0.workplane(offset=70).sketch().segment((374,459),(593,459)).segment((593,408)).segment((758,408)).segment((758,459)).segment((758,567)).segment((374,578)).close().assemble().finalize().extrude(98)).union(w0.workplane(offset=149).sketch().segment((456,913),(530,913)).segment((530,758)).segment((476,758)).segment((476,636)).segment((530,636)).segment((530,513)).segment((456,513)).close().assemble().finalize().extrude(135))
diff --git a/test/extrude/1210/1210.stl b/test/extrude/1210/1210.stl
index 07a2545d27bd490c8868f866b3c6fb8e80d30051..dd924790e2b5527e99704f5e553ef419faa30983 100644
Binary files a/test/extrude/1210/1210.stl and b/test/extrude/1210/1210.stl differ
diff --git a/test/extrude/1211/1211.py b/test/extrude/1211/1211.py
index acb96676dc45380aee559745866e1ae0ec5be9a4..ceeaefa911820f41a3391bcc6eaf0f557b802028 100644
--- a/test/extrude/1211/1211.py
+++ b/test/extrude/1211/1211.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(456,679,456))
-r=w0.sketch().segment((10,340),(28,340)).segment((28,242)).segment((179,242)).segment((162,162)).segment((331,117)).segment((331,46)).segment((518,46)).segment((518,72)).segment((670,37)).segment((697,117)).segment((518,162)).segment((518,224)).segment((483,224)).segment((492,242)).segment((590,242)).segment((590,643)).segment((599,706)).segment((590,706)).segment((590,804)).segment((197,804)).segment((126,822)).segment((126,804)).segment((28,804)).segment((28,402)).close().assemble().reset().face(w0.sketch().segment((197,242),(331,206)).segment((331,224)).segment((456,224)).segment((411,242)).close().assemble(),mode='s').push([(750,603)]).rect(759,1000).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,521))
+r=w0.sketch().segment((1,685),(60,205)).segment((900,311)).segment((870,576)).arc((1000,696),(844,785)).segment((845,789)).close().assemble().finalize().extrude(457)
\ No newline at end of file
diff --git a/test/extrude/1211/1211.stl b/test/extrude/1211/1211.stl
index a5e73ca29f95de3c064f99847a764f20b1cf9b8e..4779507b1f0c0bcc8d48057a63104aa683ce67b1 100644
Binary files a/test/extrude/1211/1211.stl and b/test/extrude/1211/1211.stl differ
diff --git a/test/extrude/1212/1212.py b/test/extrude/1212/1212.py
index da87354f79e10f5813a8d33fac87f171a95edd93..80f9e2e9fab4d3cdfd591ff97f843ac48f66805a 100644
--- a/test/extrude/1212/1212.py
+++ b/test/extrude/1212/1212.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((214,461),(254,461)).segment((254,500)).segment((221,500)).arc((254,441),(214,461)).assemble().finalize().extrude(547).union(w0.workplane(offset=667).moveTo(334,254).box(587,520,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(5,67,3))
+r=w0.sketch().segment((64,490),(64,528)).segment((99,528)).segment((99,900)).segment((64,900)).segment((64,528)).segment((766,528)).segment((766,490)).close().assemble().reset().segment((75,690),(318,690)).segment((318,448)).segment((75,448)).close().assemble(mode='s').finalize().extrude(325).translate((1,259,1))
diff --git a/test/extrude/1212/1212.stl b/test/extrude/1212/1212.stl
index 4fe863f1e1e32ac3927f430f79b0df1442213165..ff89698dbe1be82e75be449a073b7601e46a6b11 100644
Binary files a/test/extrude/1212/1212.stl and b/test/extrude/1212/1212.stl differ
diff --git a/test/extrude/1213/1213.py b/test/extrude/1213/1213.py
index 81e23b4ca9ee75ce6598d960ca89c0e39e69dc97..db008688531c49308cbe34a59493360e46839550 100644
--- a/test/extrude/1213/1213.py
+++ b/test/extrude/1213/1213.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(481,481,222))
-r=w0.sketch().arc((712,693),(654,606),(760,606)).segment((760,616)).segment((760,654)).close().assemble().finalize().extrude(923).union(w0.sketch().segment((1,39),(635,39)).segment((635,347)).segment((962,347)).segment((962,923)).segment((654,923)).arc((568,817),(443,769)).segment((443,414)).segment((1,414)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(44,18,59))
+r=w0.sketch().segment((1000,633),(1000,499)).segment((399,499)).arc((359,552),(295,534)).arc((271,533),(260,554)).segment((246,821)).segment((277,821)).arc((297,715),(366,633)).close().assemble().finalize().extrude(132).union(w0.workplane(offset=366).sketch().segment((196,1000),(544,1000)).segment((544,535)).segment((196,535)).close().assemble().finalize().extrude(178))
diff --git a/test/extrude/1213/1213.stl b/test/extrude/1213/1213.stl
index 5add46a341cd8110d810621bdcb30a01fecf0cef..e78ece85091d2b6e3da14b4ada5af59b185ab50f 100644
Binary files a/test/extrude/1213/1213.stl and b/test/extrude/1213/1213.stl differ
diff --git a/test/extrude/1214/1214.py b/test/extrude/1214/1214.py
index f8a4ee3e544e35afe4ce7eaa00b5ef18fba9cc97..33902319b83d99600d1ea84e0bb8f402e7cf983a 100644
--- a/test/extrude/1214/1214.py
+++ b/test/extrude/1214/1214.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(490,490,718))
-w1=cq.Workplane('XY',origin=(490,490,620))
-r=w0.workplane(offset=251).moveTo(104,631).box(805,815,967).union(w0.workplane(offset=283).moveTo(566,370).box(750,707,902)).union(w0.sketch().arc((316,142),(511,1),(479,240)).segment((479,142)).close().assemble().reset().face(w0.sketch().arc((620,707),(707,707),(783,674)).arc((772,739),(707,739)).segment((707,1000)).segment((620,1000)).close().assemble()).push([(859,153)]).circle(663).push([(853,158)]).rect(544,587,mode='s').finalize().extrude(446)).union(w1.workplane(offset=549).moveTo(566,370).cylinder(609,522)).translate((1,22,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(66,9,10))
+r=w0.sketch().segment((518,948),(665,400)).segment((391,474)).close().assemble().finalize().extrude(273).union(w0.workplane(offset=187).sketch().segment((492,314),(46,314)).segment((46,492)).segment((492,492)).close().assemble().finalize().extrude(82)).union(w0.workplane(offset=213).sketch().segment((386,311),(612,311)).segment((612,259)).segment((386,259)).close().assemble().finalize().extrude(101)).translate((1,306,1))
diff --git a/test/extrude/1214/1214.stl b/test/extrude/1214/1214.stl
index 5c1e2be541b3295357a7eddfa3e9eaee3a883c50..4f4ae5dc4530d6135d75c381bd6766fbedc1196c 100644
Binary files a/test/extrude/1214/1214.stl and b/test/extrude/1214/1214.stl differ
diff --git a/test/extrude/1215/1215.py b/test/extrude/1215/1215.py
index 4e2dc4d41ad3ac4c4a18ca6db815f915550acbfe..a87fda1374557d4c8c0b011de69c8a32ed3e96b4 100644
--- a/test/extrude/1215/1215.py
+++ b/test/extrude/1215/1215.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(660,334,334))
-r=w0.workplane(offset=1).cylinder(1000,987).translate((1,654,654))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(41,5,14))
+r=w0.sketch().segment((278,806),(894,806)).segment((894,1)).segment((278,1)).close().assemble().push([(638,360)]).circle(105,mode='s').finalize().extrude(74)
diff --git a/test/extrude/1215/1215.stl b/test/extrude/1215/1215.stl
index 4271d2d7288a5e70956573710cc0f8a1e922d69b..ffa50aa5d6dd456272cd6cac88d612baaa7e2bff 100644
Binary files a/test/extrude/1215/1215.stl and b/test/extrude/1215/1215.stl differ
diff --git a/test/extrude/1216/1216.py b/test/extrude/1216/1216.py
index 6233e658275da799bea76283b31bd0e5be69885f..c38b9675d7b64e3d6e7b8fb357b20491260edbef 100644
--- a/test/extrude/1216/1216.py
+++ b/test/extrude/1216/1216.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,670))
-r=w0.workplane(offset=326).moveTo(585,461).box(690,640,850).union(w0.sketch().segment((331,491),(401,491)).arc((461,1),(530,491)).segment((790,491)).segment((790,1000)).segment((331,1000)).close().assemble().reset().face(w0.sketch().arc((500,780),(491,720),(530,680)).close().assemble(),mode='s').reset().face(w0.sketch().segment((580,810),(620,710)).arc((630,770),(580,810)).assemble(),mode='s').finalize().extrude(361)).union(w0.sketch().segment((301,720),(530,720)).arc((520,700),(510,690)).segment((361,690)).segment((361,600)).segment((481,600)).arc((520,451),(640,361)).segment((640,790)).arc((630,780),(610,780)).segment((301,780)).close().assemble().finalize().extrude(371))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(17,78,4))
+r=w0.sketch().segment((530,914),(652,914)).segment((600,192)).segment((582,192)).close().assemble().push([(637,581)]).circle(108,mode='s').finalize().extrude(95)
diff --git a/test/extrude/1216/1216.stl b/test/extrude/1216/1216.stl
index db816fa3c77595e00e854cef31c169261deec912..9a2a21696997c9c784f2594e962bc2d43ae96ca4 100644
Binary files a/test/extrude/1216/1216.stl and b/test/extrude/1216/1216.stl differ
diff --git a/test/extrude/1217/1217.py b/test/extrude/1217/1217.py
index a2a1ddb5864064bfdb2321991563364947c6e6c2..a7d7ac95c2f19e426662782b38901954cb864408 100644
--- a/test/extrude/1217/1217.py
+++ b/test/extrude/1217/1217.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(522,522,436))
-r=w0.workplane(offset=497).moveTo(130,314).cylinder(571,608).union(w0.sketch().push([(234,1)]).rect(1000,706).push([(792,877)]).circle(779).finalize().extrude(743))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(62,53,2))
+r=w0.sketch().segment((132,633),(806,633)).segment((806,745)).segment((132,745)).close().assemble().push([(680,721)]).rect(74,88,mode='s').push([(306,681)]).rect(60,73,mode='s').finalize().extrude(87).translate((1,35,1))
diff --git a/test/extrude/1217/1217.stl b/test/extrude/1217/1217.stl
index 242e5f9ac3b26e76094bdde644cdb537188b3b0a..dd77a038c1d5a7f1976724c3f933be8564102711 100644
Binary files a/test/extrude/1217/1217.stl and b/test/extrude/1217/1217.stl differ
diff --git a/test/extrude/1218/1218.py b/test/extrude/1218/1218.py
index d01a8b68116d1c357fe3d16d0190f3785fcf93d2..12938cb0c6c85cd9dccbb22d7dc39c522cebb8fc 100644
--- a/test/extrude/1218/1218.py
+++ b/test/extrude/1218/1218.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(564,532,532))
-w1=cq.Workplane('YZ',origin=(596,532,532))
-r=w0.sketch().push([(288,277)]).rect(957,745).push([(522,532)]).circle(617).push([(1000,883)]).circle(575).finalize().extrude(192).union(w0.sketch().segment((22,75),(86,75)).segment((86,1)).segment((288,1)).segment((288,75)).segment((341,75)).segment((341,373)).segment((288,373)).segment((288,447)).segment((86,447)).segment((86,373)).segment((22,373)).close().assemble().push([(745,288)]).circle(756).finalize().extrude(384)).union(w0.workplane(offset=665).moveTo(500,851).cylinder(798,745)).union(w1.workplane(offset=384).moveTo(522,532).cylinder(830,543))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(63,72,76))
+r=w0.sketch().segment((37,333),(699,333)).segment((37,853)).close().assemble().push([(234,454)]).circle(152,mode='s').finalize().extrude(111).translate((1,40,1))
diff --git a/test/extrude/1218/1218.stl b/test/extrude/1218/1218.stl
index 4fa31e38c1ee1dd9e26a1156fa6b71da80f9ab45..02a8c06f82340763b888242b9f5c1a4d01d8f2cc 100644
Binary files a/test/extrude/1218/1218.stl and b/test/extrude/1218/1218.stl differ
diff --git a/test/extrude/1219/1219.py b/test/extrude/1219/1219.py
index bf01444fbf7d567b7008f32937efc5bb9ad9f78e..9a6e017d043adf058f2102041966a33325fb1125 100644
--- a/test/extrude/1219/1219.py
+++ b/test/extrude/1219/1219.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.workplane(offset=667).cylinder(1000,647).translate((1,314,314))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(21,71,56))
+r=w0.sketch().segment((696,616),(696,59)).segment((139,59)).arc((302,452),(695,616)).close().assemble().push([(537,238)]).circle(93,mode='s').finalize().extrude(232).translate((1,162,1))
diff --git a/test/extrude/1219/1219.stl b/test/extrude/1219/1219.stl
index 0b9031523e0d1279247be3a6da35aa0f8a046fcc..4a7b5541c95ae40ef6ff68dddc1838ed6cc924ad 100644
Binary files a/test/extrude/1219/1219.stl and b/test/extrude/1219/1219.stl differ
diff --git a/test/extrude/122/122.py b/test/extrude/122/122.py
index 94ea6dc3e056284448231bdc54c2e0114cc0d74d..3679bbff7f8408603ef15b21ec94d2a494ffcc81 100644
--- a/test/extrude/122/122.py
+++ b/test/extrude/122/122.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(530,530,530))
-w1=cq.Workplane('YZ',origin=(569,530,530))
-r=w0.sketch().arc((471,559),(442,324),(647,187)).segment((647,197)).segment((657,197)).segment((657,187)).arc((804,246),(882,383)).arc((853,873),(471,559)).assemble().reset().face(w0.sketch().segment((540,363),(628,363)).arc((579,393),(540,432)).close().assemble(),mode='s').finalize().extrude(461).union(w0.workplane(offset=667).moveTo(652,422).box(716,1000,804)).union(w1.sketch().push([(363,329)]).rect(922,677).push([(525,270)]).rect(540,540,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(611,501,500))
+w1=cq.Workplane('YZ',origin=(674,501,499))
+r=w0.sketch().segment((2,200),(56,201)).arc((55,406),(225,520)).segment((225,545)).segment((260,547)).segment((260,520)).arc((396,461),(459,327)).segment((460,726)).segment((1,725)).close().assemble().finalize().extrude(12).union(w0.workplane(offset=349).moveTo(990,791).cylinder(805,511)).union(w1.sketch().push([(830,685)]).circle(580).reset().face(w1.sketch().arc((830,637),(864,610),(864,651)).arc((810,731),(831,635)).assemble(),mode='s').finalize().extrude(706))
\ No newline at end of file
diff --git a/test/extrude/122/122.stl b/test/extrude/122/122.stl
index cdf4d6cf1439605fcb5c2ace12d69eecf4cbba7b..00090579932610b965936251aa73ef1662116bf4 100644
Binary files a/test/extrude/122/122.stl and b/test/extrude/122/122.stl differ
diff --git a/test/extrude/1220/1220.py b/test/extrude/1220/1220.py
index 0991237c89c87a11e711755c0929f6aa9d936826..4cba234f052d7940e0c165f72a1bc066f33a013f 100644
--- a/test/extrude/1220/1220.py
+++ b/test/extrude/1220/1220.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(480,240,480))
-w1=cq.Workplane('XY',origin=(480,480,781))
-r=w0.sketch().push([(209,740)]).rect(979,792).reset().face(w0.sketch().segment((240,761),(282,677)).segment((386,729)).segment((344,813)).close().assemble(),mode='s').finalize().extrude(261).union(w0.sketch().push([(240,584)]).circle(625).reset().face(w0.sketch().segment((344,334),(761,1)).segment((1000,303)).segment((584,636)).close().assemble()).finalize().extrude(813)).union(w1.workplane(offset=417).moveTo(797,729).box(802,896,605))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(51,51,64))
+r=w0.sketch().segment((360,734),(360,104)).segment((444,104)).arc((382,396),(423,692)).arc((404,710),(390,734)).close().assemble().push([(373,489)]).circle(87,mode='s').finalize().extrude(243)
diff --git a/test/extrude/1220/1220.stl b/test/extrude/1220/1220.stl
index 568e6d62cc9a8715e10d3a8c7785a7dcad356688..26fdb7b71848ac1c185f3fe36e568d0d796fb24a 100644
Binary files a/test/extrude/1220/1220.stl and b/test/extrude/1220/1220.stl differ
diff --git a/test/extrude/1221/1221.py b/test/extrude/1221/1221.py
index 3f87bfa1eb01bc24684c11952a5458193420152a..150b6800a763b445d00f7bb182573504feee565e 100644
--- a/test/extrude/1221/1221.py
+++ b/test/extrude/1221/1221.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().circle(920).circle(867,mode='s').finalize().extrude(1).union(w0.sketch().arc((660,700),(634,647),(694,640)).arc((740,714),(660,700)).assemble().finalize().extrude(394)).union(w0.sketch().segment((481,627),(514,547)).segment((534,554)).segment((534,580)).arc((520,614),(514,640)).close().assemble().finalize().extrude(654)).translate((254,1,254))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(66,45,64))
+r=w0.sketch().segment((964,769),(230,769)).segment((231,489)).segment((964,489)).close().assemble().push([(551,658)]).circle(124,mode='s').finalize().extrude(110)
diff --git a/test/extrude/1221/1221.stl b/test/extrude/1221/1221.stl
index 4c8aa44d0ffee69e2612b06c55c6154f0de4e4c9..43d347affd0e63e924a03fbdaf0c8da8ed883fb2 100644
Binary files a/test/extrude/1221/1221.stl and b/test/extrude/1221/1221.stl differ
diff --git a/test/extrude/1222/1222.py b/test/extrude/1222/1222.py
index 2f389c61c9366d499669a726fba5226b44aae7e8..03fad9e73478cc1b0a67e3e0e533f3802a4a4035 100644
--- a/test/extrude/1222/1222.py
+++ b/test/extrude/1222/1222.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(485,485,248))
-r=w0.sketch().circle(1000).reset().face(w0.sketch().segment((42,434),(372,434)).segment((372,269)).segment((269,403)).segment((207,361)).segment((444,1)).segment((516,52)).segment((403,207)).segment((598,207)).segment((598,434)).segment((928,434)).segment((928,537)).segment((598,537)).segment((598,763)).segment((372,763)).segment((372,701)).segment((310,804)).segment((248,773)).segment((372,567)).segment((372,537)).segment((42,537)).close().assemble(),mode='s').finalize().extrude(959).translate((516,517,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(50,76,4))
+r=w0.sketch().segment((66,728),(66,307)).segment((66,728)).segment((738,728)).segment((738,307)).arc((400,1),(66,307)).arc((402,1),(735,307)).segment((735,724)).segment((69,724)).close().assemble().push([(356,498)]).rect(153,251,mode='s').finalize().extrude(148)
diff --git a/test/extrude/1222/1222.stl b/test/extrude/1222/1222.stl
index ba02084dde933071204cbf8be1aba818739849d5..5c427584397d00c94683496bdce5786c36b6e0a8 100644
Binary files a/test/extrude/1222/1222.stl and b/test/extrude/1222/1222.stl differ
diff --git a/test/extrude/1223/1223.py b/test/extrude/1223/1223.py
index 38980c818720f4450e7a8663ab7c2979ede6d4b7..bf474a91578cc5b2310848299163d121d7653b3c 100644
--- a/test/extrude/1223/1223.py
+++ b/test/extrude/1223/1223.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(817,550,550))
-r=w0.sketch().push([(484,151)]).circle(983).push([(667,1000)]).circle(933).finalize().extrude(1).translate((1,1,283))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(29,27,35))
+r=w0.sketch().segment((117,17),(117,636)).arc((158,737),(260,779)).segment((640,779)).arc((742,737),(783,636)).segment((783,17)).close().assemble().finalize().extrude(152).union(w0.sketch().segment((534,280),(677,280)).segment((677,309)).segment((724,342)).segment((677,375)).arc((696,394),(677,413)).arc((610,558),(619,718)).arc((639,737),(619,756)).segment((648,784)).segment((648,870)).segment((629,870)).segment((629,851)).segment((534,851)).close().assemble().finalize().extrude(42)).translate((1,126,1))
diff --git a/test/extrude/1223/1223.stl b/test/extrude/1223/1223.stl
index c6b873ea94c34dd55a4e2f4c6d2134ee8e6326d4..68ddc7ffaddf8643b097a64085d571e005d8f4de 100644
Binary files a/test/extrude/1223/1223.stl and b/test/extrude/1223/1223.stl differ
diff --git a/test/extrude/1224/1224.py b/test/extrude/1224/1224.py
index d810538c207bf4ae4de7e018d12bc450cc36320d..a939a91d2f472cfb9247bd44de65993fbaace241 100644
--- a/test/extrude/1224/1224.py
+++ b/test/extrude/1224/1224.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,500,500))
-r=w0.sketch().segment((610,670),(660,600)).segment((720,630)).arc((690,660),(670,700)).close().assemble().finalize().extrude(261).union(w0.sketch().arc((231,431),(291,1),(311,431)).arc((271,421),(231,431)).assemble().reset().face(w0.sketch().segment((750,750),(930,750)).segment((930,800)).arc((950,880),(930,950)).segment((930,1000)).segment((750,1000)).segment((750,950)).arc((720,880),(750,800)).close().assemble()).finalize().extrude(750))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(58,38,19))
+r=w0.sketch().segment((190,491),(790,491)).segment((490,239)).close().assemble().push([(662,317)]).circle(46,mode='s').push([(644,353)]).circle(35,mode='s').push([(680,415)]).rect(78,70,mode='s').finalize().extrude(355).translate((1,318,1))
diff --git a/test/extrude/1224/1224.stl b/test/extrude/1224/1224.stl
index d7944ef62289d5770f68a6f40fe3c438905a0c20..0cc266cec5acd27f75cceda31cebadaf5a9e573e 100644
Binary files a/test/extrude/1224/1224.stl and b/test/extrude/1224/1224.stl differ
diff --git a/test/extrude/1225/1225.py b/test/extrude/1225/1225.py
index 827e1cee4273f6b9b27ff5d05fcf7db561d7e088..c08dcf0bbc84178b5fe460c92eb726dea9d2cfb8 100644
--- a/test/extrude/1225/1225.py
+++ b/test/extrude/1225/1225.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(523,569,569))
-r=w0.sketch().segment((251,12),(523,1)).segment((523,12)).segment((535,12)).segment((535,1)).segment((648,1)).segment((671,398)).segment((353,410)).arc((353,330),(319,251)).segment((319,183)).segment((262,183)).close().assemble().push([(466,205)]).circle(625,mode='s').push([(750,1000)]).circle(705).finalize().extrude(659)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(45,60,19))
+r=w0.sketch().segment((360,529),(1000,529)).segment((1000,151)).segment((360,151)).close().assemble().finalize().extrude(80).union(w0.sketch().segment((451,526),(605,526)).segment((605,820)).segment((451,820)).close().assemble().finalize().extrude(50)).union(w0.sketch().segment((105,795),(335,795)).segment((336,564)).segment((105,564)).segment((105,796)).close().assemble().finalize().extrude(115)).translate((1,56,1))
diff --git a/test/extrude/1225/1225.stl b/test/extrude/1225/1225.stl
index a811f50c8db757ae5f7249e9bc15fa6b1626d8f8..3a4053cf4f1ba0c4b3009ace2194ef13bd3eee7d 100644
Binary files a/test/extrude/1225/1225.stl and b/test/extrude/1225/1225.stl differ
diff --git a/test/extrude/1226/1226.py b/test/extrude/1226/1226.py
index 139217dcfe2e222b86bb7c2a6901ab34d1b2f4a6..155bf4589ec4584b1243ce60166acfca8017ed17 100644
--- a/test/extrude/1226/1226.py
+++ b/test/extrude/1226/1226.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(660,550,550))
-r=w0.sketch().segment((1,264),(275,264)).segment((275,341)).arc((341,330),(396,330)).segment((396,210)).segment((440,210)).segment((440,12)).segment((726,12)).segment((726,188)).segment((890,188)).segment((890,627)).segment((462,627)).segment((462,605)).arc((264,627),(188,451)).segment((1,451)).close().assemble().finalize().extrude(89).union(w0.workplane(offset=325).moveTo(890,879).cylinder(1000,758)).union(w0.sketch().arc((155,561),(583,363),(550,813)).arc((155,978),(155,561)).assemble().finalize().extrude(791))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(69,25,4))
+r=w0.sketch().segment((700,229),(422,926)).segment((422,222)).close().assemble().push([(533,533)]).circle(63,mode='s').push([(577,465)]).circle(38,mode='s').push([(506,566)]).rect(77,51,mode='s').finalize().extrude(173).translate((1,149,1))
diff --git a/test/extrude/1226/1226.stl b/test/extrude/1226/1226.stl
index a9ee347f198ecaafc6cb3f9fda4d7243a9e78e1c..0f69e57152925ec1b9bd79ac970a0f5872ccd403 100644
Binary files a/test/extrude/1226/1226.stl and b/test/extrude/1226/1226.stl differ
diff --git a/test/extrude/1227/1227.py b/test/extrude/1227/1227.py
index 67bdbe1f2b595569d4bcf7f443eef24113145ffd..40d9f2be6573aad00457ad5c7c3977c47fc98466 100644
--- a/test/extrude/1227/1227.py
+++ b/test/extrude/1227/1227.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).box(587,361,1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(2,65,80))
+r=w0.sketch().segment((39,298),(1,391)).segment((1,639)).segment((39,732)).segment((571,732)).segment((672,639)).segment((672,391)).segment((571,298)).close().assemble().push([(597,610)]).rect(47,55,mode='s').push([(437,341)]).rect(86,104,mode='s').finalize().extrude(290).translate((1,226,1))
diff --git a/test/extrude/1227/1227.stl b/test/extrude/1227/1227.stl
index f89ac5661cc8e4bc31f46da61230795a83317fce..ff1c660a0b262059ebac19241953c7576fa0abbe 100644
Binary files a/test/extrude/1227/1227.stl and b/test/extrude/1227/1227.stl differ
diff --git a/test/extrude/1228/1228.py b/test/extrude/1228/1228.py
index 4e764608b8dd48f4e3564059cd50d95f93741628..9c726898f70b1b6097fb12340a820c92c11b73f7 100644
--- a/test/extrude/1228/1228.py
+++ b/test/extrude/1228/1228.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(551,551,827))
-r=w0.sketch().segment((42,480),(154,419)).arc((256,256),(450,276)).segment((572,215)).segment((643,358)).segment((521,419)).arc((419,582),(235,562)).segment((113,623)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((827,450),(898,511),(1000,521)).arc((735,867),(827,450)).assemble().finalize().extrude(62))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(69,54,39))
+r=w0.sketch().segment((92,563),(960,563)).segment((960,112)).arc((950,87),(925,77)).segment((127,77)).arc((102,87),(92,112)).close().assemble().push([(647,129)]).circle(73,mode='s').push([(430,279)]).circle(46,mode='s').push([(542,401)]).circle(70,mode='s').push([(650,186)]).rect(93,123,mode='s').finalize().extrude(54)
diff --git a/test/extrude/1228/1228.stl b/test/extrude/1228/1228.stl
index 30eef0266684d0cdec11b2a811deb7c9b513d5dd..152b1b6dfe0ba3bb52e3236efd805efb7c4b241f 100644
Binary files a/test/extrude/1228/1228.stl and b/test/extrude/1228/1228.stl differ
diff --git a/test/extrude/1229/1229.py b/test/extrude/1229/1229.py
index c3f9b48eadbe492e3915d713251b349fb6b6786a..5841e5c5972fa7d0d6ff082a15cb610b07134568 100644
--- a/test/extrude/1229/1229.py
+++ b/test/extrude/1229/1229.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(518,380,518))
-r=w0.sketch().arc((127,610),(966,116),(403,908)).arc((1,1000),(127,610)).assemble().push([(185,839)]).circle(541,mode='s').finalize().extrude(805)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(71,46,74))
+r=w0.sketch().segment((789,312),(1000,312)).segment((1000,598)).segment((789,598)).segment((223,598)).segment((223,282)).segment((789,282)).segment((789,598)).close().assemble().push([(742,386)]).rect(173,221,mode='s').finalize().extrude(124)
diff --git a/test/extrude/1229/1229.stl b/test/extrude/1229/1229.stl
index 841fad165911825d903fb1c81f28bcc7774b326f..c0ec678eff230a3ca94cc6d9d5beb679d007d97e 100644
Binary files a/test/extrude/1229/1229.stl and b/test/extrude/1229/1229.stl differ
diff --git a/test/extrude/123/123.py b/test/extrude/123/123.py
index a8b271e59439abd41c40129e62a87a13b6100dbe..3de1ec7e3a2736b24268a2fa2c31dae4d8932f37 100644
--- a/test/extrude/123/123.py
+++ b/test/extrude/123/123.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,380,495))
-w1=cq.Workplane('ZX',origin=(495,401,495))
-r=w0.workplane(offset=395).moveTo(148,232).box(621,979,695).union(w0.workplane(offset=711).moveTo(138,232).box(790,790,926)).union(w1.sketch().segment((64,106),(75,106)).arc((295,1),(537,75)).arc((1000,222),(748,642)).segment((748,1000)).segment((685,1000)).segment((685,642)).arc((632,632),(579,611)).arc((85,611),(64,117)).close().assemble().finalize().extrude(663))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(252,251,390))
+r=w0.sketch().arc((236,246),(474,175),(296,348)).arc((301,344),(303,342)).segment((305,342)).segment((305,340)).arc((313,328),(315,315)).segment((315,312)).segment((315,311)).arc((292,282),(252,289)).segment((248,289)).segment((250,294)).arc((242,303),(240,315)).segment((239,321)).segment((269,353)).arc((184,320),(237,247)).assemble().push([(365,239)]).circle(313,mode='s').finalize().extrude(3).union(w0.sketch().push([(64,445)]).circle(306).circle(287,mode='s').push([(293,50)]).circle(300).push([(295,51)]).rect(298,294,mode='s').finalize().extrude(96))
\ No newline at end of file
diff --git a/test/extrude/123/123.stl b/test/extrude/123/123.stl
index 602f6d0dccf2185dd729372aa128becab6822cd0..42c16509b096ca4e7e2eedf711a43d46abf2f269 100644
Binary files a/test/extrude/123/123.stl and b/test/extrude/123/123.stl differ
diff --git a/test/extrude/1230/1230.py b/test/extrude/1230/1230.py
index 0971ad00dc05f36b0fd18d318a470a6950c73d75..9d25788a53752196bfd6996f3fa369697908582a 100644
--- a/test/extrude/1230/1230.py
+++ b/test/extrude/1230/1230.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(564,391,391))
-w1=cq.Workplane('YZ',origin=(529,391,391))
-r=w0.sketch().segment((357,713),(380,449)).segment((690,472)).segment((667,736)).close().assemble().push([(437,656)]).rect(460,483,mode='s').finalize().extrude(277).union(w0.sketch().arc((93,713),(196,816),(208,966)).close().assemble().finalize().extrude(690)).union(w1.workplane(offset=87).moveTo(334,1).cylinder(1000,575)).translate((1,1,184))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(33,31,36))
+r=w0.sketch().segment((180,164),(311,856)).segment((684,856)).segment((684,529)).segment((519,529)).segment((362,164)).close().assemble().finalize().extrude(215).union(w0.sketch().segment((758,852),(758,879)).segment((667,879)).segment((667,871)).segment((712,852)).segment((712,607)).segment((348,607)).segment((348,575)).segment((758,575)).segment((758,607)).close().assemble().finalize().extrude(105)).union(w0.sketch().segment((529,445),(594,445)).segment((594,415)).segment((529,415)).segment((300,415)).segment((300,467)).segment((529,467)).segment((529,415)).close().assemble().finalize().extrude(76))
diff --git a/test/extrude/1230/1230.stl b/test/extrude/1230/1230.stl
index 151053d313cb3488cfa6ffaf0a5d3cd79092ed53..5d691792d52db13e9703ee8a738d7d06f937bb72 100644
Binary files a/test/extrude/1230/1230.stl and b/test/extrude/1230/1230.stl differ
diff --git a/test/extrude/1231/1231.py b/test/extrude/1231/1231.py
index c48dc028219362b817716a6fcf027f214576113b..5735a96da0bdeb019e454ff7a7918740305c7b15 100644
--- a/test/extrude/1231/1231.py
+++ b/test/extrude/1231/1231.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(220,438,220))
-r=w0.workplane(offset=1).cylinder(657,1000).translate((781,1,781))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(46,61,2))
+r=w0.sketch().segment((15,108),(15,508)).segment((615,508)).segment((615,108)).close().assemble().push([(278,337)]).circle(68,mode='s').finalize().extrude(393)
diff --git a/test/extrude/1231/1231.stl b/test/extrude/1231/1231.stl
index dcdb1946e58accd72ae306d48bc9f0b7ff87a1c4..c60b76e5c93a8f8ac1dcc6004216f02ce5e9d002 100644
Binary files a/test/extrude/1231/1231.stl and b/test/extrude/1231/1231.stl differ
diff --git a/test/extrude/1232/1232.py b/test/extrude/1232/1232.py
index 25acc977edefc17e3d356ebc3fcb47b3a574170e..d0dd3b7c0c1b57e70087e74b2e19155c98eb0e43 100644
--- a/test/extrude/1232/1232.py
+++ b/test/extrude/1232/1232.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(397,397,96))
-r=w0.sketch().segment((61,328),(147,328)).arc((259,27),(578,1)).segment((578,182)).segment((716,182)).arc((724,277),(699,380)).arc((535,811),(130,604)).segment((61,604)).close().assemble().reset().face(w0.sketch().segment((182,604),(259,604)).arc((277,638),(311,664)).segment((182,664)).close().assemble(),mode='s').reset().face(w0.sketch().arc((535,664),(569,638),(587,604)).segment((638,604)).segment((638,371)).segment((664,371)).segment((664,664)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(66,12,62))
+r=w0.sketch().segment((543,807),(783,807)).segment((783,209)).segment((717,209)).segment((717,782)).segment((543,782)).close().assemble().finalize().extrude(239).union(w0.workplane(offset=256).sketch().segment((774,174),(966,456)).segment((582,456)).close().assemble().finalize().extrude(115)).translate((1,360,1))
diff --git a/test/extrude/1232/1232.stl b/test/extrude/1232/1232.stl
index a77f82c73152060e6b0d0bf226f8f77e14cdb013..8c34a6d6b4e3ee2120a7a6ec64dd63704c25389d 100644
Binary files a/test/extrude/1232/1232.stl and b/test/extrude/1232/1232.stl differ
diff --git a/test/extrude/1233/1233.py b/test/extrude/1233/1233.py
index 2cae79c46b22a12d390b2edc60a3c140fe1bf417..08afa533ca7b07cce7c2d0ed1fb2a35e8f75cd40 100644
--- a/test/extrude/1233/1233.py
+++ b/test/extrude/1233/1233.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(621,926,621))
-r=w0.sketch().segment((190,653),(201,611)).arc((201,569),(211,527)).segment((264,96)).segment((285,96)).segment((232,485)).arc((506,600),(211,653)).segment((211,663)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=432).moveTo(821,916).cylinder(1000,853))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(77,67,46))
+r=w0.sketch().segment((673,176),(625,176)).segment((625,748)).segment((673,748)).close().assemble().push([(608,443)]).circle(115,mode='s').finalize().extrude(189)
diff --git a/test/extrude/1233/1233.stl b/test/extrude/1233/1233.stl
index 64925f08bda8aaf318328920d3d5148c8f0c8edf..3895c5c56a64c65789322fb8c4e78b27f92f8a02 100644
Binary files a/test/extrude/1233/1233.stl and b/test/extrude/1233/1233.stl differ
diff --git a/test/extrude/1234/1234.py b/test/extrude/1234/1234.py
index f4b7dd9313c961a8390f927334203d5b2c4cb3e3..b17e8f208908ca274cd0583384b90b09febc4a01 100644
--- a/test/extrude/1234/1234.py
+++ b/test/extrude/1234/1234.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(207,207,1))
-r=w0.sketch().circle(1000).circle(334,mode='s').finalize().extrude(635).translate((794,794,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(12,50,78))
+r=w0.sketch().segment((1,361),(703,361)).segment((703,465)).segment((1,465)).close().assemble().push([(577,437)]).rect(57,51,mode='s').push([(53,441)]).circle(62,mode='s').finalize().extrude(240)
diff --git a/test/extrude/1234/1234.stl b/test/extrude/1234/1234.stl
index 3ac9b83758c4afc7035aa4b7e565fe92acdf5951..5d69f8034fafc6b090c0c407ceb478175d89d79d 100644
Binary files a/test/extrude/1234/1234.stl and b/test/extrude/1234/1234.stl differ
diff --git a/test/extrude/1235/1235.py b/test/extrude/1235/1235.py
index 2175834b7dc668f1a179da9ed7cd88bd1b1f73c8..3b821aef241e00f227d42fd07532b93e0b0c9a09 100644
--- a/test/extrude/1235/1235.py
+++ b/test/extrude/1235/1235.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(544,544,316))
-r=w0.sketch().segment((262,1),(653,1)).segment((653,207)).segment((826,207)).segment((826,490)).segment((490,490)).segment((490,240)).segment((262,240)).close().assemble().finalize().extrude(761).union(w0.sketch().segment((283,175),(435,175)).arc((490,153),(555,175)).segment((707,175)).segment((707,338)).segment((555,338)).arc((490,359),(435,338)).segment((283,338)).close().assemble().finalize().extrude(967)).union(w0.workplane(offset=772).moveTo(555,957).cylinder(1000,674))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(36,30,53))
+r=w0.sketch().segment((652,412),(404,916)).segment((900,916)).close().assemble().finalize().extrude(204).union(w0.sketch().segment((482,737),(735,362)).segment((1000,555)).segment((769,930)).close().assemble().finalize().extrude(47))
diff --git a/test/extrude/1235/1235.stl b/test/extrude/1235/1235.stl
index 979da9ee53ccf29a2864bcc75d14ba4c8b2473c6..d7b48b967fe147009ea2885e737604cb495a1ecc 100644
Binary files a/test/extrude/1235/1235.stl and b/test/extrude/1235/1235.stl differ
diff --git a/test/extrude/1236/1236.py b/test/extrude/1236/1236.py
index 8f4b3b3ddaf98633cb9893782bd6688373c9c2be..53b1fcd67e75ad1bb356c2355c03251825f35da8 100644
--- a/test/extrude/1236/1236.py
+++ b/test/extrude/1236/1236.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(361,431,431))
-w1=cq.Workplane('YZ',origin=(331,431,431))
-r=w0.sketch().segment((451,251),(580,161)).segment((670,161)).segment((670,451)).segment((610,451)).arc((590,321),(451,301)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((131,560),(221,251)).segment((361,291)).segment((191,391)).segment((341,620)).segment((600,461)).segment((520,331)).segment((700,381)).segment((610,700)).close().assemble().finalize().extrude(1000)).union(w1.sketch().segment((321,271),(730,271)).segment((730,411)).segment((600,411)).arc((610,520),(560,610)).segment((361,610)).segment((361,660)).arc((221,500),(321,301)).close().assemble().finalize().extrude(281))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(75,60,69))
+r=w0.sketch().segment((439,957),(439,317)).segment((471,349)).segment((471,925)).close().assemble().push([(415,630)]).circle(78,mode='s').finalize().extrude(119)
diff --git a/test/extrude/1236/1236.stl b/test/extrude/1236/1236.stl
index 957161dcf0daa0224143ba37393c420d7382067f..75e8c54303ece9a8167f865b5b16872381e92437 100644
Binary files a/test/extrude/1236/1236.stl and b/test/extrude/1236/1236.stl differ
diff --git a/test/extrude/1237/1237.py b/test/extrude/1237/1237.py
index 3ed7348b2e7c207dcb7c8ffdc3ae375540b808eb..cc0a89460cad2772dacba2616e11818d838c8744 100644
--- a/test/extrude/1237/1237.py
+++ b/test/extrude/1237/1237.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(579,527,527))
-w1=cq.Workplane('ZX',origin=(527,821,527))
-r=w0.sketch().segment((222,674),(306,590)).segment((306,621)).segment((359,621)).segment((359,548)).segment((338,548)).segment((348,537)).segment((443,621)).arc((558,663),(611,779)).segment((695,863)).segment((569,1000)).segment((474,916)).arc((359,884),(306,769)).close().assemble().finalize().extrude(316).union(w0.workplane(offset=763).moveTo(779,706).cylinder(1000,579)).union(w1.sketch().segment((190,12),(401,12)).arc((432,1),(464,12)).segment((663,12)).segment((663,495)).segment((190,495)).segment((190,443)).arc((54,243),(190,43)).close().assemble().finalize().extrude(96))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(74,64,49))
+r=w0.sketch().segment((974,202),(974,597)).segment((197,597)).segment((197,202)).segment((382,202)).segment((382,101)).segment((461,101)).segment((461,33)).segment((709,33)).segment((709,101)).segment((788,101)).segment((788,202)).close().assemble().push([(525,179)]).circle(133,mode='s').finalize().extrude(80).translate((1,17,1))
diff --git a/test/extrude/1237/1237.stl b/test/extrude/1237/1237.stl
index edd4c698d9b738b7226248ebeb8caf3cec8e65c2..9e148a6e70869e15eb29b82114b3a3e56a55589f 100644
Binary files a/test/extrude/1237/1237.stl and b/test/extrude/1237/1237.stl differ
diff --git a/test/extrude/1238/1238.py b/test/extrude/1238/1238.py
index db654e75cfc4249732717add6db92d8fe4d737c3..6e86f366bae99f440b8d6150c8f59b3fd6bff25f 100644
--- a/test/extrude/1238/1238.py
+++ b/test/extrude/1238/1238.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((321,334),(327,321)).segment((347,334)).segment((347,347)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(69,38,44))
+r=w0.sketch().segment((467,253),(349,253)).segment((349,870)).arc((408,929),(467,870)).close().assemble().push([(379,474)]).circle(38,mode='s').push([(447,552)]).circle(60,mode='s').push([(399,808)]).circle(37,mode='s').push([(396,682)]).rect(51,76,mode='s').finalize().extrude(268)
diff --git a/test/extrude/1238/1238.stl b/test/extrude/1238/1238.stl
index 80773930c5b9a07473bf6234c1e5957673559ace..72f6643c23c79a6ff64e9df71bba1365d59ca7c2 100644
Binary files a/test/extrude/1238/1238.stl and b/test/extrude/1238/1238.stl differ
diff --git a/test/extrude/1239/1239.py b/test/extrude/1239/1239.py
index 9b9857552350484ffa1cec789ff41c85cebbbdb5..a2ca20b546ccdbb6ea456f356f954bc468ffbbe2 100644
--- a/test/extrude/1239/1239.py
+++ b/test/extrude/1239/1239.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(342,342,342))
-w1=cq.Workplane('YZ',origin=(153,342,342))
-r=w0.workplane(offset=494).moveTo(115,734).cylinder(646,583).union(w0.workplane(offset=494).moveTo(633,342).cylinder(646,456)).union(w1.sketch().push([(14,330)]).rect(949,924).push([(1,241)]).circle(431,mode='s').finalize().extrude(1000)).translate((128,120,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(21,18,64))
+r=w0.sketch().segment((453,1000),(843,1000)).segment((843,298)).segment((453,298)).close().assemble().push([(626,666)]).circle(168,mode='s').finalize().extrude(376)
diff --git a/test/extrude/1239/1239.stl b/test/extrude/1239/1239.stl
index 968a0e7ce859b0b9d9c9d1b049a5ac7593f2f6b6..b64f414c91eb6c47596f568fc8a801e63e8699b3 100644
Binary files a/test/extrude/1239/1239.stl and b/test/extrude/1239/1239.stl differ
diff --git a/test/extrude/124/124.py b/test/extrude/124/124.py
index 8e5261d7db87e5b43cd889f9b4c05a44c39ca0c9..dba6c368c1569d5cbbe527e823a1c6ea63f86726 100644
--- a/test/extrude/124/124.py
+++ b/test/extrude/124/124.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(575,575,575))
-r=w0.workplane(offset=363).moveTo(770,541).cylinder(1000,954).union(w0.sketch().segment((1,874),(242,874)).segment((139,989)).close().assemble().finalize().extrude(989))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(606,502,501))
+r=w0.sketch().segment((1,196),(430,197)).segment((430,830)).segment((36,830)).segment((37,815)).segment((26,815)).segment((26,830)).segment((2,830)).close().assemble().push([(738,369)]).rect(1000,894).finalize().extrude(82).union(w0.sketch().arc((106,516),(312,450),(170,620)).segment((170,557)).segment((142,557)).arc((122,536),(107,515)).assemble().push([(217,513)]).rect(601,545,mode='s').finalize().extrude(710))
\ No newline at end of file
diff --git a/test/extrude/124/124.stl b/test/extrude/124/124.stl
index 3fab0ab218c4a24c1d523737ec2d35668cdb0ee0..72b267c62519cd62f2ecdef79371d9c8dafea55a 100644
Binary files a/test/extrude/124/124.stl and b/test/extrude/124/124.stl differ
diff --git a/test/extrude/1240/1240.py b/test/extrude/1240/1240.py
index 1bec6b51e74d50e163e19e15fe53a1d424daa3eb..be100f9182e847cbbd51b37fb8b0ca025f22791e 100644
--- a/test/extrude/1240/1240.py
+++ b/test/extrude/1240/1240.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(261,500,500))
-r=w0.sketch().segment((111,600),(341,461)).segment((241,461)).segment((241,1)).segment((411,1)).segment((411,421)).segment((570,321)).segment((810,720)).segment((351,1000)).close().assemble().finalize().extrude(630).union(w0.sketch().segment((670,491),(690,271)).segment((780,271)).segment((780,321)).segment((890,321)).segment((890,441)).segment((780,441)).segment((780,491)).close().assemble().finalize().extrude(980))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(32,79,9))
+r=w0.sketch().segment((320,134),(752,134)).segment((739,525)).arc((527,676),(320,519)).close().assemble().finalize().extrude(131).union(w0.sketch().segment((726,702),(726,466)).segment((489,466)).arc((370,584),(489,702)).close().assemble().finalize().extrude(238))
diff --git a/test/extrude/1240/1240.stl b/test/extrude/1240/1240.stl
index 822a43ccd8ba0ce9ad851e118c87fe81f8f42b3c..ea9ca844d211665405a87038aaca4be10e282dc7 100644
Binary files a/test/extrude/1240/1240.stl and b/test/extrude/1240/1240.stl differ
diff --git a/test/extrude/1241/1241.py b/test/extrude/1241/1241.py
index f4e377e00c161555e4c0d09ac108af17b354bde8..f621347d6212ada72268aa75fda31ed6514e76ac 100644
--- a/test/extrude/1241/1241.py
+++ b/test/extrude/1241/1241.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().arc((447,747),(800,474),(667,900)).segment((667,800)).arc((727,547),(560,747)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=584).box(947,867,834))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(34,80,19))
+r=w0.sketch().segment((250,811),(868,811)).segment((868,503)).segment((251,503)).close().assemble().finalize().extrude(312).union(w0.sketch().segment((650,900),(372,622)).segment((372,900)).close().assemble().finalize().extrude(95)).union(w0.workplane(offset=174).sketch().segment((406,354),(698,354)).segment((698,278)).segment((406,278)).close().assemble().finalize().extrude(193))
diff --git a/test/extrude/1241/1241.stl b/test/extrude/1241/1241.stl
index 4b58b2db2ea7b0b35de0065b537fc7d5783e8972..7a10c414b80d405aef63810c7ef6cc120ff2656a 100644
Binary files a/test/extrude/1241/1241.stl and b/test/extrude/1241/1241.stl differ
diff --git a/test/extrude/1242/1242.py b/test/extrude/1242/1242.py
index f248aa9610dde4ce02fb0a38ce455a8ca481214d..5bd47d5c754fc42f2992d8efb3d8e46dc6f2079c 100644
--- a/test/extrude/1242/1242.py
+++ b/test/extrude/1242/1242.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(469,649,469))
-r=w0.workplane(offset=288).moveTo(267,511).cylinder(830,479).union(w0.sketch().arc((362,150),(214,1),(426,54)).segment((564,54)).segment((564,384)).segment((362,384)).close().assemble().reset().face(w0.sketch().segment((320,426),(384,426)).segment((384,415)).segment((681,415)).segment((681,426)).segment((734,426)).segment((734,989)).segment((681,989)).segment((681,1000)).segment((384,1000)).segment((384,989)).segment((320,989)).close().assemble()).finalize().extrude(160))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(71,1,54))
+r=w0.sketch().segment((347,47),(323,47)).segment((323,923)).segment((347,923)).close().assemble().push([(353,529)]).rect(233,196,mode='s').finalize().extrude(85).union(w0.sketch().segment((385,931),(177,931)).segment((177,527)).segment((385,527)).close().assemble().finalize().extrude(40)).translate((1,85,1))
diff --git a/test/extrude/1242/1242.stl b/test/extrude/1242/1242.stl
index e967235ebf43acdae15e0baa8b899c423ae541f9..f2f9e91ec13f7096afc853502a55141833d2535e 100644
Binary files a/test/extrude/1242/1242.stl and b/test/extrude/1242/1242.stl differ
diff --git a/test/extrude/1243/1243.py b/test/extrude/1243/1243.py
index 298b79d84ecd3325f2fbfa68cf81c34e0bff1731..55526eab9d91ce5671d6bcfc150933eb91d634aa 100644
--- a/test/extrude/1243/1243.py
+++ b/test/extrude/1243/1243.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(455,455,210))
-r=w0.workplane(offset=482).moveTo(650,637).box(864,1000,510).union(w0.workplane(offset=564).moveTo(650,637).box(700,528,673)).union(w0.sketch().segment((55,364),(101,1)).segment((373,28)).segment((355,146)).segment((228,146)).segment((228,364)).segment((337,364)).segment((328,392)).close().assemble().finalize().extrude(946))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(40,40,1))
+r=w0.sketch().segment((870,46),(869,608)).segment((4,608)).segment((5,46)).close().assemble().push([(537,191)]).circle(34,mode='s').push([(750,260)]).rect(122,57,mode='s').push([(185,132)]).rect(102,88,mode='s').push([(300,442)]).circle(40,mode='s').finalize().extrude(65)
diff --git a/test/extrude/1243/1243.stl b/test/extrude/1243/1243.stl
index cfd73ce26f29626a77bbbca690d4f11696ee7ca7..1fd4e8c9a834a4201b6d128830ecb692afa703b3 100644
Binary files a/test/extrude/1243/1243.stl and b/test/extrude/1243/1243.stl differ
diff --git a/test/extrude/1244/1244.py b/test/extrude/1244/1244.py
index 4ac6fd7af1883520de1237207597f5fa5ef69413..158438546379300ff0f152f473b61dc4f5c782aa 100644
--- a/test/extrude/1244/1244.py
+++ b/test/extrude/1244/1244.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(394,95,394))
-r=w0.sketch().segment((166,1),(622,182)).segment((379,788)).segment((166,701)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(31,33,54))
+r=w0.sketch().segment((97,976),(925,976)).segment((925,182)).segment((97,182)).close().assemble().push([(570,622)]).rect(207,138,mode='s').finalize().extrude(334).translate((1,302,1))
diff --git a/test/extrude/1244/1244.stl b/test/extrude/1244/1244.stl
index b1d0c0763aeb1451b18f0d7056f94f33a55f83b1..f7d5ea7974255d178ae09483e9590bb4024e7d68 100644
Binary files a/test/extrude/1244/1244.stl and b/test/extrude/1244/1244.stl differ
diff --git a/test/extrude/1245/1245.py b/test/extrude/1245/1245.py
index 21d2406e4e1bd24ae4f5ff0ba483e93f17b3f59c..feb0ee21d1dcff5407b720b897f84f56674b3597 100644
--- a/test/extrude/1245/1245.py
+++ b/test/extrude/1245/1245.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,141))
-w1=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((221,314),(254,314)).segment((254,274)).segment((434,274)).segment((434,407)).arc((347,214),(221,387)).close().assemble().reset().face(w0.sketch().segment((234,407),(254,407)).segment((254,434)).arc((241,421),(234,407)).assemble()).reset().face(w0.sketch().segment((294,454),(374,454)).arc((334,461),(294,454)).assemble()).finalize().extrude(221).union(w1.sketch().rect(814,560).push([(284,337)]).rect(407,341,mode='s').finalize().extrude(1000)).translate((74,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(65,26,79))
+r=w0.sketch().segment((655,1000),(313,1000)).segment((313,284)).segment((655,284)).close().assemble().push([(453,638)]).circle(100,mode='s').finalize().extrude(384).translate((1,359,1))
diff --git a/test/extrude/1245/1245.stl b/test/extrude/1245/1245.stl
index 82e37ec3b7c168f698ae8dea51b529554c4ecca3..01df4be18d9d4f0ab5fe6ea68df7d7962b6a6dcf 100644
Binary files a/test/extrude/1245/1245.stl and b/test/extrude/1245/1245.stl differ
diff --git a/test/extrude/1246/1246.py b/test/extrude/1246/1246.py
index 3f09100f2f231bfd15779a8587778d3835c94ecf..450b2499e46073b8bcd254329a4069cd6e281f0a 100644
--- a/test/extrude/1246/1246.py
+++ b/test/extrude/1246/1246.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(366,45,366))
-r=w0.sketch().segment((125,125),(125,424)).segment((336,424)).segment((336,1)).arc((614,125),(635,431)).arc((614,701),(351,592)).arc((96,431),(125,125)).assemble().finalize().extrude(490).union(w0.sketch().segment((8,300),(110,59)).segment((723,300)).segment((621,548)).segment((366,446)).segment((366,439)).segment((351,439)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(39,18,19))
+r=w0.sketch().segment((698,349),(698,698)).segment((82,698)).segment((82,349)).segment((178,254)).segment((602,254)).close().assemble().finalize().extrude(99).union(w0.sketch().segment((410,68),(222,68)).segment((222,568)).segment((410,568)).close().assemble().finalize().extrude(49)).union(w0.workplane(offset=57).sketch().segment((486,526),(716,526)).segment((716,510)).segment((486,510)).close().assemble().finalize().extrude(156))
diff --git a/test/extrude/1246/1246.stl b/test/extrude/1246/1246.stl
index 312f301de5539219afbe19a43e52e964320f32e6..5e3e19802d0fe5e0d5dac3deff3fc389b13d3f40 100644
Binary files a/test/extrude/1246/1246.stl and b/test/extrude/1246/1246.stl differ
diff --git a/test/extrude/1247/1247.py b/test/extrude/1247/1247.py
index 8d41a2a13346215688ce5b3ee0764858c752e9cc..0c9846f357e304e8ed22d7c593aeb9f1843684ab 100644
--- a/test/extrude/1247/1247.py
+++ b/test/extrude/1247/1247.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(22,348,348))
-r=w0.sketch().segment((1,341),(84,341)).arc((355,84),(612,341)).segment((695,341)).segment((695,355)).segment((612,355)).arc((355,612),(84,355)).segment((1,355)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(351,501,501))
+r=w0.sketch().segment((390,555),(610,556)).arc((606,680),(670,776)).segment((390,775)).close().assemble().reset().face(w0.sketch().arc((425,640),(481,572),(541,625)).segment((576,625)).segment((575,765)).segment((426,765)).close().assemble(),mode='s').finalize().extrude(377).union(w0.workplane(offset=597).moveTo(222,202).cylinder(696,701)).union(w0.workplane(offset=713).moveTo(818,820).box(824,861,924))
\ No newline at end of file
diff --git a/test/extrude/1247/1247.stl b/test/extrude/1247/1247.stl
index 7eee9ddb7270cf350d3dd5caa9abf55170925247..47342e4c039b2e131a3e4e70c33f8e31e1300e88 100644
Binary files a/test/extrude/1247/1247.stl and b/test/extrude/1247/1247.stl differ
diff --git a/test/extrude/1248/1248.py b/test/extrude/1248/1248.py
index e2481adfae90aa63447a4a6048e858f62ff9272a..061b5f2fe34508df82acf0357309ed957df92c64 100644
--- a/test/extrude/1248/1248.py
+++ b/test/extrude/1248/1248.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(457,457,457))
-r=w0.workplane(offset=186).moveTo(500,663).cylinder(1000,707).union(w0.sketch().segment((131,348),(490,1)).segment((772,294)).segment((587,479)).segment((772,479)).segment((772,848)).segment((240,848)).segment((240,479)).segment((262,479)).close().assemble().reset().face(w0.sketch().segment((468,729),(533,598)).segment((544,598)).segment((479,729)).close().assemble(),mode='s').finalize().extrude(66)).union(w0.sketch().segment((229,598),(359,598)).arc((500,511),(642,598)).segment((783,598)).segment((783,739)).segment((642,739)).arc((500,826),(359,739)).segment((229,739)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(73,6,14))
+r=w0.sketch().segment((860,343),(536,343)).segment((536,1000)).segment((860,1000)).close().assemble().finalize().extrude(193).union(w0.workplane(offset=353).sketch().segment((753,534),(193,534)).segment((193,254)).segment((753,254)).close().assemble().finalize().extrude(210))
diff --git a/test/extrude/1248/1248.stl b/test/extrude/1248/1248.stl
index f6ecc20311090d41586e6459f520a90b383bf624..1277e903000e719dd17ace2849c2aadb38362f7a 100644
Binary files a/test/extrude/1248/1248.stl and b/test/extrude/1248/1248.stl differ
diff --git a/test/extrude/1249/1249.py b/test/extrude/1249/1249.py
index 2b2c2a1cd597d71adeeccee52a84707584bd5c71..bcadd0b940c0ab1d0b2d72a3ce44e23ae89a233e 100644
--- a/test/extrude/1249/1249.py
+++ b/test/extrude/1249/1249.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(344,480,480))
-r=w0.workplane(offset=527).moveTo(1,188).cylinder(573,521).union(w0.sketch().segment((636,500),(688,500)).segment((688,396)).segment((938,396)).segment((938,500)).segment((1000,500)).segment((1000,709)).segment((938,709)).segment((938,813)).segment((688,813)).segment((688,709)).segment((636,709)).close().assemble().finalize().extrude(750)).translate((1,41,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(47,44,30))
+r=w0.sketch().segment((1,897),(785,897)).segment((785,397)).segment((1,397)).close().assemble().push([(349,732)]).rect(98,52,mode='s').push([(435,519)]).circle(54,mode='s').push([(439,522)]).rect(91,103,mode='s').push([(522,477)]).rect(91,113,mode='s').finalize().extrude(199)
diff --git a/test/extrude/1249/1249.stl b/test/extrude/1249/1249.stl
index 4e722518f11e66a8f31885ea8601db19a2ff43ee..1e8fc5f4010a0b5a4d7f8a203f9772771bcdac1b 100644
Binary files a/test/extrude/1249/1249.stl and b/test/extrude/1249/1249.stl differ
diff --git a/test/extrude/125/125.py b/test/extrude/125/125.py
index 43f0ee160c59272c482914ac641609aacd006ded..e8bd098bb257eaae7e13267a314c0216879478ba 100644
--- a/test/extrude/125/125.py
+++ b/test/extrude/125/125.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,445,495))
-r=w0.workplane(offset=349).moveTo(324,586).box(596,758,788).union(w0.sketch().segment((72,475),(425,475)).segment((425,495)).segment((485,495)).segment((485,617)).segment((566,617)).segment((566,1000)).segment((263,1000)).segment((263,738)).segment((72,738)).close().assemble().finalize().extrude(263)).union(w0.sketch().arc((677,314),(637,1),(738,304)).arc((778,667),(677,314)).assemble().push([(672,162)]).rect(627,738,mode='s').finalize().extrude(889))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,580))
+r=w0.sketch().arc((165,870),(67,310),(569,40)).arc((669,126),(801,140)).arc((974,422),(930,750)).segment((775,751)).segment((775,919)).arc((736,946),(696,966)).segment((241,726)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((466,521),(590,445),(495,555)).arc((475,541),(466,521)).assemble().finalize().extrude(920))
\ No newline at end of file
diff --git a/test/extrude/125/125.stl b/test/extrude/125/125.stl
index 6cbaaa43da12fbd3396102221f6473093f8ded22..ffa52f819251c3c37afa4607420ef8a4123268f3 100644
Binary files a/test/extrude/125/125.stl and b/test/extrude/125/125.stl differ
diff --git a/test/extrude/1250/1250.py b/test/extrude/1250/1250.py
index c1b126d55101ec8bd92f334e0ee007d0bb70b1e0..adc975ede21a0f2a7f6d5fd9320f0ab88350ecc0 100644
--- a/test/extrude/1250/1250.py
+++ b/test/extrude/1250/1250.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(566,744,566))
-r=w0.sketch().arc((435,721),(528,760),(450,721)).segment((450,729)).segment((450,737)).segment((435,737)).segment((435,729)).close().assemble().finalize().extrude(1).union(w0.sketch().circle(946).rect(644,1000,mode='s').finalize().extrude(775)).translate((381,1,381))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(40,27,22))
+r=w0.sketch().segment((998,209),(237,208)).segment((237,970)).segment((998,970)).close().assemble().push([(612,606)]).circle(110,mode='s').finalize().extrude(320).union(w0.workplane(offset=252).sketch().segment((91,659),(375,659)).segment((91,659)).segment((91,942)).segment((375,942)).segment((375,659)).segment((375,376)).segment((91,376)).close().assemble().finalize().extrude(115))
diff --git a/test/extrude/1250/1250.stl b/test/extrude/1250/1250.stl
index 6e71306fb186c8f3f391dfc2b2fd4a2faec66a55..94d07ae4d8654285f4011e739fa957f3245bd248 100644
Binary files a/test/extrude/1250/1250.stl and b/test/extrude/1250/1250.stl differ
diff --git a/test/extrude/1251/1251.py b/test/extrude/1251/1251.py
index fe057fb14bb9835a7436dd412b99cc88d0b1eeaf..54d1ccc24bae00b0349f8a7a2c462c31672e0432 100644
--- a/test/extrude/1251/1251.py
+++ b/test/extrude/1251/1251.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(469,830,469))
-w1=cq.Workplane('XY',origin=(469,469,660))
-r=w0.sketch().segment((1,989),(1,1000)).arc((1,957),(12,1000)).segment((12,989)).close().assemble().finalize().extrude(564).union(w1.workplane(offset=617).moveTo(75,277).box(745,1000,766))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(18,26,77))
+r=w0.sketch().segment((327,58),(327,730)).segment((495,730)).segment((495,58)).close().assemble().push([(413,383)]).rect(233,129,mode='s').finalize().extrude(59)
diff --git a/test/extrude/1251/1251.stl b/test/extrude/1251/1251.stl
index e518f7f626869c3823106d174fdd7bfa4b435e7a..e5366c5c276b16f77e88c9597226fbb60075f885 100644
Binary files a/test/extrude/1251/1251.stl and b/test/extrude/1251/1251.stl differ
diff --git a/test/extrude/1252/1252.py b/test/extrude/1252/1252.py
index b3fb3876745bd42bd1f16b8c8f228442f66dacb0..8773f47d2c2e19d4fb5fce6ebda218183726bed0 100644
--- a/test/extrude/1252/1252.py
+++ b/test/extrude/1252/1252.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,471,500))
-r=w0.sketch().segment((121,241),(640,1)).segment((670,61)).segment((151,301)).close().assemble().reset().face(w0.sketch().segment((331,770),(371,570)).segment((570,610)).segment((520,810)).close().assemble()).reset().face(w0.sketch().segment((770,461),(790,461)).segment((880,1000)).segment((860,1000)).close().assemble()).finalize().extrude(560)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(26,45,3))
+r=w0.sketch().segment((741,824),(189,824)).arc((44,679),(189,534)).segment((741,534)).close().assemble().push([(445,705)]).rect(178,226,mode='s').finalize().extrude(249)
diff --git a/test/extrude/1252/1252.stl b/test/extrude/1252/1252.stl
index f29ba54352d264d6ca55fb80709477d0109b40a0..f1149ce284d1d84c9acadb2c46063c58f1a7114a 100644
Binary files a/test/extrude/1252/1252.stl and b/test/extrude/1252/1252.stl differ
diff --git a/test/extrude/1253/1253.py b/test/extrude/1253/1253.py
index 7dd849adc1a2d6f415003bee0948191b38112cb9..438cb5e1dbd8a0d6fc6e2c439cd3e3039c75dbcf 100644
--- a/test/extrude/1253/1253.py
+++ b/test/extrude/1253/1253.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(391,208,391))
-r=w0.sketch().segment((62,769),(196,622)).segment((232,622)).segment((232,574)).segment((476,318)).segment((720,549)).segment((306,1000)).close().assemble().push([(427,1)]).circle(610).finalize().extrude(756).translate((219,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(11,1,69))
+r=w0.sketch().segment((158,522),(775,522)).arc((834,547),(858,606)).segment((858,624)).arc((834,683),(775,708)).segment((158,708)).close().assemble().push([(621,628)]).rect(59,71,mode='s').push([(293,664)]).circle(50,mode='s').finalize().extrude(347)
diff --git a/test/extrude/1253/1253.stl b/test/extrude/1253/1253.stl
index 265bd054a1ce456aa4693cfcea0a09d240371721..668c998cfba1ba431d01f2e8422b2e7404684a27 100644
Binary files a/test/extrude/1253/1253.stl and b/test/extrude/1253/1253.stl differ
diff --git a/test/extrude/1254/1254.py b/test/extrude/1254/1254.py
index 1096099e66fc2e29cca7489b85d03f7158ecb56a..ca24986c5fd5e9dc883ac9977c1e1d9561d49e87 100644
--- a/test/extrude/1254/1254.py
+++ b/test/extrude/1254/1254.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(243,243,106))
-r=w0.workplane(offset=1).cylinder(727,442).union(w0.workplane(offset=621).cylinder(1000,305)).translate((200,200,258))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(27,13,52))
+r=w0.sketch().segment((642,559),(74,559)).segment((74,321)).segment((642,321)).close().assemble().push([(363,414)]).circle(92,mode='s').finalize().extrude(155).translate((1,143,1))
diff --git a/test/extrude/1254/1254.stl b/test/extrude/1254/1254.stl
index 2c32b8e24e9aa3f0706d85e0254dbb580e2ed6d9..11e1e6a61bb3e58b1c4c36c97f63396a2303348b 100644
Binary files a/test/extrude/1254/1254.stl and b/test/extrude/1254/1254.stl differ
diff --git a/test/extrude/1255/1255.py b/test/extrude/1255/1255.py
index 1bd8c37eb67f8ee9ec7134fe459303f376246e31..97e5676935a3ca0727ca348cd951e46f4efaec2a 100644
--- a/test/extrude/1255/1255.py
+++ b/test/extrude/1255/1255.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(373,236,373))
-w1=cq.Workplane('XY',origin=(373,373,148))
-r=w0.workplane(offset=197).moveTo(187,584).box(726,716,726).union(w0.sketch().segment((168,148),(187,148)).segment((187,471)).arc((177,481),(187,491)).segment((187,540)).segment((168,540)).close().assemble().push([(177,182)]).rect(393,383,mode='s').finalize().extrude(1000)).union(w1.workplane(offset=667).moveTo(1,212).box(393,422,961))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(78,20,41))
+r=w0.sketch().segment((154,787),(844,787)).segment((844,441)).segment((154,441)).close().assemble().push([(437,646)]).rect(179,127,mode='s').finalize().extrude(119)
diff --git a/test/extrude/1255/1255.stl b/test/extrude/1255/1255.stl
index 74e1d208f4c2a8d89e2572cc06779e6d8f976ced..b42d3f735a77740b04ba605b0e679a119e82b595 100644
Binary files a/test/extrude/1255/1255.stl and b/test/extrude/1255/1255.stl differ
diff --git a/test/extrude/1256/1256.py b/test/extrude/1256/1256.py
index ad5b6b3e6292e07ff7b2f1dab2fd34347226a734..2099eedeae182e1d4ef7dc75a43bba5261623259 100644
--- a/test/extrude/1256/1256.py
+++ b/test/extrude/1256/1256.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).cylinder(1000,712).translate((379,379,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(4,41,75))
+r=w0.sketch().segment((796,633),(150,633)).segment((150,319)).segment((796,319)).close().assemble().push([(417,489)]).circle(27,mode='s').push([(637,468)]).rect(53,82,mode='s').push([(451,480)]).rect(61,96,mode='s').finalize().extrude(134)
diff --git a/test/extrude/1256/1256.stl b/test/extrude/1256/1256.stl
index ccaceb9ff1b0ceb1a67578f9a26aca714f161184..7d2bbc2e0bd8e5d2a46f9c3ee353567410478694 100644
Binary files a/test/extrude/1256/1256.stl and b/test/extrude/1256/1256.stl differ
diff --git a/test/extrude/1257/1257.py b/test/extrude/1257/1257.py
index 25ac22dac50f9240e5fd7ddef1a9cd9b89874415..960ae36d05bd071077c44e0d99e239d05eef8f0b 100644
--- a/test/extrude/1257/1257.py
+++ b/test/extrude/1257/1257.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,590,500))
-r=w0.sketch().segment((141,181),(530,1)).segment((730,441)).segment((530,540)).arc((640,730),(860,800)).segment((860,1000)).segment((411,1000)).segment((411,590)).segment((351,620)).close().assemble().finalize().extrude(321)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(20,53,51))
+r=w0.sketch().segment((348,654),(958,654)).segment((958,156)).segment((348,156)).close().assemble().finalize().extrude(150).union(w0.sketch().segment((390,886),(782,886)).segment((782,494)).segment((390,494)).close().assemble().finalize().extrude(131)).union(w0.sketch().segment((504,246),(60,201)).segment((60,156)).segment((504,201)).close().assemble().finalize().extrude(148)).translate((1,98,1))
diff --git a/test/extrude/1257/1257.stl b/test/extrude/1257/1257.stl
index 1ef0983768a31664028759400f612c3e92511f7d..b375386cf0375200425b1389b9184b1144e5bbb8 100644
Binary files a/test/extrude/1257/1257.stl and b/test/extrude/1257/1257.stl differ
diff --git a/test/extrude/1258/1258.py b/test/extrude/1258/1258.py
index 5465c869d794cf217a8ae92141a6e869d8e30dbd..5b48d970d128648cccfd43aa967c6f31eaa39b23 100644
--- a/test/extrude/1258/1258.py
+++ b/test/extrude/1258/1258.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(336,336,1))
-r=w0.sketch().arc((63,542),(97,432),(199,384)).arc((425,213),(329,487)).arc((316,596),(227,658)).arc((535,63),(63,542)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(80,39,71))
+r=w0.sketch().segment((459,1000),(472,360)).segment((140,360)).segment((140,1000)).close().assemble().push([(189,906)]).rect(99,40,mode='s').push([(405,611)]).circle(40,mode='s').push([(346,544)]).circle(42,mode='s').finalize().extrude(50)
diff --git a/test/extrude/1258/1258.stl b/test/extrude/1258/1258.stl
index eb53dfdebd0df2e41a109b040ce31192d528178b..0c7df91fc3f5259bffdb1682fa4e10dc95e50863 100644
Binary files a/test/extrude/1258/1258.stl and b/test/extrude/1258/1258.stl differ
diff --git a/test/extrude/1259/1259.py b/test/extrude/1259/1259.py
index 3120ec85c16b8c7d1af8e58dec31789122244c71..c5246ad9314559c02ab67eeb69a25be8134f82b2 100644
--- a/test/extrude/1259/1259.py
+++ b/test/extrude/1259/1259.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(544,566,544))
-r=w0.sketch().push([(940,528)]).rect(837,663).push([(1000,555)]).circle(566,mode='s').finalize().extrude(316).union(w0.sketch().segment((1,392),(175,207)).segment((251,272)).segment((66,468)).close().assemble().finalize().extrude(598)).union(w0.workplane(offset=631).moveTo(739,794).cylinder(718,631))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(17,65,35))
+r=w0.sketch().segment((732,135),(1,135)).segment((1,905)).segment((732,906)).close().assemble().finalize().extrude(345).union(w0.workplane(offset=187).sketch().segment((802,370),(424,370)).segment((424,276)).segment((802,276)).close().assemble().finalize().extrude(147)).union(w0.workplane(offset=233).sketch().segment((566,661),(786,661)).segment((786,656)).segment((796,656)).segment((796,674)).segment((556,674)).segment((556,656)).segment((566,656)).close().assemble().finalize().extrude(48))
diff --git a/test/extrude/1259/1259.stl b/test/extrude/1259/1259.stl
index eb72039577dfbce970578d4f5fec3082090bd172..f5ab07d6925ce3e5ba13232e6d7a3489ccc5da2e 100644
Binary files a/test/extrude/1259/1259.stl and b/test/extrude/1259/1259.stl differ
diff --git a/test/extrude/126/126.py b/test/extrude/126/126.py
index 1b5194b072667c4c5d081eb6732b42e87b4e7a31..be4a5cb667be9ee0332bac39d5ff20af079ca807 100644
--- a/test/extrude/126/126.py
+++ b/test/extrude/126/126.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(289,516,516))
-r=w0.sketch().push([(516,1000)]).circle(547).push([(809,315)]).rect(567,629).push([(830,274)]).rect(526,526,mode='s').finalize().extrude(670).union(w0.sketch().segment((197,1),(712,1)).segment((712,341)).segment((753,341)).segment((753,773)).segment((701,773)).segment((701,423)).segment((197,423)).close().assemble().finalize().extrude(969))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(465,501,501))
+w1=cq.Workplane('YZ',origin=(537,502,501))
+r=w0.workplane(offset=293).moveTo(696,468).cylinder(916,647).union(w0.sketch().segment((853,941),(867,903)).segment((866,908)).segment((872,907)).arc((872,926),(856,943)).close().assemble().finalize().extrude(767)).union(w0.sketch().arc((181,696),(261,531),(391,662)).arc((342,997),(181,697)).assemble().push([(482,197)]).circle(697).circle(606,mode='s').finalize().extrude(982)).union(w1.workplane(offset=454).moveTo(698,465).cylinder(598,607))
\ No newline at end of file
diff --git a/test/extrude/126/126.stl b/test/extrude/126/126.stl
index 0c6f70dd34bfa8faffac341efa3670120a34bf80..c4b36d75d47d114599f391b45cc3cda52430e737 100644
Binary files a/test/extrude/126/126.stl and b/test/extrude/126/126.stl differ
diff --git a/test/extrude/1260/1260.py b/test/extrude/1260/1260.py
index 9f8cee5a5507a874f2cb7850b0354410ab27a2b4..adb3ee7b81f40cabedaade4c5d1dcad7fcacf79e 100644
--- a/test/extrude/1260/1260.py
+++ b/test/extrude/1260/1260.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(222,419,419))
-r=w0.sketch().push([(106,280)]).rect(512,652).push([(628,1)]).circle(582).finalize().extrude(617).union(w0.sketch().segment((47,82),(164,82)).segment((164,408)).segment((477,408)).segment((477,1000)).segment((117,1000)).segment((117,477)).segment((47,477)).close().assemble().finalize().extrude(814)).translate((1,1,164))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(36,18,27))
+r=w0.sketch().segment((146,418),(928,418)).segment((928,732)).segment((146,732)).close().assemble().reset().segment((597,686),(403,686)).segment((403,344)).segment((597,345)).close().assemble(mode='s').finalize().extrude(285).translate((1,268,1))
diff --git a/test/extrude/1260/1260.stl b/test/extrude/1260/1260.stl
index 40ae3c7b3516fdb25f2d320a7e0b8bbf8250fbc8..f7c4b7b7b5612d180f2a0448ac323ea0c4ccef2b 100644
Binary files a/test/extrude/1260/1260.stl and b/test/extrude/1260/1260.stl differ
diff --git a/test/extrude/1261/1261.py b/test/extrude/1261/1261.py
index b58c66634cd2a4efb65e757b10a320d8847460b0..0ff458b81ec24ce8045d74c45837fe867db4dc16 100644
--- a/test/extrude/1261/1261.py
+++ b/test/extrude/1261/1261.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(426,380,426))
-r=w0.sketch().push([(1,598)]).circle(575).circle(552,mode='s').finalize().extrude(483).union(w0.sketch().segment((633,104),(977,104)).segment((977,277)).arc((1000,368),(977,460)).segment((977,621)).segment((633,621)).segment((633,460)).arc((610,368),(633,277)).close().assemble().finalize().extrude(529)).translate((1,1,149))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(44,11,3))
+r=w0.sketch().segment((38,331),(742,331)).segment((742,289)).segment((38,289)).close().assemble().push([(337,332)]).rect(163,193,mode='s').finalize().extrude(157)
diff --git a/test/extrude/1261/1261.stl b/test/extrude/1261/1261.stl
index 29bc0c801a5641b2f2e5a8c71c31e3d50faaec0a..965f3dcf16bd93639443966645b33be13128a788 100644
Binary files a/test/extrude/1261/1261.stl and b/test/extrude/1261/1261.stl differ
diff --git a/test/extrude/1262/1262.py b/test/extrude/1262/1262.py
index 276b6e4eeaad92514fc7c64416b9e3c0a49ced55..45c18c53744ae4f26020480aaa16cd8c6bddc1f0 100644
--- a/test/extrude/1262/1262.py
+++ b/test/extrude/1262/1262.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,630))
-r=w0.sketch().segment((1,451),(211,91)).segment((500,251)).segment((1000,251)).segment((1000,910)).segment((391,910)).segment((391,640)).segment((371,660)).close().assemble().push([(690,580)]).circle(560,mode='s').finalize().extrude(231)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(56,30,42))
+r=w0.sketch().segment((800,140),(188,140)).segment((188,422)).arc((494,728),(800,422)).close().assemble().push([(477,276)]).rect(92,162,mode='s').finalize().extrude(314)
diff --git a/test/extrude/1262/1262.stl b/test/extrude/1262/1262.stl
index 844823bd02ba0ffaed0c8aec13eb703f96b30114..2ca25aab54ddf2c5f36473af0096769a28ec9f23 100644
Binary files a/test/extrude/1262/1262.stl and b/test/extrude/1262/1262.stl differ
diff --git a/test/extrude/1263/1263.py b/test/extrude/1263/1263.py
index 08ef85291ad986166d612478d66bdce382802b18..f116693719f7335ea7e840a8743921f904cac10d 100644
--- a/test/extrude/1263/1263.py
+++ b/test/extrude/1263/1263.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().arc((168,367),(467,227),(261,487)).arc((261,394),(168,367)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(78,78,53))
+r=w0.sketch().segment((7,426),(8,163)).segment((852,163)).segment((852,426)).arc((847,437),(835,439)).arc((430,384),(25,439)).arc((13,437),(8,426)).close().assemble().push([(445,307)]).circle(190,mode='s').finalize().extrude(376)
diff --git a/test/extrude/1263/1263.stl b/test/extrude/1263/1263.stl
index 3ec9e861e7aa0e830611d7c07a18c5f7a31fbf60..9d520334374463eb7b4a5052890cfcf52b0be755 100644
Binary files a/test/extrude/1263/1263.stl and b/test/extrude/1263/1263.stl differ
diff --git a/test/extrude/1264/1264.py b/test/extrude/1264/1264.py
index bd450a63e1a2a15559b87c2db1c0ba166b2f9657..67742e078b43da37eae76e3d0d87155e8a85f91e 100644
--- a/test/extrude/1264/1264.py
+++ b/test/extrude/1264/1264.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(436,412,412))
-w1=cq.Workplane('XY',origin=(412,412,365))
-r=w0.workplane(offset=295).moveTo(213,1).cylinder(647,589).union(w0.sketch().segment((483,706),(530,706)).arc((624,671),(718,706)).segment((765,706)).segment((765,753)).arc((788,835),(765,918)).segment((765,965)).segment((718,965)).arc((624,1000),(530,965)).segment((483,965)).segment((483,918)).arc((459,835),(483,753)).close().assemble().finalize().extrude(777)).union(w1.sketch().segment((177,389),(177,624)).segment((365,624)).segment((365,471)).arc((365,647),(224,741)).segment((224,765)).segment((177,765)).segment((177,741)).arc((25,565),(177,389)).assemble().finalize().extrude(83)).translate((1,1,177))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(12,32,80))
+r=w0.sketch().segment((420,328),(960,328)).segment((960,714)).segment((420,714)).close().assemble().finalize().extrude(328).union(w0.sketch().segment((496,395),(204,395)).segment((204,103)).segment((496,103)).close().assemble().finalize().extrude(54)).union(w0.sketch().segment((81,397),(373,397)).segment((373,689)).segment((81,689)).close().assemble().finalize().extrude(84))
diff --git a/test/extrude/1264/1264.stl b/test/extrude/1264/1264.stl
index dc2c4022e3950e8ea5349e236284bd63d06fdf43..b411cae9a81ea94ba5ea89748aa015ffd3855db9 100644
Binary files a/test/extrude/1264/1264.stl and b/test/extrude/1264/1264.stl differ
diff --git a/test/extrude/1265/1265.py b/test/extrude/1265/1265.py
index 2ee27c939789f5c5dd920fe169dbfe3754ea7211..0cba2ef8d37ea3a263289c1e082bb770c5946d0f 100644
--- a/test/extrude/1265/1265.py
+++ b/test/extrude/1265/1265.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,257))
-r=w0.sketch().segment((14,718),(206,718)).arc((257,552),(360,424)).segment((232,424)).arc((308,257),(232,78)).segment((475,78)).segment((475,232)).arc((539,91),(398,14)).arc((808,1),(475,244)).segment((475,372)).arc((949,910),(232,910)).segment((14,910)).close().assemble().finalize().extrude(565).union(w0.sketch().segment((513,513),(680,513)).segment((680,974)).segment((629,974)).segment((513,834)).segment((513,705)).arc((629,616),(513,526)).close().assemble().reset().face(w0.sketch().segment((513,962),(526,974)).segment((513,974)).close().assemble()).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(11,25,9))
+r=w0.sketch().segment((413,516),(732,690)).segment((94,690)).close().assemble().push([(413,619)]).rect(74,66,mode='s').push([(298,646)]).rect(59,49,mode='s').push([(446,577)]).circle(38,mode='s').finalize().extrude(144)
diff --git a/test/extrude/1265/1265.stl b/test/extrude/1265/1265.stl
index 876bfe7cfb73f4c0cc10f44ff22401cedf5a59d6..eae0d408e314c2122db76ddf6d9940bc487fc825 100644
Binary files a/test/extrude/1265/1265.stl and b/test/extrude/1265/1265.stl differ
diff --git a/test/extrude/1266/1266.py b/test/extrude/1266/1266.py
index 0901c4d4a9af05b699420397f4e787c8475dc275..019afa709b1327a0db1b4903a9125159dad52a24 100644
--- a/test/extrude/1266/1266.py
+++ b/test/extrude/1266/1266.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,732,732))
-r=w0.sketch().arc((713,778),(741,686),(722,778)).arc((722,769),(713,778)).assemble().finalize().extrude(1).union(w0.sketch().circle(944).push([(542,713)]).rect(760,750,mode='s').finalize().extrude(926)).translate((1,213,213))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(329,500,500))
+r=w0.sketch().segment((160,619),(559,620)).segment((560,828)).segment((524,829)).arc((316,998),(161,779)).close().assemble().finalize().extrude(653).union(w0.workplane(offset=606).moveTo(374,2).box(638,505,715)).union(w0.workplane(offset=669).moveTo(725,345).box(734,530,840))
\ No newline at end of file
diff --git a/test/extrude/1266/1266.stl b/test/extrude/1266/1266.stl
index c58d1d68b1ee7d0201c821f81f20a20a84da09f7..ca3d3a1ccfb43a3a9035240b2e1c914508d6cb94 100644
Binary files a/test/extrude/1266/1266.stl and b/test/extrude/1266/1266.stl differ
diff --git a/test/extrude/1267/1267.py b/test/extrude/1267/1267.py
index 45f9a2ec59f43f35f1aab9b93027425b15f67be2..4c208d2f2f6b9370c8e6147a9d84f62db2ac207f 100644
--- a/test/extrude/1267/1267.py
+++ b/test/extrude/1267/1267.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(649,484,484))
-r=w0.workplane(offset=319).moveTo(462,1000).cylinder(813,517).union(w0.workplane(offset=407).moveTo(490,1).box(583,616,638))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(17,14,11))
+r=w0.sketch().segment((288,685),(838,685)).segment((838,375)).segment((288,375)).close().assemble().finalize().extrude(107).union(w0.sketch().segment((597,526),(554,526)).segment((470,526)).segment((447,526)).segment((447,514)).segment((227,514)).segment((227,497)).segment((227,376)).segment((255,376)).segment((255,497)).segment((632,497)).segment((632,566)).segment((597,566)).close().assemble().finalize().extrude(177))
diff --git a/test/extrude/1267/1267.stl b/test/extrude/1267/1267.stl
index c3bfe755e58d930d461b96b10d8974d1f0c59d45..855b4e2074bf3ac7f396aff726da73dd49e2bb75 100644
Binary files a/test/extrude/1267/1267.stl and b/test/extrude/1267/1267.stl differ
diff --git a/test/extrude/1268/1268.py b/test/extrude/1268/1268.py
index 2d93d5b4a640fe65f06a8d7acc251412a0836e0f..43a4f62c6ce8fba8ffdf50138099a77e59c4cae1 100644
--- a/test/extrude/1268/1268.py
+++ b/test/extrude/1268/1268.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(411,360,360))
-r=w0.sketch().push([(39,481)]).rect(1000,834).push([(39,488)]).circle(436,mode='s').finalize().extrude(142).union(w0.sketch().segment((500,1),(1000,1)).segment((1000,232)).arc((744,78),(500,232)).close().assemble().finalize().extrude(475)).translate((1,102,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(23,47,66))
+r=w0.sketch().segment((527,98),(701,98)).segment((701,770)).segment((527,770)).close().assemble().push([(643,458)]).rect(112,136,mode='s').finalize().extrude(208).translate((1,162,1))
diff --git a/test/extrude/1268/1268.stl b/test/extrude/1268/1268.stl
index 7baa788e7c121902e72c03b873f7c77603e6a1b8..629b51cb1e0a89c08b5f82b49a76afbb26a4f31c 100644
Binary files a/test/extrude/1268/1268.stl and b/test/extrude/1268/1268.stl differ
diff --git a/test/extrude/1269/1269.py b/test/extrude/1269/1269.py
index 8ab9394549447d945efa32c58de77c5237179069..3b450c47f0fd0e206b42d6f7a6022846ce00dc87 100644
--- a/test/extrude/1269/1269.py
+++ b/test/extrude/1269/1269.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(674,474,474))
-r=w0.sketch().push([(1,590)]).circle(527).reset().face(w0.sketch().segment((590,422),(653,306)).segment((1000,495)).segment((937,611)).close().assemble()).finalize().extrude(75).translate((1,53,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(56,47,2))
+r=w0.sketch().segment((392,391),(751,1000)).segment((767,1000)).segment((763,1000)).segment((406,387)).segment((406,172)).segment((392,172)).segment((392,384)).segment((385,384)).segment((385,391)).close().assemble().push([(514,557)]).circle(168,mode='s').finalize().extrude(321).union(w0.sketch().segment((130,837),(637,837)).segment((130,837)).segment((130,585)).segment((637,585)).segment((130,585)).segment((130,522)).segment((637,522)).segment((637,585)).segment((638,837)).segment((637,900)).segment((130,900)).close().assemble().finalize().extrude(91))
diff --git a/test/extrude/1269/1269.stl b/test/extrude/1269/1269.stl
index 98063005792f9f1ed72ffd4a51121062c76c0584..6b3bb433c42074edacccf1200c1836eff0e4fe33 100644
Binary files a/test/extrude/1269/1269.stl and b/test/extrude/1269/1269.stl differ
diff --git a/test/extrude/127/127.py b/test/extrude/127/127.py
index 656b20d84da230c8d9241d8b45ac314089c5e62a..85d0774398dbe2d7219b8d3a2a27f074f2619b60 100644
--- a/test/extrude/127/127.py
+++ b/test/extrude/127/127.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(338,338,570))
-w1=cq.Workplane('XY',origin=(338,338,675))
-r=w0.workplane(offset=53).moveTo(773,88).box(605,1000,907).union(w1.workplane(offset=65).moveTo(1,744).box(803,686,884)).translate((64,75,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,177))
+r=w0.sketch().arc((526,956),(591,900),(606,816)).segment((691,836)).segment((699,785)).segment((759,805)).segment((701,1000)).close().assemble().finalize().extrude(656).union(w0.workplane(offset=825).moveTo(446,205).cylinder(1000,704))
\ No newline at end of file
diff --git a/test/extrude/127/127.stl b/test/extrude/127/127.stl
index d9c49273ec8a120c342868e58313c3aae94a7003..dff01cc18deeb247be0326bfb40702e40cd0bead 100644
Binary files a/test/extrude/127/127.stl and b/test/extrude/127/127.stl differ
diff --git a/test/extrude/1270/1270.py b/test/extrude/1270/1270.py
index 8b3ca2e95377e6d977c01ab608b47919bc6e39a0..176d53a9a1b827dbf0166d15e380780a373f4f7c 100644
--- a/test/extrude/1270/1270.py
+++ b/test/extrude/1270/1270.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(474,432,474))
-w1=cq.Workplane('XY',origin=(474,474,495))
-r=w0.sketch().segment((12,527),(211,359)).segment((600,832)).segment((411,1000)).close().assemble().push([(227,543)]).rect(653,506,mode='s').reset().face(w0.sketch().arc((474,390),(253,1),(569,327)).segment((600,327)).segment((600,432)).segment((748,569)).segment((695,621)).segment((600,537)).segment((516,537)).segment((516,432)).close().assemble()).push([(364,248)]).rect(611,569,mode='s').finalize().extrude(579).union(w1.sketch().arc((159,390),(201,401),(180,359)).arc((253,338),(295,327)).arc((474,274),(611,390)).segment((390,390)).arc((432,485),(401,558)).segment((611,558)).arc((485,674),(316,632)).arc((159,569),(159,390)).assemble().finalize().extrude(916))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(22,76,69))
+r=w0.sketch().segment((148,567),(148,615)).segment((346,615)).segment((346,721)).segment((522,721)).segment((522,611)).segment((852,611)).segment((852,567)).close().assemble().finalize().extrude(279).union(w0.workplane(offset=121).sketch().segment((558,598),(546,609)).segment((140,204)).segment((152,193)).close().assemble().finalize().extrude(200))
diff --git a/test/extrude/1270/1270.stl b/test/extrude/1270/1270.stl
index 36e621abd410977e806f660266d1887828da1900..97fcde6a4592c63f519d33d31a0c7705d4cc9d31 100644
Binary files a/test/extrude/1270/1270.stl and b/test/extrude/1270/1270.stl differ
diff --git a/test/extrude/1271/1271.py b/test/extrude/1271/1271.py
index cf6a8fd7428fff1c247fc06545143e1cf2f884dc..0adf79b98fe83f14cc21335662a970ffca63ee08 100644
--- a/test/extrude/1271/1271.py
+++ b/test/extrude/1271/1271.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(535,535,561))
-r=w0.workplane(offset=497).moveTo(1,726).cylinder(612,637).union(w0.workplane(offset=542).moveTo(1000,268).box(879,586,548)).translate((102,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(4,56,15))
+r=w0.sketch().segment((560,84),(620,81)).segment((643,459)).segment((649,563)).segment((666,837)).segment((593,837)).close().assemble().finalize().extrude(140).union(w0.workplane(offset=343).sketch().segment((456,232),(456,390)).segment((951,390)).segment((951,232)).segment((1000,232)).segment((1000,390)).segment((951,390)).segment((951,232)).close().assemble().finalize().extrude(43)).translate((1,331,1))
diff --git a/test/extrude/1271/1271.stl b/test/extrude/1271/1271.stl
index ece967f47b9766d6ce24c299b20c7563593d8b05..8cac90026a5e360e0da0fcdb69bcd5081cadb088 100644
Binary files a/test/extrude/1271/1271.stl and b/test/extrude/1271/1271.stl differ
diff --git a/test/extrude/1272/1272.py b/test/extrude/1272/1272.py
index 1b3d0037894b2f87b88b879d81596484900150d0..78a379b1a4d6a3f49eaf71ce5cea4c8d12af2c91 100644
--- a/test/extrude/1272/1272.py
+++ b/test/extrude/1272/1272.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(360,360,360))
-w1=cq.Workplane('XY',origin=(360,360,505))
-r=w0.sketch().push([(166,360)]).rect(942,670).circle(486,mode='s').finalize().extrude(534).union(w0.sketch().segment((476,486),(845,379)).segment((845,399)).segment((476,505)).close().assemble().finalize().extrude(593)).union(w0.workplane(offset=544).moveTo(166,360).box(631,1000,728)).union(w1.sketch().segment((1,127),(137,127)).arc((205,98),(263,127)).segment((379,127)).segment((379,195)).segment((263,195)).arc((205,234),(137,195)).segment((1,195)).close().assemble().finalize().extrude(117))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(9,79,45))
+r=w0.sketch().segment((1,784),(666,784)).segment((666,496)).segment((1,496)).close().assemble().push([(292,659)]).rect(117,157,mode='s').finalize().extrude(87).translate((1,9,1))
diff --git a/test/extrude/1272/1272.stl b/test/extrude/1272/1272.stl
index 046b890b44ea79fc7f6097a82914e0d6225ec792..289984fdfccba03324f0e57a54386086de762140 100644
Binary files a/test/extrude/1272/1272.stl and b/test/extrude/1272/1272.stl differ
diff --git a/test/extrude/1273/1273.py b/test/extrude/1273/1273.py
index 64d62f26f16c90fd0898464a5205d23bc7da9e4e..878c20b1911f48897a036a535e6cc9621f1192fe 100644
--- a/test/extrude/1273/1273.py
+++ b/test/extrude/1273/1273.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).box(827,827,1000).translate((81,81,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(71,7,23))
+r=w0.sketch().segment((82,105),(850,105)).segment((850,873)).segment((82,873)).close().assemble().push([(515,415)]).rect(155,195,mode='s').finalize().extrude(74)
diff --git a/test/extrude/1273/1273.stl b/test/extrude/1273/1273.stl
index c812c4b7f3ae0f65cae0035fe080490c50bddfd1..fdc080c5a3f707bcfb0650467f295b5085c09df5 100644
Binary files a/test/extrude/1273/1273.stl and b/test/extrude/1273/1273.stl differ
diff --git a/test/extrude/1274/1274.py b/test/extrude/1274/1274.py
index 53c04d3666c99b98545ca955187dc1c0524c03cb..fe26524c1944652a7237aad229bc0e91b5230a63 100644
--- a/test/extrude/1274/1274.py
+++ b/test/extrude/1274/1274.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,701))
-r=w0.sketch().arc((434,1000),(372,1),(660,979)).arc((547,979),(434,1000)).assemble().push([(186,567)]).circle(701,mode='s').finalize().extrude(83)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(35,48,75))
+r=w0.sketch().segment((366,262),(428,262)).segment((428,1000)).segment((944,1000)).segment((944,580)).segment((1000,580)).segment((1000,1000)).segment((366,1000)).close().assemble().push([(643,725)]).circle(175,mode='s').finalize().extrude(133)
diff --git a/test/extrude/1274/1274.stl b/test/extrude/1274/1274.stl
index e6d9fb27e35df131ae04f548ddbfe2d397bcf2e1..bf36c1006aae8839c09d4eb49882fad528769bea 100644
Binary files a/test/extrude/1274/1274.stl and b/test/extrude/1274/1274.stl differ
diff --git a/test/extrude/1275/1275.py b/test/extrude/1275/1275.py
index 2f1887d066470720b3135e993ff7869b41245890..37227d2ca6c80682f037bbd9728f9461b9f57305 100644
--- a/test/extrude/1275/1275.py
+++ b/test/extrude/1275/1275.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(389,263,389))
-r=w0.sketch().arc((1,709),(49,651),(59,593)).segment((137,631)).arc((767,370),(156,651)).segment((98,758)).close().assemble().finalize().extrude(30).union(w0.workplane(offset=694).moveTo(457,505).cylinder(1000,467))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(14,42,37))
+r=w0.sketch().segment((469,230),(859,230)).segment((1000,577)).segment((899,662)).segment((771,432)).segment((557,432)).segment((429,662)).segment((276,577)).close().assemble().push([(659,535)]).rect(267,235,mode='s').finalize().extrude(154)
diff --git a/test/extrude/1275/1275.stl b/test/extrude/1275/1275.stl
index e6d710ddca52a1db163ec86ad6331b318748a1c8..4f439416feb774f844dd9cebf2a5b20c813235ba 100644
Binary files a/test/extrude/1275/1275.stl and b/test/extrude/1275/1275.stl differ
diff --git a/test/extrude/1276/1276.py b/test/extrude/1276/1276.py
index e4ce794c71ad98636257e893a41f929db0f9d7f9..36d234048bd3d106f934fd10ab2b5e25ecdfc18f 100644
--- a/test/extrude/1276/1276.py
+++ b/test/extrude/1276/1276.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,420))
-r=w0.workplane(offset=1).moveTo(161,877).cylinder(1000,408).union(w0.workplane(offset=383).moveTo(161,870).box(852,346,433)).union(w0.sketch().push([(538,7)]).rect(790,914).push([(544,1)]).circle(359,mode='s').finalize().extrude(827)).translate((1,117,80))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,502,571))
+w1=cq.Workplane('ZX',origin=(500,634,501))
+r=w0.workplane(offset=715).moveTo(609,561).box(511,730,930).union(w1.sketch().segment((42,367),(181,367)).segment((181,415)).arc((221,501),(182,587)).segment((181,636)).segment((42,635)).segment((42,585)).arc((1,500),(41,417)).close().assemble().finalize().extrude(192))
\ No newline at end of file
diff --git a/test/extrude/1276/1276.stl b/test/extrude/1276/1276.stl
index 740affbc73bf985bf091dd87990ac9eeaa5e265d..6554eb8b5b6de9a39c7fd6e14085aa4caf2afac0 100644
Binary files a/test/extrude/1276/1276.stl and b/test/extrude/1276/1276.stl differ
diff --git a/test/extrude/1277/1277.py b/test/extrude/1277/1277.py
index bbcee850c4dd12cdfb5d2ffa74164dd86a2cb68e..19d10caf775eac5e26a7fc8d8daef74bb611a85f 100644
--- a/test/extrude/1277/1277.py
+++ b/test/extrude/1277/1277.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(420,420,554))
-r=w0.workplane(offset=130).moveTo(224,376).cylinder(1000,625).union(w0.sketch().segment((1,117),(447,117)).segment((447,206)).segment((822,206)).segment((822,215)).segment((839,215)).segment((839,715)).segment((822,715)).segment((822,723)).segment((385,723)).segment((385,715)).segment((367,715)).segment((367,634)).segment((1,634)).close().assemble().push([(37,518)]).circle(447,mode='s').push([(273,420)]).rect(608,759,mode='s').finalize().extrude(732))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(79,42,35))
+r=w0.sketch().segment((757,263),(757,833)).segment((1,833)).segment((1,263)).close().assemble().push([(412,541)]).rect(271,216,mode='s').finalize().extrude(359)
diff --git a/test/extrude/1277/1277.stl b/test/extrude/1277/1277.stl
index 190f8171a94c91c451a69ec14cab441dd7bed972..cd3ff3f9cbaddf9612b489cb849a7a4d21a8d410 100644
Binary files a/test/extrude/1277/1277.stl and b/test/extrude/1277/1277.stl differ
diff --git a/test/extrude/1278/1278.py b/test/extrude/1278/1278.py
index 441be6ea1087a7842f83ab21212041bbb22ae035..ec81457a6ed74acd83b04ef8394aef10c8c9d8bc 100644
--- a/test/extrude/1278/1278.py
+++ b/test/extrude/1278/1278.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(363,124,363))
-r=w0.sketch().arc((1,428),(52,363),(110,428)).close().assemble().push([(642,363)]).rect(529,1000).finalize().extrude(841)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(71,2,58))
+r=w0.sketch().segment((718,282),(1,282)).segment((1,1000)).segment((718,1000)).close().assemble().push([(298,623)]).rect(190,177,mode='s').finalize().extrude(161).union(w0.workplane(offset=317).sketch().segment((395,416),(792,416)).segment((792,20)).segment((395,20)).close().assemble().finalize().extrude(130)).translate((1,446,1))
diff --git a/test/extrude/1278/1278.stl b/test/extrude/1278/1278.stl
index 12c1da6e350c47ba5cb0f2ad5c59a6f3486016e8..e269edc6e2b588842937a36cac1a53715497271d 100644
Binary files a/test/extrude/1278/1278.stl and b/test/extrude/1278/1278.stl differ
diff --git a/test/extrude/1279/1279.py b/test/extrude/1279/1279.py
index b42f819bae9ff9bb529fd4c6b26bdc4c03d582eb..cd991a20aa6b5e60c5b6bb0d7d4b7cd8d3b332d4 100644
--- a/test/extrude/1279/1279.py
+++ b/test/extrude/1279/1279.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(286,465,465))
-r=w0.workplane(offset=530).moveTo(168,798).cylinder(596,726).union(w0.sketch().push([(839,1)]).rect(834,726).push([(1000,49)]).circle(489,mode='s').finalize().extrude(834)).translate((1,94,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(75,1,29))
+r=w0.sketch().segment((124,391),(688,390)).segment((688,983)).arc((682,996),(669,1000)).segment((476,1000)).segment((476,884)).arc((406,813),(336,884)).segment((336,1000)).segment((143,1000)).arc((130,996),(124,983)).close().assemble().push([(364,894)]).circle(143,mode='s').finalize().extrude(74).translate((1,74,1))
diff --git a/test/extrude/1279/1279.stl b/test/extrude/1279/1279.stl
index 27aecbdb0d4fa75eb92114050bc4a3da9b16a26f..a6f84492b90b0db75057c6cad2df97f73fe5d0ff 100644
Binary files a/test/extrude/1279/1279.stl and b/test/extrude/1279/1279.stl differ
diff --git a/test/extrude/128/128.py b/test/extrude/128/128.py
index c8a04dc2e934fc9b4d8589dc9b607bb1b9f9a3ac..a4e962f3870e037a6defcdc5344b2e4f97865ce1 100644
--- a/test/extrude/128/128.py
+++ b/test/extrude/128/128.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(221,451,451))
-w1=cq.Workplane('YZ',origin=(440,451,451))
-r=w0.sketch().arc((1,758),(23,407),(286,649)).segment((605,649)).segment((605,857)).segment((1,857)).close().assemble().push([(720,259)]).rect(726,879).finalize().extrude(517).union(w1.sketch().segment((374,144),(1000,144)).segment((1000,473)).segment((715,473)).segment((715,791)).segment((572,791)).segment((572,473)).segment((374,473)).close().assemble().finalize().extrude(693))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,621,499))
+w1=cq.Workplane('ZX',origin=(500,336,500))
+r=w0.sketch().arc((1,316),(20,365),(1,421)).close().assemble().finalize().extrude(1).union(w1.sketch().segment((222,120),(456,121)).segment((456,97)).segment((771,97)).segment((770,122)).segment((1000,121)).segment((1000,880)).segment((771,879)).segment((770,905)).segment((454,905)).segment((456,881)).segment((220,880)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/128/128.stl b/test/extrude/128/128.stl
index 5ede6ddbc6b265ebc21afd149b6d3a699b7dc863..78fd7417da1fcb17640c5b0c91c71d3908d7b0f2 100644
Binary files a/test/extrude/128/128.stl and b/test/extrude/128/128.stl differ
diff --git a/test/extrude/1280/1280.py b/test/extrude/1280/1280.py
index affd6888fbbf0a3a337f8b5af093e9855358b908..9b1dfea4a086207bff9d6b417332f9e9c082a6fb 100644
--- a/test/extrude/1280/1280.py
+++ b/test/extrude/1280/1280.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,481))
-w1=cq.Workplane('XY',origin=(500,500,411))
-r=w0.workplane(offset=456).moveTo(860,510).cylinder(590,570).union(w0.sketch().segment((1,481),(11,481)).arc((191,261),(431,431)).segment((471,431)).segment((471,680)).segment((371,680)).segment((371,720)).segment((1,720)).close().assemble().finalize().extrude(660)).union(w1.sketch().segment((81,540),(221,540)).arc((381,361),(590,500)).segment((1000,500)).segment((1000,720)).segment((540,720)).segment((540,690)).arc((341,730),(221,560)).segment((81,560)).close().assemble().reset().face(w1.sketch().segment((271,451),(341,451)).segment((341,500)).arc((371,550),(341,600)).segment((341,650)).segment((271,650)).segment((271,600)).arc((241,550),(271,500)).close().assemble(),mode='s').finalize().extrude(451))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(22,68,49))
+r=w0.sketch().segment((300,475),(756,475)).segment((832,475)).segment((832,469)).segment((756,469)).segment((300,469)).close().assemble().finalize().extrude(249).union(w0.sketch().segment((209,1000),(305,1000)).segment((305,524)).segment((209,524)).close().assemble().finalize().extrude(226)).translate((1,182,1))
diff --git a/test/extrude/1280/1280.stl b/test/extrude/1280/1280.stl
index eed3042240ddeaca730ba895a8232a0dca808484..7adac3e8809892281d98d2b773c37c036b587417 100644
Binary files a/test/extrude/1280/1280.stl and b/test/extrude/1280/1280.stl differ
diff --git a/test/extrude/1281/1281.py b/test/extrude/1281/1281.py
index cbc953e00819958a0b00d7e4f082d908011e7b52..aae4e945f2be16bd520fa097b2043d55148507a0 100644
--- a/test/extrude/1281/1281.py
+++ b/test/extrude/1281/1281.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,263,506))
-r=w0.sketch().segment((1,495),(314,495)).arc((384,455),(455,495)).segment((475,495)).segment((475,818)).segment((1,818)).close().assemble().reset().face(w0.sketch().arc((334,495),(384,475),(435,495)).close().assemble(),mode='s').push([(808,324)]).circle(707).finalize().extrude(1000).union(w0.workplane(offset=753).moveTo(748,778).cylinder(1000,617))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(33,38,6))
+r=w0.sketch().segment((1,548),(676,586)).segment((676,548)).close().assemble().push([(428,595)]).circle(137,mode='s').finalize().extrude(167)
diff --git a/test/extrude/1281/1281.stl b/test/extrude/1281/1281.stl
index c9384d378f19678e3061780a4d26a9525b5f46ac..aa42d7c43dc41a67cd3e4f9b741a7af43b34e2e5 100644
Binary files a/test/extrude/1281/1281.stl and b/test/extrude/1281/1281.stl differ
diff --git a/test/extrude/1282/1282.py b/test/extrude/1282/1282.py
index ab5dfdbb4156e7fbffe9219e4d4f28edbd1973af..80ee25d5d71be7ed36789ffad2bf17c3e632441b 100644
--- a/test/extrude/1282/1282.py
+++ b/test/extrude/1282/1282.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(524,524,781))
-r=w0.sketch().push([(391,277)]).circle(753).reset().face(w0.sketch().segment((477,657),(886,657)).segment((886,1000)).segment((477,1000)).segment((477,933)).arc((486,924),(477,924)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(79,72,27))
+r=w0.sketch().segment((914,228),(1000,228)).segment((1000,596)).segment((256,596)).segment((256,465)).segment((914,465)).segment((914,307)).segment((888,307)).arc((848,267),(888,228)).close().assemble().push([(824,446)]).rect(213,227,mode='s').finalize().extrude(302)
diff --git a/test/extrude/1282/1282.stl b/test/extrude/1282/1282.stl
index 25c8d29524fa2800de803c17ee1ad3db16f4c56f..1c1006dba4fe7c15534fa7c8061c7ab02b099410 100644
Binary files a/test/extrude/1282/1282.stl and b/test/extrude/1282/1282.stl differ
diff --git a/test/extrude/1283/1283.py b/test/extrude/1283/1283.py
index 1b3e8503384ed86108caa2a5fa758882bc864154..96a6d608aa40acf3fdf8a1ad9e77150d2c1d7466 100644
--- a/test/extrude/1283/1283.py
+++ b/test/extrude/1283/1283.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(361,361,71))
-r=w0.workplane(offset=437).moveTo(1,82).cylinder(512,500).union(w0.workplane(offset=570).moveTo(47,512).cylinder(779,628)).union(w0.workplane(offset=657).moveTo(622,332).box(1000,698,954)).translate((221,58,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(75,44,40))
+r=w0.sketch().segment((133,586),(848,586)).segment((763,72)).segment((136,68)).segment((136,51)).segment((777,56)).segment((867,603)).segment((133,603)).close().assemble().push([(409,275)]).rect(158,191,mode='s').finalize().extrude(299)
diff --git a/test/extrude/1283/1283.stl b/test/extrude/1283/1283.stl
index 0bc8662c59a654ce2bad832f945cfe8185c864bd..396db86a11429ac61641736439a6ec927d9a5319 100644
Binary files a/test/extrude/1283/1283.stl and b/test/extrude/1283/1283.stl differ
diff --git a/test/extrude/1284/1284.py b/test/extrude/1284/1284.py
index bd96f9db89e5fd0c1ac4562690a63cafa16317a4..1aec460f975dd89941391bc998fbe105f46633ce 100644
--- a/test/extrude/1284/1284.py
+++ b/test/extrude/1284/1284.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,717,506))
-r=w0.workplane(offset=258).moveTo(576,384).cylinder(1000,738).union(w0.sketch().segment((1,173),(374,173)).segment((374,405)).segment((617,405)).arc((566,344),(485,374)).segment((415,374)).segment((415,233)).segment((738,233)).segment((738,405)).segment((818,405)).segment((818,495)).arc((970,798),(637,667)).segment((526,667)).segment((526,677)).segment((284,677)).segment((1,677)).close().assemble().finalize().extrude(576))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(14,39,46))
+r=w0.sketch().segment((885,786),(964,588)).arc((670,462),(382,322)).segment((292,546)).close().assemble().push([(774,672)]).circle(28,mode='s').push([(729,430)]).circle(53,mode='s').finalize().extrude(384)
diff --git a/test/extrude/1284/1284.stl b/test/extrude/1284/1284.stl
index 1ff5c5c23f145c693d8ffc1d74fe14a3bc544eee..8dc2fdd2837c94b5cfe1a3c38fe12c9723645ce7 100644
Binary files a/test/extrude/1284/1284.stl and b/test/extrude/1284/1284.stl differ
diff --git a/test/extrude/1285/1285.py b/test/extrude/1285/1285.py
index 14b80317a051e7c3ca28e82198f458abf3f185a5..afef138c29b74dd9b87f5f7660962c328cd6e2f9 100644
--- a/test/extrude/1285/1285.py
+++ b/test/extrude/1285/1285.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,491))
-w1=cq.Workplane('XY',origin=(500,500,620))
-r=w0.sketch().segment((351,481),(560,401)).segment((570,421)).arc((820,590),(760,890)).segment((770,920)).segment((560,1000)).segment((550,980)).arc((301,800),(361,510)).close().assemble().reset().face(w0.sketch().segment((381,620),(740,620)).segment((740,680)).segment((790,680)).segment((790,730)).segment((740,730)).segment((740,780)).segment((381,780)).close().assemble(),mode='s').finalize().extrude(820).union(w1.sketch().segment((161,81),(211,81)).segment((211,1)).segment((580,1)).segment((580,81)).segment((630,81)).segment((630,341)).segment((580,341)).segment((580,421)).segment((211,421)).segment((211,341)).segment((161,341)).close().assemble().push([(206,211)]).rect(510,740,mode='s').finalize().extrude(71))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(67,36,31))
+r=w0.sketch().segment((16,300),(666,300)).segment((379,587)).arc((230,632),(109,532)).segment((15,300)).close().assemble().push([(167,361)]).rect(39,62,mode='s').push([(551,406)]).rect(91,79,mode='s').push([(442,598)]).circle(53,mode='s').push([(472,365)]).rect(91,89,mode='s').finalize().extrude(178)
diff --git a/test/extrude/1285/1285.stl b/test/extrude/1285/1285.stl
index c1c18261bedce77d0f91b494917f351e225ba286..b6215af2c1522c90d5cf9a205beef63fd9cb7c55 100644
Binary files a/test/extrude/1285/1285.stl and b/test/extrude/1285/1285.stl differ
diff --git a/test/extrude/1286/1286.py b/test/extrude/1286/1286.py
index a081932f5a69709033639b4549410c49c794d2f4..16a83ee10d10efa9fe2207d137882f32ac3943ff 100644
--- a/test/extrude/1286/1286.py
+++ b/test/extrude/1286/1286.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(624,315,315))
-r=w0.workplane(offset=1).moveTo(11,291).box(672,1000,942).union(w0.workplane(offset=1).moveTo(768,628).box(373,421,942)).translate((1,11,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(35,33,68))
+r=w0.sketch().segment((358,650),(526,650)).segment((799,650)).segment((798,716)).segment((526,716)).segment((358,716)).segment((86,716)).segment((86,650)).close().assemble().reset().segment((330,642),(526,642)).segment((526,756)).segment((330,756)).close().assemble(mode='s').finalize().extrude(239).translate((1,207,1))
diff --git a/test/extrude/1286/1286.stl b/test/extrude/1286/1286.stl
index 11092f487c29896180a48875e1a5931fb04e76fe..b376b87e57fc1209c855446b11145d7684dc061f 100644
Binary files a/test/extrude/1286/1286.stl and b/test/extrude/1286/1286.stl differ
diff --git a/test/extrude/1287/1287.py b/test/extrude/1287/1287.py
index d9af1209242a913588be300b3e73f739b2535560..84cbb3fffc11964e879e53332c1019a9774e1294 100644
--- a/test/extrude/1287/1287.py
+++ b/test/extrude/1287/1287.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,500,500))
-r=w0.workplane(offset=326).moveTo(530,860).box(700,520,850).union(w0.sketch().segment((670,930),(690,790)).arc((640,690),(710,600)).segment((730,451)).segment((800,461)).segment((780,610)).arc((840,710),(760,800)).segment((750,940)).close().assemble().finalize().extrude(261)).union(w0.sketch().segment((161,700),(231,700)).arc((391,630),(241,720)).segment((241,1000)).segment((161,1000)).close().assemble().reset().face(w0.sketch().segment((321,1),(640,1)).segment((640,61)).segment((481,61)).arc((421,191),(361,61)).segment((321,61)).close().assemble()).finalize().extrude(860))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(56,66,19))
+r=w0.sketch().segment((1,838),(700,838)).segment((699,120)).segment((1,120)).close().assemble().finalize().extrude(305).union(w0.sketch().segment((766,460),(490,460)).segment((490,24)).segment((582,24)).segment((582,196)).arc((766,299),(950,196)).segment((950,24)).segment((1000,24)).segment((1000,460)).close().assemble().finalize().extrude(132))
diff --git a/test/extrude/1287/1287.stl b/test/extrude/1287/1287.stl
index 630504f080de4bf621f310c6975b1e754c12822c..0c6f0b338ee1196227b17d3c5c4d6ca1e77964d9 100644
Binary files a/test/extrude/1287/1287.stl and b/test/extrude/1287/1287.stl differ
diff --git a/test/extrude/1288/1288.py b/test/extrude/1288/1288.py
index 26be74d5358e5ea0b607f62cacd5ab7dde6dd4c1..157736ba3c953232a0bc8c7d0adeec1b00a49f1e 100644
--- a/test/extrude/1288/1288.py
+++ b/test/extrude/1288/1288.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(396,484,484))
-w1=cq.Workplane('YZ',origin=(583,484,484))
-r=w0.sketch().segment((396,330),(495,1)).segment((704,67)).segment((594,396)).close().assemble().push([(956,890)]).circle(561).finalize().extrude(155).union(w0.workplane(offset=742).moveTo(188,682).cylinder(1000,737)).union(w1.workplane(offset=462).moveTo(544,199).box(583,748,528)).translate((1,66,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(61,67,52))
+r=w0.sketch().segment((299,622),(367,622)).segment((367,460)).segment((379,460)).segment((379,137)).arc((357,74),(299,40)).segment((299,137)).segment((299,460)).close().assemble().push([(361,321)]).rect(172,157,mode='s').finalize().extrude(342)
diff --git a/test/extrude/1288/1288.stl b/test/extrude/1288/1288.stl
index f49f88c98b91e0a04277c5c8592ac6ccb534b3db..9391c276ae1664aa0b7c0feec8cce96a29bc2114 100644
Binary files a/test/extrude/1288/1288.stl and b/test/extrude/1288/1288.stl differ
diff --git a/test/extrude/1289/1289.py b/test/extrude/1289/1289.py
index 1a81859838422115a2a173ec966d9006cc9632db..33dde31ed801be6c4a4da7889249a2ca8b23bc09 100644
--- a/test/extrude/1289/1289.py
+++ b/test/extrude/1289/1289.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((84,429),(144,393)).segment((441,393)).segment((441,239)).segment((929,239)).segment((929,524)).segment((691,524)).segment((691,560)).segment((96,560)).segment((96,429)).close().assemble().push([(679,382)]).circle(393,mode='s').finalize().extrude(1000).union(w0.sketch().push([(84,334)]).circle(679).push([(90,334)]).rect(631,762,mode='s').finalize().extrude(1000)).translate((262,12,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(75,68,60))
+r=w0.sketch().segment((20,424),(786,424)).segment((786,182)).segment((803,182)).segment((803,442)).segment((20,442)).close().assemble().finalize().extrude(201).union(w0.workplane(offset=85).sketch().segment((79,1000),(663,1000)).segment((663,450)).segment((382,450)).segment((360,450)).segment((78,450)).close().assemble().finalize().extrude(190))
diff --git a/test/extrude/1289/1289.stl b/test/extrude/1289/1289.stl
index 4beb49c2b905bdfc4a5267f787b78ea5fc6e1775..822bd41f0f73f22586e8424e3e2db624bd1c2a94 100644
Binary files a/test/extrude/1289/1289.stl and b/test/extrude/1289/1289.stl differ
diff --git a/test/extrude/129/129.py b/test/extrude/129/129.py
index 1ad4f0893f755d0faeeb13b1e05669534f4d2c12..4279109108987ded71fb52705015559d67057d15 100644
--- a/test/extrude/129/129.py
+++ b/test/extrude/129/129.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(554,469,469))
-r=w0.sketch().segment((182,798),(617,628)).segment((437,628)).segment((437,394)).segment((745,394)).segment((745,543)).segment((734,543)).segment((734,564)).segment((745,564)).segment((745,628)).segment((681,628)).segment((756,798)).segment((267,1000)).close().assemble().finalize().extrude(299).union(w0.workplane(offset=431).moveTo(532,1).cylinder(543,532)).translate((1,1,63))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,456,500))
+w1=cq.Workplane('YZ',origin=(392,500,501))
+r=w0.sketch().push([(928,653)]).rect(646,1000).reset().face(w0.sketch().segment((895,886),(899,870)).segment((910,875)).arc((925,875),(940,885)).segment((946,891)).segment((939,905)).segment((930,906)).arc((915,906),(906,891)).close().assemble(),mode='s').finalize().extrude(151).union(w0.sketch().push([(255,366)]).rect(1000,961).push([(317,181)]).rect(546,551,mode='s').finalize().extrude(910)).union(w1.sketch().arc((450,509),(305,261),(471,20)).segment((470,186)).segment((680,186)).segment((680,22)).arc((769,86),(829,185)).segment((894,185)).segment((894,536)).segment((621,536)).arc((571,541),(520,536)).segment((452,536)).close().assemble().finalize().extrude(190))
\ No newline at end of file
diff --git a/test/extrude/129/129.stl b/test/extrude/129/129.stl
index c254a0e2d90cbadcd925bbab0ccf199369afc763..a50acd41ffbfc711291ea8dc5eb537bc0c12d999 100644
Binary files a/test/extrude/129/129.stl and b/test/extrude/129/129.stl differ
diff --git a/test/extrude/1290/1290.py b/test/extrude/1290/1290.py
index cebd17a3d3c53680a14f2b5289966ae4cea70f6c..724b19297ddbceec7a034f8b734b91bb9d2c1a0b 100644
--- a/test/extrude/1290/1290.py
+++ b/test/extrude/1290/1290.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(343,385,343))
-w1=cq.Workplane('YZ',origin=(274,343,343))
-r=w0.workplane(offset=108).moveTo(325,219).box(855,693,812).union(w0.sketch().arc((274,325),(701,343),(334,556)).arc((172,479),(274,325)).assemble().finalize().extrude(274)).union(w1.sketch().push([(441,214)]).rect(1000,804).push([(582,1)]).rect(377,360,mode='s').finalize().extrude(710))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(71,31,23))
+r=w0.sketch().segment((1000,686),(318,686)).segment((318,266)).segment((1000,266)).close().assemble().push([(716,517)]).circle(76,mode='s').finalize().extrude(205)
diff --git a/test/extrude/1290/1290.stl b/test/extrude/1290/1290.stl
index 14439530539735fc277689a9291814f4dcb4e7cc..ebdec39cc7ece5dcc4e4550951899e8c4b57f598 100644
Binary files a/test/extrude/1290/1290.stl and b/test/extrude/1290/1290.stl differ
diff --git a/test/extrude/1291/1291.py b/test/extrude/1291/1291.py
index 53e2c7302d59345ab9d4555aa118210e5b6030ff..5aeaa34e6afaf2aa36cfe9dc95c02251ede959ff 100644
--- a/test/extrude/1291/1291.py
+++ b/test/extrude/1291/1291.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,354).translate((21,1,21))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(35,66,56))
+r=w0.sketch().segment((464,888),(464,302)).segment((650,302)).segment((650,888)).close().assemble().finalize().extrude(142).union(w0.sketch().segment((620,888),(586,888)).segment((586,437)).segment((620,437)).close().assemble().finalize().extrude(187)).union(w0.sketch().segment((561,788),(551,788)).segment((551,568)).segment((561,568)).close().assemble().finalize().extrude(74))
diff --git a/test/extrude/1291/1291.stl b/test/extrude/1291/1291.stl
index 9f31335fd24ec25900f798463feae29e57c5570d..a260953472dd1348a39371186a1af8dfa9b95431 100644
Binary files a/test/extrude/1291/1291.stl and b/test/extrude/1291/1291.stl differ
diff --git a/test/extrude/1292/1292.py b/test/extrude/1292/1292.py
index 963b418ffc11bcdec7ebb035433ba74ffa75c859..92bb7bb3676e7999d2d0837a9a25fac1d54d85ec 100644
--- a/test/extrude/1292/1292.py
+++ b/test/extrude/1292/1292.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(425,142,425))
-r=w0.sketch().segment((88,544),(635,407)).segment((726,745)).segment((170,881)).close().assemble().push([(571,1)]).rect(808,489).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(18,75,19))
+r=w0.sketch().segment((273,898),(605,898)).segment((605,136)).segment((273,136)).close().assemble().push([(308,864)]).circle(71,mode='s').push([(403,238)]).circle(69,mode='s').push([(405,822)]).circle(60,mode='s').push([(330,441)]).rect(84,48,mode='s').finalize().extrude(66)
diff --git a/test/extrude/1292/1292.stl b/test/extrude/1292/1292.stl
index ae90838cd7f71fb6cac475dc22a1c5332c18fac1..d8d05526cb58479d87170f3f54b3c4e74d06e4a5 100644
Binary files a/test/extrude/1292/1292.stl and b/test/extrude/1292/1292.stl differ
diff --git a/test/extrude/1293/1293.py b/test/extrude/1293/1293.py
index 93b52f6ca3f1eac86156fba541d67cb1eda44089..8d820b6a3bfd406d81e29e83593d7af45ca86e70 100644
--- a/test/extrude/1293/1293.py
+++ b/test/extrude/1293/1293.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(357,483,483))
-r=w0.sketch().arc((116,196),(139,93),(208,12)).arc((598,1),(506,380)).arc((368,185),(116,196)).assemble().finalize().extrude(403).union(w0.sketch().segment((495,518),(851,518)).segment((851,759)).segment((747,759)).arc((334,1000),(495,552)).close().assemble().reset().face(w0.sketch().segment((782,518),(793,518)).segment((793,529)).close().assemble(),mode='s').finalize().extrude(828))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(20,47,34))
+r=w0.sketch().segment((498,1),(498,880)).segment((248,880)).segment((248,817)).segment((298,817)).segment((298,492)).segment((348,492)).segment((348,1)).close().assemble().reset().segment((428,570),(368,585)).segment((357,576)).segment((346,576)).segment((346,490)).arc((338,461),(316,440)).segment((219,384)).segment((196,384)).segment((196,600)).segment((444,600)).segment((444,570)).close().assemble(mode='s').finalize().extrude(389)
diff --git a/test/extrude/1293/1293.stl b/test/extrude/1293/1293.stl
index 61028c8bdaee4cdd9c4097b2a928091183565dd3..004037f2095fda012050d713c1449cacbee2f81f 100644
Binary files a/test/extrude/1293/1293.stl and b/test/extrude/1293/1293.stl differ
diff --git a/test/extrude/1294/1294.py b/test/extrude/1294/1294.py
index d10efa31f7ee7a30f13476448ac0d0ddc7bf118d..9e9513c5ca0e5ca169453953e6bd984448468166 100644
--- a/test/extrude/1294/1294.py
+++ b/test/extrude/1294/1294.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(447,447,170))
-r=w0.sketch().segment((108,483),(536,1)).segment((661,117)).segment((242,599)).close().assemble().finalize().extrude(500).union(w0.workplane(offset=723).moveTo(759,866).cylinder(1000,474))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(48,15,79))
+r=w0.sketch().segment((171,62),(655,62)).segment((655,752)).segment((171,752)).close().assemble().push([(364,449)]).rect(176,201,mode='s').finalize().extrude(150)
diff --git a/test/extrude/1294/1294.stl b/test/extrude/1294/1294.stl
index 05672a00ff8598908162777ca4278ec745feb8c5..4c112b2e1676741499e7c3777bbc94e82d95de20 100644
Binary files a/test/extrude/1294/1294.stl and b/test/extrude/1294/1294.stl differ
diff --git a/test/extrude/1295/1295.py b/test/extrude/1295/1295.py
index 70036040b8e894a676094cf5421b90c3295d200b..080760967d9a405a200bed97501cb255fbb90c2b 100644
--- a/test/extrude/1295/1295.py
+++ b/test/extrude/1295/1295.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(231,500,500))
-w1=cq.Workplane('ZX',origin=(500,371,500))
-r=w0.sketch().push([(201,481)]).circle(530).push([(216,476)]).rect(510,510,mode='s').finalize().extrude(301).union(w1.sketch().segment((331,740),(391,740)).segment((391,640)).segment((530,640)).segment((530,530)).arc((510,1),(570,520)).segment((580,520)).segment((580,640)).segment((720,640)).segment((720,740)).segment((780,740)).segment((780,780)).segment((720,780)).segment((720,880)).segment((580,880)).segment((580,1000)).segment((530,1000)).segment((530,880)).segment((391,880)).segment((391,780)).segment((331,780)).close().assemble().finalize().extrude(970))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(25,55,72))
+r=w0.sketch().segment((452,579),(678,579)).segment((678,35)).segment((452,35)).close().assemble().finalize().extrude(144).union(w0.sketch().segment((527,186),(491,186)).segment((491,584)).segment((527,584)).close().assemble().finalize().extrude(102)).union(w0.workplane(offset=131).sketch().segment((317,607),(175,607)).segment((175,251)).segment((317,251)).close().assemble().finalize().extrude(99))
diff --git a/test/extrude/1295/1295.stl b/test/extrude/1295/1295.stl
index 6e0fc8843ce52f62dfac63e1fd5d665869ae8b4a..45fcec280a339c69a02fea21ef613058b644495c 100644
Binary files a/test/extrude/1295/1295.stl and b/test/extrude/1295/1295.stl differ
diff --git a/test/extrude/1296/1296.py b/test/extrude/1296/1296.py
index 2296a6766f6ff82cbe0ef56252c4de5c254b5069..7a47c69c698234033757c7e76c0e4ea91350f733 100644
--- a/test/extrude/1296/1296.py
+++ b/test/extrude/1296/1296.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(112,112,112))
-r=w0.sketch().arc((190,667),(223,523),(201,390)).segment((500,390)).segment((500,667)).close().assemble().finalize().extrude(90).union(w0.workplane(offset=123).moveTo(73,1).box(811,1000,134)).translate((388,1,222))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(11,7,56))
+r=w0.sketch().segment((398,555),(922,555)).segment((660,101)).close().assemble().push([(648,399)]).rect(84,170,mode='s').finalize().extrude(127).translate((1,121,1))
diff --git a/test/extrude/1296/1296.stl b/test/extrude/1296/1296.stl
index 9c11c98176039c99703689f648f4c7819d6b5cb1..90a2c3f16597cacff0e0c099d4e579ec0665b21e 100644
Binary files a/test/extrude/1296/1296.stl and b/test/extrude/1296/1296.stl differ
diff --git a/test/extrude/1297/1297.py b/test/extrude/1297/1297.py
index 2c4580f92c6e7de79ca80af04143e4c5d9421383..33cad7a83e5d725ea11e3b5b51fb0db6931b3487 100644
--- a/test/extrude/1297/1297.py
+++ b/test/extrude/1297/1297.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(388,463,463))
-w1=cq.Workplane('XY',origin=(463,463,484))
-r=w0.sketch().segment((108,527),(162,495)).segment((270,495)).segment((270,431)).segment((409,355)).segment((484,484)).segment((184,667)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=264).moveTo(748,318).box(710,731,860)).union(w0.sketch().segment((55,484),(108,484)).segment((108,270)).segment((484,270)).segment((484,484)).segment((538,484)).segment((538,527)).segment((484,527)).segment((484,742)).segment((108,742)).segment((108,527)).segment((55,527)).close().assemble().finalize().extrude(227)).union(w1.sketch().segment((807,216),(850,216)).arc((903,194),(957,216)).segment((1000,216)).segment((1000,323)).segment((957,323)).arc((903,345),(850,323)).segment((807,323)).close().assemble().finalize().extrude(495))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(2,55,70))
+r=w0.sketch().segment((438,128),(400,128)).segment((453,175)).segment((453,199)).segment((462,199)).segment((539,866)).arc((573,881),(610,888)).segment((610,884)).arc((580,879),(553,864)).segment((476,199)).segment((476,175)).segment((438,127)).close().assemble().push([(571,501)]).rect(195,141,mode='s').finalize().extrude(71).translate((1,17,1))
diff --git a/test/extrude/1297/1297.stl b/test/extrude/1297/1297.stl
index 9ddf73e7ba9371c7b8d53c88373a0087e7698a6b..a2f4aaeb1b807e404661cd3b3be4e3b10797afa7 100644
Binary files a/test/extrude/1297/1297.stl and b/test/extrude/1297/1297.stl differ
diff --git a/test/extrude/1298/1298.py b/test/extrude/1298/1298.py
index c35587befe5815f9111ea4b8b286d9a2a866267e..5dc57f434cbbea41ffc445deee910516ea6bf001 100644
--- a/test/extrude/1298/1298.py
+++ b/test/extrude/1298/1298.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,394).translate((61,1,61))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,880))
+r=w0.workplane(offset=119).moveTo(766,130).cylinder(1000,630).union(w0.sketch().arc((106,615),(491,614),(506,1000)).arc((376,736),(105,615)).assemble().finalize().extrude(356))
\ No newline at end of file
diff --git a/test/extrude/1298/1298.stl b/test/extrude/1298/1298.stl
index 84dad0ca69bf61f6c01ad1891a62ebe2c278d12d..0778d148db9b171e72b843813251ea86fe64e3c1 100644
Binary files a/test/extrude/1298/1298.stl and b/test/extrude/1298/1298.stl differ
diff --git a/test/extrude/1299/1299.py b/test/extrude/1299/1299.py
index 146651bd6969ab8af7e69539ff4a451afc61c8b5..56d74b37f1300141f32444103a6ab9e1c788bd0b 100644
--- a/test/extrude/1299/1299.py
+++ b/test/extrude/1299/1299.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(616,923,616))
-r=w0.sketch().segment((232,485),(439,485)).segment((439,477)).segment((793,477)).segment((793,485)).segment((1000,485)).segment((1000,746)).segment((793,746)).segment((793,754)).segment((439,754)).segment((439,746)).segment((232,746)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(44,23,13))
+r=w0.sketch().segment((220,684),(890,684)).segment((890,1)).segment((220,1)).close().assemble().finalize().extrude(274).union(w0.sketch().segment((627,378),(771,544)).segment((627,710)).close().assemble().finalize().extrude(180)).union(w0.workplane(offset=34).sketch().segment((149,724),(467,724)).segment((467,378)).segment((149,378)).close().assemble().finalize().extrude(155))
diff --git a/test/extrude/1299/1299.stl b/test/extrude/1299/1299.stl
index 87d31175e688d23905459fee90498f524ac00ac2..a3a80759348007ee4cc1bf560d37fb5dccdc059e 100644
Binary files a/test/extrude/1299/1299.stl and b/test/extrude/1299/1299.stl differ
diff --git a/test/extrude/13/13.py b/test/extrude/13/13.py
index 882c42d51dfb46a3758c28d7029d8197798aa2b2..20e7fc6471e005796fcf9e27b637e995fc490d64 100644
--- a/test/extrude/13/13.py
+++ b/test/extrude/13/13.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(133,331,331))
-w1=cq.Workplane('ZX',origin=(331,246,331))
-r=w0.workplane(offset=359).moveTo(694,218).box(378,708,387).union(w0.workplane(offset=665).moveTo(218,359).cylinder(1000,604)).union(w1.workplane(offset=397).moveTo(359,1).cylinder(463,472)).translate((141,56,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(75,24,16))
+r=w0.sketch().segment((768,372),(80,372)).segment((80,716)).segment((768,716)).close().assemble().push([(439,605)]).rect(168,241,mode='s').finalize().extrude(344).translate((1,321,1))
diff --git a/test/extrude/13/13.stl b/test/extrude/13/13.stl
index d5696d5723266615b95d6a4f427e7ee64e162c56..3a1cd48082c32edfb6cafdc7fd376ca4ffbf4975 100644
Binary files a/test/extrude/13/13.stl and b/test/extrude/13/13.stl differ
diff --git a/test/extrude/130/130.py b/test/extrude/130/130.py
index dc7d5ee7a3fa40fb2736a22351bc8434b1941a18..0aa92c7b86ff1494f5429839ae3e2c5987aa3d76 100644
--- a/test/extrude/130/130.py
+++ b/test/extrude/130/130.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(410,681,410))
-w1=cq.Workplane('YZ',origin=(1,410,410))
-r=w0.workplane(offset=116).moveTo(152,734).box(632,582,1000).union(w0.workplane(offset=284).moveTo(566,157).box(787,656,664)).union(w0.workplane(offset=431).moveTo(566,152).box(836,615,451)).union(w1.sketch().arc((492,705),(599,402),(607,722)).arc((558,672),(492,705)).assemble().finalize().extrude(877))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(382,500,500))
+w1=cq.Workplane('YZ',origin=(536,500,501))
+r=w0.workplane(offset=810).moveTo(540,180).box(570,561,1000).union(w1.sketch().arc((716,785),(120,430),(804,320)).segment((805,586)).segment((841,585)).arc((809,670),(754,745)).segment((891,746)).segment((891,786)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/130/130.stl b/test/extrude/130/130.stl
index fd5e3ff37f385784c78d1d957cced7fc446b3f50..18cb55763d03aadc51fac0fea5d442db47eb6b82 100644
Binary files a/test/extrude/130/130.stl and b/test/extrude/130/130.stl differ
diff --git a/test/extrude/1300/1300.py b/test/extrude/1300/1300.py
index b50740d0ef0bc864c39c45f8299eb9aaad088879..4917cc5880f5a028ba297a736d61b9e7dbbac595 100644
--- a/test/extrude/1300/1300.py
+++ b/test/extrude/1300/1300.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(431,431,361))
-r=w0.sketch().rect(730,710).reset().face(w0.sketch().segment((371,331),(381,321)).segment((491,530)).segment((481,540)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=715).cylinder(1000,461)).translate((31,31,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,20,7))
+r=w0.sketch().segment((546,395),(546,883)).segment((546,973)).arc((617,1000),(688,973)).segment((688,883)).segment((688,395)).segment((688,305)).arc((617,235),(546,305)).close().assemble().finalize().extrude(130).union(w0.workplane(offset=110).sketch().segment((611,899),(631,899)).segment((631,485)).segment((611,485)).close().assemble().finalize().extrude(209))
diff --git a/test/extrude/1300/1300.stl b/test/extrude/1300/1300.stl
index a3a32d4f493a007e9262dcb59c22cf21c6b1199b..d2c5893f4986043c3dfdb589b573f643e56a6704 100644
Binary files a/test/extrude/1300/1300.stl and b/test/extrude/1300/1300.stl differ
diff --git a/test/extrude/1301/1301.py b/test/extrude/1301/1301.py
index 505d528025ebd3349901ffda041bea70bb3a7e82..7b0e0ee035ec2a9b07c27dee4504f2d963b54e41 100644
--- a/test/extrude/1301/1301.py
+++ b/test/extrude/1301/1301.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(861,570,570))
-r=w0.sketch().push([(39,203)]).circle(671).push([(444,937)]).circle(671).reset().face(w0.sketch().segment((355,962),(494,861)).segment((519,911)).segment((393,1000)).close().assemble(),mode='s').push([(924,431)]).circle(848).finalize().extrude(1).translate((1,63,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,745))
+r=w0.sketch().segment((62,322),(155,320)).segment((157,525)).arc((216,625),(155,721)).segment((155,930)).segment((60,931)).segment((62,721)).arc((2,625),(61,525)).close().assemble().push([(107,625)]).circle(580,mode='s').reset().face(w0.sketch().segment((476,85),(482,71)).segment((1000,330)).segment((995,341)).close().assemble()).finalize().extrude(5)
\ No newline at end of file
diff --git a/test/extrude/1301/1301.stl b/test/extrude/1301/1301.stl
index 23a5115cf524d70c12a342953d79513818aed1d0..6af78bc5d2467ed22d907861a3a98699373ae834 100644
Binary files a/test/extrude/1301/1301.stl and b/test/extrude/1301/1301.stl differ
diff --git a/test/extrude/1302/1302.py b/test/extrude/1302/1302.py
index d03bad0b24f89c822ac7be37cbf3af291d4848a2..a75964d14a42f069f20cf9425038043fc255e0cf 100644
--- a/test/extrude/1302/1302.py
+++ b/test/extrude/1302/1302.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(511,684,511))
-r=w0.sketch().arc((307,225),(541,1),(674,297)).arc((704,419),(664,531)).arc((786,623),(766,766)).arc((480,1000),(439,643)).arc((235,480),(307,225)).assemble().push([(562,811)]).rect(674,582,mode='s').finalize().extrude(154)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(38,16,54))
+r=w0.sketch().segment((83,215),(731,215)).segment((731,1000)).segment((83,1000)).close().assemble().push([(421,598)]).rect(193,147,mode='s').finalize().extrude(334).translate((1,319,1))
diff --git a/test/extrude/1302/1302.stl b/test/extrude/1302/1302.stl
index 626169de81eba723dae078ba6a9052d5b76bdc54..144916d0dcbe166fef7ec54b8c6c2c85d8130281 100644
Binary files a/test/extrude/1302/1302.stl and b/test/extrude/1302/1302.stl differ
diff --git a/test/extrude/1303/1303.py b/test/extrude/1303/1303.py
index 122ff7d891e61746b3afa93d93e009af7ecef3f9..c95775d648f5ccc592e88436cb8260a940f458ee 100644
--- a/test/extrude/1303/1303.py
+++ b/test/extrude/1303/1303.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(485,485,712))
-r=w0.sketch().segment((176,640),(320,516)).segment((392,588)).arc((300,629),(248,712)).close().assemble().reset().face(w0.sketch().arc((423,918),(516,887),(567,804)).segment((640,876)).segment((495,1000)).close().assemble()).finalize().extrude(42).union(w0.sketch().arc((310,444),(640,1),(464,526)).segment((464,681)).segment((310,681)).close().assemble().finalize().extrude(413))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,521))
+r=w0.sketch().push([(363,244)]).rect(856,985).rect(785,504,mode='s').reset().face(w0.sketch().segment((779,994),(780,1000)).arc((796,951),(791,999)).segment((784,994)).close().assemble()).finalize().extrude(460)
\ No newline at end of file
diff --git a/test/extrude/1303/1303.stl b/test/extrude/1303/1303.stl
index 6b4c3bf12da0210b33fd6937c40d0c1a7adbfdea..0dd0f949fb972c498e9c318e751bee207f8acf90 100644
Binary files a/test/extrude/1303/1303.stl and b/test/extrude/1303/1303.stl differ
diff --git a/test/extrude/1304/1304.py b/test/extrude/1304/1304.py
index 38178f903a60f9dcf15abaf340f0863bb1f34251..abccaee3db992f704cfe54154d6d8407305d370e 100644
--- a/test/extrude/1304/1304.py
+++ b/test/extrude/1304/1304.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().segment((506,300),(793,116)).segment((908,288)).segment((621,483)).close().assemble().finalize().extrude(805).union(w0.sketch().push([(277,334)]).circle(851).circle(678,mode='s').finalize().extrude(1000)).translate((1,241,184))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(2,39,61))
+r=w0.sketch().segment((78,523),(261,523)).segment((392,393)).segment((576,393)).segment((707,523)).segment((890,523)).segment((630,263)).segment((338,263)).close().assemble().push([(468,483)]).rect(130,185,mode='s').finalize().extrude(397)
diff --git a/test/extrude/1304/1304.stl b/test/extrude/1304/1304.stl
index e6e66cdab22aadafb60c1f66b225c0d212d58d70..556ac8e24ee46aac28cd92daffb9c6781c19cf07 100644
Binary files a/test/extrude/1304/1304.stl and b/test/extrude/1304/1304.stl differ
diff --git a/test/extrude/1305/1305.py b/test/extrude/1305/1305.py
index f66e952248ec13e6258323c6459d75e9995894f0..721d854feb0e4145baaa965b8721a99deee9db7c 100644
--- a/test/extrude/1305/1305.py
+++ b/test/extrude/1305/1305.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,331,500))
-r=w0.sketch().segment((1,231),(311,231)).arc((500,171),(690,231)).segment((1000,231)).segment((1000,770)).segment((690,770)).arc((500,830),(311,770)).segment((1,770)).close().assemble().reset().face(w0.sketch().segment((221,670),(491,181)).segment((780,331)).segment((510,820)).close().assemble(),mode='s').finalize().extrude(850)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(46,71,23))
+r=w0.sketch().segment((858,642),(504,814)).segment((216,462)).segment((720,98)).close().assemble().finalize().extrude(272).union(w0.sketch().segment((502,537),(870,525)).segment((870,487)).segment((502,463)).segment((870,463)).segment((870,537)).close().assemble().finalize().extrude(138)).translate((1,202,1))
diff --git a/test/extrude/1305/1305.stl b/test/extrude/1305/1305.stl
index f99cfdfcc2b49ec8b05a7f60958a244a182c7c67..2f3e6f06fb5089662169a2ea079281fb557be1fe 100644
Binary files a/test/extrude/1305/1305.stl and b/test/extrude/1305/1305.stl differ
diff --git a/test/extrude/1306/1306.py b/test/extrude/1306/1306.py
index 1d886a4dcd7471cf14ece8d5b4c35a289889b01b..0c8db2f88a6ccb1c27212c19a91f3d55793ae118 100644
--- a/test/extrude/1306/1306.py
+++ b/test/extrude/1306/1306.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(330,292,330))
-w1=cq.Workplane('YZ',origin=(570,330,330))
-r=w0.sketch().segment((102,570),(304,507)).segment((342,646)).segment((178,697)).arc((507,317),(127,646)).close().assemble().finalize().extrude(317).union(w0.workplane(offset=665).moveTo(330,500).box(987,418,1000)).union(w1.workplane(offset=1).moveTo(77,330).cylinder(987,709)).translate((1,303,50))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(56,23,38))
+r=w0.sketch().segment((489,990),(489,310)).segment((546,310)).segment((546,365)).segment((546,950)).segment((603,950)).arc((566,980),(520,990)).close().assemble().push([(526,716)]).rect(153,105,mode='s').finalize().extrude(215).translate((1,193,1))
diff --git a/test/extrude/1306/1306.stl b/test/extrude/1306/1306.stl
index 97f00afd8871771fd15d155791875a983dba335c..27420b423b527015295d7d39f2455eee2e8781c1 100644
Binary files a/test/extrude/1306/1306.stl and b/test/extrude/1306/1306.stl differ
diff --git a/test/extrude/1307/1307.py b/test/extrude/1307/1307.py
index 2f2ff0218e7d98ef15731691f5795b26fb379d50..9569067e98508b88d54b8ae820385223c665f21f 100644
--- a/test/extrude/1307/1307.py
+++ b/test/extrude/1307/1307.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(390,432,432))
-w1=cq.Workplane('XY',origin=(432,432,127))
-r=w0.workplane(offset=190).moveTo(295,117).cylinder(916,516).union(w0.sketch().arc((1,411),(306,180),(422,558)).arc((85,821),(1,411)).assemble().finalize().extrude(1000)).union(w1.workplane(offset=448).moveTo(658,748).box(464,832,464))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(26,53,42))
+r=w0.sketch().segment((253,198),(253,1000)).segment((307,1000)).segment((307,985)).segment((469,799)).segment((469,198)).close().assemble().reset().segment((223,578),(216,578)).segment((216,957)).segment((223,958)).segment((437,958)).segment((444,958)).segment((444,578)).segment((437,578)).close().assemble(mode='s').finalize().extrude(365)
diff --git a/test/extrude/1307/1307.stl b/test/extrude/1307/1307.stl
index b2af924c67349e802acd75eaf28ba7699a05db18..74734337c88ce60f4dfd32ed1eef2941042394b5 100644
Binary files a/test/extrude/1307/1307.stl and b/test/extrude/1307/1307.stl differ
diff --git a/test/extrude/1308/1308.py b/test/extrude/1308/1308.py
index 2abc2c4e62380f57df7865b5fcf3245584fce65b..592d448000c6a0442dbd8ceb295f7ef8827fe97c 100644
--- a/test/extrude/1308/1308.py
+++ b/test/extrude/1308/1308.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(448,521,521))
-w1=cq.Workplane('YZ',origin=(480,521,521))
-r=w0.sketch().segment((188,1),(469,1)).segment((469,251)).segment((188,251)).segment((188,209)).arc((178,188),(188,178)).close().assemble().finalize().extrude(511).union(w0.workplane(offset=755).moveTo(292,755).box(1000,823,990)).union(w1.sketch().push([(802,854)]).circle(709).reset().face(w1.sketch().segment((709,813),(802,813)).segment((802,688)).segment((886,688)).segment((886,813)).segment((979,813)).segment((979,834)).segment((886,834)).segment((886,958)).segment((802,958)).segment((802,834)).segment((709,834)).close().assemble(),mode='s').finalize().extrude(168))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(33,63,72))
+r=w0.sketch().segment((219,1000),(1000,1000)).segment((1000,231)).segment((218,231)).close().assemble().push([(570,499)]).rect(59,55,mode='s').push([(297,324)]).rect(75,49,mode='s').finalize().extrude(272).translate((1,210,1))
diff --git a/test/extrude/1308/1308.stl b/test/extrude/1308/1308.stl
index df333e278051c14b9997fee02ee61967b6a3ea1b..2e7923b1853125d3c415f6a8b866d880c9e82d98 100644
Binary files a/test/extrude/1308/1308.stl and b/test/extrude/1308/1308.stl differ
diff --git a/test/extrude/1309/1309.py b/test/extrude/1309/1309.py
index 1f70d4317c90d21152635103568b8e3cee57d3f4..194a2ec8dbff848008fde4608124f6c3e862e492 100644
--- a/test/extrude/1309/1309.py
+++ b/test/extrude/1309/1309.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((241,434),(247,421)).arc((221,287),(327,214)).segment((334,194)).segment((427,234)).segment((421,247)).arc((447,381),(341,454)).segment((334,474)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(47,3,22))
+r=w0.sketch().segment((637,377),(637,358)).segment((601,358)).segment((648,901)).segment((683,902)).close().assemble().push([(683,539)]).rect(139,170,mode='s').finalize().extrude(92)
diff --git a/test/extrude/1309/1309.stl b/test/extrude/1309/1309.stl
index 27f8e98d9e9b7793cef17aa94c27044cb6b3af5a..ed29f0a7d3c7c77e496020c682bcaf4b9ffeddb2 100644
Binary files a/test/extrude/1309/1309.stl and b/test/extrude/1309/1309.stl differ
diff --git a/test/extrude/131/131.py b/test/extrude/131/131.py
index 588c8afd279d58f8efbefe129b5e1ab7d440bc10..dfcbb0029b4fcf0753d1cdbe77a9a2c72d2a5e0d 100644
--- a/test/extrude/131/131.py
+++ b/test/extrude/131/131.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(539,660,539))
-r=w0.sketch().push([(319,660)]).circle(868).push([(374,846)]).circle(649,mode='s').finalize().extrude(133).union(w0.sketch().segment((1,528),(407,89)).segment((780,429)).segment((374,868)).close().assemble().finalize().extrude(210)).union(w0.workplane(offset=616).moveTo(1000,319).cylinder(693,627)).translate((1,1,11))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(567,501,501))
+r=w0.workplane(offset=410).moveTo(759,257).box(979,1000,681).union(w0.workplane(offset=523).moveTo(326,675).cylinder(547,824))
\ No newline at end of file
diff --git a/test/extrude/131/131.stl b/test/extrude/131/131.stl
index 0e30f303794837f286627c938585b5fd859c35fa..e6d550ab81917f75872634c9fb36adf8e68558ee 100644
Binary files a/test/extrude/131/131.stl and b/test/extrude/131/131.stl differ
diff --git a/test/extrude/1310/1310.py b/test/extrude/1310/1310.py
index aa73f62fb2e174fece2c0d487fc7632dfa50a1de..357ae8998773f88bac83068083036a4b7e4840fa 100644
--- a/test/extrude/1310/1310.py
+++ b/test/extrude/1310/1310.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,211,211))
-r=w0.workplane(offset=27).moveTo(632,685).cylinder(579,251).union(w0.workplane(offset=277).moveTo(632,685).cylinder(343,251)).union(w0.sketch().push([(14,40)]).circle(671).reset().face(w0.sketch().segment((408,566),(422,540)).segment((869,816)).segment((855,842)).close().assemble()).finalize().extrude(1000)).translate((263,447,422))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(36,39,57))
+r=w0.sketch().segment((730,14),(584,14)).segment((584,614)).arc((622,781),(730,914)).close().assemble().reset().segment((507,287),(687,287)).arc((722,375),(687,463)).segment((507,463)).arc((472,375),(507,287)).close().assemble(mode='s').finalize().extrude(136)
diff --git a/test/extrude/1310/1310.stl b/test/extrude/1310/1310.stl
index e7a80c2eed1c51d3a8508edcb7de495963a1c248..dd9f2874a8e0054bafa8ef185afa8a7b3f077d3c 100644
Binary files a/test/extrude/1310/1310.stl and b/test/extrude/1310/1310.stl differ
diff --git a/test/extrude/1311/1311.py b/test/extrude/1311/1311.py
index 0a63983ff78fec7a3ce91cd84c04ea9344200c08..d0c2582432838c26701d21480eeb4cd2c1c8ceee 100644
--- a/test/extrude/1311/1311.py
+++ b/test/extrude/1311/1311.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(428,521,521))
-r=w0.sketch().segment((168,542),(261,542)).arc((865,625),(386,1000)).segment((168,1000)).close().assemble().reset().face(w0.sketch().segment((511,1),(605,1)).segment((605,272)).segment((553,272)).arc((563,136),(511,1)).assemble()).finalize().extrude(698)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(69,71,40))
+r=w0.sketch().segment((267,384),(523,384)).segment((523,896)).segment((267,896)).close().assemble().push([(431,610)]).circle(96,mode='s').finalize().extrude(73)
diff --git a/test/extrude/1311/1311.stl b/test/extrude/1311/1311.stl
index 59fff5a211ecc1325d50d0a8d55e864dda3529cb..501377b7b2973440c2e1f723c657a735603723a4 100644
Binary files a/test/extrude/1311/1311.stl and b/test/extrude/1311/1311.stl differ
diff --git a/test/extrude/1312/1312.py b/test/extrude/1312/1312.py
index 0fda83b70c8b641babd069b9e490b141efd30099..be2bb0d171a32a15d2428f9cf1b473b00e36b870 100644
--- a/test/extrude/1312/1312.py
+++ b/test/extrude/1312/1312.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.workplane(offset=577).cylinder(820,681).union(w0.sketch().arc((431,237),(383,306),(466,299)).arc((216,403),(431,237)).assemble().finalize().extrude(1000)).translate((348,1,348))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(55,13,15))
+r=w0.sketch().segment((810,469),(810,37)).arc((206,469),(810,901)).close().assemble().push([(745,458)]).rect(214,253,mode='s').finalize().extrude(309)
diff --git a/test/extrude/1312/1312.stl b/test/extrude/1312/1312.stl
index b4c7510753210ad340658f0a8f9e68599424d56d..0b1d5e333c90c7e29d0422f43081232370489974 100644
--- a/test/extrude/1312/1312.stl
+++ b/test/extrude/1312/1312.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0deed6d1b3c8f607f143e2ba0d17c0102a5a473540ef7480107c4d20a4ac46c5
-size 107884
+oid sha256:e962966435404051936d8b0a7b8816439aacba999fc00408cda5ff4c72c25490
+size 16084
diff --git a/test/extrude/1313/1313.py b/test/extrude/1313/1313.py
index 789e1487fc263fc026103ec52851340d7339d739..151e4fc42a8e3531c4e68dc151596fc49af6ac36 100644
--- a/test/extrude/1313/1313.py
+++ b/test/extrude/1313/1313.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(390,390,612))
-r=w0.workplane(offset=84).moveTo(421,390).cylinder(1000,667).union(w0.sketch().arc((144,445),(1,271),(215,223)).segment((461,25)).segment((786,429)).segment((390,754)).close().assemble().finalize().extrude(556))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(64,27,47))
+r=w0.sketch().segment((2,456),(717,745)).segment((805,526)).segment((772,289)).segment((169,45)).close().assemble().finalize().extrude(223).union(w0.sketch().segment((438,388),(900,388)).segment((900,226)).segment((438,226)).close().assemble().finalize().extrude(146))
diff --git a/test/extrude/1313/1313.stl b/test/extrude/1313/1313.stl
index 779d78604749689f27208d6b3e1f892eec826158..0ac9f4e9c166827cd9fbac21ff074679cd7d9343 100644
Binary files a/test/extrude/1313/1313.stl and b/test/extrude/1313/1313.stl differ
diff --git a/test/extrude/1314/1314.py b/test/extrude/1314/1314.py
index 9cbd8dd957585a7f2e55b37e1ce596c8a25833c2..bd77e83d67184c40b8d86277cde919092fc327c2 100644
--- a/test/extrude/1314/1314.py
+++ b/test/extrude/1314/1314.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(44,360,360))
-r=w0.sketch().segment((1,303),(173,303)).segment((173,80)).segment((720,80)).segment((720,590)).segment((382,590)).segment((382,641)).segment((1,641)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(79,62,14))
+r=w0.sketch().segment((1,670),(660,670)).segment((660,2)).segment((1,2)).close().assemble().finalize().extrude(350).union(w0.workplane(offset=149).sketch().segment((426,704),(953,704)).segment((953,586)).segment((426,586)).close().assemble().finalize().extrude(131))
diff --git a/test/extrude/1314/1314.stl b/test/extrude/1314/1314.stl
index 416fbef9ff88cf69ff57281e1406f8986d03b5ad..d6d902f91acd906aba9b784f770de42f281aef7c 100644
Binary files a/test/extrude/1314/1314.stl and b/test/extrude/1314/1314.stl differ
diff --git a/test/extrude/1315/1315.py b/test/extrude/1315/1315.py
index 4ae5472b5110014505b2321036a97a7791b2904e..63e619b6a0f15c9f20b8eff82e444bacaba0efb4 100644
--- a/test/extrude/1315/1315.py
+++ b/test/extrude/1315/1315.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(484,352,484))
-r=w0.sketch().arc((100,879),(748,1),(264,989)).segment((264,967)).segment((275,956)).segment((232,846)).segment((232,1000)).segment((100,1000)).close().assemble().reset().face(w0.sketch().segment((56,693),(155,660)).segment((155,682)).segment((100,682)).segment((100,846)).segment((56,726)).segment((67,726)).close().assemble(),mode='s').finalize().extrude(758)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(450,499,502))
+r=w0.sketch().push([(455,265)]).circle(764).push([(453,265)]).rect(955,770,mode='s').finalize().extrude(110).union(w0.sketch().segment((276,260),(756,261)).segment((754,661)).arc((805,790),(755,924)).segment((756,965)).segment((715,965)).arc((597,1000),(477,964)).segment((276,964)).close().assemble().finalize().extrude(996))
\ No newline at end of file
diff --git a/test/extrude/1315/1315.stl b/test/extrude/1315/1315.stl
index 90f7b80a937bf6835054cbce7a6d20b5fa7ebe56..afafc8c207690ea99fa2201d633e32c67cf91647 100644
Binary files a/test/extrude/1315/1315.stl and b/test/extrude/1315/1315.stl differ
diff --git a/test/extrude/1316/1316.py b/test/extrude/1316/1316.py
index 63147c46de169f16a9cfe5e04dad54e6b285069a..86a9e713482a5022f12995e1d25c6b183608f96c 100644
--- a/test/extrude/1316/1316.py
+++ b/test/extrude/1316/1316.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,315))
-r=w0.sketch().segment((1,327),(23,327)).segment((23,315)).arc((113,259),(225,248)).arc((237,259),(237,248)).arc((282,731),(1,327)).assemble().push([(1000,383)]).rect(607,562).finalize().extrude(865)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(50,43,36))
+r=w0.sketch().segment((315,132),(853,132)).segment((853,918)).segment((315,918)).close().assemble().push([(517,589)]).rect(196,258,mode='s').finalize().extrude(127)
diff --git a/test/extrude/1316/1316.stl b/test/extrude/1316/1316.stl
index 8e9401422f4c6a56976a440f1394374b3b8e9e84..af741a2ea63bc8634170f2b739a96ce8fe6e7130 100644
Binary files a/test/extrude/1316/1316.stl and b/test/extrude/1316/1316.stl differ
diff --git a/test/extrude/1317/1317.py b/test/extrude/1317/1317.py
index 2c7a65f47a3cee31d250f06f054162aad6b590d1..fdf367fc1d36ecf15141013cce0e48550a1742b3 100644
--- a/test/extrude/1317/1317.py
+++ b/test/extrude/1317/1317.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(411,321,411))
-r=w0.sketch().circle(740).reset().face(w0.sketch().arc((461,361),(461,401),(481,421)).arc((361,441),(461,361)).assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=705).moveTo(421,411).box(810,610,1000)).translate((330,1,330))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(66,37,45))
+r=w0.sketch().segment((1,494),(806,494)).segment((806,302)).segment((1,302)).close().assemble().push([(410,432)]).rect(246,263,mode='s').finalize().extrude(66)
diff --git a/test/extrude/1317/1317.stl b/test/extrude/1317/1317.stl
index a20a01a13a8e540f8e6a90694646c07398bec362..1bb1079c4d7b1ae8194419addbd454f45bb9c838 100644
Binary files a/test/extrude/1317/1317.stl and b/test/extrude/1317/1317.stl differ
diff --git a/test/extrude/1318/1318.py b/test/extrude/1318/1318.py
index d46c33d6cde5aa944393929cfed1160fbcc87d50..fc4bc5e2e224e7158630ad1be8e3b65c9b5786b0 100644
--- a/test/extrude/1318/1318.py
+++ b/test/extrude/1318/1318.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(556,556,667))
-w1=cq.Workplane('YZ',origin=(345,556,556))
-r=w0.sketch().segment((79,378),(356,456)).segment((345,467)).close().assemble().push([(423,512)]).circle(567).finalize().extrude(834).union(w0.workplane(offset=767).moveTo(423,512).cylinder(978,778)).union(w0.sketch().arc((722,312),(800,212),(889,301)).arc((845,711),(722,312)).assemble().finalize().extrude(1000)).union(w1.sketch().arc((489,301),(656,1),(856,290)).arc((689,623),(489,301)).assemble().finalize().extrude(500))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(150,500,500))
+r=w0.sketch().push([(237,456)]).circle(735).circle(706,mode='s').push([(755,535)]).circle(746).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/1318/1318.stl b/test/extrude/1318/1318.stl
index f6a30b81e8b17c8e4ae8eb6a8b93520c04eed8cc..20837dfe05d81432d5525658b7f8de2e7e6e2d7b 100644
Binary files a/test/extrude/1318/1318.stl and b/test/extrude/1318/1318.stl differ
diff --git a/test/extrude/1319/1319.py b/test/extrude/1319/1319.py
index 0219d117aa04f6f872d532d09e5a3109db6bfdca..7bc979f9c638814ea95a60454a806f03599b7d7b 100644
--- a/test/extrude/1319/1319.py
+++ b/test/extrude/1319/1319.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(481,741,481))
-r=w0.workplane(offset=222).moveTo(558,702).cylinder(1000,549).union(w0.sketch().arc((385,462),(424,1),(587,433)).segment((741,433)).segment((741,549)).segment((741,885)).segment((741,962)).segment((385,962)).close().assemble().finalize().extrude(145))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(74,19,59))
+r=w0.sketch().segment((180,410),(908,410)).segment((908,896)).segment((180,896)).close().assemble().push([(593,659)]).rect(194,235,mode='s').finalize().extrude(132).translate((1,114,1))
diff --git a/test/extrude/1319/1319.stl b/test/extrude/1319/1319.stl
index 16456a9d93ca6e93691becd9d527896df0edde90..da738ed51faf6a51ded60b342693133fdb750ad4 100644
Binary files a/test/extrude/1319/1319.stl and b/test/extrude/1319/1319.stl differ
diff --git a/test/extrude/132/132.py b/test/extrude/132/132.py
index 6b23c0616a940fe27ffc3337f33e20d5fe2e1e57..485ffd065ad2bb7863c356f29c37e57fa1f04d70 100644
--- a/test/extrude/132/132.py
+++ b/test/extrude/132/132.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,431,500))
-r=w0.sketch().segment((51,1),(530,1)).segment((530,101)).arc((510,161),(530,211)).segment((530,431)).segment((51,431)).close().assemble().reset().face(w0.sketch().segment((71,161),(261,161)).arc((251,221),(261,271)).segment((71,271)).close().assemble(),mode='s').reset().face(w0.sketch().segment((481,850),(860,620)).segment((950,770)).segment((570,1000)).close().assemble()).finalize().extrude(650)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(480,500,500))
+r=w0.workplane(offset=260).moveTo(501,266).cylinder(980,756).union(w0.sketch().segment((417,964),(560,576)).segment((615,596)).segment((471,991)).close().assemble().push([(502,264)]).rect(650,836).finalize().extrude(205)).union(w0.workplane(offset=760).moveTo(499,513).box(540,524,1000))
\ No newline at end of file
diff --git a/test/extrude/132/132.stl b/test/extrude/132/132.stl
index b85b7963450bb9804b9df33d9952a6aab809cad4..ccae123b670ae92848e21d77aee393ed35d62d6b 100644
Binary files a/test/extrude/132/132.stl and b/test/extrude/132/132.stl differ
diff --git a/test/extrude/1320/1320.py b/test/extrude/1320/1320.py
index c0014a649114f4fc5da9e4298a8c8a34271cc790..e049d9dd8a8e0e79802f2396ab73ee2b34e1768e 100644
--- a/test/extrude/1320/1320.py
+++ b/test/extrude/1320/1320.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(366,463,463))
-w1=cq.Workplane('ZX',origin=(463,538,463))
-r=w0.sketch().arc((270,506),(366,108),(635,431)).segment((774,345)).segment((1000,753)).segment((560,989)).segment((452,807)).arc((474,592),(270,506)).assemble().push([(420,334)]).circle(495,mode='s').finalize().extrude(184).union(w0.workplane(offset=705).moveTo(1,12).cylinder(946,538)).union(w1.sketch().segment((98,313),(409,313)).arc((517,291),(613,345)).segment((613,538)).segment((377,538)).segment((345,463)).segment((334,463)).arc((313,474),(291,463)).segment((98,463)).close().assemble().finalize().extrude(55)).translate((1,76,65))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(13,26,70))
+r=w0.sketch().segment((606,238),(961,852)).segment((1000,828)).segment((661,238)).segment((1000,238)).segment((1000,190)).segment((346,190)).segment((346,238)).segment((511,238)).segment((411,296)).segment((402,399)).segment((449,403)).segment((456,324)).close().assemble().push([(780,284)]).rect(91,73,mode='s').push([(675,702)]).circle(38,mode='s').push([(420,506)]).circle(36,mode='s').push([(853,267)]).circle(51,mode='s').finalize().extrude(196).translate((1,171,1))
diff --git a/test/extrude/1320/1320.stl b/test/extrude/1320/1320.stl
index dfcb8c6515848b0c5978f6662e360c2b3f2297f5..b13c3cd1e14c2fc65e4716013d5694ab0a7ab027 100644
Binary files a/test/extrude/1320/1320.stl and b/test/extrude/1320/1320.stl differ
diff --git a/test/extrude/1321/1321.py b/test/extrude/1321/1321.py
index 3d6c6b048e84d4a31facce795d07c1c92986ffdb..155833f7dba51e9c0a8300c467dabe4b1c6ca117 100644
--- a/test/extrude/1321/1321.py
+++ b/test/extrude/1321/1321.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.workplane(offset=667).box(747,827,1000).translate((81,1,41))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(11,39,27))
+r=w0.sketch().segment((1000,566),(308,566)).segment((308,270)).segment((1000,270)).close().assemble().push([(728,405)]).circle(29,mode='s').push([(826,487)]).circle(32,mode='s').push([(844,462)]).rect(93,88,mode='s').push([(716,444)]).rect(100,95,mode='s').finalize().extrude(255)
diff --git a/test/extrude/1321/1321.stl b/test/extrude/1321/1321.stl
index 26a4e502bdac20b4930ddffeea15103976ada145..72979d5a525e0e7351b9686a5ec12b3fdbdba8ed 100644
Binary files a/test/extrude/1321/1321.stl and b/test/extrude/1321/1321.stl differ
diff --git a/test/extrude/1322/1322.py b/test/extrude/1322/1322.py
index 9a534d38856d7feb2bdb90f13160ba99896b5661..492a15695b3aab4dd8de6de9740b2622c9e34fe0 100644
--- a/test/extrude/1322/1322.py
+++ b/test/extrude/1322/1322.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().push([(925,624)]).circle(946).reset().face(w0.sketch().segment((860,409),(968,409)).segment((979,839)).segment((893,839)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().segment((130,796),(184,796)).segment((184,646)).segment((388,646)).segment((388,796)).segment((431,796)).segment((431,839)).segment((388,839)).segment((388,979)).segment((184,979)).segment((184,839)).segment((130,839)).close().assemble().finalize().extrude(398))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(29,54,15))
+r=w0.sketch().segment((456,204),(242,204)).segment((242,1000)).segment((456,1000)).close().assemble().finalize().extrude(188).union(w0.sketch().segment((390,488),(185,488)).segment((185,590)).segment((595,590)).segment((595,488)).close().assemble().finalize().extrude(82))
diff --git a/test/extrude/1322/1322.stl b/test/extrude/1322/1322.stl
index 77d96446dbc37bde3f51dff8ed5b32b42efd7823..e9a1e6a0773fc6267fe7b8c45895161d139e4073 100644
Binary files a/test/extrude/1322/1322.stl and b/test/extrude/1322/1322.stl differ
diff --git a/test/extrude/1323/1323.py b/test/extrude/1323/1323.py
index 567b54474820925379cdbae43382709f6d3d5d9e..d0c27c458c83fd954b79f84617c95c60d9d6881d 100644
--- a/test/extrude/1323/1323.py
+++ b/test/extrude/1323/1323.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,291,500))
-r=w0.sketch().segment((111,720),(650,720)).segment((181,680)).segment((221,261)).segment((221,81)).segment((241,81)).segment((251,1)).segment((890,61)).segment((850,481)).segment((850,660)).segment((830,660)).segment((820,740)).segment((860,740)).segment((860,970)).segment((720,970)).segment((720,1000)).segment((111,1000)).close().assemble().reset().face(w0.sketch().segment((720,730),(820,740)).segment((720,740)).close().assemble(),mode='s').finalize().extrude(930)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(47,19,15))
+r=w0.sketch().segment((1000,426),(1000,457)).arc((976,484),(858,494)).segment((755,494)).segment((263,426)).close().assemble().finalize().extrude(324).union(w0.workplane(offset=391).sketch().segment((246,64),(510,64)).segment((510,526)).segment((246,526)).close().assemble().finalize().extrude(140)).translate((1,513,1))
diff --git a/test/extrude/1323/1323.stl b/test/extrude/1323/1323.stl
index e2147c92de10327dee1494a844371a249a283c6d..e9093b3be008790cb659a919e701990932793e7d 100644
Binary files a/test/extrude/1323/1323.stl and b/test/extrude/1323/1323.stl differ
diff --git a/test/extrude/1324/1324.py b/test/extrude/1324/1324.py
index fbf694037b2c912d50a3c9f531c219c4b4299301..2455279dc83319cab10b99fdc49134eb6a66729b 100644
--- a/test/extrude/1324/1324.py
+++ b/test/extrude/1324/1324.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(556,489,556))
-r=w0.sketch().segment((612,401),(856,1)).segment((1000,90)).segment((800,401)).close().assemble().finalize().extrude(478).union(w0.sketch().push([(445,767)]).circle(900).circle(756,mode='s').finalize().extrude(545)).union(w0.workplane(offset=667).moveTo(756,312).cylinder(778,811))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(3,70,77))
+r=w0.sketch().segment((508,858),(266,858)).segment((266,114)).arc((387,148),(508,114)).close().assemble().push([(460,481)]).rect(166,147,mode='s').finalize().extrude(101)
diff --git a/test/extrude/1324/1324.stl b/test/extrude/1324/1324.stl
index 33d0cebb73aabc23349b9970fc74a7b120cb2e2e..5c9201ab0c7490e4431da7a2004b5f14c8aa9201 100644
Binary files a/test/extrude/1324/1324.stl and b/test/extrude/1324/1324.stl differ
diff --git a/test/extrude/1325/1325.py b/test/extrude/1325/1325.py
index a7e80477b567374e25a8405ea44e77f561f006d9..a3693527c1e83433223243fad2a2b03d3bd98398 100644
--- a/test/extrude/1325/1325.py
+++ b/test/extrude/1325/1325.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(353,353,29))
-r=w0.sketch().segment((423,1),(458,1)).segment((458,325)).arc((479,402),(458,472)).segment((458,705)).segment((423,705)).segment((423,508)).arc((226,402),(423,296)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(26,68,18))
+r=w0.sketch().segment((205,941),(657,941)).segment((657,217)).segment((205,217)).close().assemble().push([(405,583)]).circle(140,mode='s').finalize().extrude(346)
diff --git a/test/extrude/1325/1325.stl b/test/extrude/1325/1325.stl
index 9e77a3adca0984c4ab7cd312e8caa6a5ccd4cb56..36303207c592402e111066310ea9cf38cb25b2ea 100644
Binary files a/test/extrude/1325/1325.stl and b/test/extrude/1325/1325.stl differ
diff --git a/test/extrude/1326/1326.py b/test/extrude/1326/1326.py
index 979384a51471381fafcdb0f96dc8e26f82d93c67..d6a1cd6c863a097f545b8e653fc1d96b045f98c6 100644
--- a/test/extrude/1326/1326.py
+++ b/test/extrude/1326/1326.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(889,630,630))
-r=w0.sketch().segment((260,852),(356,852)).segment((356,674)).segment((401,674)).segment((356,578)).segment((415,556)).arc((571,290),(867,341)).segment((926,312)).segment((1000,475)).segment((948,512)).arc((904,689),(734,785)).segment((734,993)).segment((260,993)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=686).moveTo(489,830).cylinder(741,682))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(38,47,45))
+r=w0.sketch().segment((98,286),(907,286)).segment((907,331)).segment((794,600)).segment((212,600)).segment((98,331)).segment((99,286)).close().assemble().reset().segment((674,330),(380,330)).segment((380,624)).segment((674,624)).close().assemble(mode='s').finalize().extrude(81).translate((1,35,1))
diff --git a/test/extrude/1326/1326.stl b/test/extrude/1326/1326.stl
index 5b237e12fac3ae06786c636dbb698292fed9b421..f0698e79666d37710f4f220ec8e19c4c31fdf568 100644
Binary files a/test/extrude/1326/1326.stl and b/test/extrude/1326/1326.stl differ
diff --git a/test/extrude/1327/1327.py b/test/extrude/1327/1327.py
index e626b82722c9484e03f3fe91aeac63d580c455be..89f746240616bad28c6a523bf9d1545dbb31ec9a 100644
--- a/test/extrude/1327/1327.py
+++ b/test/extrude/1327/1327.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(457,712,457))
-w1=cq.Workplane('YZ',origin=(856,457,457))
-r=w0.workplane(offset=201).moveTo(169,712).cylinder(968,504).union(w0.sketch().segment((265,57),(712,57)).segment((712,121)).arc((688,489),(353,361)).segment((265,361)).close().assemble().finalize().extrude(1)).union(w1.workplane(offset=185).moveTo(572,169).box(544,552,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(65,27,20))
+r=w0.sketch().segment((259,824),(519,824)).segment((519,260)).segment((259,260)).close().assemble().finalize().extrude(173).union(w0.sketch().segment((344,400),(728,400)).segment((728,390)).segment((344,390)).close().assemble().finalize().extrude(111)).union(w0.sketch().segment((656,305),(294,305)).segment((294,583)).segment((656,583)).close().assemble().finalize().extrude(167))
diff --git a/test/extrude/1327/1327.stl b/test/extrude/1327/1327.stl
index 463eb10cf36c16e3375dce2ca321d14290c5706f..870ab1a0128dd2b7a26b292800c09447fdfbc1cb 100644
Binary files a/test/extrude/1327/1327.stl and b/test/extrude/1327/1327.stl differ
diff --git a/test/extrude/1328/1328.py b/test/extrude/1328/1328.py
index 7716f6181701d44bc5969c6c6468c5ecbea85b5e..4e08434e3d7e7850be2c2f94f3346b7f7b07cbb4 100644
--- a/test/extrude/1328/1328.py
+++ b/test/extrude/1328/1328.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(843,562,562))
-r=w0.sketch().circle(686).reset().face(w0.sketch().segment((500,562),(557,523)).segment((557,450)).segment((568,450)).segment((568,512)).segment((579,506)).segment((624,562)).segment((568,602)).segment((568,674)).segment((557,674)).segment((557,613)).segment((545,618)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=509).box(1000,899,669)).translate((1,125,125))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,70,73))
+r=w0.sketch().segment((30,754),(926,754)).segment((926,578)).segment((30,578)).close().assemble().reset().segment((443,820),(453,820)).segment((453,550)).segment((443,550)).close().assemble(mode='s').finalize().extrude(390)
diff --git a/test/extrude/1328/1328.stl b/test/extrude/1328/1328.stl
index adc2173bd93f5870603602a68236a7a8ea1a8bf7..e29562ba79342e95546ee5346b499b1e3bb294c9 100644
Binary files a/test/extrude/1328/1328.stl and b/test/extrude/1328/1328.stl differ
diff --git a/test/extrude/1329/1329.py b/test/extrude/1329/1329.py
index d486f7f0d659771d20b91fc4b8df18c008884dbf..85de99cf0bc4ddcc741a9d7a73372d4d4c7dc07a 100644
--- a/test/extrude/1329/1329.py
+++ b/test/extrude/1329/1329.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(498,743,498))
-r=w0.sketch().push([(277,498)]).rect(615,1000).push([(682,386)]).rect(687,721).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,286,500))
+r=w0.sketch().arc((2,25),(42,82),(22,151)).arc((16,85),(1,27)).assemble().reset().face(w0.sketch().segment((291,600),(926,477)).segment((999,851)).segment((366,976)).close().assemble()).finalize().extrude(935)
\ No newline at end of file
diff --git a/test/extrude/1329/1329.stl b/test/extrude/1329/1329.stl
index 2721cc39c650591706f48493005000a64c3a331c..6cc800cc87a13ee67264f3b691581ab5d9fdfee3 100644
Binary files a/test/extrude/1329/1329.stl and b/test/extrude/1329/1329.stl differ
diff --git a/test/extrude/133/133.py b/test/extrude/133/133.py
index 0e409f3e117b9d03952f1fa210e0235040673cd3..d0a6cebec32b985cd7b35e94232a3c81f3ba9df4 100644
--- a/test/extrude/133/133.py
+++ b/test/extrude/133/133.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(509,630,509))
-r=w0.sketch().segment((343,365),(465,365)).arc((564,432),(663,365)).segment((730,365)).segment((730,719)).segment((641,719)).segment((641,928)).segment((443,928)).segment((443,719)).segment((343,719)).close().assemble().reset().face(w0.sketch().segment((443,509),(443,520)).arc((420,409),(465,509)).close().assemble(),mode='s').reset().face(w0.sketch().segment((685,630),(696,608)).segment((730,641)).segment((707,652)).close().assemble(),mode='s').push([(1000,145)]).rect(630,619).finalize().extrude(12).union(w0.sketch().segment((354,487),(730,487)).segment((730,564)).arc((674,873),(509,597)).segment((354,597)).close().assemble().finalize().extrude(244)).union(w0.workplane(offset=630).moveTo(1,619).cylinder(752,553)).translate((1,1,44))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(795,501,500))
+r=w0.sketch().segment((326,909),(395,904)).segment((396,804)).segment((346,790)).segment((366,721)).segment((396,729)).segment((397,716)).segment((730,715)).segment((729,825)).segment((781,841)).segment((759,900)).segment((765,975)).segment((701,979)).segment((635,980)).segment((635,996)).segment((460,996)).segment((460,991)).segment((336,1000)).close().assemble().reset().face(w0.sketch().segment((530,845),(570,856)).arc((550,855),(530,845)).assemble(),mode='s').reset().face(w0.sketch().arc((551,774),(575,775),(592,785)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().push([(475,256)]).circle(756).reset().face(w0.sketch().segment((285,187),(360,91)).segment((660,325)).segment((586,420)).close().assemble(),mode='s').finalize().extrude(116))
\ No newline at end of file
diff --git a/test/extrude/133/133.stl b/test/extrude/133/133.stl
index 32a1a0ee89c3e3efd0c85ba0833d98db97dc73e9..ea3ae4a9778bcdd9c743d264e98f8ca7ef4f6654 100644
Binary files a/test/extrude/133/133.stl and b/test/extrude/133/133.stl differ
diff --git a/test/extrude/1330/1330.py b/test/extrude/1330/1330.py
index a13c37256a8f2cbf3fbafacf077518bb2660ca2a..4a21892cc485e39b52328dcb68f642d434960e2e 100644
--- a/test/extrude/1330/1330.py
+++ b/test/extrude/1330/1330.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(458,724,458))
-r=w0.workplane(offset=187).moveTo(346,607).box(915,926,1000).union(w0.sketch().segment((203,256),(245,256)).segment((245,384)).arc((564,458),(447,756)).segment((447,989)).segment((267,989)).segment((267,734)).arc((256,724),(245,724)).segment((245,734)).segment((203,734)).segment((203,681)).arc((160,554),(203,426)).close().assemble().push([(235,288)]).circle(469,mode='s').push([(384,915)]).rect(543,543,mode='s').finalize().extrude(1)).union(w0.workplane(offset=394).moveTo(522,203).cylinder(586,734)).translate((75,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(18,57,17))
+r=w0.sketch().segment((861,204),(63,204)).segment((63,1000)).segment((861,1000)).close().assemble().push([(517,623)]).rect(235,267,mode='s').finalize().extrude(261)
diff --git a/test/extrude/1330/1330.stl b/test/extrude/1330/1330.stl
index 880aba16ae088869dbd9f857e6c924f8e0876287..0f148f93e3b5b37fb3c375df9bc82608f722408b 100644
Binary files a/test/extrude/1330/1330.stl and b/test/extrude/1330/1330.stl differ
diff --git a/test/extrude/1331/1331.py b/test/extrude/1331/1331.py
index 25d93ee67520234998ecb2f5cbe9fd5b3608d767..c472d06cc5fff129679a6c7510dceb7d0266677f 100644
--- a/test/extrude/1331/1331.py
+++ b/test/extrude/1331/1331.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(387,194,387))
-w1=cq.Workplane('YZ',origin=(202,387,387))
-r=w0.sketch().arc((43,194),(43,177),(51,152)).segment((51,177)).segment((161,177)).segment((161,152)).arc((169,161),(169,177)).segment((219,177)).arc((647,102),(580,538)).arc((589,412),(547,303)).segment((547,748)).segment((43,748)).close().assemble().reset().face(w0.sketch().arc((219,177),(295,161),(370,177)).close().assemble(),mode='s').reset().face(w0.sketch().arc((85,127),(110,119),(135,127)).close().assemble()).finalize().extrude(1000).union(w1.workplane(offset=400).moveTo(1,631).cylinder(412,421)).translate((1,35,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(41,56,12))
+r=w0.sketch().segment((786,355),(786,336)).segment((286,336)).segment((286,836)).segment((305,836)).segment((546,836)).arc((716,766),(786,596)).close().assemble().push([(535,609)]).circle(68,mode='s').finalize().extrude(305)
diff --git a/test/extrude/1331/1331.stl b/test/extrude/1331/1331.stl
index 64b76e90e69f06da304498e4b7c5eab21031c3e6..2f2a7355813016e10361a05b33ea08d1a84d8154 100644
Binary files a/test/extrude/1331/1331.stl and b/test/extrude/1331/1331.stl differ
diff --git a/test/extrude/1332/1332.py b/test/extrude/1332/1332.py
index b6fed23d87991f7b39899aa1429366c93d3007c5..7b23de7fda4ad84b235a612abd058a3b141aeb76 100644
--- a/test/extrude/1332/1332.py
+++ b/test/extrude/1332/1332.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(382,405,405))
-r=w0.workplane(offset=209).moveTo(548,382).cylinder(798,608).union(w0.workplane(offset=471).moveTo(1,108).cylinder(536,596)).union(w0.sketch().segment((405,168),(679,168)).segment((679,500)).arc((750,489),(822,512)).segment((1000,512)).segment((1000,881)).segment((822,881)).arc((750,893),(667,881)).segment((489,881)).segment((489,608)).segment((405,608)).close().assemble().finalize().extrude(857)).translate((1,192,85))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(18,29,20))
+r=w0.sketch().segment((53,633),(806,633)).segment((806,675)).segment((53,675)).segment((12,675)).segment((12,361)).segment((53,361)).segment((53,675)).close().assemble().push([(498,516)]).rect(49,87,mode='s').push([(89,489)]).rect(85,118,mode='s').push([(693,566)]).rect(61,69,mode='s').push([(771,415)]).circle(75,mode='s').finalize().extrude(316)
diff --git a/test/extrude/1332/1332.stl b/test/extrude/1332/1332.stl
index e83c987ad5aa84d1f0619cf275f0c68bfb3262ca..85308900006d7893921dd088254252b2835d072c 100644
Binary files a/test/extrude/1332/1332.stl and b/test/extrude/1332/1332.stl differ
diff --git a/test/extrude/1333/1333.py b/test/extrude/1333/1333.py
index 5e0e7573364aea0516a040a699882e34c62dfd47..c42d643a12990d9957fcb12d63e5df147d331b2d 100644
--- a/test/extrude/1333/1333.py
+++ b/test/extrude/1333/1333.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(174,174,174))
-r=w0.sketch().circle(455).push([(364,145)]).rect(290,315,mode='s').finalize().extrude(1).union(w0.workplane(offset=261).box(1000,207,348)).translate((1,327,282))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(699,502,501))
+r=w0.sketch().segment((1,186),(691,187)).segment((690,251)).arc((999,315),(690,382)).segment((690,850)).segment((1,849)).close().assemble().finalize().extrude(96)
\ No newline at end of file
diff --git a/test/extrude/1333/1333.stl b/test/extrude/1333/1333.stl
index 2c1085ea0afc7d7f5cfbea255e4ddd0681070030..4e6e9d2e32374a6ab97631a1af386acf739f3023 100644
Binary files a/test/extrude/1333/1333.stl and b/test/extrude/1333/1333.stl differ
diff --git a/test/extrude/1334/1334.py b/test/extrude/1334/1334.py
index 1d4f30ec94053ba323b3846d13318a171eda4522..a68971b37e9914ac1dceb0759af0cf4f99db3c40 100644
--- a/test/extrude/1334/1334.py
+++ b/test/extrude/1334/1334.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(382,382,358))
-r=w0.workplane(offset=96).moveTo(548,322).cylinder(952,596).union(w0.sketch().segment((1,370),(358,370)).segment((358,596)).segment((1,655)).close().assemble().finalize().extrude(1000)).translate((1,1,23))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(69,6,48))
+r=w0.sketch().segment((303,336),(303,199)).segment((208,199)).segment((208,336)).segment((372,787)).segment((456,756)).close().assemble().push([(330,417)]).rect(138,179,mode='s').finalize().extrude(156).translate((1,151,1))
diff --git a/test/extrude/1334/1334.stl b/test/extrude/1334/1334.stl
index 5d93d49245ad152f5bf2f22ef1ca1ba4654d9fe4..afb1f356d44cf26e7f4889a8c3347005168c3501 100644
Binary files a/test/extrude/1334/1334.stl and b/test/extrude/1334/1334.stl differ
diff --git a/test/extrude/1335/1335.py b/test/extrude/1335/1335.py
index 0d57ce34e0a9438351e761f8feb624abaf8d8da3..fb7c91bb201ac396749e9a31154009b3d5a125b4 100644
--- a/test/extrude/1335/1335.py
+++ b/test/extrude/1335/1335.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).box(614,374,1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(24,49,18))
+r=w0.sketch().segment((90,1),(736,1)).segment((736,689)).segment((90,689)).close().assemble().finalize().extrude(95).union(w0.workplane(offset=211).sketch().segment((249,374),(45,856)).segment((371,584)).close().assemble().finalize().extrude(172)).translate((1,335,1))
diff --git a/test/extrude/1335/1335.stl b/test/extrude/1335/1335.stl
index d85ec058641148540b64656f08557d7082f96f1a..eed6b46641e5cab2931cf74a895b548cbaa70e76 100644
Binary files a/test/extrude/1335/1335.stl and b/test/extrude/1335/1335.stl differ
diff --git a/test/extrude/1336/1336.py b/test/extrude/1336/1336.py
index d88037facc334953696fd3e030ffe4661fdaa215..200c5ee252f13e8a4cf318e45d69132bd86153cc 100644
--- a/test/extrude/1336/1336.py
+++ b/test/extrude/1336/1336.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,740,500))
-r=w0.workplane(offset=256).moveTo(500,421).cylinder(990,510).union(w0.sketch().segment((421,51),(550,51)).arc((610,41),(640,1)).segment((800,1)).segment((800,51)).segment((880,51)).segment((880,211)).segment((800,211)).segment((800,461)).segment((590,461)).segment((590,211)).segment((421,211)).close().assemble().reset().face(w0.sketch().segment((620,211),(770,211)).arc((690,311),(620,211)).assemble(),mode='s').finalize().extrude(91)).union(w0.sketch().arc((291,520),(341,680),(510,660)).arc((520,670),(520,680)).segment((800,680)).segment((800,1000)).segment((311,1000)).segment((311,920)).arc((121,730),(291,520)).assemble().finalize().extrude(201))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(79,35,47))
+r=w0.sketch().segment((142,620),(844,620)).segment((844,1)).segment((142,1)).close().assemble().finalize().extrude(135).union(w0.workplane(offset=342).sketch().segment((331,784),(75,784)).segment((75,454)).segment((331,454)).close().assemble().finalize().extrude(198))
diff --git a/test/extrude/1336/1336.stl b/test/extrude/1336/1336.stl
index c96002e44762589d014e7f0e3add817f6900e9cf..5857acad645c14cda327241df0b7fb20ed037582 100644
Binary files a/test/extrude/1336/1336.stl and b/test/extrude/1336/1336.stl differ
diff --git a/test/extrude/1337/1337.py b/test/extrude/1337/1337.py
index f914ce2e0d2ed2cb4a65dc6196cfe9dd1b8f340b..6e23be2e11cc664cfae87bf5562579a026c9963f 100644
--- a/test/extrude/1337/1337.py
+++ b/test/extrude/1337/1337.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(232,354,354))
-r=w0.sketch().push([(670,647)]).circle(424).push([(673,650)]).rect(454,408,mode='s').finalize().extrude(308).union(w0.workplane(offset=500).moveTo(1,316).box(416,1000,647))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(80,32,1))
+r=w0.sketch().segment((764,571),(168,571)).segment((168,639)).segment((764,639)).close().assemble().push([(407,636)]).rect(178,91,mode='s').finalize().extrude(116).translate((1,85,1))
diff --git a/test/extrude/1337/1337.stl b/test/extrude/1337/1337.stl
index 3fb7aec360ddbf1004e0b56662eb4350a82a30fd..05a6b0e47c336b4d2393d004805628c10bc0069c 100644
Binary files a/test/extrude/1337/1337.stl and b/test/extrude/1337/1337.stl differ
diff --git a/test/extrude/1338/1338.py b/test/extrude/1338/1338.py
index eb6dc21631bb374ff61b6ab0c26b3159484cb31e..805a8e9364be733459e802052c6b68f590466181 100644
--- a/test/extrude/1338/1338.py
+++ b/test/extrude/1338/1338.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(520,491,491))
-r=w0.workplane(offset=236).moveTo(794,843).cylinder(1000,510).union(w0.sketch().segment((1,334),(275,334)).segment((275,393)).arc((285,363),(305,344)).segment((305,334)).arc((461,256),(638,314)).segment((638,119)).segment((980,119)).segment((980,412)).segment((696,412)).arc((579,696),(285,608)).segment((285,726)).segment((148,726)).segment((148,687)).segment((1,687)).close().assemble().finalize().extrude(931))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(6,71,1))
+r=w0.sketch().segment((760,407),(79,407)).segment((79,589)).segment((760,589)).close().assemble().push([(388,454)]).rect(126,170,mode='s').finalize().extrude(239)
diff --git a/test/extrude/1338/1338.stl b/test/extrude/1338/1338.stl
index b799161277a7107be802c24c7aef08ca9731bb84..cf95312d1398df25b2e951981e3d7f92695d104b 100644
Binary files a/test/extrude/1338/1338.stl and b/test/extrude/1338/1338.stl differ
diff --git a/test/extrude/1339/1339.py b/test/extrude/1339/1339.py
index 8fd4726942012870ed95532210b5fbdcc19dc752..146df48e41d353ba53d57730ac26c1155a704331 100644
--- a/test/extrude/1339/1339.py
+++ b/test/extrude/1339/1339.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,411,500))
-r=w0.sketch().arc((301,1000),(101,730),(411,600)).arc((251,770),(301,1000)).assemble().finalize().extrude(510).union(w0.sketch().segment((510,411),(710,1)).segment((910,91)).segment((700,510)).close().assemble().finalize().extrude(690))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(14,60,27))
+r=w0.sketch().segment((1000,410),(778,410)).segment((718,460)).segment((659,410)).segment((386,410)).segment((385,752)).segment((1000,752)).close().assemble().push([(704,491)]).circle(109,mode='s').finalize().extrude(350).union(w0.sketch().segment((706,785),(562,785)).segment((562,255)).segment((706,255)).close().assemble().finalize().extrude(66))
diff --git a/test/extrude/1339/1339.stl b/test/extrude/1339/1339.stl
index 460b244b7652c17d97e9c91f17669e052ec10aa1..1a74de37668454b9c7dbdc973fb5da1bf2bdaafe 100644
Binary files a/test/extrude/1339/1339.stl and b/test/extrude/1339/1339.stl differ
diff --git a/test/extrude/134/134.py b/test/extrude/134/134.py
index b01adead6d4c461df8c2943eed0732400638f53a..ba02702ad41b30f896bdf6c9e13fec07b2b7d51e 100644
--- a/test/extrude/134/134.py
+++ b/test/extrude/134/134.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(660,500,500))
-r=w0.sketch().segment((1,800),(21,600)).segment((570,650)).segment((550,850)).close().assemble().finalize().extrude(11).union(w0.sketch().segment((411,241),(580,241)).segment((570,211)).segment((770,151)).segment((790,241)).segment((1000,241)).segment((1000,361)).segment((830,361)).segment((840,391)).segment((650,441)).segment((620,361)).segment((411,361)).close().assemble().finalize().extrude(660))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(250,499,501))
+w1=cq.Workplane('XY',origin=(501,501,325))
+r=w0.sketch().arc((102,145),(111,147),(111,136)).segment((140,136)).segment((141,290)).segment((101,290)).close().assemble().push([(715,580)]).circle(785).finalize().extrude(1000).union(w1.workplane(offset=707).moveTo(390,122).cylinder(914,619))
\ No newline at end of file
diff --git a/test/extrude/134/134.stl b/test/extrude/134/134.stl
index 1d6e08bbe76e9178a9d9fcddec0f6bb8906ee599..1229adda802bf054cd28481ab9e7113f3eb6db5e 100644
Binary files a/test/extrude/134/134.stl and b/test/extrude/134/134.stl differ
diff --git a/test/extrude/1340/1340.py b/test/extrude/1340/1340.py
index a4d7d213fef098890206623ff481093e9b467b24..95724c8ce29f153462a2182a2956842636bf9a8f 100644
--- a/test/extrude/1340/1340.py
+++ b/test/extrude/1340/1340.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(451,264,451))
-r=w0.sketch().segment((166,638),(308,638)).segment((308,616)).segment((363,616)).segment((363,638)).segment((506,638)).segment((506,715)).segment((462,715)).arc((418,671),(363,649)).segment((363,967)).arc((418,934),(462,901)).segment((506,901)).segment((506,978)).segment((363,978)).segment((363,1000)).segment((308,1000)).segment((308,978)).segment((166,978)).segment((166,901)).segment((199,901)).arc((243,934),(308,967)).segment((308,649)).arc((243,671),(199,715)).segment((166,715)).close().assemble().push([(517,133)]).circle(682).finalize().extrude(758).union(w0.sketch().segment((155,188),(199,177)).segment((319,517)).segment((286,528)).close().assemble().push([(462,1)]).circle(539).finalize().extrude(835)).translate((99,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(48,5,44))
+r=w0.sketch().segment((315,737),(951,737)).segment((951,229)).segment((315,229)).close().assemble().push([(414,647)]).rect(94,49,mode='s').push([(538,521)]).circle(58,mode='s').finalize().extrude(123)
diff --git a/test/extrude/1340/1340.stl b/test/extrude/1340/1340.stl
index 7e433f2b837f229876487d9014629793d533ef81..9fed31679e5129fec96522439b566cc5b2fd2740 100644
Binary files a/test/extrude/1340/1340.stl and b/test/extrude/1340/1340.stl differ
diff --git a/test/extrude/1341/1341.py b/test/extrude/1341/1341.py
index b3d5a4eb537f3525d43ef3f825d9d83239e73d1d..a2baa1fdcd22b04eaf67e35a2c30b0f7676bde94 100644
--- a/test/extrude/1341/1341.py
+++ b/test/extrude/1341/1341.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(471,500,500))
-r=w0.sketch().segment((1,381),(281,381)).arc((500,251),(720,381)).segment((1000,381)).segment((1000,620)).segment((720,620)).arc((500,750),(281,620)).segment((1,620)).close().assemble().reset().face(w0.sketch().segment((371,690),(381,600)).arc((351,491),(401,391)).segment((401,371)).segment((411,371)).segment((421,291)).segment((650,321)).segment((640,421)).arc((670,530),(610,630)).segment((600,720)).close().assemble(),mode='s').finalize().extrude(560)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(67,46,4))
+r=w0.sketch().segment((221,1),(671,1)).segment((671,735)).segment((221,735)).close().assemble().push([(397,405)]).circle(113,mode='s').finalize().extrude(204).translate((1,159,1))
diff --git a/test/extrude/1341/1341.stl b/test/extrude/1341/1341.stl
index 5da9cabfed4726e407cfe927d86a1331ccf2da69..bf33d9807d663afd914ceb78a0f54f2d7c7be00e 100644
Binary files a/test/extrude/1341/1341.stl and b/test/extrude/1341/1341.stl differ
diff --git a/test/extrude/1342/1342.py b/test/extrude/1342/1342.py
index c48107b15f1757dfa1f1b9ba9a3fb41e03a2757a..de30fc656cfc9021c13f2ee69d54658b9a382b45 100644
--- a/test/extrude/1342/1342.py
+++ b/test/extrude/1342/1342.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,194,194))
-r=w0.workplane(offset=396).cylinder(597,1000).translate((1,807,807))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(50,19,58))
+r=w0.sketch().segment((249,31),(239,31)).segment((239,727)).segment((521,727)).segment((521,31)).segment((511,31)).segment((511,717)).segment((249,717)).close().assemble().push([(476,452)]).circle(51,mode='s').push([(332,182)]).rect(52,76,mode='s').finalize().extrude(364).translate((1,346,1))
diff --git a/test/extrude/1342/1342.stl b/test/extrude/1342/1342.stl
index 499eb47e1850901372950ead934ab1117b076135..ef0ced9561cde5b64b0c24ee5c7bb6b512b187b3 100644
Binary files a/test/extrude/1342/1342.stl and b/test/extrude/1342/1342.stl differ
diff --git a/test/extrude/1343/1343.py b/test/extrude/1343/1343.py
index 28132b7eeadc4ba49619c9b4f8798e300aa9ad32..0d1b65b07ce425c98d8c57e03f8712ef30047847 100644
--- a/test/extrude/1343/1343.py
+++ b/test/extrude/1343/1343.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(474,422,474))
-w1=cq.Workplane('YZ',origin=(527,474,474))
-r=w0.sketch().push([(758,653)]).circle(506).reset().face(w0.sketch().segment((737,653),(748,632)).segment((790,663)).segment((779,674)).close().assemble(),mode='s').finalize().extrude(1).union(w1.sketch().segment((516,327),(558,327)).segment((558,159)).segment((800,159)).segment((800,327)).segment((1000,327)).segment((1000,548)).segment((800,548)).segment((800,642)).segment((558,642)).segment((558,548)).segment((516,548)).close().assemble().push([(595,269)]).rect(506,485,mode='s').finalize().extrude(211))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(29,50,1))
+r=w0.sketch().segment((478,956),(504,956)).segment((504,315)).segment((478,316)).close().assemble().finalize().extrude(349).union(w0.workplane(offset=185).sketch().segment((417,877),(417,894)).segment((389,894)).segment((389,652)).segment((408,652)).segment((408,634)).segment((409,634)).segment((409,653)).segment((391,653)).segment((391,893)).segment((415,893)).segment((415,877)).close().assemble().finalize().extrude(97)).union(w0.workplane(offset=134).sketch().segment((497,55),(848,55)).segment((848,367)).segment((497,367)).close().assemble().finalize().extrude(96)).translate((1,300,1))
diff --git a/test/extrude/1343/1343.stl b/test/extrude/1343/1343.stl
index d0895c1431cd2344a949c385395ae1332148442f..4895e9ba4304fb26fe2efba77b8c4d086ecd0d59 100644
Binary files a/test/extrude/1343/1343.stl and b/test/extrude/1343/1343.stl differ
diff --git a/test/extrude/1344/1344.py b/test/extrude/1344/1344.py
index db4b874766995ce338099987ca781682f6061ed7..a2fa5a803ec0c3afd6829331aa158a62cc3c725b 100644
--- a/test/extrude/1344/1344.py
+++ b/test/extrude/1344/1344.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(496,565,496))
-r=w0.sketch().push([(390,227)]).rect(1000,658).rect(573,505,mode='s').finalize().extrude(1).union(w0.sketch().segment((129,334),(257,334)).segment((257,223)).segment((479,223)).segment((479,334)).segment((863,334)).segment((863,846)).segment((129,846)).close().assemble().push([(360,266)]).circle(530,mode='s').push([(496,586)]).rect(599,590,mode='s').finalize().extrude(855))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(20,65,76))
+r=w0.sketch().segment((108,886),(728,886)).segment((728,268)).segment((108,268)).close().assemble().push([(416,733)]).rect(68,46,mode='s').push([(390,511)]).rect(38,92,mode='s').finalize().extrude(288)
diff --git a/test/extrude/1344/1344.stl b/test/extrude/1344/1344.stl
index 5036e701d97353789d1e74e6bbd40ded12500bff..9e393d2711c80d1711725a131793a723e2a18c4d 100644
Binary files a/test/extrude/1344/1344.stl and b/test/extrude/1344/1344.stl differ
diff --git a/test/extrude/1345/1345.py b/test/extrude/1345/1345.py
index 3eb2095fe3198cf386091b51e89d5c0efc022292..1820c0a20c8331b8fad13ec98eb6ffcfd579e5c6 100644
--- a/test/extrude/1345/1345.py
+++ b/test/extrude/1345/1345.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(537,516,516))
-r=w0.sketch().arc((804,1),(846,11),(887,11)).segment((887,52)).segment((804,52)).close().assemble().finalize().extrude(73).union(w0.sketch().push([(248,907)]).rect(722,763).reset().face(w0.sketch().segment((155,846),(197,846)).segment((197,804)).segment((300,804)).segment((300,846)).segment((341,846)).segment((341,969)).segment((300,969)).segment((300,1000)).segment((197,1000)).segment((197,969)).segment((155,969)).close().assemble(),mode='s').finalize().extrude(918))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(25,63,34))
+r=w0.sketch().segment((303,19),(699,19)).segment((699,613)).segment((303,613)).close().assemble().push([(506,294)]).circle(93,mode='s').finalize().extrude(130)
diff --git a/test/extrude/1345/1345.stl b/test/extrude/1345/1345.stl
index 8eb9347ef46d537e4f3e3e3e641ba0bfdc22d028..df3917d539af135aefad7ad40a4e3b51ffe84f47 100644
Binary files a/test/extrude/1345/1345.stl and b/test/extrude/1345/1345.stl differ
diff --git a/test/extrude/1346/1346.py b/test/extrude/1346/1346.py
index 78b5b5583495612b79cc37b18d01f7bbdce5b378..c7b6d53caa579351a33165d264577ac83453560e 100644
--- a/test/extrude/1346/1346.py
+++ b/test/extrude/1346/1346.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(398,265,265))
-r=w0.sketch().rect(633,1000).push([(379,372)]).rect(302,405,mode='s').finalize().extrude(1).translate((1,53,236))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(35,27,54))
+r=w0.sketch().segment((248,293),(821,293)).segment((820,474)).arc((534,761),(248,474)).close().assemble().push([(505,426)]).rect(91,111,mode='s').finalize().extrude(134).union(w0.sketch().segment((471,391),(1000,391)).segment((1000,555)).segment((471,555)).close().assemble().finalize().extrude(169))
diff --git a/test/extrude/1346/1346.stl b/test/extrude/1346/1346.stl
index 233ad13da091ae6048a218b40aca5de61b1e2b49..125d9cea18e4a597638b726ce2b8ee76fee5fa6d 100644
Binary files a/test/extrude/1346/1346.stl and b/test/extrude/1346/1346.stl differ
diff --git a/test/extrude/1347/1347.py b/test/extrude/1347/1347.py
index 858f58d4ec2ca7678d3d191748b03df831de28b7..5ad009a5c2c6225ef210bf888343378bb782c909 100644
--- a/test/extrude/1347/1347.py
+++ b/test/extrude/1347/1347.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(451,451,226))
-r=w0.workplane(offset=406).moveTo(604,352).cylinder(541,748).union(w0.sketch().arc((172,757),(1,613),(190,496)).arc((244,451),(307,433)).segment((307,532)).arc((352,523),(406,532)).segment((397,424)).arc((577,631),(415,847)).segment((406,739)).arc((361,757),(316,748)).segment((316,847)).arc((235,820),(172,757)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(64,12,34))
+r=w0.sketch().segment((182,394),(363,394)).segment((619,435)).segment((822,435)).segment((822,398)).segment((622,398)).segment((366,357)).segment((182,357)).close().assemble().push([(456,407)]).rect(144,191,mode='s').finalize().extrude(258)
diff --git a/test/extrude/1347/1347.stl b/test/extrude/1347/1347.stl
index 85fddf7d78830b366874e35b1f64f19ac5912b69..d1aa7f1bd4ed9d3380ac25ef4e31cf25a1ee6a5a 100644
--- a/test/extrude/1347/1347.stl
+++ b/test/extrude/1347/1347.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:21bbb3f5ea574f8adb27b4bb0d00724d51c44d8fbaabd9d4b3a286b6ef04d082
-size 109084
+oid sha256:cf33e441306db8a886a08c87f74685bd17e4c445b9faca80506a8b319012b3d5
+size 2084
diff --git a/test/extrude/1348/1348.py b/test/extrude/1348/1348.py
index b4a24447f464e439916780cf564dca7817c822e1..a21b954f3c4d4eb7bdf97d619be101193e8e4719 100644
--- a/test/extrude/1348/1348.py
+++ b/test/extrude/1348/1348.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((494,474),(494,547)).segment((587,547)).segment((587,421)).arc((780,893),(494,474)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(12,68,61))
+r=w0.sketch().segment((176,425),(922,425)).segment((922,957)).segment((176,957)).close().assemble().push([(745,712)]).circle(55,mode='s').push([(557,746)]).rect(70,69,mode='s').push([(367,647)]).circle(69,mode='s').push([(807,871)]).rect(51,105,mode='s').finalize().extrude(191)
diff --git a/test/extrude/1348/1348.stl b/test/extrude/1348/1348.stl
index 2507c2c2a42f5393f76fb02d39470e3cd2b20fc9..42f5717c909bc97f9967f5b22199dde59892f5e5 100644
Binary files a/test/extrude/1348/1348.stl and b/test/extrude/1348/1348.stl differ
diff --git a/test/extrude/1349/1349.py b/test/extrude/1349/1349.py
index a93a97439797043147a9693c21d902251885d97d..e1c229c8bdcdc2cfc280c2ef9ea574771c8cf650 100644
--- a/test/extrude/1349/1349.py
+++ b/test/extrude/1349/1349.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(599,486,486))
-w1=cq.Workplane('XY',origin=(486,486,402))
-r=w0.sketch().arc((552,346),(608,346),(552,356)).segment((561,356)).segment((561,346)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(697,655)]).rect(1000,860).push([(697,650)]).rect(533,776,mode='s').push([(785,655)]).circle(524,mode='s').push([(697,650)]).rect(515,589).finalize().extrude(346)).union(w0.sketch().push([(580,346)]).rect(804,804).rect(655,617,mode='s').finalize().extrude(393)).union(w1.sketch().arc((683,300),(617,57),(860,141)).segment((767,141)).segment((767,178)).arc((711,234),(683,300)).assemble().finalize().extrude(216))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(48,69,47))
+r=w0.sketch().segment((343,238),(633,238)).segment((633,1000)).segment((343,1000)).close().assemble().push([(451,622)]).circle(81,mode='s').finalize().extrude(347).translate((1,279,1))
diff --git a/test/extrude/1349/1349.stl b/test/extrude/1349/1349.stl
index 01f18322ae7519ad7a4d1a8c4b7d631e59fd605c..76834397b9e9c8923265042298ac137bf2a5a065 100644
Binary files a/test/extrude/1349/1349.stl and b/test/extrude/1349/1349.stl differ
diff --git a/test/extrude/135/135.py b/test/extrude/135/135.py
index 15243dd812fcf0c7788643def0c3acd107030ea9..fa6d1bff0c2ff617a29be6f43e445fb4ddc17474 100644
--- a/test/extrude/135/135.py
+++ b/test/extrude/135/135.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(269,308,308))
-r=w0.workplane(offset=1).moveTo(295,412).cylinder(922,491).union(w0.sketch().segment((504,21),(504,73)).arc((491,47),(504,21)).assemble().finalize().extrude(1000)).translate((192,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(135,502,501))
+r=w0.sketch().push([(501,660)]).circle(841).circle(831,mode='s').finalize().extrude(561).union(w0.sketch().segment((435,2),(566,2)).segment((565,411)).arc((591,482),(565,551)).segment((565,640)).segment((435,641)).segment((435,575)).arc((375,480),(435,386)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/135/135.stl b/test/extrude/135/135.stl
index 3b000f3d60a27aed4581c1f73ce39af3851f970f..1233156e9c22855ccf69a8e2459d1510fb99de85 100644
Binary files a/test/extrude/135/135.stl and b/test/extrude/135/135.stl differ
diff --git a/test/extrude/1350/1350.py b/test/extrude/1350/1350.py
index 26b272c589ff66027b30020b45d378db5abcf9f7..f638c5686ddb555d67aa07d20658dd47fd119cb0 100644
--- a/test/extrude/1350/1350.py
+++ b/test/extrude/1350/1350.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(125,413,413))
-r=w0.sketch().push([(94,104)]).circle(609).reset().face(w0.sketch().segment((454,1),(691,1)).segment((691,166)).arc((804,248),(876,372)).segment((928,372)).segment((928,413)).segment((887,413)).arc((846,619),(691,763)).segment((691,918)).segment((454,918)).segment((454,763)).arc((248,464),(454,166)).close().assemble()).finalize().extrude(1000).translate((1,104,94))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(63,37,20))
+r=w0.sketch().segment((892,129),(259,129)).segment((259,762)).segment((891,762)).close().assemble().push([(629,408)]).rect(130,171,mode='s').finalize().extrude(243).translate((1,207,1))
diff --git a/test/extrude/1350/1350.stl b/test/extrude/1350/1350.stl
index b3b40e0c14075c0e6704a85a92c40aa32f295b67..a4bf118b3196088091b8a556765d659ce510cf01 100644
Binary files a/test/extrude/1350/1350.stl and b/test/extrude/1350/1350.stl differ
diff --git a/test/extrude/1351/1351.py b/test/extrude/1351/1351.py
index cb5de8de38614dc80c47bdaa4a05cfa7dea6011c..60fc84df07a01ad6e29d463426c138e9d44bed46 100644
--- a/test/extrude/1351/1351.py
+++ b/test/extrude/1351/1351.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,510,500))
-r=w0.sketch().segment((271,391),(520,391)).segment((520,321)).segment((1000,321)).segment((1000,830)).segment((520,830)).segment((520,500)).segment((271,500)).close().assemble().reset().face(w0.sketch().segment((550,500),(770,500)).segment((770,391)).segment((640,391)).arc((930,710),(550,500)).assemble(),mode='s').finalize().extrude(181).union(w0.sketch().segment((1,171),(51,171)).arc((41,221),(51,271)).segment((1,271)).close().assemble().finalize().extrude(800))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(66,65,78))
+r=w0.sketch().segment((216,461),(818,461)).segment((818,270)).segment((800,270)).arc((782,262),(774,244)).segment((774,145)).segment((262,145)).segment((262,244)).arc((254,262),(236,270)).segment((216,270)).close().assemble().push([(468,311)]).rect(166,173,mode='s').finalize().extrude(350).translate((1,286,1))
diff --git a/test/extrude/1351/1351.stl b/test/extrude/1351/1351.stl
index 7be71e5142cae7db31ea90630be91a40cfc4c966..c2310b665eb31679c5fa962c1074179d621d58dc 100644
Binary files a/test/extrude/1351/1351.stl and b/test/extrude/1351/1351.stl differ
diff --git a/test/extrude/1352/1352.py b/test/extrude/1352/1352.py
index f5eac1b5cd16baf0669174facdf30c0cc895b510..384a61fb625c36bd3184680d6d58bc7e7e4ad6b9 100644
--- a/test/extrude/1352/1352.py
+++ b/test/extrude/1352/1352.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(527,527,758))
-r=w0.sketch().push([(506,411)]).rect(926,779).push([(380,401)]).circle(558,mode='s').push([(1000,274)]).circle(579).finalize().extrude(64).union(w0.sketch().segment((1,716),(285,716)).arc((138,832),(1,716)).assemble().finalize().extrude(148))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(29,66,69))
+r=w0.sketch().segment((218,464),(218,798)).segment((336,798)).arc((389,833),(452,846)).segment((942,846)).arc((1000,797),(1000,679)).segment((1000,631)).arc((1000,513),(942,464)).close().assemble().reset().segment((890,628),(890,433)).segment((498,433)).segment((498,628)).arc((694,824),(890,628)).close().assemble(mode='s').finalize().extrude(355)
diff --git a/test/extrude/1352/1352.stl b/test/extrude/1352/1352.stl
index f0fd4a702f2dfbafe86dd1a784ad7c133688507d..553cab8a39d032d5d9c98a348e8077b510a4bc68 100644
Binary files a/test/extrude/1352/1352.stl and b/test/extrude/1352/1352.stl differ
diff --git a/test/extrude/1353/1353.py b/test/extrude/1353/1353.py
index fc986ca3eef832af07fa6a9ab7a854156a5791ed..440f53ada4a07bc9e3228df5b428fa38ac25ad2a 100644
--- a/test/extrude/1353/1353.py
+++ b/test/extrude/1353/1353.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(516,495,495))
-r=w0.sketch().segment((395,929),(415,899)).arc((455,950),(495,980)).segment((475,1000)).close().assemble().reset().face(w0.sketch().segment((657,637),(677,606)).segment((758,687)).segment((738,707)).arc((707,667),(657,637)).assemble()).finalize().extrude(354).union(w0.sketch().segment((334,667),(395,798)).arc((344,455),(526,748)).segment((455,606)).close().assemble().reset().face(w0.sketch().arc((344,334),(475,1),(455,354)).segment((455,334)).close().assemble()).reset().face(w0.sketch().segment((435,788),(516,748)).arc((475,778),(435,788)).assemble()).finalize().extrude(596))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(66,55,69))
+r=w0.sketch().segment((463,308),(414,308)).segment((414,862)).segment((968,862)).segment((968,813)).segment((463,813)).close().assemble().finalize().extrude(317).union(w0.workplane(offset=95).sketch().segment((474,582),(970,582)).segment((970,86)).segment((474,86)).close().assemble().finalize().extrude(241)).translate((1,282,1))
diff --git a/test/extrude/1353/1353.stl b/test/extrude/1353/1353.stl
index 6e31181b0ca6c4d0186a6cc5db717ce84a85e792..d0c2b74e7ff3a1d39ef1a8861acc22ac72f99082 100644
Binary files a/test/extrude/1353/1353.stl and b/test/extrude/1353/1353.stl differ
diff --git a/test/extrude/1354/1354.py b/test/extrude/1354/1354.py
index 001d4ccbf23f5ee76302c7fb31b68ba735426356..3cc101f1b9fb4887cec2afa8918d3f6bf61033ba 100644
--- a/test/extrude/1354/1354.py
+++ b/test/extrude/1354/1354.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(369,553,369))
-r=w0.sketch().segment((474,185),(579,185)).arc((623,378),(807,439)).arc((798,500),(807,553)).arc((544,448),(474,185)).assemble().finalize().extrude(1).union(w0.workplane(offset=229).moveTo(246,439).box(1000,474,649))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(25,37,33))
+r=w0.sketch().segment((1,494),(435,584)).segment((846,494)).close().assemble().push([(490,521)]).circle(142,mode='s').finalize().extrude(120)
diff --git a/test/extrude/1354/1354.stl b/test/extrude/1354/1354.stl
index 4f40bf43fa1def0f9de2d29a8ada8c731878471a..b2067bc24ecfa2bddbb23a5167a1633f207ca1c8 100644
Binary files a/test/extrude/1354/1354.stl and b/test/extrude/1354/1354.stl differ
diff --git a/test/extrude/1355/1355.py b/test/extrude/1355/1355.py
index af574a735f56ccaf23e4e1112bcef084548ad41a..23c2ab800dbad95449c4d2eb78bc07c85227dbc2 100644
--- a/test/extrude/1355/1355.py
+++ b/test/extrude/1355/1355.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(445,567,445))
-r=w0.workplane(offset=317).moveTo(650,761).box(678,612,700).union(w0.sketch().segment((1,634),(445,634)).segment((445,456)).segment((889,456)).segment((889,1000)).segment((445,1000)).segment((445,722)).segment((1,722)).close().assemble().push([(278,678)]).circle(467,mode='s').push([(445,156)]).rect(778,978).finalize().extrude(412))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(68,80,62))
+r=w0.sketch().segment((850,425),(850,527)).segment((545,833)).segment((341,833)).segment((216,698)).arc((392,629),(216,560)).segment((341,425)).close().assemble().push([(409,533)]).circle(46,mode='s').push([(672,466)]).circle(48,mode='s').finalize().extrude(173)
diff --git a/test/extrude/1355/1355.stl b/test/extrude/1355/1355.stl
index 77c25009a31390026fc7693b2d2e90cb1ad1b72d..71a10fba2f863429f91477e98e51b4a58c228ecc 100644
Binary files a/test/extrude/1355/1355.stl and b/test/extrude/1355/1355.stl differ
diff --git a/test/extrude/1356/1356.py b/test/extrude/1356/1356.py
index fa2dc4d1aa21d75d2e8e0cff6977fd705349b8af..9714604834b4732d1df0c0e7bbab32ae70f7b659 100644
--- a/test/extrude/1356/1356.py
+++ b/test/extrude/1356/1356.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,738,495))
-r=w0.sketch().segment((132,849),(445,667)).segment((536,818)).segment((213,1000)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((284,395),(304,314)).arc((314,193),(374,82)).segment((395,1)).segment((445,21)).arc((647,1),(808,122)).segment((859,132)).segment((839,213)).arc((849,253),(849,294)).arc((778,314),(828,354)).arc((808,405),(778,445)).segment((758,526)).segment((697,506)).arc((495,526),(344,405)).close().assemble().finalize().extrude(435))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(7,16,58))
+r=w0.sketch().segment((678,586),(322,221)).arc((337,418),(146,469)).segment((628,693)).close().assemble().push([(447,534)]).rect(96,99,mode='s').finalize().extrude(354)
diff --git a/test/extrude/1356/1356.stl b/test/extrude/1356/1356.stl
index a8ab9372626f2fc266d2add24feed61eb183e441..60bf8749b35afec1d79147d8589e4f05e7535f08 100644
Binary files a/test/extrude/1356/1356.stl and b/test/extrude/1356/1356.stl differ
diff --git a/test/extrude/1357/1357.py b/test/extrude/1357/1357.py
index 4482c1075b2da6987102458ef7972d8f3fff0f74..d82148fc714ca32980f11131697b548a192e1a85 100644
--- a/test/extrude/1357/1357.py
+++ b/test/extrude/1357/1357.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(524,524,493))
-w1=cq.Workplane('YZ',origin=(641,524,524))
-r=w0.workplane(offset=413).moveTo(746,387).cylinder(746,588).union(w0.workplane(offset=424).moveTo(752,397).box(577,778,725)).union(w0.workplane(offset=619).moveTo(804,1).box(683,535,715)).union(w1.workplane(offset=286).moveTo(894,619).cylinder(1000,683))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(305,71,306))
+r=w0.sketch().push([(240,151)]).circle(456).reset().face(w0.sketch().segment((355,498),(453,434)).segment((525,542)).segment((431,609)).close().assemble()).finalize().extrude(609)
\ No newline at end of file
diff --git a/test/extrude/1357/1357.stl b/test/extrude/1357/1357.stl
index 4d47d634945be53bb45288d280799182cb2d0b28..a9acc55f8d3a03aa5dac551df1457d2d5e09aff5 100644
Binary files a/test/extrude/1357/1357.stl and b/test/extrude/1357/1357.stl differ
diff --git a/test/extrude/1358/1358.py b/test/extrude/1358/1358.py
index c578b950d5fab45fbcf2fdbc07b8c84ca13077c9..11899c1961d13b520e329dff4c4ec63bd5e32041 100644
--- a/test/extrude/1358/1358.py
+++ b/test/extrude/1358/1358.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(604,905,604))
-r=w0.sketch().arc((659,794),(445,255),(841,683)).segment((841,1000)).segment((659,1000)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,390))
+r=w0.sketch().segment((360,581),(361,596)).segment((367,595)).segment((366,591)).arc((286,701),(360,580)).assemble().push([(324,643)]).rect(556,556,mode='s').reset().face(w0.sketch().segment((312,26),(360,26)).arc((469,2),(580,26)).segment((634,26)).segment((636,65)).arc((709,241),(635,417)).segment((636,454)).segment((580,457)).arc((470,480),(361,455)).segment((311,456)).segment((310,415)).arc((230,240),(310,65)).close().assemble()).finalize().extrude(610).union(w0.workplane(offset=582).moveTo(323,642).box(956,866,666)).union(w0.sketch().push([(755,851)]).circle(651).push([(814,350)]).circle(511).finalize().extrude(721))
\ No newline at end of file
diff --git a/test/extrude/1358/1358.stl b/test/extrude/1358/1358.stl
index 214206a7ebe9ef5e0ce9de493d34849a020a59ed..7d4a7463abf9e9db13dcb73e80b5a62c3d88cfaf 100644
Binary files a/test/extrude/1358/1358.stl and b/test/extrude/1358/1358.stl differ
diff --git a/test/extrude/1359/1359.py b/test/extrude/1359/1359.py
index 29be6b719f9732024908d8b9a51751645fc36560..7e248d75a340b989ea4d283c1fe92a62d9f20e66 100644
--- a/test/extrude/1359/1359.py
+++ b/test/extrude/1359/1359.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((481,893),(594,441)).segment((853,507)).segment((853,760)).arc((654,794),(481,893)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(3,68,43))
+r=w0.sketch().segment((201,365),(537,661)).segment((863,491)).segment((697,25)).close().assemble().finalize().extrude(205).union(w0.sketch().segment((419,444),(759,444)).segment((759,842)).segment((419,842)).close().assemble().finalize().extrude(95))
diff --git a/test/extrude/1359/1359.stl b/test/extrude/1359/1359.stl
index 705d5a7913544f03715174a89a8b6b1a62ebe582..e86d690dea19d7dea7f0a1e54460252aaf2dba08 100644
Binary files a/test/extrude/1359/1359.stl and b/test/extrude/1359/1359.stl differ
diff --git a/test/extrude/136/136.py b/test/extrude/136/136.py
index 42e12d906f0d98bdc39286292847d4b3cde4601b..873542c968fc16788b6738d8dbe7ae4f80816d04 100644
--- a/test/extrude/136/136.py
+++ b/test/extrude/136/136.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,401,500))
-r=w0.sketch().segment((181,610),(261,570)).arc((341,1),(481,560)).segment((630,820)).segment((580,850)).arc((570,770),(510,730)).arc((351,630),(371,810)).arc((391,880),(451,930)).segment((391,960)).close().assemble().finalize().extrude(580).union(w0.sketch().segment((161,431),(570,431)).arc((870,171),(660,500)).segment((660,1000)).segment((161,1000)).close().assemble().push([(770,211)]).rect(580,580,mode='s').finalize().extrude(700))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,401,501))
+r=w0.workplane(offset=601).box(1000,1000,700)
\ No newline at end of file
diff --git a/test/extrude/136/136.stl b/test/extrude/136/136.stl
index e0aa45a7434065b138c5051f7b465c5e929a3f21..fdcbd45daecc66f64b50ec18f8004ca664325962 100644
Binary files a/test/extrude/136/136.stl and b/test/extrude/136/136.stl differ
diff --git a/test/extrude/1360/1360.py b/test/extrude/1360/1360.py
index 2d32bd5b1904e8ec8219b75b933822dffd86b710..890b430278d05d1caae091875dc11b32c0e332fc 100644
--- a/test/extrude/1360/1360.py
+++ b/test/extrude/1360/1360.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(301,500,500))
-r=w0.sketch().segment((1,261),(141,261)).arc((491,81),(860,261)).segment((1000,261)).segment((1000,740)).segment((860,740)).arc((491,920),(141,740)).segment((1,740)).close().assemble().finalize().extrude(910)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(64,48,31))
+r=w0.sketch().segment((214,646),(1000,646)).segment((1000,272)).segment((214,272)).close().assemble().push([(534,487)]).rect(170,165,mode='s').finalize().extrude(170)
diff --git a/test/extrude/1360/1360.stl b/test/extrude/1360/1360.stl
index b88d0871050ae1da40b26d91eda7327fcea293f6..3e80a18daead3f87994ea5fb9406097ade6ca572 100644
Binary files a/test/extrude/1360/1360.stl and b/test/extrude/1360/1360.stl differ
diff --git a/test/extrude/1361/1361.py b/test/extrude/1361/1361.py
index d6a7d76971c60b9f4574cf6786189b3de1d3244e..a27826e20b2cbf307a94068d1ade64847e1c88f9 100644
--- a/test/extrude/1361/1361.py
+++ b/test/extrude/1361/1361.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(100,1,100))
-r=w0.sketch().rect(658,1000).rect(442,514,mode='s').finalize().extrude(298).translate((401,1,230))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(48,17,36))
+r=w0.sketch().segment((236,420),(768,420)).segment((768,538)).segment((546,538)).segment((546,468)).segment((236,468)).close().assemble().push([(471,424)]).rect(168,122,mode='s').finalize().extrude(220).translate((1,204,1))
diff --git a/test/extrude/1361/1361.stl b/test/extrude/1361/1361.stl
index 403785ccff16556df120b35056d35e3517098d09..690e4505e265722284d052f0d6405f61a7959e8c 100644
Binary files a/test/extrude/1361/1361.stl and b/test/extrude/1361/1361.stl differ
diff --git a/test/extrude/1362/1362.py b/test/extrude/1362/1362.py
index c6dc20a2e6f70da3c369e628d91138b2c2bfd280..df85f22d5bb989cb097be17b71ca40290c5b7dd0 100644
--- a/test/extrude/1362/1362.py
+++ b/test/extrude/1362/1362.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(486,486,224))
-r=w0.workplane(offset=709).moveTo(418,350).cylinder(932,641).union(w0.sketch().arc((408,728),(544,816),(709,816)).arc((505,961),(408,728)).assemble().reset().face(w0.sketch().segment((641,1),(709,1)).arc((670,69),(641,1)).assemble()).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(80,57,41))
+r=w0.sketch().segment((946,771),(436,771)).segment((436,261)).segment((946,261)).close().assemble().finalize().extrude(320).union(w0.workplane(offset=43).sketch().segment((768,498),(412,498)).segment((412,652)).segment((768,652)).close().assemble().finalize().extrude(202))
diff --git a/test/extrude/1362/1362.stl b/test/extrude/1362/1362.stl
index 72638ca728ce721a2b435053cea9ea07a5f1ae2d..34010976bd26a8e0eef0ff38ce0a2963f58a09db 100644
Binary files a/test/extrude/1362/1362.stl and b/test/extrude/1362/1362.stl differ
diff --git a/test/extrude/1363/1363.py b/test/extrude/1363/1363.py
index 9de17e64a968651ecf0ce17b07c6e87dfa2de955..040f1f80ccf835858d66c3ab5152a6d6a02e46ba 100644
--- a/test/extrude/1363/1363.py
+++ b/test/extrude/1363/1363.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(487,661,487))
-w1=cq.Workplane('XY',origin=(487,487,780))
-r=w0.workplane(offset=230).moveTo(624,230).cylinder(1000,688).union(w0.sketch().segment((487,423),(624,432)).segment((533,432)).segment((533,450)).arc((514,441),(487,423)).assemble().reset().face(w0.sketch().segment((789,395),(817,83)).arc((863,239),(789,395)).assemble()).finalize().extrude(1)).union(w0.workplane(offset=555).moveTo(303,753).cylinder(624,679)).union(w1.sketch().segment((102,505),(111,505)).arc((230,468),(340,505)).segment((349,505)).segment((349,514)).arc((404,643),(349,771)).segment((349,780)).segment((340,780)).arc((230,826),(111,780)).segment((102,780)).segment((102,771)).arc((47,643),(102,514)).close().assemble().finalize().extrude(111))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(10,6,48))
+r=w0.sketch().segment((954,597),(454,597)).segment((404,597)).segment((404,447)).segment((454,447)).segment((954,447)).close().assemble().push([(579,529)]).circle(132,mode='s').finalize().extrude(344).translate((1,339,1))
diff --git a/test/extrude/1363/1363.stl b/test/extrude/1363/1363.stl
index 0ba2a8e1bd767574d9f512b60117005266cfcad9..231b5fea8a6f8a2fc2024d8d005adb137f33b792 100644
Binary files a/test/extrude/1363/1363.stl and b/test/extrude/1363/1363.stl differ
diff --git a/test/extrude/1364/1364.py b/test/extrude/1364/1364.py
index 891ad306e4e163e15d7d298772e5fc19d2e285f5..cd28cc9d10de385475ac0da6fd943c2c00806b7f 100644
--- a/test/extrude/1364/1364.py
+++ b/test/extrude/1364/1364.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((174,254),(494,254)).segment((494,414)).segment((221,414)).arc((214,327),(174,254)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(51,5,51))
+r=w0.sketch().segment((596,484),(70,484)).segment((69,790)).segment((596,790)).close().assemble().finalize().extrude(126).union(w0.sketch().segment((181,136),(181,690)).segment((227,690)).segment((227,136)).segment((181,135)).close().assemble().finalize().extrude(57))
diff --git a/test/extrude/1364/1364.stl b/test/extrude/1364/1364.stl
index b71cad1be62affcfd69e42b52709625ec988f0d7..cf1b7baa0eeac280e019fc38be36b2dc52082948 100644
Binary files a/test/extrude/1364/1364.stl and b/test/extrude/1364/1364.stl differ
diff --git a/test/extrude/1365/1365.py b/test/extrude/1365/1365.py
index afcc62889fc7e6611677e782c485e820a1bcf181..dc08628dfb434622bd38bf0b1f3039a9b579c68f 100644
--- a/test/extrude/1365/1365.py
+++ b/test/extrude/1365/1365.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(341,341,21))
-r=w0.sketch().segment((21,239),(293,151)).segment((354,1)).segment((402,21)).segment((375,96)).segment((477,96)).segment((606,55)).segment((613,83)).segment((572,96)).segment((592,96)).segment((592,239)).arc((660,388),(592,538)).segment((592,681)).segment((327,681)).segment((327,538)).arc((266,436),(273,320)).segment((232,300)).segment((280,191)).segment((28,266)).close().assemble().finalize().extrude(320).union(w0.workplane(offset=670).moveTo(460,388).box(470,735,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(66,38,10))
+r=w0.sketch().segment((411,907),(442,907)).segment((929,420)).segment((929,389)).close().assemble().push([(716,612)]).rect(88,170,mode='s').finalize().extrude(251)
diff --git a/test/extrude/1365/1365.stl b/test/extrude/1365/1365.stl
index 5331d21e447fb9b03f1079de5753755a22fe02a2..8ba9e9aa61c67ddb20bc5e2eb4a8fa79378db09a 100644
Binary files a/test/extrude/1365/1365.stl and b/test/extrude/1365/1365.stl differ
diff --git a/test/extrude/1366/1366.py b/test/extrude/1366/1366.py
index f0ba6ee98a4cea3fb591112690fa0b24db7abb25..48eb977c03baa779378467bd419cac41b18a2386 100644
--- a/test/extrude/1366/1366.py
+++ b/test/extrude/1366/1366.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(520,540,520))
-r=w0.sketch().arc((451,680),(471,181),(690,620)).arc((610,860),(451,680)).assemble().push([(520,436)]).rect(780,730,mode='s').finalize().extrude(1).union(w0.workplane(offset=760).moveTo(580,720).cylinder(1000,590))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(20,8,59))
+r=w0.sketch().segment((1,546),(675,546)).segment((1,546)).segment((1,595)).segment((675,595)).segment((675,546)).segment((675,527)).segment((1,527)).close().assemble().finalize().extrude(172).union(w0.sketch().segment((63,182),(85,182)).segment((523,182)).segment((523,204)).segment((85,204)).segment((85,182)).segment((85,532)).segment((63,532)).close().assemble().finalize().extrude(50)).union(w0.workplane(offset=229).sketch().segment((159,717),(539,717)).segment((539,499)).segment((159,499)).segment((159,556)).segment((266,556)).arc((378,575),(266,594)).segment((159,594)).close().assemble().finalize().extrude(118))
diff --git a/test/extrude/1366/1366.stl b/test/extrude/1366/1366.stl
index 9312be9cb8d18087ff36d13a6df170c450da882d..a83dfb510512f454901279cd92167f315ee8dcbc 100644
Binary files a/test/extrude/1366/1366.stl and b/test/extrude/1366/1366.stl differ
diff --git a/test/extrude/1367/1367.py b/test/extrude/1367/1367.py
index 45dc68fa83d1abfb0752ef9f9ac438b324954346..c3b4b6fe397b551a2914a07f12a4063c00e9c55b 100644
--- a/test/extrude/1367/1367.py
+++ b/test/extrude/1367/1367.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(525,788,525))
-r=w0.sketch().push([(525,775)]).rect(813,650).reset().face(w0.sketch().segment((476,769),(488,763)).arc((500,756),(519,756)).segment((532,750)).segment((544,794)).segment((532,800)).arc((519,806),(500,813)).segment((488,813)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=288).moveTo(588,294).cylinder(1000,607))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(54,60,47))
+r=w0.sketch().segment((340,722),(485,371)).segment((350,371)).segment((485,316)).segment((360,316)).segment((485,271)).segment((376,220)).segment((682,296)).segment((485,777)).close().assemble().finalize().extrude(148).union(w0.sketch().segment((890,594),(702,591)).segment((610,427)).segment((706,266)).segment((894,269)).segment((986,433)).close().assemble().finalize().extrude(149)).union(w0.workplane(offset=242).sketch().segment((373,434),(373,450)).segment((252,450)).segment((252,569)).segment((237,569)).segment((237,315)).segment((252,315)).segment((252,434)).close().assemble().finalize().extrude(200))
diff --git a/test/extrude/1367/1367.stl b/test/extrude/1367/1367.stl
index bf94b365b9cd28eed977c5bd3b5f000bff3b57a0..f1d0a8df99917acf3375a8ef1aa9288c639c19cd 100644
Binary files a/test/extrude/1367/1367.stl and b/test/extrude/1367/1367.stl differ
diff --git a/test/extrude/1368/1368.py b/test/extrude/1368/1368.py
index c7e7e527c38b79908d7df8de5b5dcc4e10eacc1b..16a206c7723f7772bd85f3dad2f39f5f36ac9072 100644
--- a/test/extrude/1368/1368.py
+++ b/test/extrude/1368/1368.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(730,500,500))
-r=w0.sketch().segment((351,281),(371,221)).segment((520,221)).segment((520,1)).segment((930,121)).segment((850,421)).close().assemble().finalize().extrude(41).union(w0.sketch().segment((71,910),(101,790)).segment((121,800)).segment((331,800)).segment((331,870)).segment((381,890)).segment((341,1000)).segment((331,1000)).segment((121,1000)).segment((121,920)).close().assemble().finalize().extrude(71))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(4,55,68))
+r=w0.sketch().segment((314,246),(144,328)).segment((314,246)).segment((135,333)).segment((205,1000)).segment((423,1000)).segment((493,333)).close().assemble().push([(231,479)]).circle(93,mode='s').finalize().extrude(255).union(w0.workplane(offset=25).sketch().segment((308,694),(728,694)).segment((728,274)).segment((308,274)).close().assemble().finalize().extrude(126)).translate((1,201,1))
diff --git a/test/extrude/1368/1368.stl b/test/extrude/1368/1368.stl
index 37c90a5b85d7d37dbfdf9e02355ce2e29edd85b6..271533b3d6475b6720a8e89bbc05221a825e21cf 100644
Binary files a/test/extrude/1368/1368.stl and b/test/extrude/1368/1368.stl differ
diff --git a/test/extrude/1369/1369.py b/test/extrude/1369/1369.py
index 50f5d5edfc41a8809dcd47a4ea5d899c1570aa22..d616f1b2e792e47c117aecdc03116553c7bf3083 100644
--- a/test/extrude/1369/1369.py
+++ b/test/extrude/1369/1369.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,810).translate((1,477,477))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(4,51,72))
+r=w0.sketch().segment((358,460),(910,460)).segment((910,258)).segment((358,258)).close().assemble().push([(620,349)]).circle(127,mode='s').finalize().extrude(243)
diff --git a/test/extrude/1369/1369.stl b/test/extrude/1369/1369.stl
index 4c55da0595ccc9117c3699a23307b28964be1d84..6053839f40b09a5abe6403c11c4bb5022d89b05e 100644
Binary files a/test/extrude/1369/1369.stl and b/test/extrude/1369/1369.stl differ
diff --git a/test/extrude/137/137.py b/test/extrude/137/137.py
index 4edb6654628b5c7c8290fba569fb8405d8a156c1..c90aab455f4816bd75a9324f75a6082b263be4cf 100644
--- a/test/extrude/137/137.py
+++ b/test/extrude/137/137.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,636,500))
-r=w0.sketch().push([(646,813)]).circle(709).circle(532,mode='s').reset().face(w0.sketch().arc((906,365),(542,105),(958,282)).segment((1000,282)).segment((1000,365)).close().assemble()).reset().face(w0.sketch().arc((646,282),(740,95),(834,282)).close().assemble(),mode='s').finalize().extrude(230).union(w0.sketch().segment((1,532),(147,480)).segment((168,480)).segment((178,490)).arc((303,500),(396,563)).segment((688,563)).segment((688,698)).arc((677,719),(657,740)).segment((438,740)).arc((157,896),(32,594)).close().assemble().finalize().extrude(355))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,600,502))
+w1=cq.Workplane('YZ',origin=(295,501,501))
+r=w0.sketch().arc((647,776),(777,667),(700,511)).arc((997,712),(646,777)).assemble().finalize().extrude(316).union(w0.workplane(offset=628).moveTo(460,226).cylinder(757,586)).union(w1.sketch().push([(296,151)]).circle(651).push([(331,159)]).rect(701,577,mode='s').finalize().extrude(592))
\ No newline at end of file
diff --git a/test/extrude/137/137.stl b/test/extrude/137/137.stl
index 23b08a3df54cd73f4e58e394507468602a116b67..f75099e9daea617a2e3a43ab13845532c3f67e1a 100644
--- a/test/extrude/137/137.stl
+++ b/test/extrude/137/137.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2461fe1690f717274fb4b6972857d5c55fc05c80749cf914aeb7a21008cd3c3f
-size 100684
+oid sha256:e3269072c42160c101cd704d77bf747c87390bcf40b3da224f77ac18353ad9f0
+size 82184
diff --git a/test/extrude/1370/1370.py b/test/extrude/1370/1370.py
index 32ffb352e240c5fbd04f9dc39a657dbba7c1f0f4..221eff1a6d7abe1bff71eb1c7a6581dbf7fc0cce 100644
--- a/test/extrude/1370/1370.py
+++ b/test/extrude/1370/1370.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(338,8,338))
-r=w0.sketch().segment((1,446),(150,42)).segment((676,230)).segment((528,636)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(62,17,71))
+r=w0.sketch().segment((556,357),(336,357)).segment((280,511)).segment((832,511)).segment((776,357)).close().assemble().push([(553,454)]).rect(187,184,mode='s').finalize().extrude(375)
diff --git a/test/extrude/1370/1370.stl b/test/extrude/1370/1370.stl
index f5655e87273af46dfad3dd46f9d99dbfed7dfded..e9bd6a716c2f14332f3e23811a5b1fbc9c714b96 100644
Binary files a/test/extrude/1370/1370.stl and b/test/extrude/1370/1370.stl differ
diff --git a/test/extrude/1371/1371.py b/test/extrude/1371/1371.py
index 86aed3bcc2dcdf6a4b1b061e9587729c16900b59..17ba02b0a92e06611a53f701b8f8f6b38626a65c 100644
--- a/test/extrude/1371/1371.py
+++ b/test/extrude/1371/1371.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(547,500,500))
-w1=cq.Workplane('ZX',origin=(500,565,500))
-r=w0.workplane(offset=704).moveTo(686,547).box(1000,648,908).union(w1.sketch().arc((140,565),(38,399),(186,260)).arc((963,519),(140,565)).assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,48,42))
+r=w0.sketch().segment((306,470),(1000,470)).segment((1000,260)).segment((306,260)).close().assemble().push([(667,345)]).rect(171,195,mode='s').finalize().extrude(267).union(w0.workplane(offset=258).sketch().segment((870,216),(650,216)).segment((650,708)).segment((870,708)).close().assemble().finalize().extrude(56))
diff --git a/test/extrude/1371/1371.stl b/test/extrude/1371/1371.stl
index 6ea7820b2a122795d3d61a1efe05c0501383d12c..94f56b31084b4cfbfa556f0c3430d53c63502b78 100644
Binary files a/test/extrude/1371/1371.stl and b/test/extrude/1371/1371.stl differ
diff --git a/test/extrude/1372/1372.py b/test/extrude/1372/1372.py
index 44eb7bda76d08181537404368af2249a9723d249..ce7ea00e3e182781f6793afcdba88aa6336061f3 100644
--- a/test/extrude/1372/1372.py
+++ b/test/extrude/1372/1372.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(490,623,490))
-r=w0.sketch().segment((184,1),(246,1)).segment((246,378)).arc((439,419),(572,572)).segment((572,225)).segment((1000,225)).segment((1000,715)).segment((582,715)).arc((93,918),(184,399)).close().assemble().finalize().extrude(225)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(67,55,73))
+r=w0.sketch().segment((672,798),(374,798)).segment((374,204)).segment((672,204)).close().assemble().finalize().extrude(318).union(w0.workplane(offset=62).sketch().segment((412,205),(600,205)).segment((600,296)).segment((721,296)).segment((721,199)).segment((739,199)).segment((739,489)).segment((409,489)).close().assemble().finalize().extrude(184)).translate((1,264,1))
diff --git a/test/extrude/1372/1372.stl b/test/extrude/1372/1372.stl
index c5532a1c5fa9fe497d7cffc5a47dc8599099ac14..6aa03688181d239685edc60c73640fe861990ab7 100644
Binary files a/test/extrude/1372/1372.stl and b/test/extrude/1372/1372.stl differ
diff --git a/test/extrude/1373/1373.py b/test/extrude/1373/1373.py
index bad7d05e3342b16ec8fd003239e4883f02c2f1b8..f68088fa797de18edc0145e1230ec1b1e7fb10c0 100644
--- a/test/extrude/1373/1373.py
+++ b/test/extrude/1373/1373.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(256,307,307))
-w1=cq.Workplane('XY',origin=(307,307,134))
-r=w0.sketch().segment((480,307),(817,307)).arc((643,439),(480,307)).assemble().finalize().extrude(1).union(w0.workplane(offset=511).moveTo(144,648).box(1000,602,715)).union(w1.workplane(offset=149).moveTo(261,582).box(847,409,623)).translate((1,50,30))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(42,33,47))
+r=w0.sketch().segment((426,1000),(502,1000)).arc((517,922),(522,791)).segment((522,649)).arc((505,437),(455,231)).segment((426,231)).close().assemble().finalize().extrude(142).union(w0.workplane(offset=108).sketch().segment((847,625),(567,625)).segment((567,587)).arc((576,566),(597,557)).segment((903,557)).segment((903,625)).close().assemble().finalize().extrude(63)).translate((1,139,1))
diff --git a/test/extrude/1373/1373.stl b/test/extrude/1373/1373.stl
index f9b2d3ccb88d71eac368044774586ffa2e5923e1..b1001ce33086191691755373e3cd99d019a3c0d2 100644
Binary files a/test/extrude/1373/1373.stl and b/test/extrude/1373/1373.stl differ
diff --git a/test/extrude/1374/1374.py b/test/extrude/1374/1374.py
index 034db1a51e67cdcf94da754412260b2fa7e53291..f0b2c8cf4b0dafaa5fe254a0e478c9b450668a30 100644
--- a/test/extrude/1374/1374.py
+++ b/test/extrude/1374/1374.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,580).translate((1,247,247))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(13,8,26))
+r=w0.sketch().segment((334,377),(832,578)).segment((893,425)).segment((870,260)).segment((450,90)).close().assemble().push([(661,393)]).rect(84,121,mode='s').finalize().extrude(118)
diff --git a/test/extrude/1374/1374.stl b/test/extrude/1374/1374.stl
index df25f5c070740978f4810ebb9220841515a3ae2e..fe5ce279d84149765dcd4b7871b9dabf88049eee 100644
Binary files a/test/extrude/1374/1374.stl and b/test/extrude/1374/1374.stl differ
diff --git a/test/extrude/1375/1375.py b/test/extrude/1375/1375.py
index a3990c6228fba4fd9f5c25d385e7213f6fe1d70d..563031768a07272450013ab2b2fdbd679571775c 100644
--- a/test/extrude/1375/1375.py
+++ b/test/extrude/1375/1375.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,570,500))
-w1=cq.Workplane('YZ',origin=(610,500,500))
-r=w0.sketch().arc((491,520),(550,540),(600,590)).arc((550,550),(491,520)).assemble().finalize().extrude(1).union(w0.sketch().arc((910,341),(970,401),(1000,491)).close().assemble().finalize().extrude(780)).union(w0.workplane(offset=680).moveTo(500,620).cylinder(860,680)).union(w1.sketch().segment((111,61),(201,61)).segment((201,1)).segment((371,1)).segment((371,61)).segment((461,61)).segment((461,261)).arc((710,650),(271,510)).segment((201,510)).segment((201,441)).segment((111,441)).close().assemble().push([(286,256)]).rect(510,710,mode='s').reset().face(w1.sketch().segment((451,441),(461,441)).segment((461,351)).segment((580,351)).segment((580,650)).segment((451,650)).close().assemble(),mode='s').finalize().extrude(91))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,499,596))
+r=w0.sketch().segment((1,215),(335,216)).segment((335,90)).segment((770,90)).segment((770,591)).segment((999,591)).segment((1000,911)).segment((1,911)).close().assemble().push([(211,829)]).rect(591,591,mode='s').finalize().extrude(311)
\ No newline at end of file
diff --git a/test/extrude/1375/1375.stl b/test/extrude/1375/1375.stl
index 3478112ed1035efca3a556fcfb9e70e0e05af54c..5d63ee270b39554b2906699c69c88acc2e1c8668 100644
Binary files a/test/extrude/1375/1375.stl and b/test/extrude/1375/1375.stl differ
diff --git a/test/extrude/1376/1376.py b/test/extrude/1376/1376.py
index c28a0a81f0d4ed4eff455bfba4342ca9bc418689..dcc7585e538a3e2d1607402779307b020cdb0049 100644
--- a/test/extrude/1376/1376.py
+++ b/test/extrude/1376/1376.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,550,500))
-w1=cq.Workplane('YZ',origin=(491,500,500))
-r=w0.workplane(offset=281).moveTo(710,471).cylinder(940,680).union(w0.sketch().segment((1,241),(421,241)).segment((520,251)).arc((730,181),(930,291)).segment((950,291)).segment((950,311)).arc((1000,500),(920,680)).segment((900,820)).segment((371,770)).segment((421,301)).segment((1,301)).close().assemble().push([(660,530)]).rect(680,820,mode='s').reset().face(w0.sketch().arc((580,251),(730,221),(870,281)).close().assemble(),mode='s').reset().face(w0.sketch().segment((920,600),(940,391)).arc((960,500),(920,600)).assemble(),mode='s').finalize().extrude(840)).union(w1.sketch().push([(416,705)]).rect(910,790).push([(416,645)]).rect(570,630,mode='s').finalize().extrude(291))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(12,35,19))
+r=w0.sketch().segment((371,943),(371,276)).segment((468,276)).segment((468,563)).segment((634,285)).segment((716,334)).segment((516,668)).segment((751,809)).segment((687,916)).segment((468,765)).segment((468,943)).close().assemble().reset().segment((385,702),(479,757)).segment((573,702)).segment((573,594)).segment((479,539)).segment((385,594)).close().assemble(mode='s').finalize().extrude(368)
diff --git a/test/extrude/1376/1376.stl b/test/extrude/1376/1376.stl
index dbe5292dc7b21a98972cf04cc1de96d96112357d..acf94382582dc59eae197deab125372c968afd70 100644
Binary files a/test/extrude/1376/1376.stl and b/test/extrude/1376/1376.stl differ
diff --git a/test/extrude/1377/1377.py b/test/extrude/1377/1377.py
index 05277832b9ed3eaa4536e0aff26ff8f68f0b2c78..d4ba02b9ba0afa14061de96d8c03779971c37d8f 100644
--- a/test/extrude/1377/1377.py
+++ b/test/extrude/1377/1377.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(485,578,485))
-r=w0.sketch().arc((207,475),(186,1),(567,279)).segment((331,372)).segment((413,567)).segment((444,567)).segment((444,629)).segment((464,629)).segment((464,557)).segment((691,464)).arc((660,650),(506,753)).segment((598,897)).segment((444,1000)).segment((269,722)).segment((300,701)).arc((228,598),(207,475)).assemble().finalize().extrude(300).union(w0.sketch().segment((207,413),(238,413)).segment((228,331)).segment((320,320)).segment((320,444)).segment((310,444)).segment((310,609)).segment((320,609)).segment((320,701)).segment((547,701)).segment((279,732)).segment((258,609)).segment((207,609)).close().assemble().push([(815,516)]).circle(598).finalize().extrude(475))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(29,43,50))
+r=w0.sketch().segment((250,579),(926,579)).segment((926,601)).segment((250,601)).segment((273,601)).segment((273,590)).segment((250,590)).segment((250,601)).close().assemble().push([(407,565)]).circle(70,mode='s').finalize().extrude(103).translate((1,61,1))
diff --git a/test/extrude/1377/1377.stl b/test/extrude/1377/1377.stl
index cee48f8bdbfc7ab6500991aa7b1b7c8ea1c930b7..812affb6a575dacb918641a47b7c00932c17c3d1 100644
Binary files a/test/extrude/1377/1377.stl and b/test/extrude/1377/1377.stl differ
diff --git a/test/extrude/1378/1378.py b/test/extrude/1378/1378.py
index 133351c74090c5580f47fa83c9d87f415040b8f5..75ed181ad9d412f9380036a3940f2a7bd154e84e 100644
--- a/test/extrude/1378/1378.py
+++ b/test/extrude/1378/1378.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(421,421,309))
-w1=cq.Workplane('YZ',origin=(356,421,421))
-r=w0.sketch().segment((113,412),(262,412)).arc((393,356),(524,412)).segment((673,412)).segment((673,701)).segment((524,701)).arc((393,757),(262,701)).segment((113,701)).close().assemble().finalize().extrude(66).union(w0.sketch().push([(538,90)]).rect(505,655).push([(505,66)]).circle(430,mode='s').finalize().extrude(216)).union(w0.sketch().arc((589,1),(729,94),(664,253)).arc((244,234),(589,1)).assemble().finalize().extrude(1000)).union(w1.sketch().arc((860,169),(851,290),(888,402)).arc((683,309),(860,169)).assemble().finalize().extrude(486))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,74,15))
+r=w0.sketch().segment((98,880),(716,880)).segment((716,510)).segment((98,510)).close().assemble().push([(222,685)]).circle(28,mode='s').push([(183,574)]).circle(40,mode='s').finalize().extrude(181)
diff --git a/test/extrude/1378/1378.stl b/test/extrude/1378/1378.stl
index 78fe3b085a56cdc06e1a8f97d52dfaf37e60e16e..c4e99420594825a773f8c0a068218d2c0d19dae3 100644
Binary files a/test/extrude/1378/1378.stl and b/test/extrude/1378/1378.stl differ
diff --git a/test/extrude/1379/1379.py b/test/extrude/1379/1379.py
index d1adf980687879327f533e79fb14d1aebae2e09c..caf46fa9c7e36608ef8820f5316b0dec861e15be 100644
--- a/test/extrude/1379/1379.py
+++ b/test/extrude/1379/1379.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,610))
-r=w0.sketch().segment((1,21),(1000,21)).segment((1000,790)).segment((800,790)).segment((800,980)).segment((261,980)).segment((261,790)).segment((1,790)).segment((1,760)).segment((101,760)).segment((101,700)).segment((1,700)).close().assemble().push([(111,461)]).circle(510,mode='s').finalize().extrude(271)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(25,42,77))
+r=w0.sketch().segment((861,639),(115,639)).segment((115,591)).segment((861,591)).close().assemble().finalize().extrude(269).union(w0.workplane(offset=91).sketch().segment((701,801),(895,801)).segment((895,418)).segment((701,418)).close().assemble().finalize().extrude(48)).union(w0.workplane(offset=249).sketch().segment((242,619),(576,619)).segment((576,507)).segment((242,507)).close().assemble().finalize().extrude(30)).translate((1,238,1))
diff --git a/test/extrude/1379/1379.stl b/test/extrude/1379/1379.stl
index 2d7d2d2643c016b5095ddb79d39cb505d9e37f4d..c83d9cf95d4f3d9a0022a48741b782c3e21b39cc 100644
Binary files a/test/extrude/1379/1379.stl and b/test/extrude/1379/1379.stl differ
diff --git a/test/extrude/138/138.py b/test/extrude/138/138.py
index 2dd32b02e65cba894fe433759eb7f149f33bf705..1fafc7bff61a3bb058c1cf99b9a37c24b1a03439 100644
--- a/test/extrude/138/138.py
+++ b/test/extrude/138/138.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().segment((74,148),(174,148)).segment((154,347)).segment((234,361)).segment((261,154)).segment((207,148)).segment((594,148)).segment((594,520)).segment((74,520)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,491,500))
+r=w0.workplane(offset=351).moveTo(655,668).box(671,545,801).union(w0.sketch().push([(231,875)]).circle(625).reset().face(w0.sketch().segment((360,21),(416,2)).segment((511,282)).segment((460,297)).close().assemble()).push([(583,511)]).rect(846,790).push([(846,487)]).circle(550).finalize().extrude(825))
\ No newline at end of file
diff --git a/test/extrude/138/138.stl b/test/extrude/138/138.stl
index 060cbe06b74d3ee15e9b8e5c75f3b9c5cf94750d..f7c206e8c60f91b5fb87d14d952d9c3510b15466 100644
Binary files a/test/extrude/138/138.stl and b/test/extrude/138/138.stl differ
diff --git a/test/extrude/1380/1380.py b/test/extrude/1380/1380.py
index 655dac08a9e73ac98b9516aaa95bb879848aafed..696f813efbe50f92e72c25cb01c752300be53ff5 100644
--- a/test/extrude/1380/1380.py
+++ b/test/extrude/1380/1380.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(864,618,618))
-r=w0.sketch().segment((50,235),(112,235)).segment((112,544)).arc((161,618),(112,692)).segment((112,1000)).segment((50,1000)).segment((50,692)).arc((1,618),(50,544)).close().assemble().finalize().extrude(124).union(w0.workplane(offset=544).moveTo(889,642).cylinder(766,963))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(7,36,19))
+r=w0.sketch().segment((596,771),(790,771)).segment((790,1)).segment((596,1)).close().assemble().push([(673,382)]).circle(202,mode='s').finalize().extrude(304)
diff --git a/test/extrude/1380/1380.stl b/test/extrude/1380/1380.stl
index 4e62f5d5ab927fc8c0b65eebe6ee9f217d8be476..400c06780941e9484b95383ffd165792f5db18c8 100644
Binary files a/test/extrude/1380/1380.stl and b/test/extrude/1380/1380.stl differ
diff --git a/test/extrude/1381/1381.py b/test/extrude/1381/1381.py
index 91649df348a8a63d47335940fd3c9af0b7cad974..91fb61ff7c5343384f13ac7da9231227249559f0 100644
--- a/test/extrude/1381/1381.py
+++ b/test/extrude/1381/1381.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(435,193,435))
-w1=cq.Workplane('XY',origin=(435,435,203))
-r=w0.sketch().segment((92,112),(102,92)).segment((213,162)).segment((243,21)).segment((334,31)).segment((294,223)).segment((455,324)).segment((445,344)).segment((294,243)).segment((294,263)).segment((203,243)).segment((213,193)).close().assemble().reset().face(w0.sketch().segment((243,92),(294,92)).segment((294,193)).segment((253,193)).segment((243,183)).close().assemble(),mode='s').reset().face(w0.sketch().segment((475,536),(728,374)).segment((939,707)).segment((687,869)).close().assemble()).finalize().extrude(1000).union(w1.sketch().segment((1,112),(72,112)).arc((31,132),(1,162)).close().assemble().finalize().extrude(162))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(4,68,28))
+r=w0.sketch().segment((178,270),(1000,270)).segment((1000,1000)).segment((178,1000)).close().assemble().finalize().extrude(100).union(w0.workplane(offset=136).sketch().segment((173,587),(547,587)).segment((547,105)).segment((173,105)).close().assemble().finalize().extrude(86))
diff --git a/test/extrude/1381/1381.stl b/test/extrude/1381/1381.stl
index 7ab7a92d714f883d3af981974b17635a2770d8bf..80ee31480366901c4f5e7a9be0dd4e2333670577 100644
Binary files a/test/extrude/1381/1381.stl and b/test/extrude/1381/1381.stl differ
diff --git a/test/extrude/1382/1382.py b/test/extrude/1382/1382.py
index e4fb04e2b1cc6aff934daf5ba73bc242e4e04089..e847b362150245a04bb3a1de302e305a04ade218 100644
--- a/test/extrude/1382/1382.py
+++ b/test/extrude/1382/1382.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(532,268,268))
-r=w0.workplane(offset=1).box(1000,517,802).translate((1,233,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(13,33,5))
+r=w0.sketch().segment((178,522),(700,522)).segment((700,262)).segment((178,262)).close().assemble().finalize().extrude(381).union(w0.sketch().segment((1000,404),(854,434)).segment((486,360)).segment((486,168)).segment((536,168)).segment((536,342)).segment((608,342)).segment((608,168)).segment((1000,168)).close().assemble().finalize().extrude(234))
diff --git a/test/extrude/1382/1382.stl b/test/extrude/1382/1382.stl
index 76b35aa2c02603c66791f1a8fe21a4b5a6d9b8da..6da9f856bb7591a88571e43f3a947d970aae05e5 100644
Binary files a/test/extrude/1382/1382.stl and b/test/extrude/1382/1382.stl differ
diff --git a/test/extrude/1383/1383.py b/test/extrude/1383/1383.py
index b1ed9a5005ebec4ffe5d2ba88451853602ef8e78..948aec73956ca692059d74828f6bc8e67d081160 100644
--- a/test/extrude/1383/1383.py
+++ b/test/extrude/1383/1383.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(368,90,368))
-w1=cq.Workplane('YZ',origin=(254,368,368))
-r=w0.sketch().segment((595,140),(684,140)).segment((684,165)).arc((810,342),(684,507)).segment((684,532)).segment((595,532)).segment((595,507)).arc((456,342),(595,165)).close().assemble().push([(633,336)]).rect(469,380,mode='s').finalize().extrude(406).union(w0.sketch().arc((140,975),(1,633),(304,861)).segment((317,861)).segment((254,949)).segment((254,1000)).segment((229,1000)).segment((216,1000)).segment((140,1000)).close().assemble().finalize().extrude(937)).union(w1.workplane(offset=108).moveTo(482,203).cylinder(886,444)).translate((82,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,125,499))
+r=w0.workplane(offset=475).moveTo(391,241).cylinder(551,521).union(w0.sketch().segment((2,107),(866,105)).arc((885,282),(971,440)).segment((971,699)).segment((1000,746)).segment((780,894)).segment((505,496)).segment((556,745)).segment((2,746)).close().assemble().reset().face(w0.sketch().segment((706,322),(826,295)).segment((879,570)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/1383/1383.stl b/test/extrude/1383/1383.stl
index 31183954412c19b3538265f55ea9a8bdd1680f36..ea4bc0da8f6feb6cfdb862ce036513b1fc03939a 100644
Binary files a/test/extrude/1383/1383.stl and b/test/extrude/1383/1383.stl differ
diff --git a/test/extrude/1384/1384.py b/test/extrude/1384/1384.py
index 21925a99554728491b3eca42f10ebebc3afb9108..67c5df97690290e9dafe0d313fafffbf4488bf12 100644
--- a/test/extrude/1384/1384.py
+++ b/test/extrude/1384/1384.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(147,432,432))
-r=w0.sketch().segment((1,354),(87,354)).arc((311,190),(535,354)).segment((621,354)).segment((621,509)).segment((535,509)).arc((311,673),(87,509)).segment((1,509)).close().assemble().finalize().extrude(707).union(w0.sketch().arc((656,612),(457,406),(733,320)).arc((854,509),(656,612)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(79,43,9))
+r=w0.sketch().segment((19,319),(851,319)).segment((851,365)).segment((643,365)).segment((643,739)).segment((435,739)).segment((435,458)).segment((19,458)).close().assemble().push([(466,538)]).rect(131,202,mode='s').finalize().extrude(166)
diff --git a/test/extrude/1384/1384.stl b/test/extrude/1384/1384.stl
index c1e4ef0ae6eac281803786c139823ebbf465674d..c5ffe5411475ddda6f6ad187fc39df718d5b8fb4 100644
Binary files a/test/extrude/1384/1384.stl and b/test/extrude/1384/1384.stl differ
diff --git a/test/extrude/1385/1385.py b/test/extrude/1385/1385.py
index fee36f8a54d14fb43e5febca01c5a00db5790154..2f4d15601cb2cdc9c145509a05a5c96dc5de8f72 100644
--- a/test/extrude/1385/1385.py
+++ b/test/extrude/1385/1385.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,481,500))
-w1=cq.Workplane('ZX',origin=(500,361,500))
-r=w0.sketch().segment((311,550),(311,560)).segment((431,560)).arc((441,1),(451,560)).segment((520,560)).arc((630,570),(700,491)).arc((840,740),(710,990)).segment((381,990)).segment((381,1000)).arc((241,790),(311,550)).assemble().finalize().extrude(680).union(w1.sketch().arc((361,800),(690,630),(431,900)).arc((291,920),(361,800)).assemble().finalize().extrude(491))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(620,500,500))
+w1=cq.Workplane('YZ',origin=(700,499,500))
+r=w0.sketch().push([(701,756)]).rect(541,991).reset().face(w0.sketch().segment((695,659),(705,655)).segment((719,681)).segment((710,686)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=391).moveTo(329,216).box(596,930,721)).union(w1.workplane(offset=600).moveTo(329,215).box(585,680,700))
\ No newline at end of file
diff --git a/test/extrude/1385/1385.stl b/test/extrude/1385/1385.stl
index 9012b660dfcf2224486949a742dc6a5674effa56..f6c9433bacb4688a6e887dc8e06bde231ca99742 100644
Binary files a/test/extrude/1385/1385.stl and b/test/extrude/1385/1385.stl differ
diff --git a/test/extrude/1386/1386.py b/test/extrude/1386/1386.py
index fc22cb092a3869fad776290e0b46054e76f2f13e..01cf78817c892936bdb9bb1eb115e0e81d492ad1 100644
--- a/test/extrude/1386/1386.py
+++ b/test/extrude/1386/1386.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().circle(760).circle(687,mode='s').finalize().extrude(1).translate((1,94,94))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(78,56,56))
+r=w0.sketch().segment((822,666),(318,666)).segment((318,162)).segment((822,162)).close().assemble().push([(523,444)]).rect(96,127,mode='s').finalize().extrude(382).translate((1,327,1))
diff --git a/test/extrude/1386/1386.stl b/test/extrude/1386/1386.stl
index 7eb65bf405943a6a0385442deed37d01db0417cb..61d7dd9a20d656b4380e846db165ba95bf173fa8 100644
Binary files a/test/extrude/1386/1386.stl and b/test/extrude/1386/1386.stl differ
diff --git a/test/extrude/1387/1387.py b/test/extrude/1387/1387.py
index 1ae15e1cb62719cf1e72279a577f5a9f4f94e64a..7799cb27efb0b960cf08c49fef9759297cce9cee 100644
--- a/test/extrude/1387/1387.py
+++ b/test/extrude/1387/1387.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().arc((720,760),(687,660),(727,567)).segment((727,387)).segment((940,387)).segment((940,567)).arc((987,667),(940,767)).segment((940,947)).segment((727,947)).segment((727,900)).arc((853,820),(720,760)).assemble().finalize().extrude(1).union(w0.sketch().segment((347,800),(414,767)).arc((427,814),(461,853)).segment((401,887)).close().assemble().reset().face(w0.sketch().segment((647,627),(707,594)).segment((760,680)).segment((700,720)).arc((680,667),(647,627)).assemble()).finalize().extrude(394))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(731,502,502))
+r=w0.sketch().arc((243,607),(4,431),(277,327)).arc((402,217),(562,178)).arc((387,522),(645,811)).arc((402,790),(241,605)).assemble().finalize().extrude(43).union(w0.workplane(offset=288).moveTo(683,366).box(1000,680,925))
\ No newline at end of file
diff --git a/test/extrude/1387/1387.stl b/test/extrude/1387/1387.stl
index ddc413755cb2bc03c0cdbdf8a3933b7a68e0423b..b55673f5134765c5696e8c4d3cec3d8136b83d92 100644
Binary files a/test/extrude/1387/1387.stl and b/test/extrude/1387/1387.stl differ
diff --git a/test/extrude/1388/1388.py b/test/extrude/1388/1388.py
index 46363c70c0e7ce0ca8f7e5712d7c135ca4432706..c2a95c9e86df11fc55e704028c6789b3c367d6fe 100644
--- a/test/extrude/1388/1388.py
+++ b/test/extrude/1388/1388.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,565,565))
-r=w0.sketch().segment((621,325),(1000,325)).segment((658,408)).segment((769,870)).segment((621,870)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=746).moveTo(269,399).cylinder(926,704))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(5,70,74))
+r=w0.sketch().segment((1,806),(743,806)).segment((744,542)).segment((1,542)).close().assemble().finalize().extrude(256).union(w0.sketch().segment((385,480),(329,480)).segment((329,422)).segment((300,422)).segment((300,228)).segment((414,229)).segment((414,422)).segment((385,422)).close().assemble().finalize().extrude(197)).union(w0.sketch().segment((535,584),(781,584)).segment((781,888)).segment((535,888)).close().assemble().finalize().extrude(135))
diff --git a/test/extrude/1388/1388.stl b/test/extrude/1388/1388.stl
index bcf02f74649e34a850892572e856ee2842236a17..8247e5e574a31869da0200d1cbe48897a4815438 100644
Binary files a/test/extrude/1388/1388.stl and b/test/extrude/1388/1388.stl differ
diff --git a/test/extrude/1389/1389.py b/test/extrude/1389/1389.py
index 633010bb5953b4c8305e0a039bd0ccc074ecc98b..8762a238ff60c1a5bda73fcf677fd0c4cc01c46b 100644
--- a/test/extrude/1389/1389.py
+++ b/test/extrude/1389/1389.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(385,109,385))
-r=w0.workplane(offset=358).moveTo(408,470).cylinder(439,685).union(w0.sketch().segment((62,531),(193,316)).arc((193,247),(247,216)).segment((378,1)).segment((424,32)).segment((301,247)).arc((301,308),(239,339)).segment((116,562)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(27,15,33))
+r=w0.sketch().segment((268,464),(830,464)).segment((830,226)).segment((268,226)).close().assemble().finalize().extrude(303).union(w0.workplane(offset=102).sketch().segment((460,505),(64,505)).segment((64,261)).segment((460,261)).close().assemble().finalize().extrude(152)).union(w0.workplane(offset=245).sketch().segment((357,516),(155,516)).segment((155,232)).segment((357,232)).close().assemble().finalize().extrude(152)).translate((1,383,1))
diff --git a/test/extrude/1389/1389.stl b/test/extrude/1389/1389.stl
index 4098ad8be6a7cbc08e0a72d99843a2052c35b810..c181428ac5ef35ed66b7a261b548f16ee4bba5a8 100644
Binary files a/test/extrude/1389/1389.stl and b/test/extrude/1389/1389.stl differ
diff --git a/test/extrude/139/139.py b/test/extrude/139/139.py
index 8105acc0a7f4d5c30469d7f0fd3c8c861240ae7c..68af770ff417146044abeaaa01ab9bffbbb24c8d 100644
--- a/test/extrude/139/139.py
+++ b/test/extrude/139/139.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(640,780,640))
-r=w0.sketch().segment((720,630),(760,301)).segment((860,311)).segment((820,630)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((421,910),(471,800)).segment((640,800)).segment((640,650)).segment((700,680)).segment((580,980)).arc((510,910),(421,910)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(605,502,502))
+w1=cq.Workplane('YZ',origin=(841,501,501))
+r=w0.sketch().segment((236,596),(880,330)).segment((1000,616)).segment((356,880)).close().assemble().finalize().extrude(220).union(w1.sketch().arc((540,805),(36,331),(721,415)).segment((801,415)).segment((800,805)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/139/139.stl b/test/extrude/139/139.stl
index 19dfa8c50b59d7ca2a9aee1c9e839466f7ba428f..f21b217550dde2a96caffe994c24d412bd6a9d59 100644
Binary files a/test/extrude/139/139.stl and b/test/extrude/139/139.stl differ
diff --git a/test/extrude/1390/1390.py b/test/extrude/1390/1390.py
index 3257d24335504863ea912ecef0d497cbad269242..8a28e7e16853de2d5826cbebf7cf093b0b095fe8 100644
--- a/test/extrude/1390/1390.py
+++ b/test/extrude/1390/1390.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,431))
-r=w0.sketch().segment((1,660),(231,371)).segment((660,710)).segment((431,1000)).close().assemble().push([(860,141)]).circle(640).finalize().extrude(650)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(57,71,78))
+r=w0.sketch().segment((249,764),(824,764)).segment((824,190)).segment((248,190)).close().assemble().finalize().extrude(332).union(w0.sketch().segment((548,450),(629,450)).segment((629,466)).segment((656,485)).segment((629,504)).arc((640,514),(629,525)).arc((590,604),(591,692)).arc((601,703),(591,714)).segment((613,736)).segment((613,784)).segment((602,784)).segment((602,774)).segment((548,774)).close().assemble().finalize().extrude(131)).union(w0.sketch().segment((232,664),(296,664)).segment((296,625)).segment((404,625)).segment((404,664)).segment((468,707)).segment((232,707)).close().assemble().finalize().extrude(149))
diff --git a/test/extrude/1390/1390.stl b/test/extrude/1390/1390.stl
index 80537c3146429f043c71e0f08ba12258969fe11c..13434fb9106d7c7088bffda09e71f8f6bb4b1055 100644
Binary files a/test/extrude/1390/1390.stl and b/test/extrude/1390/1390.stl differ
diff --git a/test/extrude/1391/1391.py b/test/extrude/1391/1391.py
index 6a303316b2c6e3df52029feaaa6017fb72c756a2..0ba0de00cd4ba35f25931d040e63b5149a2dbc86 100644
--- a/test/extrude/1391/1391.py
+++ b/test/extrude/1391/1391.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(319,455,455))
-r=w0.workplane(offset=555).moveTo(591,873).box(1000,528,655).union(w0.sketch().segment((46,55),(164,1)).segment((401,528)).segment((273,582)).close().assemble().finalize().extrude(737))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(46,32,14))
+r=w0.sketch().segment((136,920),(528,920)).segment((528,210)).segment((136,210)).close().assemble().push([(316,553)]).rect(108,220,mode='s').finalize().extrude(211)
diff --git a/test/extrude/1391/1391.stl b/test/extrude/1391/1391.stl
index c6f2e7f0c9ad86102426c71f1bc04c3941c5bb30..4354028f22887d26a8e446030ca3c2b8026771c2 100644
Binary files a/test/extrude/1391/1391.stl and b/test/extrude/1391/1391.stl differ
diff --git a/test/extrude/1392/1392.py b/test/extrude/1392/1392.py
index 7839dae8460dab3160ccc86c2389c3fa795a934c..ef54a2d6821a64e23f267602d93e34fc89a03816 100644
--- a/test/extrude/1392/1392.py
+++ b/test/extrude/1392/1392.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).cylinder(1000,667).translate((334,334,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(77,51,13))
+r=w0.sketch().segment((183,844),(683,844)).segment((683,30)).segment((183,30)).close().assemble().finalize().extrude(187).union(w0.workplane(offset=223).sketch().segment((165,24),(419,24)).segment((419,448)).segment((165,448)).close().assemble().finalize().extrude(195))
diff --git a/test/extrude/1392/1392.stl b/test/extrude/1392/1392.stl
index 8a4800ae15649409394d5c2626433c1a459728da..f5c78103d6c51de41a14a7ffd5a5565ba92667ad 100644
Binary files a/test/extrude/1392/1392.stl and b/test/extrude/1392/1392.stl differ
diff --git a/test/extrude/1393/1393.py b/test/extrude/1393/1393.py
index 6640ff294ee6593436a14ba78130884ac32ae86a..c1a5d2c27dbd6b5535c89c880474ccaa32e09616 100644
--- a/test/extrude/1393/1393.py
+++ b/test/extrude/1393/1393.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(444,444,535))
-w1=cq.Workplane('XY',origin=(444,444,455))
-r=w0.workplane(offset=353).moveTo(466,500).cylinder(625,603).union(w0.workplane(offset=455).moveTo(370,80).box(705,648,466)).union(w0.sketch().push([(1000,1)]).circle(455).reset().face(w0.sketch().segment((989,1),(1000,1)).segment((1000,12)).close().assemble(),mode='s').finalize().extrude(489)).union(w1.workplane(offset=364).moveTo(52,898).box(796,466,603)).translate((1,11,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(31,58,34))
+r=w0.sketch().segment((158,125),(788,125)).segment((788,755)).segment((158,755)).close().assemble().finalize().extrude(96).union(w0.workplane(offset=2).sketch().segment((458,1),(1,1)).segment((1,431)).segment((458,431)).close().assemble().finalize().extrude(112)).union(w0.sketch().segment((622,462),(500,810)).segment((270,462)).close().assemble().finalize().extrude(186))
diff --git a/test/extrude/1393/1393.stl b/test/extrude/1393/1393.stl
index 15e5f9ac8f8305b0d7cfd9e2e0049755e2d8999f..57182578ebdef1b6d9598e9a4204da94e3378187 100644
Binary files a/test/extrude/1393/1393.stl and b/test/extrude/1393/1393.stl differ
diff --git a/test/extrude/1394/1394.py b/test/extrude/1394/1394.py
index 8c0850b3176e077e3c969339e05880ccf8bca196..1d6506ec2a4474e7de2ee5d6e01a2ba2766480ec 100644
--- a/test/extrude/1394/1394.py
+++ b/test/extrude/1394/1394.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(630,630,940))
-r=w0.sketch().arc((234,406),(630,578),(905,251)).arc((724,1000),(234,406)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(49,44,34))
+r=w0.sketch().segment((257,372),(1000,372)).segment((1000,772)).segment((257,772)).close().assemble().push([(625,536)]).rect(215,240,mode='s').finalize().extrude(335)
diff --git a/test/extrude/1394/1394.stl b/test/extrude/1394/1394.stl
index a608f594383b06123b324c03bfd4ce637503fe05..06a5545a3093638488ebb13bf2083fb12c460cd9 100644
Binary files a/test/extrude/1394/1394.stl and b/test/extrude/1394/1394.stl differ
diff --git a/test/extrude/1395/1395.py b/test/extrude/1395/1395.py
index 6b2c9aa69547912d49d0c2f9b6fd63064866b7f3..8d18d8d66b096d337ede7fe498c02f6b9f5969e2 100644
--- a/test/extrude/1395/1395.py
+++ b/test/extrude/1395/1395.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(947,474,474))
-w1=cq.Workplane('XY',origin=(474,474,1000))
-r=w0.workplane(offset=290).moveTo(548,285).cylinder(842,811).union(w0.workplane(offset=443).moveTo(663,947).cylinder(537,516)).union(w1.sketch().segment((1,64),(180,64)).segment((180,117)).segment((464,117)).segment((464,64)).segment((590,64)).segment((590,211)).segment((653,211)).segment((653,621)).segment((232,621)).segment((232,380)).segment((1,380)).close().assemble().finalize().extrude(232)).translate((1,1,53))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(28,63,64))
+r=w0.sketch().segment((300,942),(950,942)).segment((950,228)).segment((300,228)).close().assemble().finalize().extrude(353).union(w0.workplane(offset=24).sketch().segment((480,662),(168,662)).segment((168,676)).segment((480,676)).close().assemble().finalize().extrude(176)).translate((1,291,1))
diff --git a/test/extrude/1395/1395.stl b/test/extrude/1395/1395.stl
index 248fed4775583d2aabb18643e1130b9a36346eb2..7bfd725fd8261b53ca455bb8a9bb9436273886d6 100644
Binary files a/test/extrude/1395/1395.stl and b/test/extrude/1395/1395.stl differ
diff --git a/test/extrude/1396/1396.py b/test/extrude/1396/1396.py
index 74e0c310344e5a8d69cc0566f3929e6291267b23..2ccb6fbeda1f55c2cec99bd8ac15a55b5659cd81 100644
--- a/test/extrude/1396/1396.py
+++ b/test/extrude/1396/1396.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(396,690,396))
-w1=cq.Workplane('YZ',origin=(404,396,396))
-r=w0.sketch().segment((109,442),(133,442)).arc((226,295),(380,233)).segment((388,226)).segment((528,257)).segment((528,272)).arc((605,342),(659,442)).segment((682,442)).segment((682,566)).segment((659,566)).arc((566,706),(411,768)).segment((404,783)).segment((264,752)).segment((264,737)).arc((187,667),(133,566)).segment((109,566)).close().assemble().finalize().extrude(164).union(w1.sketch().push([(396,280)]).rect(1000,442).push([(396,284)]).rect(427,404,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(30,41,68))
+r=w0.sketch().segment((396,678),(536,678)).arc((998,663),(536,648)).segment((396,648)).close().assemble().push([(438,675)]).circle(150,mode='s').finalize().extrude(79)
diff --git a/test/extrude/1396/1396.stl b/test/extrude/1396/1396.stl
index f792ab2be897d2d3c7b3bced3e3652952403fc16..127e1abb16ed07ce235e38b3bd274b7e5a3d2298 100644
Binary files a/test/extrude/1396/1396.stl and b/test/extrude/1396/1396.stl differ
diff --git a/test/extrude/1397/1397.py b/test/extrude/1397/1397.py
index a74716868cf06999011cc2540efedd4d4aad213c..94706bca9d5dc3e082b4d7b0fb62814a94cd8ea0 100644
--- a/test/extrude/1397/1397.py
+++ b/test/extrude/1397/1397.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(539,597,539))
-r=w0.sketch().push([(741,741)]).circle(635).push([(736,741)]).rect(625,712,mode='s').finalize().extrude(1).union(w0.workplane(offset=601).moveTo(736,741).box(875,1000,664)).union(w0.sketch().segment((155,404),(174,318)).segment((318,347)).segment((395,107)).segment((856,251)).segment((789,472)).segment((923,500)).segment((904,597)).segment((760,558)).segment((683,798)).segment((222,654)).segment((289,443)).close().assemble().finalize().extrude(962))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,499,161))
+w1=cq.Workplane('ZX',origin=(501,610,500))
+r=w0.sketch().segment((2,421),(30,421)).segment((31,375)).segment((282,374)).segment((281,420)).segment((311,420)).segment((311,579)).segment((281,581)).segment((281,625)).segment((32,627)).segment((32,579)).segment((1,581)).close().assemble().finalize().extrude(940).union(w1.workplane(offset=420).moveTo(661,821).cylinder(661,681))
\ No newline at end of file
diff --git a/test/extrude/1397/1397.stl b/test/extrude/1397/1397.stl
index 22da7318fb8d891395fea6f89d2ef4456255020d..a3c1cca1fafc2c94285bcb5a60b9a38331b7bd42 100644
Binary files a/test/extrude/1397/1397.stl and b/test/extrude/1397/1397.stl differ
diff --git a/test/extrude/1398/1398.py b/test/extrude/1398/1398.py
index 433d93e42d7d2e84ff0c34a2308e78b33dbafee8..e0dabc8fa51988ecfd3ead27f7ed9514affe76c3 100644
--- a/test/extrude/1398/1398.py
+++ b/test/extrude/1398/1398.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(451,676,451))
-r=w0.sketch().rect(956,1000).reset().face(w0.sketch().segment((402,308),(500,308)).segment((500,363)).arc((544,451),(500,539)).segment((500,610)).segment((402,610)).segment((402,539)).arc((341,451),(402,363)).close().assemble(),mode='s').finalize().extrude(1).translate((50,1,28))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(47,70,75))
+r=w0.sketch().segment((1000,525),(1000,653)).segment((809,653)).segment((809,784)).segment((308,784)).segment((308,524)).segment((367,524)).segment((367,701)).segment((487,701)).segment((490,525)).close().assemble().reset().segment((385,678),(385,527)).segment((519,527)).segment((519,603)).segment((527,611)).segment((652,611)).segment((653,695)).segment((518,695)).arc((499,682),(477,678)).close().assemble(mode='s').finalize().extrude(250)
diff --git a/test/extrude/1398/1398.stl b/test/extrude/1398/1398.stl
index 3fcdfa08fa6d25a60fa68e617ba1822ae1230bbc..ba7f53f702220ea30a121893718127f79fc864fb 100644
Binary files a/test/extrude/1398/1398.stl and b/test/extrude/1398/1398.stl differ
diff --git a/test/extrude/1399/1399.py b/test/extrude/1399/1399.py
index b3ef9abfff55c66b90df3cdb6b4be890d8222f7a..59db667577d2e9a7e548318bffa72967f07403fb 100644
--- a/test/extrude/1399/1399.py
+++ b/test/extrude/1399/1399.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(538,807,538))
-r=w0.sketch().arc((447,549),(479,506),(495,458)).arc((613,586),(447,549)).assemble().finalize().extrude(1).union(w0.workplane(offset=307).moveTo(533,538).cylinder(1000,608))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(73,78,26))
+r=w0.sketch().segment((198,659),(918,659)).segment((918,479)).segment((198,479)).close().assemble().push([(543,534)]).rect(165,114,mode='s').finalize().extrude(171).translate((1,94,1))
diff --git a/test/extrude/1399/1399.stl b/test/extrude/1399/1399.stl
index fad25a7fa4275499866114739b7d4f499213f5d6..f9f427430b4eabe1a2926712a71fa492514c578b 100644
Binary files a/test/extrude/1399/1399.stl and b/test/extrude/1399/1399.stl differ
diff --git a/test/extrude/14/14.py b/test/extrude/14/14.py
index 2a227bc0a49761bff6f0ae3d191b27abc417f62e..8b437b9d7c9eb6ba8114ff9d0e47ec9b86ac213b 100644
--- a/test/extrude/14/14.py
+++ b/test/extrude/14/14.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(535,535,522))
-r=w0.sketch().arc((51,522),(1,162),(324,299)).segment((634,299)).segment((634,535)).segment((572,535)).arc((435,435),(286,510)).segment((286,473)).arc((262,485),(249,497)).arc((187,944),(51,522)).assemble().finalize().extrude(262).union(w0.workplane(offset=454).moveTo(1000,535).box(845,907,696)).union(w0.sketch().push([(497,423)]).circle(609).push([(473,423)]).circle(572,mode='s').finalize().extrude(845))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,985,501))
+r=w0.sketch().segment((476,1),(516,1)).segment((516,335)).arc((665,505),(514,666)).segment((515,1000)).segment((475,1000)).segment((477,665)).arc((335,506),(475,335)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/14/14.stl b/test/extrude/14/14.stl
index 0431608c3852250cb86ec86bce7f40cb08279e27..dba67a500adedd4be660b9ce03cf8892856dcdfa 100644
--- a/test/extrude/14/14.stl
+++ b/test/extrude/14/14.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:adac49bcb2f6b2b81e99b309f09cb0bdff7005d0cf932624621d8a49d63d30d5
-size 117284
+oid sha256:afb70158b754c26e18d576b1a1277abab843508fc93330350a9ed0d61522008c
+size 24284
diff --git a/test/extrude/140/140.py b/test/extrude/140/140.py
index a73e51a5c6f75d65f66fa196bd94d3bac4b8fc7d..10a892be210345200dfe675f7ef9a7c1baec1704 100644
--- a/test/extrude/140/140.py
+++ b/test/extrude/140/140.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(614,614,920))
-r=w0.sketch().push([(531,614)]).rect(1000,994).push([(550,574)]).rect(804,779,mode='s').finalize().extrude(1).union(w0.sketch().segment((595,577),(645,522)).segment((675,546)).segment((694,516)).segment((871,583)).segment((841,675)).segment((890,718)).segment((847,779)).segment((810,749)).segment((798,785)).segment((614,712)).segment((651,620)).close().assemble().finalize().extrude(222))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(480,500,501))
+r=w0.sketch().arc((938,740),(48,292),(980,646)).segment((978,740)).close().assemble().finalize().extrude(535)
\ No newline at end of file
diff --git a/test/extrude/140/140.stl b/test/extrude/140/140.stl
index 5073fa9e367078a76c1e4a495b18a30918c5438d..465004431b952b461b80162c374898c8fb92b5b6 100644
Binary files a/test/extrude/140/140.stl and b/test/extrude/140/140.stl differ
diff --git a/test/extrude/1400/1400.py b/test/extrude/1400/1400.py
index 3fa18769bf0941e05fd002d580da26d0058f8763..d0aa6b9c1a500960a1e64ac340a88a08b91fa8f9 100644
--- a/test/extrude/1400/1400.py
+++ b/test/extrude/1400/1400.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(398,398,353))
-w1=cq.Workplane('ZX',origin=(398,251,398))
-r=w0.workplane(offset=217).moveTo(574,132).box(841,1000,762).union(w0.sketch().segment((1,807),(444,580)).segment((535,728)).segment((80,966)).close().assemble().finalize().extrude(614)).union(w1.sketch().push([(762,625)]).circle(444).reset().face(w1.sketch().segment((739,591),(773,591)).segment((773,625)).segment((784,625)).segment((784,648)).segment((773,648)).segment((773,659)).segment((739,659)).close().assemble(),mode='s').finalize().extrude(989))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(56,56,55))
+r=w0.sketch().segment((205,783),(205,168)).segment((627,168)).segment((627,783)).segment((519,784)).arc((416,680),(313,783)).close().assemble().push([(453,564)]).circle(145,mode='s').finalize().extrude(97)
diff --git a/test/extrude/1400/1400.stl b/test/extrude/1400/1400.stl
index e70ec7b7e44c655a4e53211890d9346d9575ae91..718ff7d6a142242159dccc00eeee7558adc6e531 100644
Binary files a/test/extrude/1400/1400.stl and b/test/extrude/1400/1400.stl differ
diff --git a/test/extrude/1401/1401.py b/test/extrude/1401/1401.py
index 67c4b851c1fb3fc23c42d406e2379c0598553b96..cdf487b28dafcb43c7949d5ba7db2d629eb20a9b 100644
--- a/test/extrude/1401/1401.py
+++ b/test/extrude/1401/1401.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(470,490,490))
-r=w0.sketch().arc((286,694),(378,766),(480,786)).segment((378,827)).segment((409,918)).segment((602,847)).segment((572,766)).arc((633,725),(684,674)).segment((694,674)).segment((694,1000)).segment((286,1000)).close().assemble().finalize().extrude(256).union(w0.workplane(offset=633).moveTo(450,1).cylinder(776,511)).translate((1,1,21))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(11,21,54))
+r=w0.sketch().segment((338,1),(970,1)).segment((970,381)).arc((654,700),(338,381)).close().assemble().push([(532,358)]).rect(70,113,mode='s').push([(616,339)]).circle(70,mode='s').push([(683,166)]).circle(77,mode='s').finalize().extrude(399)
diff --git a/test/extrude/1401/1401.stl b/test/extrude/1401/1401.stl
index d0437ff55a7cdb0c6e79af0512ac1ee26831f723..f7c93b5f5fedb2a10fdf0296e9c74c983ac09f33 100644
Binary files a/test/extrude/1401/1401.stl and b/test/extrude/1401/1401.stl differ
diff --git a/test/extrude/1402/1402.py b/test/extrude/1402/1402.py
index 4344c72d523aa666ca869700518c41cfd4f7849e..729fad7579992362986e169514e817e5dbc5d5e2 100644
--- a/test/extrude/1402/1402.py
+++ b/test/extrude/1402/1402.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(330,330,1))
-r=w0.sketch().circle(879).push([(210,341)]).circle(363,mode='s').finalize().extrude(1000).translate((550,550,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(59,5,71))
+r=w0.sketch().segment((764,763),(641,763)).segment((502,381)).segment((323,381)).segment((231,763)).segment((96,763)).segment((303,1)).segment((526,1)).close().assemble().push([(198,633)]).rect(90,83,mode='s').push([(674,356)]).circle(74,mode='s').push([(382,104)]).rect(115,101,mode='s').finalize().extrude(70)
diff --git a/test/extrude/1402/1402.stl b/test/extrude/1402/1402.stl
index b3107d862f31fe95a888ea2a0dc4c32b432e934f..2e9ef2cda7dcd55ac63cdd3a58dc4dc6573db5fb 100644
Binary files a/test/extrude/1402/1402.stl and b/test/extrude/1402/1402.stl differ
diff --git a/test/extrude/1403/1403.py b/test/extrude/1403/1403.py
index 30b044a013532e524c258bc27da1e203bf7bbccd..8d5dfd93c769a731046e4f7a105995798cb8e6ae 100644
--- a/test/extrude/1403/1403.py
+++ b/test/extrude/1403/1403.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(334,347,347))
-r=w0.workplane(offset=33).moveTo(571,65).box(590,424,974).union(w0.sketch().segment((1,577),(180,577)).segment((91,667)).close().assemble().finalize().extrude(1000)).translate((121,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(15,66,64))
+r=w0.sketch().segment((899,108),(630,108)).segment((283,108)).segment((283,555)).segment((630,555)).segment((630,108)).segment((630,1000)).segment((899,1000)).segment((899,107)).close().assemble().push([(574,382)]).circle(106,mode='s').finalize().extrude(384)
diff --git a/test/extrude/1403/1403.stl b/test/extrude/1403/1403.stl
index a6eb89a021cd69f82d41fe8f8c36afdfe8f7ef2a..0271eed44d4a8a282895f4203c45a526dc2ea025 100644
Binary files a/test/extrude/1403/1403.stl and b/test/extrude/1403/1403.stl differ
diff --git a/test/extrude/1404/1404.py b/test/extrude/1404/1404.py
index 67cc1a4968fdca763d39266e5b662bdf6f7e1858..b6665a13a0e8b0d402e906d057527aca3d51827e 100644
--- a/test/extrude/1404/1404.py
+++ b/test/extrude/1404/1404.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(485,876,485))
-w1=cq.Workplane('YZ',origin=(454,485,485))
-r=w0.sketch().arc((392,1000),(279,11),(928,763)).arc((629,784),(392,1000)).assemble().finalize().extrude(1).union(w1.workplane(offset=253).moveTo(258,197).cylinder(949,650))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(35,70,18))
+r=w0.sketch().segment((1000,602),(294,602)).segment((294,12)).segment((1000,12)).close().assemble().push([(872,513)]).rect(93,83,mode='s').push([(456,451)]).circle(65,mode='s').push([(365,355)]).rect(60,77,mode='s').finalize().extrude(353).translate((1,284,1))
diff --git a/test/extrude/1404/1404.stl b/test/extrude/1404/1404.stl
index e7597b227fa130b5759c0eaf5c0b362d6da0df4f..7cade568017c7df668bdf64624a48a9a94574591 100644
Binary files a/test/extrude/1404/1404.stl and b/test/extrude/1404/1404.stl differ
diff --git a/test/extrude/1405/1405.py b/test/extrude/1405/1405.py
index b5bb9218158a21b00097241ddb69e0de7eee49af..d3b2eb28459b1ed647f656e13cf3f8926d6c2863 100644
--- a/test/extrude/1405/1405.py
+++ b/test/extrude/1405/1405.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,700,500))
-w1=cq.Workplane('YZ',origin=(371,500,500))
-r=w0.sketch().segment((21,580),(401,580)).segment((401,1)).segment((900,1)).segment((900,580)).segment((481,580)).segment((481,620)).segment((21,620)).close().assemble().push([(680,560)]).circle(520,mode='s').finalize().extrude(11).union(w0.sketch().segment((700,740),(800,740)).segment((800,560)).segment((830,560)).segment((830,740)).segment((940,740)).segment((940,830)).segment((830,830)).segment((830,1000)).segment((800,1000)).segment((800,830)).segment((700,830)).close().assemble().finalize().extrude(451)).union(w1.sketch().segment((211,690),(790,690)).segment((790,840)).arc((461,760),(211,980)).close().assemble().finalize().extrude(780))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(17,28,28))
+r=w0.sketch().segment((580,819),(570,819)).segment((508,104)).arc((575,31),(642,104)).close().assemble().push([(593,511)]).circle(133,mode='s').finalize().extrude(128)
diff --git a/test/extrude/1405/1405.stl b/test/extrude/1405/1405.stl
index 358df0040b20764d6abc8528a73adee9f6233d82..5e4aeeae4cce927f51966882d30460072e576d12 100644
Binary files a/test/extrude/1405/1405.stl and b/test/extrude/1405/1405.stl differ
diff --git a/test/extrude/1406/1406.py b/test/extrude/1406/1406.py
index e79c15650238e99efcfbb0e1923057c66a562239..47af3c56cd9fffa36f564adc96244d64a7236374 100644
--- a/test/extrude/1406/1406.py
+++ b/test/extrude/1406/1406.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(516,516,743))
-r=w0.sketch().segment((279,166),(372,166)).arc((537,94),(701,166)).segment((794,166)).segment((794,258)).segment((1000,238)).segment((1000,320)).segment((794,341)).segment((794,526)).segment((701,526)).arc((537,588),(372,526)).segment((279,526)).close().assemble().finalize().extrude(63).union(w0.workplane(offset=398).moveTo(125,938).cylinder(753,609)).union(w0.sketch().segment((495,1),(876,1)).segment((876,207)).arc((907,310),(876,413)).segment((876,609)).segment((495,609)).segment((495,413)).arc((475,310),(495,207)).close().assemble().finalize().extrude(310))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(15,14,70))
+r=w0.sketch().segment((825,338),(523,338)).segment((523,942)).segment((825,942)).close().assemble().push([(553,724)]).circle(37,mode='s').push([(642,390)]).circle(52,mode='s').push([(617,739)]).circle(28,mode='s').push([(742,454)]).circle(27,mode='s').finalize().extrude(90)
diff --git a/test/extrude/1406/1406.stl b/test/extrude/1406/1406.stl
index 9e30ebe386b7e7e0f7133c2bf11ef188a1e4e173..5ddc67e60922c3bfc84b5985bcd13f768d92ae10 100644
Binary files a/test/extrude/1406/1406.stl and b/test/extrude/1406/1406.stl differ
diff --git a/test/extrude/1407/1407.py b/test/extrude/1407/1407.py
index 506d13656c6743c3059a941be37d6345a2e546b1..c7248842abd5c1ab3c7e0b8a9a6ed6943e032636 100644
--- a/test/extrude/1407/1407.py
+++ b/test/extrude/1407/1407.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(511,511,671))
-r=w0.sketch().arc((1,458),(12,362),(97,405)).arc((129,575),(1,458)).assemble().push([(1000,628)]).circle(554).finalize().extrude(192)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(22,59,40))
+r=w0.sketch().segment((647,312),(647,565)).segment((1,565)).segment((1,85)).segment((647,85)).segment((647,240)).segment((499,240)).arc((413,282),(357,358)).arc((366,381),(389,374)).arc((435,327),(499,312)).close().assemble().push([(437,275)]).rect(144,151,mode='s').finalize().extrude(70)
diff --git a/test/extrude/1407/1407.stl b/test/extrude/1407/1407.stl
index 210b1b5a58e6998b3555c0894c16b788c3473692..d7f243b5ef1368aac57c86c37f49735fe326ef9c 100644
Binary files a/test/extrude/1407/1407.stl and b/test/extrude/1407/1407.stl differ
diff --git a/test/extrude/1408/1408.py b/test/extrude/1408/1408.py
index 19c8eab4304ed60d31b1d1a2b8ae4cdfd245cfbe..97e6a65831361d1b62863307fb87a0ccbc1fdf9c 100644
--- a/test/extrude/1408/1408.py
+++ b/test/extrude/1408/1408.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(39,39,1))
-r=w0.workplane(offset=78).box(155,1000,116).translate((40,462,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(54,49,7))
+r=w0.sketch().segment((136,411),(926,411)).segment((926,806)).segment((136,806)).close().assemble().finalize().extrude(108).union(w0.sketch().segment((428,610),(8,610)).segment((8,330)).segment((428,330)).close().assemble().finalize().extrude(175)).union(w0.workplane(offset=221).sketch().segment((150,690),(388,690)).segment((388,698)).segment((150,698)).close().assemble().finalize().extrude(56))
diff --git a/test/extrude/1408/1408.stl b/test/extrude/1408/1408.stl
index d6df01d9a7b6120e87e312c0eea76cff466684f4..e78d4206c609881345c8f5621f749511f85509a9 100644
Binary files a/test/extrude/1408/1408.stl and b/test/extrude/1408/1408.stl differ
diff --git a/test/extrude/1409/1409.py b/test/extrude/1409/1409.py
index 029b1412b085436a716a40ea6ac6e25a6dc44071..77473caa9a58b4236a71eb9f3dc15baedc4d00fd 100644
--- a/test/extrude/1409/1409.py
+++ b/test/extrude/1409/1409.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(480,480,667))
-w1=cq.Workplane('XY',origin=(480,480,573))
-r=w0.sketch().segment((646,178),(771,178)).segment((771,605)).segment((646,605)).segment((646,459)).arc((688,417),(646,386)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(230,162)]).rect(646,886).push([(173,251)]).rect(511,500,mode='s').finalize().extrude(43)).union(w1.sketch().segment((292,490),(334,490)).arc((521,396),(719,490)).segment((813,490)).segment((813,1000)).segment((292,1000)).segment((292,729)).arc((282,646),(292,553)).close().assemble().reset().face(w1.sketch().arc((386,844),(563,886),(719,792)).segment((719,958)).segment((386,958)).close().assemble(),mode='s').finalize().extrude(667))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(78,67,1))
+r=w0.sketch().segment((971,678),(971,622)).arc((655,581),(353,481)).segment((353,819)).arc((655,719),(972,678)).close().assemble().finalize().extrude(215).union(w0.workplane(offset=147).sketch().segment((956,439),(1000,293)).arc((798,200),(586,97)).segment((519,262)).close().assemble().finalize().extrude(181)).union(w0.sketch().segment((696,466),(570,466)).segment((434,466)).segment((434,294)).segment((570,294)).segment((696,294)).segment((696,310)).segment((696,294)).segment((696,310)).arc((766,380),(696,450)).close().assemble().finalize().extrude(172))
diff --git a/test/extrude/1409/1409.stl b/test/extrude/1409/1409.stl
index ff3434b05bcd2d9fe648a13e55a8f0de379be70b..1a23d915c4f84030bb7c3d27c60b73bdcb2d0a08 100644
Binary files a/test/extrude/1409/1409.stl and b/test/extrude/1409/1409.stl differ
diff --git a/test/extrude/141/141.py b/test/extrude/141/141.py
index a792b4b41f5419fac1d595bdef5b0fbaecac0979..f228779c76354f7c7558ae8820e99b354068ab96 100644
--- a/test/extrude/141/141.py
+++ b/test/extrude/141/141.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,871).translate((1,538,538))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,701))
+w1=cq.Workplane('XY',origin=(501,500,561))
+r=w0.workplane(offset=323).moveTo(480,570).cylinder(855,661).union(w0.workplane(offset=572).moveTo(660,955).cylinder(646,547)).union(w1.workplane(offset=298).moveTo(426,131).cylinder(906,629))
\ No newline at end of file
diff --git a/test/extrude/141/141.stl b/test/extrude/141/141.stl
index 43f4c37f10083a0789558def5acd08c38468df87..8919bb25b26b315666a9108f48d895245a9405a5 100644
Binary files a/test/extrude/141/141.stl and b/test/extrude/141/141.stl differ
diff --git a/test/extrude/1410/1410.py b/test/extrude/1410/1410.py
index 547671a1ec8e2fcbbb4298ad238e5f69d1d87d6b..70930b67794555c7b9a236bc27f9b14c520d167e 100644
--- a/test/extrude/1410/1410.py
+++ b/test/extrude/1410/1410.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,576,495))
-r=w0.workplane(offset=415).moveTo(828,273).box(839,1000,657).union(w0.sketch().arc((1,425),(92,273),(193,415)).segment((566,415)).segment((566,970)).segment((1,970)).close().assemble().push([(284,687)]).circle(667,mode='s').push([(828,273)]).circle(596).finalize().extrude(455))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(251,502,500))
+r=w0.sketch().segment((1,171),(511,172)).segment((510,225)).segment((615,236)).segment((605,327)).segment((734,250)).segment((1000,705)).segment((790,830)).segment((585,481)).segment((561,696)).segment((157,651)).segment((180,430)).segment((1,431)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/1410/1410.stl b/test/extrude/1410/1410.stl
index 5ed172f158559dd039c8c8bd7adaeb1ddd8722da..eae0d57a473d3fc92ca12d726a806febff132ca6 100644
Binary files a/test/extrude/1410/1410.stl and b/test/extrude/1410/1410.stl differ
diff --git a/test/extrude/1411/1411.py b/test/extrude/1411/1411.py
index 32f8230ec6cab209ffbd3cd3ac559d3fda19c1cd..069cf4cebee23aaebd4fff5c40dc4f9641624c96 100644
--- a/test/extrude/1411/1411.py
+++ b/test/extrude/1411/1411.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(220,1,220))
-w1=cq.Workplane('XY',origin=(220,220,71))
-r=w0.sketch().push([(305,220)]).rect(516,344).push([(181,165)]).circle(227,mode='s').finalize().extrude(524).union(w1.sketch().rect(1000,891).circle(235,mode='s').finalize().extrude(134)).translate((281,227,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(27,9,72))
+r=w0.sketch().segment((374,750),(29,551)).segment((29,153)).segment((374,1)).segment((719,153)).segment((719,551)).close().assemble().finalize().extrude(107).union(w0.workplane(offset=368).sketch().segment((499,97),(153,97)).segment((153,689)).segment((499,689)).segment((499,660)).segment((182,660)).segment((182,126)).segment((499,126)).close().assemble().finalize().extrude(124))
diff --git a/test/extrude/1411/1411.stl b/test/extrude/1411/1411.stl
index f681117da78fd72281e2238c547911d2edbbb1eb..b4a78379ef7a95d4c755de0443fc08207c848d65 100644
Binary files a/test/extrude/1411/1411.stl and b/test/extrude/1411/1411.stl differ
diff --git a/test/extrude/1412/1412.py b/test/extrude/1412/1412.py
index 6b2dd3e19bd8f4fc7367ba0f26e8dc9af44e801e..ca26a48386d7a969045c059624bd0b5f6611a73b 100644
--- a/test/extrude/1412/1412.py
+++ b/test/extrude/1412/1412.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(532,532,777))
-r=w0.sketch().segment((426,245),(490,150)).segment((756,309)).arc((702,341),(681,394)).close().assemble().push([(671,904)]).rect(724,851).reset().face(w0.sketch().segment((586,851),(628,819)).segment((756,968)).segment((713,1000)).close().assemble(),mode='s').reset().face(w0.sketch().arc((819,479),(862,437),(862,373)).segment((968,437)).segment((904,532)).close().assemble()).finalize().extrude(33).union(w0.sketch().segment((97,1),(586,1)).segment((586,129)).arc((766,107),(915,224)).segment((947,224)).segment((947,458)).segment((915,458)).arc((702,586),(490,469)).segment((97,469)).close().assemble().finalize().extrude(309))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(59,68,80))
+r=w0.sketch().segment((11,192),(11,159)).segment((84,159)).segment((84,192)).segment((134,427)).segment((571,427)).segment((591,191)).segment((668,191)).segment((634,509)).segment((85,509)).close().assemble().reset().segment((285,229),(407,229)).segment((285,355)).segment((181,229)).close().assemble(mode='s').finalize().extrude(221)
diff --git a/test/extrude/1412/1412.stl b/test/extrude/1412/1412.stl
index 96aeddafcd994785426023420abf49191b3f0a0c..cab3f074098bca37959c664c1a358bf426bbe9c9 100644
Binary files a/test/extrude/1412/1412.stl and b/test/extrude/1412/1412.stl differ
diff --git a/test/extrude/1413/1413.py b/test/extrude/1413/1413.py
index 14b5bace5c8230b8a701c1cb9c06a87e589b5178..722a049dd4d700818a012172dc48d4383aa643dd 100644
--- a/test/extrude/1413/1413.py
+++ b/test/extrude/1413/1413.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(516,320,516))
-w1=cq.Workplane('YZ',origin=(423,516,516))
-r=w0.sketch().segment((42,125),(197,125)).arc((279,104),(361,125)).segment((516,125)).segment((516,238)).arc((557,392),(516,537)).segment((516,650)).segment((361,650)).arc((279,670),(197,650)).segment((42,650)).segment((42,537)).arc((1,392),(42,238)).close().assemble().finalize().extrude(454).union(w0.sketch().segment((166,856),(361,856)).arc((423,804),(485,856)).segment((681,856)).segment((681,866)).segment((485,866)).arc((423,928),(361,866)).segment((166,866)).close().assemble().finalize().extrude(1000)).union(w1.sketch().arc((228,938),(526,825),(516,506)).arc((650,907),(228,938)).assemble().finalize().extrude(217))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(32,72,72))
+r=w0.sketch().segment((172,987),(1000,987)).segment((1000,393)).segment((172,393)).close().assemble().finalize().extrude(144).union(w0.workplane(offset=263).sketch().segment((679,90),(679,340)).segment((598,369)).segment((622,438)).segment((880,344)).segment((880,90)).close().assemble().finalize().extrude(97))
diff --git a/test/extrude/1413/1413.stl b/test/extrude/1413/1413.stl
index a83d1766d78d65e31d47018bdbfca5da9aae877f..fde76626b2cff0a5d9328e7c2fe8f2c57f6aee82 100644
Binary files a/test/extrude/1413/1413.stl and b/test/extrude/1413/1413.stl differ
diff --git a/test/extrude/1414/1414.py b/test/extrude/1414/1414.py
index bf3cb799d6a7346acb35775e3338cdfc74053260..c12861105c43a0317b2507243083bad1c4036655 100644
--- a/test/extrude/1414/1414.py
+++ b/test/extrude/1414/1414.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(466,432,432))
-r=w0.workplane(offset=216).moveTo(561,285).box(1000,1000,862).union(w0.sketch().segment((242,862),(277,785)).arc((259,828),(242,862)).assemble().finalize().extrude(122)).union(w0.sketch().segment((1,544),(277,423)).segment((259,423)).segment((277,113)).segment((862,156)).segment((836,457)).segment((707,449)).arc((699,440),(681,449)).segment((294,423)).segment((10,552)).close().assemble().push([(811,255)]).rect(466,492,mode='s').finalize().extrude(785))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(39,10,71))
+r=w0.sketch().segment((340,622),(1000,622)).segment((1000,320)).segment((340,320)).close().assemble().push([(420,476)]).circle(68,mode='s').push([(934,418)]).circle(40,mode='s').finalize().extrude(76)
diff --git a/test/extrude/1414/1414.stl b/test/extrude/1414/1414.stl
index e05de484584efdfd1bcd01791bdd744de0d1f5b5..d5a0f4c9fa8dda221c24a6b381b411557db2a048 100644
Binary files a/test/extrude/1414/1414.stl and b/test/extrude/1414/1414.stl differ
diff --git a/test/extrude/1415/1415.py b/test/extrude/1415/1415.py
index 2a9d8fe05387fa6d2cad61ac36b48245aeae514b..cb9c32da1844f93c0c130def155c65b1cc2d7282 100644
--- a/test/extrude/1415/1415.py
+++ b/test/extrude/1415/1415.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(254,1,254))
-r=w0.workplane(offset=512).box(1000,538,769).translate((16,1,247))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(39,46,13))
+r=w0.sketch().segment((513,326),(673,325)).segment((673,688)).arc((790,805),(833,964)).segment((513,964)).close().assemble().push([(690,704)]).circle(138,mode='s').finalize().extrude(261)
diff --git a/test/extrude/1415/1415.stl b/test/extrude/1415/1415.stl
index c479fcb32434abdfe342b6a0617d54662f858786..4f3d89ff9e39acf2ccaccae170898b855e31dd3a 100644
Binary files a/test/extrude/1415/1415.stl and b/test/extrude/1415/1415.stl differ
diff --git a/test/extrude/1416/1416.py b/test/extrude/1416/1416.py
index 0a3a5cadc37cb4021b949a76e5facb9e013e3df0..4673d873c029527d31650773f0a345df8eb1ef1d 100644
--- a/test/extrude/1416/1416.py
+++ b/test/extrude/1416/1416.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(732,561,561))
-r=w0.sketch().arc((659,525),(903,635),(854,903)).arc((232,1000),(659,525)).assemble().reset().face(w0.sketch().segment((318,793),(366,793)).segment((500,793)).arc((513,842),(549,890)).segment((366,890)).segment((366,878)).segment((318,878)).close().assemble(),mode='s').push([(537,1)]).circle(610).push([(543,1)]).rect(622,586,mode='s').finalize().extrude(232).translate((1,1,50))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(1,76,48))
+r=w0.sketch().segment((407,627),(516,799)).segment((901,133)).segment((745,42)).close().assemble().push([(695,363)]).rect(198,167,mode='s').finalize().extrude(156).translate((1,81,1))
diff --git a/test/extrude/1416/1416.stl b/test/extrude/1416/1416.stl
index f681b5fc93c1b6d8455caaeb0f73ccebffe78291..71d07e68ec7c31f840523962268929de09673bc4 100644
Binary files a/test/extrude/1416/1416.stl and b/test/extrude/1416/1416.stl differ
diff --git a/test/extrude/1417/1417.py b/test/extrude/1417/1417.py
index 9dfe544343f42812a023012066d56247a4edc914..c49faa5ee5270145b95765715b781483c333a221 100644
--- a/test/extrude/1417/1417.py
+++ b/test/extrude/1417/1417.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,51))
-w1=cq.Workplane('YZ',origin=(451,500,500))
-r=w0.sketch().segment((71,530),(281,1)).segment((620,141)).segment((401,660)).close().assemble().push([(451,960)]).circle(540).push([(451,950)]).circle(520,mode='s').push([(720,540)]).circle(710).finalize().extrude(880).union(w1.sketch().push([(720,820)]).rect(1000,760).push([(800,850)]).circle(570,mode='s').finalize().extrude(660))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(58,28,24))
+r=w0.sketch().segment((101,367),(837,367)).segment((837,515)).segment((101,515)).close().assemble().push([(491,447)]).rect(120,238,mode='s').finalize().extrude(118)
diff --git a/test/extrude/1417/1417.stl b/test/extrude/1417/1417.stl
index 87829fd49cb86165ace2985dc6b0b93b66c0de8e..e6363b0791f3eaf9d599b056c1d305352f0ec5fb 100644
Binary files a/test/extrude/1417/1417.stl and b/test/extrude/1417/1417.stl differ
diff --git a/test/extrude/1418/1418.py b/test/extrude/1418/1418.py
index 7c9f5c2046e0e4e2be6f72431b3595878e3f8653..eeee0d0181533213872b065a37e55601cb4a612b 100644
--- a/test/extrude/1418/1418.py
+++ b/test/extrude/1418/1418.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(453,527,527))
-r=w0.sketch().push([(390,390)]).circle(632).push([(327,443)]).circle(548,mode='s').finalize().extrude(348).union(w0.sketch().segment((1,663),(422,264)).segment((611,464)).segment((190,863)).close().assemble().push([(1000,243)]).circle(579).finalize().extrude(853))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,380,500))
+r=w0.sketch().segment((205,317),(242,315)).segment((240,2)).segment((356,1)).segment((356,316)).segment((251,316)).segment((390,451)).segment((450,391)).segment((449,535)).arc((356,1000),(206,551)).close().assemble().push([(298,155)]).rect(526,631,mode='s').push([(724,377)]).rect(861,915).finalize().extrude(739)
\ No newline at end of file
diff --git a/test/extrude/1418/1418.stl b/test/extrude/1418/1418.stl
index bd71aa03bbbca06178057569e6f80e451fb90bfd..ef46ce242726c81c30efd898fc01aac262c5d8cc 100644
Binary files a/test/extrude/1418/1418.stl and b/test/extrude/1418/1418.stl differ
diff --git a/test/extrude/1419/1419.py b/test/extrude/1419/1419.py
index 53829038cb91b5cfd9c34f3f3e46759c22979410..9b41baf7d2d6cd8b963fd90d14328002eab1cf5c 100644
--- a/test/extrude/1419/1419.py
+++ b/test/extrude/1419/1419.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(720,500,500))
-r=w0.sketch().segment((31,31),(141,1)).segment((151,51)).arc((81,101),(171,111)).segment((201,251)).segment((91,281)).close().assemble().finalize().extrude(11).union(w0.sketch().segment((800,730),(800,1000)).arc((690,860),(800,730)).assemble().reset().face(w0.sketch().arc((800,730),(830,720),(870,730)).close().assemble()).reset().face(w0.sketch().arc((870,730),(970,860),(870,1000)).close().assemble()).finalize().extrude(550))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(76,79,74))
+r=w0.sketch().segment((605,891),(163,345)).segment((163,162)).segment((605,162)).close().assemble().push([(442,331)]).rect(140,245,mode='s').finalize().extrude(361).translate((1,283,1))
diff --git a/test/extrude/1419/1419.stl b/test/extrude/1419/1419.stl
index 02024c5bdc5156080cd4c38d49b1c6d192d9ad44..512f9ad390fdf5f940fb47c20d6f30feb7062cb5 100644
Binary files a/test/extrude/1419/1419.stl and b/test/extrude/1419/1419.stl differ
diff --git a/test/extrude/142/142.py b/test/extrude/142/142.py
index df8055677310146e8b92550efa342483e47d3861..bffb832972850f6b25cfad1a347ebfa3e93ee042 100644
--- a/test/extrude/142/142.py
+++ b/test/extrude/142/142.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(385,322,385))
-w1=cq.Workplane('YZ',origin=(376,385,385))
-r=w0.sketch().segment((117,304),(652,304)).segment((652,527)).segment((411,527)).arc((393,536),(367,527)).segment((117,527)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((251,135),(411,90)).segment((456,260)).arc((536,349),(509,474)).segment((554,634)).segment((393,679)).segment((349,509)).arc((269,420),(295,295)).close().assemble().push([(398,385)]).rect(590,474,mode='s').finalize().extrude(893)).union(w1.workplane(offset=331).moveTo(443,398).box(1000,518,492))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,1000,500))
+r=w0.sketch().segment((206,155),(795,156)).arc((436,425),(281,846)).segment((205,844)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/142/142.stl b/test/extrude/142/142.stl
index 8bb8db729f69dfd794aab07146371a444bc15298..1c1d419f0d857455d2432dd04f07f4bd2a92f638 100644
Binary files a/test/extrude/142/142.stl and b/test/extrude/142/142.stl differ
diff --git a/test/extrude/1420/1420.py b/test/extrude/1420/1420.py
index e94c5b809dd373a198ffcd157197ba41a048e084..e5178ed235202fd333374ccb6f32d41d3841a841 100644
--- a/test/extrude/1420/1420.py
+++ b/test/extrude/1420/1420.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(27,351,351))
-r=w0.sketch().push([(559,351)]).circle(792).push([(170,403)]).circle(377,mode='s').reset().face(w0.sketch().segment((312,66),(338,1)).segment((390,27)).segment((364,92)).close().assemble(),mode='s').finalize().extrude(676).union(w0.workplane(offset=676).moveTo(53,273).cylinder(1000,702)).translate((1,299,91))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(71,41,22))
+r=w0.sketch().segment((791,167),(791,529)).arc((684,785),(428,891)).segment((66,891)).segment((66,529)).arc((172,273),(428,166)).close().assemble().push([(430,469)]).rect(178,118,mode='s').finalize().extrude(98)
diff --git a/test/extrude/1420/1420.stl b/test/extrude/1420/1420.stl
index e1a7e12fa84bba1cef1850fc63151dd43a610b53..c18228645c5bba732c416a7eebd27624d8006cd3 100644
Binary files a/test/extrude/1420/1420.stl and b/test/extrude/1420/1420.stl differ
diff --git a/test/extrude/1421/1421.py b/test/extrude/1421/1421.py
index 2bb27707591f3fab09d66ae2e9d52c26eb20adc8..6a46d02dd76e7ad2232bc6c190d3941908964c9c 100644
--- a/test/extrude/1421/1421.py
+++ b/test/extrude/1421/1421.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).cylinder(1000,441).translate((108,108,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(57,6,38))
+r=w0.sketch().segment((690,362),(490,333)).arc((482,348),(490,362)).segment((281,362)).arc((288,343),(306,333)).segment((106,333)).segment((106,351)).segment((255,351)).arc((250,359),(241,362)).segment((117,362)).segment((117,391)).segment((690,391)).close().assemble().push([(329,332)]).rect(111,195,mode='s').finalize().extrude(108).translate((1,103,1))
diff --git a/test/extrude/1421/1421.stl b/test/extrude/1421/1421.stl
index 8e660933570cea01a54cde9bc775773c3592d42f..7a92a9730dcc5f27e9773853b4a799b116eead13 100644
Binary files a/test/extrude/1421/1421.stl and b/test/extrude/1421/1421.stl differ
diff --git a/test/extrude/1422/1422.py b/test/extrude/1422/1422.py
index 4ceccf1c1c6f2914f2dd4ce07968b7286b025c7c..4f9e1017638c7195121bff6861ab8bfafe8599cc 100644
--- a/test/extrude/1422/1422.py
+++ b/test/extrude/1422/1422.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(77,381,381))
-r=w0.sketch().push([(164,1)]).circle(544).push([(392,555)]).circle(750).finalize().extrude(1000).translate((1,1,163))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,395))
+r=w0.sketch().segment((140,121),(180,121)).arc((501,1),(820,121)).segment((859,121)).segment((859,151)).arc((998,500),(858,849)).segment((858,879)).segment((819,879)).arc((575,995),(306,960)).segment((305,925)).segment((261,923)).segment((261,934)).arc((215,910),(182,880)).segment((142,879)).segment((140,849)).arc((1,501),(141,150)).close().assemble().push([(644,310)]).circle(631,mode='s').finalize().extrude(709)
\ No newline at end of file
diff --git a/test/extrude/1422/1422.stl b/test/extrude/1422/1422.stl
index e29efc2d15187bdcdf3974fe86b97f1d96ca6caf..502cddbde87b873fbf9d054837ae6a1c8fc1f66f 100644
Binary files a/test/extrude/1422/1422.stl and b/test/extrude/1422/1422.stl differ
diff --git a/test/extrude/1423/1423.py b/test/extrude/1423/1423.py
index 7b2abdbbf7ec90237be8bfce7120d4d6ffebbfad..d24537922a07bee14bbdc62793003ba0a501f89a 100644
--- a/test/extrude/1423/1423.py
+++ b/test/extrude/1423/1423.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(514,1000,514))
-w1=cq.Workplane('XY',origin=(514,514,244))
-r=w0.sketch().push([(804,332)]).rect(986,852).push([(811,325)]).circle(608,mode='s').finalize().extrude(703).union(w1.workplane(offset=386).moveTo(703,1).cylinder(770,676)).translate((1,163,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(35,4,6))
+r=w0.sketch().segment((210,1000),(704,1000)).segment((816,944)).arc((992,630),(816,316)).segment((704,181)).segment((210,181)).close().assemble().push([(544,637)]).rect(204,212,mode='s').finalize().extrude(128)
diff --git a/test/extrude/1423/1423.stl b/test/extrude/1423/1423.stl
index 21a4915de19cc4e0f614df343493555a1baf4d23..e63e368cb0c9eebdc2ad9f625a0831e7ded0f7cf 100644
Binary files a/test/extrude/1423/1423.stl and b/test/extrude/1423/1423.stl differ
diff --git a/test/extrude/1424/1424.py b/test/extrude/1424/1424.py
index 8a959e879218ef2089255f06b7be36ccf06a1428..f9aff27ffc4d0a599122fedd7cc868d87524e143 100644
--- a/test/extrude/1424/1424.py
+++ b/test/extrude/1424/1424.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(546,818,546))
-r=w0.sketch().segment((92,382),(228,382)).segment((228,210)).segment((264,210)).segment((264,128)).segment((673,128)).segment((673,210)).segment((1000,210)).segment((1000,964)).segment((228,964)).segment((228,673)).segment((92,673)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(19,78,17))
+r=w0.sketch().segment((748,845),(344,845)).segment((344,1)).segment((748,1)).close().assemble().push([(516,498)]).rect(251,215,mode='s').finalize().extrude(117)
diff --git a/test/extrude/1424/1424.stl b/test/extrude/1424/1424.stl
index 58748b72e331ee0ab83aff1a7485bf2f762ce5e6..eaa0777a5cd47f916e14a4fe3c59de5b343711eb 100644
Binary files a/test/extrude/1424/1424.stl and b/test/extrude/1424/1424.stl differ
diff --git a/test/extrude/1425/1425.py b/test/extrude/1425/1425.py
index 12dfa7023fe708ea5c7b4a91b768c453a2c91b01..9d927351390802ec002eb43274d971295733ec1b 100644
--- a/test/extrude/1425/1425.py
+++ b/test/extrude/1425/1425.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(504,752,504))
-r=w0.sketch().push([(235,504)]).rect(674,603).push([(773,504)]).rect(674,603).finalize().extrude(1).union(w0.workplane(offset=256).cylinder(1000,660)).translate((157,1,157))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(55,29,23))
+r=w0.sketch().segment((315,267),(315,821)).segment((448,821)).segment((719,821)).segment((719,267)).segment((448,267)).segment((448,821)).segment((448,267)).close().assemble().push([(457,546)]).rect(96,167,mode='s').finalize().extrude(80)
diff --git a/test/extrude/1425/1425.stl b/test/extrude/1425/1425.stl
index 54bbb7b2127526a66ffe8106875e6df18dd3e89a..ed7871e2d2809aef4a19fea04815fbf461afc382 100644
Binary files a/test/extrude/1425/1425.stl and b/test/extrude/1425/1425.stl differ
diff --git a/test/extrude/1426/1426.py b/test/extrude/1426/1426.py
index 7aa12f3352658f37039ee3e34fee5d3f9a9a889b..99fdb036823f17150e711bcb658c6ea991246f98 100644
--- a/test/extrude/1426/1426.py
+++ b/test/extrude/1426/1426.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(641,641,846))
-r=w0.sketch().segment((168,91),(500,1)).segment((667,629)).segment((334,718)).close().assemble().push([(417,360)]).rect(757,974,mode='s').push([(859,1000)]).circle(923).circle(782,mode='s').finalize().extrude(232).union(w0.sketch().arc((206,193),(257,308),(347,385)).arc((398,436),(475,411)).arc((590,360),(654,257)).arc((372,616),(206,193)).assemble().finalize().extrude(513))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(6,40,15))
+r=w0.sketch().segment((806,297),(24,297)).segment((24,649)).segment((806,649)).close().assemble().finalize().extrude(216).union(w0.workplane(offset=26).sketch().segment((675,425),(357,425)).segment((357,505)).segment((675,505)).close().assemble().finalize().extrude(75)).union(w0.workplane(offset=149).sketch().segment((877,509),(571,509)).segment((571,255)).segment((877,255)).close().assemble().finalize().extrude(101)).translate((1,211,1))
diff --git a/test/extrude/1426/1426.stl b/test/extrude/1426/1426.stl
index e575ea77c2b3815d4756aab7d6011df91ef850e7..d47cf6a0e7df4a30ac910b5c154d5f61dc2c7c9c 100644
Binary files a/test/extrude/1426/1426.stl and b/test/extrude/1426/1426.stl differ
diff --git a/test/extrude/1427/1427.py b/test/extrude/1427/1427.py
index 43976c8fbbff19289158544cadcff958e4c9be06..07ac83457510691278924cd7324f9417ba272d28 100644
--- a/test/extrude/1427/1427.py
+++ b/test/extrude/1427/1427.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(451,559,451))
-w1=cq.Workplane('XY',origin=(451,451,505))
-r=w0.sketch().arc((1,748),(190,676),(1,757)).close().assemble().finalize().extrude(172).union(w0.workplane(offset=348).moveTo(834,312).box(586,1000,658)).union(w1.workplane(offset=541).moveTo(703,586).cylinder(631,487))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(80,31,24))
+r=w0.sketch().segment((712,612),(559,512)).segment((559,401)).segment((208,612)).segment((559,823)).segment((559,712)).close().assemble().push([(529,580)]).circle(92,mode='s').finalize().extrude(195)
diff --git a/test/extrude/1427/1427.stl b/test/extrude/1427/1427.stl
index 98a085790990450728fc10817446903767e2a703..48b9e2c44da05b44c2c879fdb43776665e16c0c9 100644
Binary files a/test/extrude/1427/1427.stl and b/test/extrude/1427/1427.stl differ
diff --git a/test/extrude/1428/1428.py b/test/extrude/1428/1428.py
index c71457a487b2b46bca7ef620aa33d9c17792e233..60b81f548dfdfbaa802c09704967c1f78fdaee0d 100644
--- a/test/extrude/1428/1428.py
+++ b/test/extrude/1428/1428.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(435,435,153))
-r=w0.sketch().push([(88,348)]).circle(631).push([(82,354)]).rect(750,446,mode='s').push([(745,707)]).rect(902,653).push([(750,707)]).circle(533,mode='s').finalize().extrude(935).union(w0.sketch().arc((1,1),(218,207),(262,511)).arc((251,522),(262,533)).arc((175,729),(1,870)).close().assemble().finalize().extrude(1000)).translate((109,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(57,29,60))
+r=w0.sketch().segment((742,303),(68,303)).segment((68,505)).segment((742,505)).close().assemble().push([(199,478)]).rect(89,65,mode='s').push([(453,482)]).circle(55,mode='s').finalize().extrude(124).translate((1,96,1))
diff --git a/test/extrude/1428/1428.stl b/test/extrude/1428/1428.stl
index c26b27980ea57b15bf00ca9e94930b7c3091a199..d6b90d7de2ace7438464780486f9d497ecfab0af 100644
Binary files a/test/extrude/1428/1428.stl and b/test/extrude/1428/1428.stl differ
diff --git a/test/extrude/1429/1429.py b/test/extrude/1429/1429.py
index 47fe4f0d9a96f6fbce0a11ebccca4f150a6afe4b..c3ad161dd0ebe0141eaf0d72e0780f4d02aba440 100644
--- a/test/extrude/1429/1429.py
+++ b/test/extrude/1429/1429.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(589,589,483))
-r=w0.sketch().segment((142,95),(201,60)).arc((224,48),(236,36)).segment((295,1)).segment((318,36)).arc((377,83),(401,154)).segment((424,189)).segment((365,224)).arc((342,236),(330,248)).segment((271,283)).segment((248,260)).arc((189,213),(166,130)).close().assemble().push([(859,1000)]).circle(765).finalize().extrude(788)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(71,80,34))
+r=w0.sketch().segment((228,808),(228,604)).segment((322,604)).segment((322,456)).segment((337,456)).segment((337,477)).segment((454,477)).segment((454,456)).segment((469,456)).segment((469,477)).segment((812,477)).segment((812,714)).segment((770,714)).segment((770,808)).close().assemble().push([(528,563)]).circle(100,mode='s').finalize().extrude(283).translate((1,204,1))
diff --git a/test/extrude/1429/1429.stl b/test/extrude/1429/1429.stl
index b58409020e17e654e6e8e5b1a90671f14b499a18..cc0e1925c3ed95c22daee5e9cb83a4668aa89f4a 100644
Binary files a/test/extrude/1429/1429.stl and b/test/extrude/1429/1429.stl differ
diff --git a/test/extrude/143/143.py b/test/extrude/143/143.py
index fe445adf379ac3b08cae32c07899286edd6e4dc4..9e2a13dde05125635f1f5f4601d8e88ff9ba8bae 100644
--- a/test/extrude/143/143.py
+++ b/test/extrude/143/143.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(295,412,412))
-r=w0.sketch().push([(1,213)]).circle(589).push([(459,471)]).rect(647,694).finalize().extrude(518).union(w0.sketch().segment((612,436),(882,436)).segment((882,589)).segment((1000,589)).segment((1000,788)).segment((706,788)).segment((706,753)).segment((612,753)).segment((612,706)).arc((647,577),(612,448)).close().assemble().finalize().extrude(659)).translate((1,177,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(521,501,499))
+r=w0.sketch().push([(131,815)]).circle(630).reset().face(w0.sketch().segment((546,350),(706,57)).segment((1000,216)).segment((839,509)).close().assemble()).push([(794,625)]).circle(510).finalize().extrude(390).union(w0.sketch().segment((536,535),(541,535)).segment((540,565)).segment((535,556)).close().assemble().finalize().extrude(565))
\ No newline at end of file
diff --git a/test/extrude/143/143.stl b/test/extrude/143/143.stl
index 16af0c2c917129111a258c988e3274acc9152cc1..9a9822edcae3d3c4f857e3f05dcd53e919c40fda 100644
Binary files a/test/extrude/143/143.stl and b/test/extrude/143/143.stl differ
diff --git a/test/extrude/1430/1430.py b/test/extrude/1430/1430.py
index 6272de7c42f0274e70f7c37f21a47a098af1ff1d..44e0d6219bf111ef71406afc010fe59909930fc4 100644
--- a/test/extrude/1430/1430.py
+++ b/test/extrude/1430/1430.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(747,575,575))
-r=w0.workplane(offset=403).moveTo(805,937).box(782,1000,920).union(w0.sketch().segment((242,127),(254,127)).arc((449,1),(644,127)).segment((644,139)).arc((667,219),(644,311)).segment((254,311)).segment((242,311)).segment((242,139)).close().assemble().finalize().extrude(368))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(38,30,46))
+r=w0.sketch().segment((49,661),(389,661)).arc((542,598),(605,445)).segment((605,105)).segment((389,105)).segment((389,372)).segment((316,445)).segment((49,445)).close().assemble().push([(329,397)]).rect(122,125,mode='s').finalize().extrude(92).union(w0.workplane(offset=275).sketch().segment((663,838),(417,838)).segment((417,699)).arc((540,239),(663,699)).close().assemble().finalize().extrude(157))
diff --git a/test/extrude/1430/1430.stl b/test/extrude/1430/1430.stl
index 609cc316b13ff012ef4ff41b1d741f59f10b786c..cb471a8c3ff8cb4dd34924705ee319b6dc08f140 100644
Binary files a/test/extrude/1430/1430.stl and b/test/extrude/1430/1430.stl differ
diff --git a/test/extrude/1431/1431.py b/test/extrude/1431/1431.py
index 23d3bc44f70334df7aef290bde27c42390efdd6e..c52d503b4b323681c2d91142f476c525f0671e29 100644
--- a/test/extrude/1431/1431.py
+++ b/test/extrude/1431/1431.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((414,594),(920,594)).segment((920,740)).segment((520,740)).arc((467,714),(414,700)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(3,71,3))
+r=w0.sketch().segment((199,505),(842,505)).segment((842,373)).segment((199,373)).close().assemble().finalize().extrude(317).union(w0.workplane(offset=149).sketch().segment((420,621),(939,830)).segment((1000,671)).segment((979,499)).segment((541,322)).close().assemble().finalize().extrude(208)).translate((1,287,1))
diff --git a/test/extrude/1431/1431.stl b/test/extrude/1431/1431.stl
index db4f3501c08f8a7fba86f228ad30be2485ba7af7..d6f9fb09be9c6558611e2bfc5865a209719426e5 100644
Binary files a/test/extrude/1431/1431.stl and b/test/extrude/1431/1431.stl differ
diff --git a/test/extrude/1432/1432.py b/test/extrude/1432/1432.py
index 36f53671f0edc5ad10e04adc6d855a68ce728319..5f35d0791c4484c78fd380ea65333e47001ca1b7 100644
--- a/test/extrude/1432/1432.py
+++ b/test/extrude/1432/1432.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(432,471,471))
-w1=cq.Workplane('YZ',origin=(481,471,471))
-r=w0.workplane(offset=246).moveTo(628,363).cylinder(922,628).union(w0.sketch().segment((70,207),(197,1)).segment((500,187)).segment((559,187)).segment((559,226)).segment((716,324)).segment((638,442)).segment((726,412)).segment((843,726)).segment((403,892)).arc((354,922),(295,931)).segment((285,941)).segment((285,931)).arc((70,775),(187,540)).arc((354,657),(491,500)).segment((530,491)).segment((491,461)).arc((422,373),(305,354)).segment((285,344)).segment((226,344)).segment((226,295)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=613).moveTo(628,363).box(961,941,755))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(36,56,5))
+r=w0.sketch().segment((798,200),(16,200)).segment((16,544)).segment((798,544)).close().assemble().push([(389,400)]).rect(151,129,mode='s').finalize().extrude(371).translate((1,316,1))
diff --git a/test/extrude/1432/1432.stl b/test/extrude/1432/1432.stl
index d165d0f31dd2f3635ddd40584a45357fa16e5b37..9a4a3faded4750a3d697ab2bac83ba66a6de121c 100644
Binary files a/test/extrude/1432/1432.stl and b/test/extrude/1432/1432.stl differ
diff --git a/test/extrude/1433/1433.py b/test/extrude/1433/1433.py
index 0763c78a10b9a12df95b93cfeb4aea1c0087e9fb..2f73fc48644227067f927fde383fc7771868838c 100644
--- a/test/extrude/1433/1433.py
+++ b/test/extrude/1433/1433.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(563,376,376))
-r=w0.sketch().push([(63,207)]).rect(1000,888).reset().face(w0.sketch().segment((413,301),(538,188)).segment((688,351)).segment((738,351)).segment((788,301)).segment((850,376)).segment((825,401)).segment((825,500)).segment((1000,688)).segment((875,800)).segment((725,638)).segment((588,638)).segment((588,600)).segment((488,688)).segment((426,613)).segment((575,488)).close().assemble()).reset().face(w0.sketch().segment((625,575),(638,563)).segment((675,600)).segment((625,600)).close().assemble(),mode='s').reset().face(w0.sketch().segment((775,438),(788,426)).segment((788,463)).close().assemble(),mode='s').finalize().extrude(1).translate((1,62,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(26,31,62))
+r=w0.sketch().segment((549,28),(579,28)).arc((536,442),(169,638)).segment((169,610)).arc((516,422),(549,29)).close().assemble().push([(393,326)]).circle(122,mode='s').finalize().extrude(165).translate((1,135,1))
diff --git a/test/extrude/1433/1433.stl b/test/extrude/1433/1433.stl
index 45a1c25d45695b5a23ba79d70ea097f5db640e9c..9018add69bbc81bc79d32fb2c85856ad42cc4bbc 100644
Binary files a/test/extrude/1433/1433.stl and b/test/extrude/1433/1433.stl differ
diff --git a/test/extrude/1434/1434.py b/test/extrude/1434/1434.py
index b1b039a997875102c392326b77071cc9cea1fcaf..af28be2ffcd3b7265f22164fb325283fccbc4303 100644
--- a/test/extrude/1434/1434.py
+++ b/test/extrude/1434/1434.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().arc((680,580),(800,547),(887,654)).segment((913,654)).segment((913,687)).segment((887,687)).arc((800,787),(680,754)).arc((421,667),(680,580)).assemble().reset().face(w0.sketch().segment((447,654),(680,620)).segment((687,680)).segment((454,720)).close().assemble(),mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,2))
+r=w0.sketch().segment((31,40),(365,42)).arc((501,21),(635,40)).segment((970,40)).segment((970,824)).segment((637,826)).arc((615,830),(601,834)).segment((525,980)).segment((220,824)).segment((31,826)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/1434/1434.stl b/test/extrude/1434/1434.stl
index 6c76b09e4bad213705a722340210754782ff856b..32320590ee9585e7a8af6d3592fa0e36345739da 100644
Binary files a/test/extrude/1434/1434.stl and b/test/extrude/1434/1434.stl differ
diff --git a/test/extrude/1435/1435.py b/test/extrude/1435/1435.py
index 184a01f5c5841754207d953d58cb40afd901e625..9f433d5bff97afe10170ab400f28047b8fb6f46f 100644
--- a/test/extrude/1435/1435.py
+++ b/test/extrude/1435/1435.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(407,699,407))
-r=w0.workplane(offset=111).moveTo(224,732).box(708,570,1000).union(w0.sketch().segment((334,326),(643,326)).arc((488,375),(334,326)).assemble().reset().face(w0.sketch().arc((716,1),(740,123),(716,237)).close().assemble()).finalize().extrude(90))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,365,500))
+r=w0.sketch().segment((586,261),(970,260)).segment((970,741)).segment((944,741)).segment((945,487)).segment((775,486)).segment((774,410)).segment((585,410)).close().assemble().finalize().extrude(137).union(w0.sketch().segment((30,486),(41,444)).segment((465,541)).segment((455,582)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/1435/1435.stl b/test/extrude/1435/1435.stl
index 4af52259dc552f149aa9b0f452911674cb41e9db..9e9c292ea7e37f4e83a9bc0dc45ba50a6a74068c 100644
Binary files a/test/extrude/1435/1435.stl and b/test/extrude/1435/1435.stl differ
diff --git a/test/extrude/1436/1436.py b/test/extrude/1436/1436.py
index 777293e8a4c0ddb4f350e7a71aeb3207b5de8105..86cf63f7021338dd996f21e912c0464967730b2e 100644
--- a/test/extrude/1436/1436.py
+++ b/test/extrude/1436/1436.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(391,391,696))
-r=w0.workplane(offset=87).cylinder(1000,446).union(w0.sketch().segment((134,63),(415,63)).arc((430,79),(446,63)).segment((477,63)).segment((477,1)).segment((579,1)).segment((579,56)).segment((649,56)).segment((649,727)).segment((579,727)).segment((579,781)).segment((204,781)).segment((204,727)).segment((134,727)).close().assemble().finalize().extrude(259)).translate((56,56,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,291))
+r=w0.workplane(offset=626).moveTo(965,810).cylinder(749,535).union(w0.sketch().push([(224,216)]).rect(946,622).push([(223,213)]).rect(526,616,mode='s').finalize().extrude(920))
\ No newline at end of file
diff --git a/test/extrude/1436/1436.stl b/test/extrude/1436/1436.stl
index 007e47fc4f86a9f865f895d13fcbbcfbc5201f43..47a2c9bcac94fe304a24572f786d915f4057f1c9 100644
Binary files a/test/extrude/1436/1436.stl and b/test/extrude/1436/1436.stl differ
diff --git a/test/extrude/1437/1437.py b/test/extrude/1437/1437.py
index 91330fba042c638fdaf6b6a349f55b7964cbe3d1..88e87418b6e2843c80d82dbcf3e9cbbab9ceaf92 100644
--- a/test/extrude/1437/1437.py
+++ b/test/extrude/1437/1437.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,600,500))
-r=w0.sketch().arc((171,800),(61,451),(251,141)).segment((241,61)).segment((550,1)).segment((560,61)).arc((590,61),(630,81)).segment((580,141)).segment((590,221)).arc((251,331),(281,700)).segment((201,840)).arc((191,810),(171,800)).assemble().reset().face(w0.sketch().segment((381,940),(421,840)).segment((411,780)).arc((750,660),(720,301)).segment((780,161)).arc((940,520),(750,860)).segment((770,920)).segment((451,1000)).segment((441,940)).arc((421,940),(411,920)).arc((391,940),(381,940)).assemble()).finalize().extrude(301).union(w0.workplane(offset=416).moveTo(391,690).cylinder(670,810))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(67,9,10))
+r=w0.sketch().segment((650,282),(650,450)).segment((332,450)).segment((332,768)).segment((650,768)).segment((650,844)).segment((1,844)).segment((1,282)).close().assemble().push([(366,618)]).rect(154,119,mode='s').finalize().extrude(173)
diff --git a/test/extrude/1437/1437.stl b/test/extrude/1437/1437.stl
index 7550280f31fc76270e0a7dd613a11beeef18ea15..879883b1a7209596118158768de24796f84f0f74 100644
Binary files a/test/extrude/1437/1437.stl and b/test/extrude/1437/1437.stl differ
diff --git a/test/extrude/1438/1438.py b/test/extrude/1438/1438.py
index 07db0f05cdc36fce4fb9fe02b5b6856b61d6504c..70a4aba0ca9a1b5e573a2f495e481749ac4bc383 100644
--- a/test/extrude/1438/1438.py
+++ b/test/extrude/1438/1438.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(627,937,627))
-r=w0.sketch().arc((659,929),(263,469),(865,508)).arc((1000,834),(659,929)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(8,5,32))
+r=w0.sketch().segment((254,258),(300,231)).segment((300,1)).segment((333,1)).segment((333,323)).arc((486,584),(254,780)).close().assemble().push([(211,313)]).rect(300,165,mode='s').finalize().extrude(233)
diff --git a/test/extrude/1438/1438.stl b/test/extrude/1438/1438.stl
index 5f954f91d4b2f86bcf4f288b7933a62d7d895767..eb39f6e28b91c0261da64bb71a643512c9b167a5 100644
Binary files a/test/extrude/1438/1438.stl and b/test/extrude/1438/1438.stl differ
diff --git a/test/extrude/1439/1439.py b/test/extrude/1439/1439.py
index 82b605ff2060cfef9f6f038fe399b62f35821a06..e1181e4aaf668d36ec4a6ad46fb64201c6da539e 100644
--- a/test/extrude/1439/1439.py
+++ b/test/extrude/1439/1439.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(407,107,407))
-r=w0.sketch().segment((212,285),(342,285)).segment((342,139)).arc((732,618),(212,285)).assemble().finalize().extrude(854).union(w0.sketch().segment((17,98),(17,163)).arc((1,131),(17,98)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(24,24,36))
+r=w0.sketch().segment((358,187),(358,1000)).segment((716,1000)).segment((716,187)).close().assemble().push([(497,662)]).circle(197,mode='s').finalize().extrude(229)
diff --git a/test/extrude/1439/1439.stl b/test/extrude/1439/1439.stl
index ff508d2396e58c447f86061756395ca4d6d23b09..d188b24661c716f8418a7aead38672034915c85a 100644
Binary files a/test/extrude/1439/1439.stl and b/test/extrude/1439/1439.stl differ
diff --git a/test/extrude/144/144.py b/test/extrude/144/144.py
index f763a3b7417d5da2409786f9cb8b47c0d1e71f82..2b948d109ec75a1a2d4f70b8a42cda0d8fd16031 100644
--- a/test/extrude/144/144.py
+++ b/test/extrude/144/144.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(551,670,551))
-r=w0.sketch().segment((212,441),(432,441)).segment((432,588)).arc((1000,716),(432,835)).segment((432,918)).segment((212,918)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((102,212),(267,212)).segment((303,93)).segment((542,175)).segment((533,212)).segment((679,212)).segment((679,239)).segment((514,239)).segment((478,358)).segment((239,276)).segment((248,239)).segment((102,239)).close().assemble().finalize().extrude(863))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(251,251,299))
+r=w0.sketch().push([(150,424)]).circle(329).push([(150,491)]).rect(260,269,mode='s').push([(163,366)]).rect(264,266,mode='s').finalize().extrude(9).union(w0.workplane(offset=325).moveTo(286,146).cylinder(398,396))
\ No newline at end of file
diff --git a/test/extrude/144/144.stl b/test/extrude/144/144.stl
index c345375cc28c475ee307d217a3c9a51e6e6e1992..4b18e1c5b8481de6acb7a921364d5ef61e87c6aa 100644
Binary files a/test/extrude/144/144.stl and b/test/extrude/144/144.stl differ
diff --git a/test/extrude/1440/1440.py b/test/extrude/1440/1440.py
index 0cef4ad0e14c8556b1d1f4d5958215c87d4e685f..94b8301ad5fd227e5e7f3c9bc553808cb6c86086 100644
--- a/test/extrude/1440/1440.py
+++ b/test/extrude/1440/1440.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(385,488,488))
-r=w0.workplane(offset=571).moveTo(1,526).box(795,821,654).union(w0.sketch().push([(14,1000)]).circle(603).push([(981,91)]).rect(782,949).finalize().extrude(693)).translate((1,102,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(60,12,44))
+r=w0.sketch().segment((346,722),(1000,722)).segment((1000,470)).segment((346,470)).close().assemble().push([(803,655)]).rect(94,84,mode='s').push([(522,581)]).circle(37,mode='s').push([(949,549)]).rect(50,64,mode='s').push([(714,636)]).rect(54,55,mode='s').finalize().extrude(150)
diff --git a/test/extrude/1440/1440.stl b/test/extrude/1440/1440.stl
index 6800fa57ce8de480aabb91706a86648e0d1fbd6e..fd60bf8538bcc48246c929e443435f6176930994 100644
Binary files a/test/extrude/1440/1440.stl and b/test/extrude/1440/1440.stl differ
diff --git a/test/extrude/1441/1441.py b/test/extrude/1441/1441.py
index d9022e510f54cc4b764f1fb8a95d252a3486d9e6..83ef814bd5f236a2a095ecfe7d8a07eecdde94cd 100644
--- a/test/extrude/1441/1441.py
+++ b/test/extrude/1441/1441.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(653,527,527))
-r=w0.sketch().arc((1,516),(359,737),(611,401)).segment((159,401)).segment((159,54)).segment((758,54)).segment((758,285)).arc((1000,821),(411,874)).arc((117,800),(1,516)).assemble().finalize().extrude(274)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(26,78,37))
+r=w0.sketch().segment((631,964),(319,964)).arc((297,954),(288,932)).segment((288,120)).arc((297,98),(319,89)).segment((631,88)).arc((653,98),(662,120)).segment((662,932)).arc((653,954),(631,963)).close().assemble().push([(418,486)]).rect(202,226,mode='s').finalize().extrude(316).translate((1,239,1))
diff --git a/test/extrude/1441/1441.stl b/test/extrude/1441/1441.stl
index 3885a43ff3556b4b27291b536acafaaa6c0ca3cb..7ab086e5fe2d902a3ac7518937bfc3faef678fb4 100644
Binary files a/test/extrude/1441/1441.stl and b/test/extrude/1441/1441.stl differ
diff --git a/test/extrude/1442/1442.py b/test/extrude/1442/1442.py
index fdbf00ea1a59747f1440328452efd65521778472..06aaa346dc5906bbe81718624d2a7871d091832e 100644
--- a/test/extrude/1442/1442.py
+++ b/test/extrude/1442/1442.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(547,547,612))
-r=w0.workplane(offset=476).moveTo(749,1000).box(711,733,689).union(w0.sketch().segment((263,1),(405,1)).segment((481,1)).segment((612,1)).segment((612,165)).segment((481,165)).segment((481,187)).segment((405,187)).segment((405,165)).segment((263,165)).close().assemble().finalize().extrude(503))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(53,32,29))
+r=w0.sketch().segment((506,826),(884,826)).segment((884,30)).segment((506,30)).close().assemble().push([(695,367)]).circle(139,mode='s').finalize().extrude(375)
diff --git a/test/extrude/1442/1442.stl b/test/extrude/1442/1442.stl
index c94bda077c86ff03bc9838f31cf818eaf625b0e9..e833c8e051013c2e3fcbca26d45e7217f2af7c72 100644
Binary files a/test/extrude/1442/1442.stl and b/test/extrude/1442/1442.stl differ
diff --git a/test/extrude/1443/1443.py b/test/extrude/1443/1443.py
index 87ee0e859498cdcef7c008a44f34a24ec49b74a4..d367ac8e2fc20cb37491500bd74eb0f89167534f 100644
--- a/test/extrude/1443/1443.py
+++ b/test/extrude/1443/1443.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(463,452,463))
-w1=cq.Workplane('YZ',origin=(731,463,463))
-r=w0.workplane(offset=200).moveTo(377,404).box(613,710,989).union(w0.workplane(offset=699).moveTo(1,248).cylinder(936,517)).union(w1.sketch().segment((194,688),(334,688)).segment((334,635)).arc((345,646),(366,646)).arc((388,570),(441,506)).arc((398,463),(334,463)).segment((334,334)).arc((463,355),(549,441)).arc((839,527),(871,828)).segment((1000,828)).segment((1000,860)).segment((850,860)).arc((570,968),(366,764)).arc((270,742),(194,688)).assemble().finalize().extrude(33)).translate((1,1,55))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(60,79,64))
+r=w0.sketch().segment((1,233),(690,233)).segment((690,373)).segment((1,373)).close().assemble().push([(332,343)]).rect(196,243,mode='s').finalize().extrude(329).translate((1,251,1))
diff --git a/test/extrude/1443/1443.stl b/test/extrude/1443/1443.stl
index e24725fcbaf1bafb6f144da2013000b621f14e5b..4c3ead15cec8d3209ad7d7a7ac1410ca03096b56 100644
Binary files a/test/extrude/1443/1443.stl and b/test/extrude/1443/1443.stl differ
diff --git a/test/extrude/1444/1444.py b/test/extrude/1444/1444.py
index b27feb404566c0129ad2e77434f6d867f063f057..0a43df93a108a89a24ae1dd8fd124ae200c2dfb8 100644
--- a/test/extrude/1444/1444.py
+++ b/test/extrude/1444/1444.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(360,437,437))
-r=w0.sketch().segment((40,437),(146,437)).arc((282,292),(418,437)).segment((622,437)).segment((622,816)).segment((40,816)).segment((40,787)).arc((1,758),(40,738)).close().assemble().reset().face(w0.sketch().arc((224,437),(282,360),(350,437)).close().assemble(),mode='s').push([(840,724)]).rect(505,622).finalize().extrude(30).union(w0.sketch().arc((738,59),(544,360),(864,515)).arc((437,389),(738,59)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(53,8,68))
+r=w0.sketch().segment((581,275),(178,275)).segment((178,502)).segment((279,502)).segment((279,602)).segment((77,602)).segment((77,74)).segment((581,74)).close().assemble().push([(232,313)]).rect(81,117,mode='s').finalize().extrude(316)
diff --git a/test/extrude/1444/1444.stl b/test/extrude/1444/1444.stl
index 6c778977c9f42764e769fb62bf967c4a3d572962..10c10c89d8f7c8acfd3cfbf2e3bff87b0fec976c 100644
Binary files a/test/extrude/1444/1444.stl and b/test/extrude/1444/1444.stl differ
diff --git a/test/extrude/1445/1445.py b/test/extrude/1445/1445.py
index 086f873cfc0810ce5a885afa7a1e2f266c9a21ed..8ceb7b283a4b27194fe4f89d322f78e59204e7b3 100644
--- a/test/extrude/1445/1445.py
+++ b/test/extrude/1445/1445.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,500,500))
-r=w0.sketch().segment((1,351),(221,351)).segment((221,191)).segment((431,191)).segment((431,351)).segment((520,351)).segment((520,810)).segment((1,810)).close().assemble().finalize().extrude(21).union(w0.sketch().segment((610,401),(620,341)).segment((740,351)).arc((810,311),(880,371)).segment((1000,381)).segment((1000,431)).segment((870,421)).arc((800,461),(740,411)).close().assemble().reset().face(w0.sketch().segment((890,391),(900,371)).segment((950,391)).segment((950,411)).close().assemble(),mode='s').finalize().extrude(990))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(58,74,4))
+r=w0.sketch().segment((231,738),(1,738)).segment((1,376)).segment((231,376)).segment((744,376)).segment((744,1)).segment((231,1)).segment((231,376)).close().assemble().push([(189,605)]).circle(38,mode='s').push([(335,473)]).circle(86,mode='s').push([(293,578)]).circle(63,mode='s').finalize().extrude(118)
diff --git a/test/extrude/1445/1445.stl b/test/extrude/1445/1445.stl
index 4ffb91f6e3dd9a57306163354f994d17e84a218e..e0ec2ab433227fb41ec8acc8b1b8e7b3d844dda6 100644
Binary files a/test/extrude/1445/1445.stl and b/test/extrude/1445/1445.stl differ
diff --git a/test/extrude/1446/1446.py b/test/extrude/1446/1446.py
index 592d1b418318f3115d8ae27224b96aa386a8eda4..d41a7ec60ac3f1780b6ca293c13cae782d70568c 100644
--- a/test/extrude/1446/1446.py
+++ b/test/extrude/1446/1446.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(420,420,724))
-w1=cq.Workplane('ZX',origin=(420,439,420))
-r=w0.sketch().arc((58,448),(210,420),(258,562)).arc((20,734),(58,448)).assemble().finalize().extrude(1).union(w1.sketch().push([(344,605)]).rect(876,1000).push([(234,624)]).rect(505,562,mode='s').push([(315,477)]).circle(458,mode='s').push([(344,610)]).circle(458,mode='s').push([(539,638)]).rect(467,477,mode='s').finalize().extrude(68))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(79,26,54))
+r=w0.sketch().segment((40,574),(505,261)).segment((529,248)).segment((769,248)).close().assemble().finalize().extrude(321).union(w0.sketch().segment((634,674),(532,674)).segment((532,330)).segment((634,330)).close().assemble().finalize().extrude(119)).union(w0.workplane(offset=164).sketch().segment((220,603),(254,765)).segment((311,818)).segment((239,767)).segment((187,598)).close().assemble().finalize().extrude(55))
diff --git a/test/extrude/1446/1446.stl b/test/extrude/1446/1446.stl
index 602e8b5e41c6c2abbab5e5f1c1a077d204058884..5c4b916db511ca24f0799ca3bd09bf1cc666f052 100644
Binary files a/test/extrude/1446/1446.stl and b/test/extrude/1446/1446.stl differ
diff --git a/test/extrude/1447/1447.py b/test/extrude/1447/1447.py
index b3bdff18a1d2c7a04ccf83e9019aa1692398c7f0..7811bd1056d91f93ac244ec80579a21fd53b9b0a 100644
--- a/test/extrude/1447/1447.py
+++ b/test/extrude/1447/1447.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(316,357,316))
-r=w0.workplane(offset=1).moveTo(220,56).cylinder(945,740).union(w0.sketch().segment((1,672),(247,672)).arc((275,644),(302,631)).arc((329,370),(453,589)).arc((521,631),(576,672)).segment((836,672)).segment((836,904)).segment((576,904)).arc((412,1000),(247,904)).segment((1,904)).close().assemble().push([(357,507)]).circle(370,mode='s').finalize().extrude(863)).translate((369,116,205))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(45,67,55))
+r=w0.sketch().segment((63,655),(775,655)).segment((775,631)).segment((63,631)).close().assemble().finalize().extrude(384).union(w0.sketch().segment((419,621),(636,621)).segment((636,508)).segment((899,508)).segment((899,65)).segment((636,65)).segment((419,65)).close().assemble().finalize().extrude(181)).translate((1,318,1))
diff --git a/test/extrude/1447/1447.stl b/test/extrude/1447/1447.stl
index 27c9c809c82b2a8e07fbf3247830bfa586821ffb..cdc3ff06935843bb8b51d7e1d816f1a840dc3c94 100644
Binary files a/test/extrude/1447/1447.stl and b/test/extrude/1447/1447.stl differ
diff --git a/test/extrude/1448/1448.py b/test/extrude/1448/1448.py
index 97403105ed141edc57285899a4de0fc0a32c630f..9d29dd7fc7914049212bef8530cef46fa79a0635 100644
--- a/test/extrude/1448/1448.py
+++ b/test/extrude/1448/1448.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(546,395,395))
-w1=cq.Workplane('YZ',origin=(445,395,395))
-r=w0.workplane(offset=243).moveTo(596,147).box(1000,586,697).union(w1.workplane(offset=339).moveTo(1,627).cylinder(506,506)).translate((1,111,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(24,75,50))
+r=w0.sketch().segment((270,734),(270,142)).segment((270,100)).segment((982,100)).segment((982,142)).segment((1000,142)).segment((1000,734)).segment((982,734)).segment((982,776)).segment((270,776)).close().assemble().finalize().extrude(151).union(w0.workplane(offset=354).sketch().segment((120,713),(542,713)).segment((542,291)).segment((120,291)).close().assemble().finalize().extrude(211))
diff --git a/test/extrude/1448/1448.stl b/test/extrude/1448/1448.stl
index a744d0aaa7728e20b09a45ebab47a3d344615de9..52c6e39b5e9ce21ff9c2ffdd1892b643870abe2e 100644
Binary files a/test/extrude/1448/1448.stl and b/test/extrude/1448/1448.stl differ
diff --git a/test/extrude/1449/1449.py b/test/extrude/1449/1449.py
index fc8e52b45226306ded795952fa80cf03be421378..ab43dc4a56f51e7d357adf36cc25f4122ce2b5b0 100644
--- a/test/extrude/1449/1449.py
+++ b/test/extrude/1449/1449.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(286,1,286))
-r=w0.workplane(offset=220).moveTo(438,603).box(608,545,420).union(w0.sketch().push([(233,112)]).rect(804,831).push([(322,135)]).circle(340,mode='s').finalize().extrude(1000)).translate((19,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(44,9,7))
+r=w0.sketch().segment((66,878),(437,878)).arc((808,506),(437,135)).segment((66,134)).segment((66,877)).close().assemble().push([(194,562)]).rect(126,186,mode='s').finalize().extrude(254).translate((1,246,1))
diff --git a/test/extrude/1449/1449.stl b/test/extrude/1449/1449.stl
index 74659494b5248e1eceb9d14cbd04df39c8222df0..44a3c7c554e4ac7a47c265253a662773f081a00c 100644
Binary files a/test/extrude/1449/1449.stl and b/test/extrude/1449/1449.stl differ
diff --git a/test/extrude/145/145.py b/test/extrude/145/145.py
index 6658f61f5ead06d7b350b8d625a4a66dcd0ab0a5..009d981be6dc66be29e8dfe3a8aba09606efd30f 100644
--- a/test/extrude/145/145.py
+++ b/test/extrude/145/145.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(363,394,394))
-r=w0.sketch().arc((190,25),(206,1),(206,25)).close().assemble().finalize().extrude(166).union(w0.workplane(offset=418).moveTo(253,493).box(772,984,442)).union(w0.workplane(offset=540).moveTo(422,599).box(1000,677,685))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(645,501,502))
+r=w0.sketch().segment((212,471),(307,471)).arc((621,22),(521,562)).segment((496,476)).segment((436,497)).segment((437,1000)).segment((212,1000)).segment((212,696)).segment((213,690)).close().assemble().finalize().extrude(132).union(w0.workplane(offset=539).moveTo(632,438).cylinder(577,546))
\ No newline at end of file
diff --git a/test/extrude/145/145.stl b/test/extrude/145/145.stl
index 55101a278b45eaff4117c5014893f8eb4ddb53a2..a98a373c2b844140a45dd805e3622cc14d0a9409 100644
Binary files a/test/extrude/145/145.stl and b/test/extrude/145/145.stl differ
diff --git a/test/extrude/1450/1450.py b/test/extrude/1450/1450.py
index fbb7f7a60a150c459cd88da011e2ef9f0f3ff2ee..1f4f96a9b8355c3af2c749c9cf363db62110b106 100644
--- a/test/extrude/1450/1450.py
+++ b/test/extrude/1450/1450.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(343,343,487))
-w1=cq.Workplane('YZ',origin=(132,343,343))
-r=w0.workplane(offset=100).moveTo(316,1).cylinder(829,658).union(w0.sketch().segment((224,553),(238,553)).segment((238,461)).segment((671,461)).segment((671,553)).segment((685,553)).segment((685,921)).segment((671,921)).segment((671,1000)).segment((238,1000)).segment((238,921)).segment((224,921)).segment((224,632)).arc((80,579),(224,553)).assemble().finalize().extrude(408)).union(w1.workplane(offset=310).moveTo(593,606).cylinder(408,422)).translate((1,316,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(252,369,251))
+r=w0.workplane(offset=134).moveTo(349,312).cylinder(487,404).union(w0.workplane(offset=137).moveTo(221,328).box(414,379,482)).union(w0.sketch().push([(70,108)]).circle(320).reset().face(w0.sketch().arc((12,97),(127,115),(12,107)).arc((10,102),(12,98)).assemble(),mode='s').finalize().extrude(184))
\ No newline at end of file
diff --git a/test/extrude/1450/1450.stl b/test/extrude/1450/1450.stl
index f23736cf831b53ff8fadf8c6c4a4aecfcd40f077..53c2a3509e68e1db562a9d99f90e925eb44e8b43 100644
Binary files a/test/extrude/1450/1450.stl and b/test/extrude/1450/1450.stl differ
diff --git a/test/extrude/1451/1451.py b/test/extrude/1451/1451.py
index 9a81fbe821e2971923731c039d7877d987f90f4b..e5d2000e1f2b57b8e62e912e8a56d8886d3afc4f 100644
--- a/test/extrude/1451/1451.py
+++ b/test/extrude/1451/1451.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(98,399,399))
-r=w0.workplane(offset=633).moveTo(222,531).cylinder(867,664).union(w0.sketch().segment((478,1),(646,1)).segment((646,28)).arc((841,293),(646,549)).segment((646,576)).segment((478,576)).segment((478,549)).arc((284,293),(478,28)).close().assemble().finalize().extrude(1000)).translate((1,44,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,275,499))
+w1=cq.Workplane('ZX',origin=(501,447,501))
+r=w0.sketch().segment((37,235),(250,237)).segment((251,1)).segment((286,2)).segment((285,235)).segment((500,235)).segment((501,357)).segment((286,355)).segment((286,590)).segment((251,592)).segment((252,356)).segment((35,357)).close().assemble().finalize().extrude(535).union(w0.workplane(offset=778).moveTo(265,297).box(699,540,1000)).union(w1.sketch().arc((904,821),(964,909),(904,1000)).close().assemble().finalize().extrude(226))
\ No newline at end of file
diff --git a/test/extrude/1451/1451.stl b/test/extrude/1451/1451.stl
index 2a2c96ccc0afc2e71a449676e89e04eab9b224a7..708feca7ef7f319ac8d2cf0b9ef394f3fab735a7 100644
Binary files a/test/extrude/1451/1451.stl and b/test/extrude/1451/1451.stl differ
diff --git a/test/extrude/1452/1452.py b/test/extrude/1452/1452.py
index 902d6b3ba14e69af860d192ec76bb116ce223780..3cc3705b5b9dc1c43f97e0dbdd7e68ae4897401c 100644
--- a/test/extrude/1452/1452.py
+++ b/test/extrude/1452/1452.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,451,500))
-r=w0.sketch().segment((1,560),(41,331)).segment((391,391)).segment((361,620)).close().assemble().reset().face(w0.sketch().arc((580,600),(620,441),(700,590)).segment((1000,590)).segment((1000,670)).segment((580,670)).close().assemble()).finalize().extrude(610)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(61,59,14))
+r=w0.sketch().segment((288,435),(288,868)).segment((374,868)).segment((374,934)).segment((208,934)).segment((208,202)).segment((474,202)).segment((474,335)).close().assemble().push([(317,547)]).circle(48,mode='s').push([(265,718)]).circle(64,mode='s').finalize().extrude(147).translate((1,89,1))
diff --git a/test/extrude/1452/1452.stl b/test/extrude/1452/1452.stl
index 6ba41c2d1f9e6fafcc3725ba03e1eb7efaf38c2d..e9ce28892af77dd4f0f69ec5ba78a74c6d0c01cf 100644
Binary files a/test/extrude/1452/1452.stl and b/test/extrude/1452/1452.stl differ
diff --git a/test/extrude/1453/1453.py b/test/extrude/1453/1453.py
index 40e9f15ee79f897a022a510c0065aa518eeeb4a0..0de09223232a9f780ce5d4eca7968883a1f3273f 100644
--- a/test/extrude/1453/1453.py
+++ b/test/extrude/1453/1453.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(671,610,610))
-r=w0.workplane(offset=464).moveTo(1000,537).cylinder(903,829).union(w0.sketch().segment((1,561),(427,561)).segment((427,598)).arc((525,500),(671,525)).arc((976,549),(708,708)).arc((561,793),(427,683)).segment((427,903)).segment((1,903)).close().assemble().push([(208,732)]).circle(769,mode='s').finalize().extrude(781))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(51,51,21))
+r=w0.sketch().segment((759,805),(35,805)).segment((35,81)).segment((759,81)).close().assemble().push([(307,184)]).circle(40,mode='s').push([(205,197)]).rect(57,90,mode='s').push([(336,286)]).rect(91,82,mode='s').push([(320,337)]).rect(105,98,mode='s').finalize().extrude(163)
diff --git a/test/extrude/1453/1453.stl b/test/extrude/1453/1453.stl
index b58e019cf53506a852699382ce3c1e03875c2f68..f29b928ec77740039f6b45e5e31a897c00fccc08 100644
Binary files a/test/extrude/1453/1453.stl and b/test/extrude/1453/1453.stl differ
diff --git a/test/extrude/1454/1454.py b/test/extrude/1454/1454.py
index fb627dd1461a0e5094f23684637fe59eb26ecc34..256656af22ac87d74f6c0aba7d3db880dc721f1e 100644
--- a/test/extrude/1454/1454.py
+++ b/test/extrude/1454/1454.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,656,495))
-r=w0.sketch().arc((87,570),(1,431),(130,334)).arc((65,441),(87,570)).assemble().finalize().extrude(173).union(w0.sketch().push([(146,527)]).rect(871,817).rect(570,538,mode='s').reset().face(w0.sketch().arc((699,474),(646,334),(796,334)).arc((1000,592),(699,474)).assemble()).finalize().extrude(388))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(58,21,43))
+r=w0.sketch().segment((96,647),(630,647)).segment((630,246)).segment((439,246)).segment((439,233)).segment((284,233)).segment((284,246)).segment((96,246)).close().assemble().finalize().extrude(200).union(w0.workplane(offset=52).sketch().segment((1,404),(457,404)).segment((457,346)).segment((1,346)).close().assemble().finalize().extrude(162))
diff --git a/test/extrude/1454/1454.stl b/test/extrude/1454/1454.stl
index bf0efef60e1d0c99a983be7c9dacf3a9a92b5eef..4ed53f4df7ad4c3d30d645145853d77505ef942f 100644
Binary files a/test/extrude/1454/1454.stl and b/test/extrude/1454/1454.stl differ
diff --git a/test/extrude/1455/1455.py b/test/extrude/1455/1455.py
index ef344887119a253c5f320decc37af9d9147b7299..9b6ce792eedceab0398dd71de81d2210cca2ea6d 100644
--- a/test/extrude/1455/1455.py
+++ b/test/extrude/1455/1455.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(251,500,500))
-r=w0.workplane(offset=651).moveTo(500,792).box(625,958,802).union(w0.workplane(offset=750).moveTo(500,1).cylinder(1000,521)).translate((1,1,21))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(43,66,16))
+r=w0.sketch().segment((738,718),(144,718)).segment((144,218)).segment((738,218)).close().assemble().push([(451,419)]).rect(206,131,mode='s').finalize().extrude(61)
diff --git a/test/extrude/1455/1455.stl b/test/extrude/1455/1455.stl
index 45e8ccf2177cb6c26e5faa28f31436d5ddd27c83..f5be31ebc46227dba9bfee50377110b9491f3a8e 100644
Binary files a/test/extrude/1455/1455.stl and b/test/extrude/1455/1455.stl differ
diff --git a/test/extrude/1456/1456.py b/test/extrude/1456/1456.py
index 687ae116d8fbd994fee3f19b70fe91cee8c691d9..f8411d433fa77d6da51962b318fd1d60c8359db6 100644
--- a/test/extrude/1456/1456.py
+++ b/test/extrude/1456/1456.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(325,109,325))
-w1=cq.Workplane('XY',origin=(325,325,298))
-r=w0.sketch().arc((514,1000),(258,312),(878,716)).arc((474,568),(514,1000)).assemble().finalize().extrude(163).union(w1.workplane(offset=48).moveTo(1,352).cylinder(878,676)).translate((352,1,95))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(31,80,42))
+r=w0.sketch().segment((392,723),(693,723)).segment((693,1)).segment((605,1)).segment((605,613)).segment((480,613)).segment((480,1)).segment((113,1)).segment((113,209)).segment((205,209)).segment((205,117)).segment((392,117)).close().assemble().reset().segment((224,295),(224,227)).segment((516,227)).segment((516,295)).close().assemble(mode='s').finalize().extrude(161).translate((1,82,1))
diff --git a/test/extrude/1456/1456.stl b/test/extrude/1456/1456.stl
index d12b36408c2e2432ac5066c3c8341e4263bf00ef..8293f8b9e81585bf8fcfc9d88ed48b7e39df39c3 100644
Binary files a/test/extrude/1456/1456.stl and b/test/extrude/1456/1456.stl differ
diff --git a/test/extrude/1457/1457.py b/test/extrude/1457/1457.py
index 0bbd8045c8c51ed54e76c6b69d87f50c66bea211..1c7c94e34d16096526e6641e4066baa5118f332b 100644
--- a/test/extrude/1457/1457.py
+++ b/test/extrude/1457/1457.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(524,524,781))
-r=w0.sketch().segment((106,486),(115,477)).segment((315,648)).segment((315,125)).segment((600,125)).segment((600,857)).segment((515,857)).segment((677,990)).segment((667,1000)).segment((486,857)).segment((315,857)).segment((315,677)).close().assemble().reset().face(w0.sketch().segment((372,734),(401,762)).segment((372,762)).close().assemble(),mode='s').reset().face(w0.sketch().segment((382,715),(410,715)).segment((410,734)).close().assemble(),mode='s').push([(905,210)]).rect(600,848).circle(553,mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(42,42,37))
+r=w0.sketch().segment((620,324),(1,324)).segment((1,247)).segment((618,247)).segment((707,373)).segment((816,935)).segment((739,935)).close().assemble().finalize().extrude(253).union(w0.sketch().segment((424,924),(866,924)).segment((866,480)).segment((424,480)).close().assemble().finalize().extrude(96)).translate((1,212,1))
diff --git a/test/extrude/1457/1457.stl b/test/extrude/1457/1457.stl
index 33b5a6f9359acf22bd1ada1a7b08a173eda24701..64c6443d33ddc8c67a30fa01b985493aa38ae971 100644
Binary files a/test/extrude/1457/1457.stl and b/test/extrude/1457/1457.stl differ
diff --git a/test/extrude/1458/1458.py b/test/extrude/1458/1458.py
index 66371de41ab99b8e3f61bf790d402937f1439e31..ec41daf23a1148303d77ee974b5c3dde18b60e6b 100644
--- a/test/extrude/1458/1458.py
+++ b/test/extrude/1458/1458.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(437,552,437))
-r=w0.sketch().segment((150,403),(610,35)).segment((851,345)).segment((839,391)).segment((977,391)).segment((977,495)).segment((1000,529)).arc((1,58),(610,989)).close().assemble().finalize().extrude(196)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(27,6,53))
+r=w0.sketch().segment((1,271),(760,271)).segment((760,1000)).segment((1,1000)).close().assemble().finalize().extrude(116).union(w0.workplane(offset=84).sketch().segment((434,324),(908,324)).segment((908,744)).segment((434,744)).close().assemble().finalize().extrude(201)).translate((1,280,1))
diff --git a/test/extrude/1458/1458.stl b/test/extrude/1458/1458.stl
index c1947bd5e0ed8c374fb0f209b75e31d4cb0083d5..91b2b9ea277262fa0c31f2fb29ea0fb06252a28a 100644
Binary files a/test/extrude/1458/1458.stl and b/test/extrude/1458/1458.stl differ
diff --git a/test/extrude/1459/1459.py b/test/extrude/1459/1459.py
index 936ba9f411f9dd21de2568cefcf54b7c1d479a22..753d074912fafbd9f7232db67b7e675a86f6ad61 100644
--- a/test/extrude/1459/1459.py
+++ b/test/extrude/1459/1459.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(355,355,33))
-r=w0.sketch().segment((621,444),(621,662)).arc((1,154),(750,444)).close().assemble().push([(440,646)]).rect(380,468,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(16,56,76))
+r=w0.sketch().segment((897,468),(365,468)).segment((365,586)).segment((897,586)).close().assemble().push([(668,493)]).rect(164,84,mode='s').finalize().extrude(122)
diff --git a/test/extrude/1459/1459.stl b/test/extrude/1459/1459.stl
index 7c3ca286787ce088b375f12d523989a802dacea2..c7b58594cfdd679cac0898cccfccdc4057467321 100644
Binary files a/test/extrude/1459/1459.stl and b/test/extrude/1459/1459.stl differ
diff --git a/test/extrude/146/146.py b/test/extrude/146/146.py
index bd129a5833ce8e76f740e96227c3e555505bbe71..94a153a936b225f5fd9be431cb79fd786685ba0d 100644
--- a/test/extrude/146/146.py
+++ b/test/extrude/146/146.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(90,306,306))
-r=w0.workplane(offset=179).moveTo(264,1).box(859,353,559).union(w0.workplane(offset=648).moveTo(376,306).box(803,1000,991)).translate((12,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(418,503,501))
+r=w0.sketch().push([(176,251)]).circle(677).reset().face(w0.sketch().arc((606,316),(662,331),(721,308)).arc((713,922),(607,316)).assemble()).reset().face(w0.sketch().segment((547,758),(663,417)).segment((828,473)).segment((708,817)).close().assemble(),mode='s').finalize().extrude(672)
\ No newline at end of file
diff --git a/test/extrude/146/146.stl b/test/extrude/146/146.stl
index c6437f1ad61b9c97a8bad1f72d0ef3eca1743de1..87709e01f494c1413b2866443692d0e854a3df40 100644
Binary files a/test/extrude/146/146.stl and b/test/extrude/146/146.stl differ
diff --git a/test/extrude/1460/1460.py b/test/extrude/1460/1460.py
index ffb44c121b8d9e4ff2f9f6fd49dc8f58b490e953..e27fa53b6ab96b247db158ab5fd1e832e6fd6b5b 100644
--- a/test/extrude/1460/1460.py
+++ b/test/extrude/1460/1460.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(511,368,511))
-w1=cq.Workplane('XY',origin=(511,511,643))
-r=w0.sketch().push([(847,837)]).circle(684).push([(837,980)]).rect(531,551,mode='s').finalize().extrude(867).union(w0.sketch().segment((1,195),(195,195)).arc((500,11),(806,195)).segment((1000,195)).segment((1000,521)).segment((806,521)).arc((500,704),(195,521)).segment((1,521)).close().assemble().finalize().extrude(867)).union(w1.workplane(offset=669).moveTo(745,332).box(674,562,827))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(15,30,49))
+r=w0.sketch().segment((528,606),(232,991)).segment((232,221)).close().assemble().push([(307,525)]).circle(55,mode='s').push([(321,256)]).circle(75,mode='s').push([(369,267)]).circle(53,mode='s').finalize().extrude(393)
diff --git a/test/extrude/1460/1460.stl b/test/extrude/1460/1460.stl
index 9f0b776ba1cedb27da0a4bf44ae6e9625cba41e7..0102da9a3b832ec4a5a236fe8dc0c09f0fb7126a 100644
Binary files a/test/extrude/1460/1460.stl and b/test/extrude/1460/1460.stl differ
diff --git a/test/extrude/1461/1461.py b/test/extrude/1461/1461.py
index d36c7b857ce7b4a7e1213ad4707556fe63269286..93fd15c255ebbb9dabba8257edd2407528996eed 100644
--- a/test/extrude/1461/1461.py
+++ b/test/extrude/1461/1461.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(111,407,407))
-r=w0.sketch().segment((9,729),(18,704)).arc((1,577),(111,543)).segment((128,517)).segment((145,534)).segment((128,551)).arc((153,678),(35,712)).segment((26,738)).close().assemble().finalize().extrude(975).union(w0.workplane(offset=704).moveTo(716,94).box(636,441,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(67,27,6))
+r=w0.sketch().segment((834,634),(144,634)).segment((834,634)).segment((834,502)).segment((144,502)).segment((144,634)).close().assemble().push([(444,620)]).circle(86,mode='s').finalize().extrude(337)
diff --git a/test/extrude/1461/1461.stl b/test/extrude/1461/1461.stl
index 0607a9c494e0fcf79bd228e1eeeb94abdf32ca05..422bf735b0c7cdc5d9297d950321f146b3a0f850 100644
Binary files a/test/extrude/1461/1461.stl and b/test/extrude/1461/1461.stl differ
diff --git a/test/extrude/1462/1462.py b/test/extrude/1462/1462.py
index 548b66f947584d6c036b9ad8cd4ba761cff64c04..4552f08dc1e1904f6ad5a6b6b093e00060889526 100644
--- a/test/extrude/1462/1462.py
+++ b/test/extrude/1462/1462.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(525,476,525))
-r=w0.sketch().arc((342,488),(379,440),(354,488)).close().assemble().finalize().extrude(208).union(w0.sketch().arc((427,391),(208,62),(610,1)).arc((829,342),(427,391)).assemble().reset().face(w0.sketch().segment((440,708),(817,574)).segment((866,695)).segment((488,829)).close().assemble()).push([(622,1000)]).circle(659).finalize().extrude(939))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(50,1,46))
+r=w0.sketch().segment((276,789),(564,789)).segment((564,101)).segment((276,101)).close().assemble().push([(422,439)]).rect(184,157,mode='s').finalize().extrude(163)
diff --git a/test/extrude/1462/1462.stl b/test/extrude/1462/1462.stl
index cdd9705874a8a7ab5cae8fb39256bb917e76eb4c..cefd2841d16062f0f943176611eaa0fc198f9a62 100644
Binary files a/test/extrude/1462/1462.stl and b/test/extrude/1462/1462.stl differ
diff --git a/test/extrude/1463/1463.py b/test/extrude/1463/1463.py
index 6691680fec64c5ba05e4a53130133fa263b65deb..7aa51d6519257ed4c4d38f9ab0d3f87bebfbdd53 100644
--- a/test/extrude/1463/1463.py
+++ b/test/extrude/1463/1463.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(428,146,428))
-r=w0.sketch().segment((1,624),(10,479)).segment((274,496)).segment((232,300)).segment((769,180)).segment((855,556)).segment((479,641)).segment((479,658)).segment((419,650)).segment((317,676)).segment((308,641)).segment((291,641)).arc((223,616),(146,633)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(740,501,501))
+r=w0.workplane(offset=259).moveTo(789,669).cylinder(984,711).union(w0.sketch().segment((1,431),(401,121)).segment((694,500)).segment((560,605)).segment((515,600)).segment((517,635)).segment((482,636)).segment((481,596)).segment((107,520)).segment((97,556)).close().assemble().reset().face(w0.sketch().segment((525,866),(539,770)).arc((535,819),(525,865)).assemble()).finalize().extrude(165))
\ No newline at end of file
diff --git a/test/extrude/1463/1463.stl b/test/extrude/1463/1463.stl
index b8bec8dfd33a21fac51869b1dce8254348264b6f..e431a43f966999ad48001d50d5f31e9dc92a7723 100644
Binary files a/test/extrude/1463/1463.stl and b/test/extrude/1463/1463.stl differ
diff --git a/test/extrude/1464/1464.py b/test/extrude/1464/1464.py
index 3a6bfcdfd40f267816cc1707139d04f2e475678d..6b82660d195a37ad8a780b98d539811100b2cee0 100644
--- a/test/extrude/1464/1464.py
+++ b/test/extrude/1464/1464.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(511,532,532))
-r=w0.sketch().segment((1,65),(277,65)).segment((277,245)).arc((384,320),(299,426)).segment((299,1000)).segment((192,1000)).segment((192,405)).segment((1,405)).close().assemble().finalize().extrude(118).union(w0.workplane(offset=761).moveTo(936,421).box(787,564,989))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(61,15,34))
+r=w0.sketch().segment((263,750),(1000,750)).segment((1000,202)).segment((263,202)).close().assemble().push([(593,511)]).circle(135,mode='s').finalize().extrude(299).union(w0.workplane(offset=60).sketch().segment((158,172),(158,704)).segment((168,704)).segment((168,175)).segment((410,175)).segment((410,172)).close().assemble().finalize().extrude(91))
diff --git a/test/extrude/1464/1464.stl b/test/extrude/1464/1464.stl
index 7528c37c303d2f87d9f1215e4dd0f9c5c0a03f96..1f62c7753f2bc9d49d9cc656e4fb8cdc384100c9 100644
Binary files a/test/extrude/1464/1464.stl and b/test/extrude/1464/1464.stl differ
diff --git a/test/extrude/1465/1465.py b/test/extrude/1465/1465.py
index 118661931d1a47c0a56162c8458cbea60ffb0952..e83c14cb6c6cf8a0d0415630c7da0a3e9e9f58f3 100644
--- a/test/extrude/1465/1465.py
+++ b/test/extrude/1465/1465.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(469,203,469))
-r=w0.workplane(offset=591).moveTo(782,639).box(904,1000,713).union(w0.sketch().arc((129,426),(139,299),(192,182)).segment((192,22)).segment((745,22)).segment((745,182)).arc((819,394),(745,596)).segment((745,756)).segment((415,756)).arc((1,830),(129,426)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,382))
+r=w0.sketch().segment((815,93),(816,720)).segment((976,721)).arc((42,626),(815,92)).assemble().finalize().extrude(736)
\ No newline at end of file
diff --git a/test/extrude/1465/1465.stl b/test/extrude/1465/1465.stl
index 9ebcef9572c8a57ce1558d97c5a089d0c291066a..1cd49dfc67cf518c079913a8b528df6096b1421d 100644
Binary files a/test/extrude/1465/1465.stl and b/test/extrude/1465/1465.stl differ
diff --git a/test/extrude/1466/1466.py b/test/extrude/1466/1466.py
index 95fe9fc5fcc7171389c3ba423696df2ae97a4105..c956e10210535cbea473815de8f31d0df0ffbb31 100644
--- a/test/extrude/1466/1466.py
+++ b/test/extrude/1466/1466.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(435,435,183))
-r=w0.sketch().segment((149,1),(262,1)).segment((262,18)).arc((375,175),(262,340)).segment((262,357)).segment((149,357)).segment((149,340)).arc((36,175),(149,18)).close().assemble().push([(553,709)]).rect(1000,757).finalize().extrude(939)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(46,40,4))
+r=w0.sketch().segment((475,192),(475,798)).segment((273,798)).segment((273,192)).close().assemble().push([(319,242)]).rect(59,68,mode='s').push([(389,778)]).circle(33,mode='s').push([(362,349)]).circle(24,mode='s').finalize().extrude(275).translate((1,236,1))
diff --git a/test/extrude/1466/1466.stl b/test/extrude/1466/1466.stl
index 72b7e9ddfb04c986194fffe6e8f9f565233ca98c..94ce07d6e91a0efe634ab5d4b73264559cb2f6c2 100644
Binary files a/test/extrude/1466/1466.stl and b/test/extrude/1466/1466.stl differ
diff --git a/test/extrude/1467/1467.py b/test/extrude/1467/1467.py
index 12438c4517cdb2fef45611a3f8ae74b84e1576f3..f6df0f6479cd4ea5754961c786a3153ee7fa8bcb 100644
--- a/test/extrude/1467/1467.py
+++ b/test/extrude/1467/1467.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(527,527,642))
-r=w0.workplane(offset=406).moveTo(905,232).cylinder(769,674).union(w0.sketch().segment((1,190),(401,85)).segment((569,685)).segment((169,800)).close().assemble().reset().face(w0.sketch().arc((716,821),(716,769),(748,727)).arc((1000,842),(716,821)).assemble()).reset().face(w0.sketch().segment((832,863),(916,874)).segment((916,895)).segment((832,895)).close().assemble(),mode='s').finalize().extrude(464))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(40,62,75))
+r=w0.sketch().segment((627,899),(844,899)).segment((573,413)).segment((303,413)).close().assemble().push([(607,696)]).rect(148,115,mode='s').finalize().extrude(212)
diff --git a/test/extrude/1467/1467.stl b/test/extrude/1467/1467.stl
index bb45a2f47e77b40f6f11288b4f66a09f9df821b6..52acbce3c8f7a736104ff51421a890198a501307 100644
Binary files a/test/extrude/1467/1467.stl and b/test/extrude/1467/1467.stl differ
diff --git a/test/extrude/1468/1468.py b/test/extrude/1468/1468.py
index a15bbebd30675aea57119f2c322d577d872ef305..6dd76b7afc4fee3c67ce7194a6df2c5389ebd75c 100644
--- a/test/extrude/1468/1468.py
+++ b/test/extrude/1468/1468.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,481).translate((1,148,148))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(44,7,10))
+r=w0.sketch().segment((90,575),(90,525)).segment((572,525)).segment((634,587)).segment((585,637)).segment((523,575)).close().assemble().finalize().extrude(283).union(w0.workplane(offset=160).sketch().segment((310,848),(270,384)).segment((310,384)).close().assemble().finalize().extrude(31)).union(w0.workplane(offset=17).sketch().segment((609,452),(597,452)).arc((606,430),(609,406)).segment((610,130)).segment((610,84)).segment((402,84)).segment((402,130)).segment((448,130)).segment((448,345)).arc((609,415),(438,452)).segment((425,452)).segment((425,498)).segment((609,498)).close().assemble().finalize().extrude(44))
diff --git a/test/extrude/1468/1468.stl b/test/extrude/1468/1468.stl
index 96019427d523959737272fe6f21b107c89bede53..074fd9321fc0086433dcda61f4bb87fbdeae3c7d 100644
Binary files a/test/extrude/1468/1468.stl and b/test/extrude/1468/1468.stl differ
diff --git a/test/extrude/1469/1469.py b/test/extrude/1469/1469.py
index bbf53d8073a083648a7ce70d459d7ec8f6f8493b..00171e389fb811a2b7c5742e7aa498089b177586 100644
--- a/test/extrude/1469/1469.py
+++ b/test/extrude/1469/1469.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(37,358,358))
-r=w0.sketch().push([(315,579)]).circle(429).push([(311,575)]).rect(479,393,mode='s').finalize().extrude(615).union(w0.sketch().segment((79,179),(379,179)).segment((429,1)).segment((472,15)).segment((422,179)).segment((636,179)).segment((636,493)).segment((422,493)).arc((315,715),(208,493)).segment((79,493)).close().assemble().push([(344,657)]).circle(401,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(56,80,17))
+r=w0.sketch().segment((876,574),(876,518)).segment((656,518)).segment((656,456)).segment((594,456)).segment((594,518)).segment((374,518)).segment((374,574)).close().assemble().push([(608,513)]).circle(101,mode='s').finalize().extrude(129)
diff --git a/test/extrude/1469/1469.stl b/test/extrude/1469/1469.stl
index b96eac80c8b7ed46ba6fb698b5e58c521bd92d0f..5a93341a667fef1984fcad5191fbff382d39f415 100644
Binary files a/test/extrude/1469/1469.stl and b/test/extrude/1469/1469.stl differ
diff --git a/test/extrude/147/147.py b/test/extrude/147/147.py
index fc80a6b4ab177e874652fc4822cb2ef7f8cc1db0..0c991668680a1cd30738765462febcf54c899776 100644
--- a/test/extrude/147/147.py
+++ b/test/extrude/147/147.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().push([(101,123)]).circle(656).reset().face(w0.sketch().arc((612,800),(656,512),(889,689)).arc((789,856),(612,800)).assemble()).finalize().extrude(1000).translate((222,200,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,506))
+r=w0.workplane(offset=307).moveTo(186,661).cylinder(890,685).union(w0.sketch().segment((519,157),(1000,155)).segment((1000,320)).segment((905,321)).segment((885,631)).segment((556,611)).segment((575,320)).segment((521,320)).close().assemble().finalize().extrude(461)).union(w0.workplane(offset=689).moveTo(735,426).box(600,1000,876))
\ No newline at end of file
diff --git a/test/extrude/147/147.stl b/test/extrude/147/147.stl
index 14e19c5486de00fc29616ff5e49a96e4f975d92e..2de2b52c15531578a9242eaddfaf9db82dcabf97 100644
Binary files a/test/extrude/147/147.stl and b/test/extrude/147/147.stl differ
diff --git a/test/extrude/1470/1470.py b/test/extrude/1470/1470.py
index a1f673acbafb90b978d52548cc0b10f1ea28bb8a..a59d66a1797a7b66db345d598b96ead6865b1df4 100644
--- a/test/extrude/1470/1470.py
+++ b/test/extrude/1470/1470.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(706,412,412))
-r=w0.workplane(offset=118).moveTo(321,246).cylinder(1000,623).union(w0.workplane(offset=186).moveTo(525,548).box(729,894,864)).union(w0.sketch().segment((404,42),(713,163)).segment((713,254)).arc((653,246),(578,254)).segment((578,178)).arc((472,140),(404,58)).close().assemble().push([(642,1)]).rect(435,570,mode='s').finalize().extrude(254))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(67,74,54))
+r=w0.sketch().segment((123,454),(166,454)).segment((916,509)).segment((979,808)).segment((123,671)).close().assemble().push([(359,501)]).circle(70,mode='s').push([(866,555)]).circle(43,mode='s').finalize().extrude(318).translate((1,245,1))
diff --git a/test/extrude/1470/1470.stl b/test/extrude/1470/1470.stl
index e8df0e24b6f0b90f4ebf54d69538a4a4d34b1d4f..61e21fcee94fc9c5121675a2edf9ced21cdeb961 100644
Binary files a/test/extrude/1470/1470.stl and b/test/extrude/1470/1470.stl differ
diff --git a/test/extrude/1471/1471.py b/test/extrude/1471/1471.py
index f4aa0f8fd3e1f0ff467a3661bf255fa22b1d0075..d31ea0bf83e9eaaa3df4a8b3e815ce17e46c3cb3 100644
--- a/test/extrude/1471/1471.py
+++ b/test/extrude/1471/1471.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,102,495))
-w1=cq.Workplane('YZ',origin=(778,495,495))
-r=w0.sketch().push([(374,294)]).circle(697).circle(677,mode='s').push([(748,839)]).circle(556).finalize().extrude(384).union(w1.sketch().arc((576,647),(405,213),(869,263)).segment((1000,263)).segment((1000,889)).segment((576,889)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(8,25,69))
+r=w0.sketch().segment((276,254),(276,869)).arc((461,1000),(646,869)).segment((646,254)).close().assemble().push([(439,500)]).rect(193,240,mode='s').finalize().extrude(190).translate((1,166,1))
diff --git a/test/extrude/1471/1471.stl b/test/extrude/1471/1471.stl
index be3154c34d04c7959cde5388d87b98cb5a2f0eda..cbc5b4c864cfc6b4531b108909aec5ec733eb080 100644
Binary files a/test/extrude/1471/1471.stl and b/test/extrude/1471/1471.stl differ
diff --git a/test/extrude/1472/1472.py b/test/extrude/1472/1472.py
index c40bbc5062a75a66ccdb98902b5c247f130e3ff1..a9848e9b2d51af889fc82e1c487cf292b98ded7f 100644
--- a/test/extrude/1472/1472.py
+++ b/test/extrude/1472/1472.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(475,425,475))
-w1=cq.Workplane('ZX',origin=(475,304,475))
-r=w0.sketch().push([(233,92)]).rect(1000,556).reset().face(w0.sketch().segment((1,576),(102,576)).arc((112,586),(112,606)).segment((1,606)).close().assemble()).finalize().extrude(839).union(w1.sketch().arc((960,778),(980,839),(960,899)).close().assemble().finalize().extrude(334))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(2,40,37))
+r=w0.sketch().segment((628,1000),(668,1000)).segment((668,259)).segment((628,259)).close().assemble().push([(711,588)]).rect(221,215,mode='s').finalize().extrude(51)
diff --git a/test/extrude/1472/1472.stl b/test/extrude/1472/1472.stl
index 97ff46c955101a09d7f087218ea6d72d40fe3f46..8e149bc7c2df2473aa0dd8c1cf68042d151aa4a1 100644
Binary files a/test/extrude/1472/1472.stl and b/test/extrude/1472/1472.stl differ
diff --git a/test/extrude/1473/1473.py b/test/extrude/1473/1473.py
index 5398340e6ac72e8f24bd99850a5f5549af23b8b1..05716ceea717a3e5607d9c7088247c2f7cf50a65 100644
--- a/test/extrude/1473/1473.py
+++ b/test/extrude/1473/1473.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(591,580,580))
-w1=cq.Workplane('YZ',origin=(864,580,580))
-r=w0.sketch().segment((648,648),(750,648)).arc((705,671),(648,648)).assemble().finalize().extrude(1).union(w1.sketch().arc((830,296),(1000,557),(852,830)).arc((160,603),(830,296)).assemble().finalize().extrude(864))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(63,13,72))
+r=w0.sketch().segment((804,741),(112,599)).segment((112,741)).close().assemble().push([(228,637)]).rect(69,57,mode='s').push([(607,624)]).circle(43,mode='s').push([(763,714)]).rect(85,97,mode='s').finalize().extrude(118)
diff --git a/test/extrude/1473/1473.stl b/test/extrude/1473/1473.stl
index b8dd1304d938fc2e283317ea801e31abe98e5b41..f0f2f84a1beab611271e9a19a28dd0c8b2fee6f6 100644
Binary files a/test/extrude/1473/1473.stl and b/test/extrude/1473/1473.stl differ
diff --git a/test/extrude/1474/1474.py b/test/extrude/1474/1474.py
index 4e8bdc651840989c5aac9bacea3e8b7a17a12c69..a153ec9cd80f5d84519a63201169899c49d11f7d 100644
--- a/test/extrude/1474/1474.py
+++ b/test/extrude/1474/1474.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(462,414,414))
-r=w0.sketch().push([(20,1)]).circle(481).push([(587,601)]).rect(990,1000).push([(707,587)]).rect(712,568,mode='s').finalize().extrude(318).translate((1,49,68))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(47,69,72))
+r=w0.sketch().segment((601,795),(601,531)).segment((554,531)).arc((541,525),(535,512)).segment((535,266)).segment((527,266)).segment((527,1)).segment((479,1)).segment((479,795)).close().assemble().push([(566,387)]).rect(286,253,mode='s').finalize().extrude(156)
diff --git a/test/extrude/1474/1474.stl b/test/extrude/1474/1474.stl
index 540dbe7e7ca539785b006347ffd047a6e3128d0e..9303a9e830223cc766c538d220dc83f03e0dfc7d 100644
Binary files a/test/extrude/1474/1474.stl and b/test/extrude/1474/1474.stl differ
diff --git a/test/extrude/1475/1475.py b/test/extrude/1475/1475.py
index b3b3f8c87cba3d78d28d94e6bbeb528389434449..50106f1143c590cfa8d5120b96999bbfb9fe9359 100644
--- a/test/extrude/1475/1475.py
+++ b/test/extrude/1475/1475.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,640))
-r=w0.sketch().segment((1,151),(211,151)).arc((261,131),(301,151)).segment((371,151)).segment((371,111)).segment((590,111)).segment((590,471)).segment((371,471)).segment((371,241)).segment((301,241)).arc((261,261),(211,241)).segment((1,241)).close().assemble().push([(256,196)]).rect(650,530,mode='s').finalize().extrude(221).union(w0.sketch().segment((510,590),(540,590)).arc((580,500),(670,431)).segment((670,391)).segment((840,391)).segment((840,431)).arc((930,500),(980,590)).segment((1000,590)).segment((1000,690)).segment((980,690)).arc((930,790),(840,850)).segment((840,890)).segment((670,890)).segment((670,850)).arc((580,790),(540,690)).segment((510,690)).close().assemble().push([(685,555)]).rect(610,570,mode='s').finalize().extrude(471))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(70,52,41))
+r=w0.sketch().segment((268,942),(268,310)).segment((378,310)).segment((268,310)).segment((268,655)).segment((378,655)).segment((378,310)).segment((378,942)).close().assemble().push([(364,550)]).rect(132,117,mode='s').finalize().extrude(357)
diff --git a/test/extrude/1475/1475.stl b/test/extrude/1475/1475.stl
index 288eeeed4964174cbef8988d22725d5e4c628457..533d6ac36bb87c44fcf685942cd9013588beb041 100644
Binary files a/test/extrude/1475/1475.stl and b/test/extrude/1475/1475.stl differ
diff --git a/test/extrude/1476/1476.py b/test/extrude/1476/1476.py
index 315df66148b2552cf2f63d0d507a2e810d8351b8..54afa2ab8e44e065224198b2675ada2f1115a299 100644
--- a/test/extrude/1476/1476.py
+++ b/test/extrude/1476/1476.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(558,516,516))
-r=w0.workplane(offset=295).moveTo(579,637).box(621,863,958).union(w0.sketch().segment((348,369),(569,369)).segment((800,369)).segment((800,380)).segment((590,380)).arc((674,558),(579,727)).arc((611,758),(642,800)).arc((716,884),(632,968)).arc((390,1000),(380,758)).arc((243,569),(348,369)).assemble().finalize().extrude(285)).union(w0.sketch().segment((232,201),(243,201)).segment((243,169)).segment((264,169)).arc((453,1),(443,253)).segment((443,485)).segment((432,485)).segment((432,516)).segment((243,516)).segment((243,485)).segment((232,485)).close().assemble().finalize().extrude(884))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(56,7,75))
+r=w0.sketch().segment((395,317),(969,317)).segment((969,891)).segment((395,891)).close().assemble().finalize().extrude(263).union(w0.workplane(offset=21).sketch().segment((522,254),(214,254)).segment((214,356)).segment((522,356)).close().assemble().finalize().extrude(85))
diff --git a/test/extrude/1476/1476.stl b/test/extrude/1476/1476.stl
index 1bf3f0bd2502b82d5590c030672f55ee6338b6fc..e814993f476dff03170d01d616928b885cf70a1d 100644
Binary files a/test/extrude/1476/1476.stl and b/test/extrude/1476/1476.stl differ
diff --git a/test/extrude/1477/1477.py b/test/extrude/1477/1477.py
index 3829c53b040ba47259c3bdb06aa6f0a6e1f5a65a..8997d95a07014bd61d3598c989f11884d73f2371 100644
--- a/test/extrude/1477/1477.py
+++ b/test/extrude/1477/1477.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().arc((181,81),(234,121),(274,174)).segment((287,181)).segment((354,181)).segment((354,234)).segment((487,234)).segment((487,434)).segment((361,434)).segment((367,461)).segment((294,467)).arc((247,534),(181,587)).segment((181,401)).arc((194,334),(181,267)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(69,6,76))
+r=w0.sketch().segment((1,765),(705,765)).segment((705,311)).segment((608,311)).segment((608,668)).segment((24,668)).segment((24,311)).segment((1,311)).close().assemble().push([(332,527)]).circle(79,mode='s').finalize().extrude(267)
diff --git a/test/extrude/1477/1477.stl b/test/extrude/1477/1477.stl
index 33ce9ad670c90c88f4d9f3602fa78145d7ed1619..174a6080fb46c5d70675f77640f116cbeb7c607a 100644
Binary files a/test/extrude/1477/1477.stl and b/test/extrude/1477/1477.stl differ
diff --git a/test/extrude/1478/1478.py b/test/extrude/1478/1478.py
index b0ad98bfec29d9eb434b20c555cadfe9efb5fb2c..fbdfd9d759bea3f16d414d105a37d7b2ef9a3da5 100644
--- a/test/extrude/1478/1478.py
+++ b/test/extrude/1478/1478.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(617,532,532))
-r=w0.sketch().segment((75,1),(787,1)).segment((787,415)).arc((915,490),(989,607)).arc((947,745),(979,883)).arc((490,1000),(458,490)).segment((75,490)).close().assemble().finalize().extrude(373)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(72,47,37))
+r=w0.sketch().segment((640,391),(375,391)).segment((110,259)).segment((375,259)).segment((640,259)).close().assemble().finalize().extrude(159).union(w0.sketch().segment((337,498),(721,498)).segment((721,306)).segment((337,306)).close().assemble().finalize().extrude(84)).union(w0.sketch().segment((98,492),(98,152)).segment((360,322)).close().assemble().finalize().extrude(168))
diff --git a/test/extrude/1478/1478.stl b/test/extrude/1478/1478.stl
index 595753980365045c54715cbe5f0b65df7de22913..51590541054e7878ed6a178377fc9f1df972c41e 100644
Binary files a/test/extrude/1478/1478.stl and b/test/extrude/1478/1478.stl differ
diff --git a/test/extrude/1479/1479.py b/test/extrude/1479/1479.py
index ddb45e163076bab25bf315b9c0f7e354e5a355f0..c06d67a61ebe032736b533b485fc179f7ed8195f 100644
--- a/test/extrude/1479/1479.py
+++ b/test/extrude/1479/1479.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(395,516,395))
-w1=cq.Workplane('ZX',origin=(395,566,395))
-r=w0.sketch().arc((223,1),(596,51),(253,223)).arc((334,102),(223,1)).assemble().finalize().extrude(132).union(w1.sketch().push([(395,788)]).rect(1000,617).circle(445,mode='s').finalize().extrude(51))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(67,8,55))
+r=w0.sketch().segment((445,823),(576,823)).segment((576,718)).segment((891,718)).segment((891,193)).segment((445,193)).close().assemble().finalize().extrude(173).union(w0.workplane(offset=112).sketch().segment((570,890),(1000,890)).segment((1000,500)).segment((570,500)).close().assemble().finalize().extrude(81)).union(w0.workplane(offset=136).sketch().segment((535,386),(658,386)).segment((658,572)).segment((412,572)).segment((412,386)).close().assemble().finalize().extrude(94))
diff --git a/test/extrude/1479/1479.stl b/test/extrude/1479/1479.stl
index 841c7143f073d96b8bd55f702bfaad8b78402358..2f3db1105ff86dcffc957b0096ee01d23f863a65 100644
Binary files a/test/extrude/1479/1479.stl and b/test/extrude/1479/1479.stl differ
diff --git a/test/extrude/148/148.py b/test/extrude/148/148.py
index 6bc57f016bcce024f73a949d492329015587b42f..f79863cf8b2748ec32879a1884f37f14121d8afc 100644
--- a/test/extrude/148/148.py
+++ b/test/extrude/148/148.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(807,538,538))
-r=w0.sketch().rect(1000,828).push([(584,519)]).rect(640,683,mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(625,500,501))
+w1=cq.Workplane('XY',origin=(500,499,496))
+r=w0.sketch().segment((1,112),(6,111)).segment((7,5)).segment((246,5)).segment((247,111)).segment((381,111)).segment((382,377)).segment((376,374)).arc((47,260),(302,505)).segment((406,521)).segment((384,630)).segment((205,594)).segment((215,549)).segment((5,549)).segment((5,376)).segment((2,376)).close().assemble().finalize().extrude(17).union(w0.sketch().segment((105,500),(459,501)).arc((974,816),(401,619)).segment((106,620)).close().assemble().finalize().extrude(741)).union(w1.workplane(offset=526).moveTo(560,305).box(630,910,550))
\ No newline at end of file
diff --git a/test/extrude/148/148.stl b/test/extrude/148/148.stl
index c8ed3ae2660b4d71d417aae7b8aa83b88996f397..4457d8d994bae1acaf756fb0283e0ff8b86e054e 100644
Binary files a/test/extrude/148/148.stl and b/test/extrude/148/148.stl differ
diff --git a/test/extrude/1480/1480.py b/test/extrude/1480/1480.py
index 9b6de38c1683b2131db6a374d49030bb670eb253..e4c9f51d9d8f5394eeaf6319ca780fc4182fcb89 100644
--- a/test/extrude/1480/1480.py
+++ b/test/extrude/1480/1480.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((227,334),(321,334)).segment((321,227)).arc((414,401),(227,334)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(63,71,44))
+r=w0.sketch().segment((1,754),(828,754)).segment((828,72)).segment((1,72)).close().assemble().finalize().extrude(333).union(w0.workplane(offset=59).sketch().segment((268,408),(636,408)).segment((636,774)).segment((268,774)).close().assemble().finalize().extrude(117))
diff --git a/test/extrude/1480/1480.stl b/test/extrude/1480/1480.stl
index 0f65ec1dba8851854fd80383809be1f43a88b7b1..90f291dbd386d2fe7110982477feba0dd8df631d 100644
Binary files a/test/extrude/1480/1480.stl and b/test/extrude/1480/1480.stl differ
diff --git a/test/extrude/1481/1481.py b/test/extrude/1481/1481.py
index 4137ae70ddf936f22c07253cf051fd0bf363b8a0..8943036d32c5c64e688a1c8cdbe0a163f3c0596e 100644
--- a/test/extrude/1481/1481.py
+++ b/test/extrude/1481/1481.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(685,527,527))
-r=w0.sketch().segment((243,579),(422,748)).arc((443,779),(485,800)).arc((1,632),(432,359)).close().assemble().push([(164,926)]).rect(727,569).finalize().extrude(85).union(w0.sketch().segment((853,159),(853,211)).segment((1000,211)).arc((579,579),(947,159)).close().assemble().finalize().extrude(653))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(2,78,17))
+r=w0.sketch().segment((160,620),(396,620)).segment((702,674)).segment((998,674)).segment((998,626)).segment((706,626)).segment((400,572)).segment((160,572)).close().assemble().finalize().extrude(206).union(w0.workplane(offset=380).sketch().segment((666,598),(768,598)).segment((768,202)).segment((666,202)).close().assemble().finalize().extrude(120)).translate((1,423,1))
diff --git a/test/extrude/1481/1481.stl b/test/extrude/1481/1481.stl
index 32b9fadb9025ce9eaf0e48a6dceb1f028bfabd40..132b31c19db41fc77f0676eaff3d6922a6981f63 100644
Binary files a/test/extrude/1481/1481.stl and b/test/extrude/1481/1481.stl differ
diff --git a/test/extrude/1482/1482.py b/test/extrude/1482/1482.py
index a5d034a1afb1a8b00434f093d88b20aa499c70c3..e04b7f705fa11e4fe118cbdada24f227c24ab860 100644
--- a/test/extrude/1482/1482.py
+++ b/test/extrude/1482/1482.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,411))
-r=w0.sketch().segment((61,391),(61,870)).arc((1,630),(61,391)).assemble().reset().face(w0.sketch().arc((71,381),(431,141),(840,261)).segment((960,261)).segment((960,301)).segment((880,301)).arc((910,341),(930,381)).close().assemble()).reset().face(w0.sketch().arc((940,391),(1000,630),(940,870)).close().assemble()).finalize().extrude(680)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,476,501))
+r=w0.sketch().segment((331,676),(496,496)).segment((495,315)).segment((505,316)).segment((505,482)).segment((660,311)).segment((670,324)).segment((504,506)).segment((506,686)).segment((495,687)).segment((494,520)).segment((341,689)).close().assemble().finalize().extrude(26).union(w0.workplane(offset=763).box(1000,640,1000))
\ No newline at end of file
diff --git a/test/extrude/1482/1482.stl b/test/extrude/1482/1482.stl
index 466702f4f7d7c7079f7036199c9ec4b04bab745e..dbc276a9bdeed115bdaafcbf6a4c3997f6b5b2f4 100644
Binary files a/test/extrude/1482/1482.stl and b/test/extrude/1482/1482.stl differ
diff --git a/test/extrude/1483/1483.py b/test/extrude/1483/1483.py
index 969a66c6b64cfa69096ad696b4db7764c8b308c8..ebb4112d9986356a5e680c85cb2b69913c531044 100644
--- a/test/extrude/1483/1483.py
+++ b/test/extrude/1483/1483.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(496,496,209))
-w1=cq.Workplane('ZX',origin=(496,574,496))
-r=w0.workplane(offset=631).moveTo(774,331).box(600,1000,765).union(w0.sketch().segment((62,418),(522,418)).segment((522,522)).segment((592,522)).segment((592,670)).segment((522,670)).segment((522,913)).segment((62,913)).close().assemble().finalize().extrude(835)).union(w1.sketch().segment((348,670),(366,670)).segment((366,418)).segment((765,418)).segment((765,670)).segment((783,670)).segment((783,679)).segment((765,679)).segment((765,931)).segment((366,931)).segment((366,679)).segment((348,679)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(71,72,3))
+r=w0.sketch().segment((340,524),(852,524)).segment((852,282)).segment((340,282)).close().assemble().push([(586,419)]).circle(93,mode='s').finalize().extrude(316)
diff --git a/test/extrude/1483/1483.stl b/test/extrude/1483/1483.stl
index d75c499fab6fa32a820b1c6468fbfef3ed157bfc..d6b8c68133ba179369e51a5397dc861054ae181d 100644
Binary files a/test/extrude/1483/1483.stl and b/test/extrude/1483/1483.stl differ
diff --git a/test/extrude/1484/1484.py b/test/extrude/1484/1484.py
index 6f78d35332414e13e1d5d2829aada2a1b5e5f292..428bdbc01e5432a818f86f80752103910942fd35 100644
--- a/test/extrude/1484/1484.py
+++ b/test/extrude/1484/1484.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(331,161,331))
-r=w0.sketch().push([(291,406)]).rect(451,481).push([(251,411)]).rect(351,351,mode='s').push([(296,466)]).rect(341,361,mode='s').finalize().extrude(1).union(w0.sketch().segment((401,181),(431,181)).arc((421,191),(401,201)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(78,18,37))
+r=w0.sketch().segment((226,950),(406,950)).segment((406,410)).segment((226,410)).close().assemble().push([(294,682)]).circle(111,mode='s').finalize().extrude(112).translate((1,95,1))
diff --git a/test/extrude/1484/1484.stl b/test/extrude/1484/1484.stl
index 07c2731fde547574e2a0bef213b323e471f8f1c4..0625c13d8a6bc25e56ff3c939a77e2224e6b06f9 100644
Binary files a/test/extrude/1484/1484.stl and b/test/extrude/1484/1484.stl differ
diff --git a/test/extrude/1485/1485.py b/test/extrude/1485/1485.py
index d7439ad219b8401d1abe6b2b25318813961b693e..75ad559769b7cf1c284564d06746f38b2c4b369c 100644
--- a/test/extrude/1485/1485.py
+++ b/test/extrude/1485/1485.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(209,468,468))
-r=w0.sketch().segment((494,14),(585,14)).segment((585,66)).arc((792,299),(585,546)).segment((585,598)).segment((494,598)).segment((494,546)).arc((299,299),(494,66)).close().assemble().push([(851,792)]).rect(1000,753).finalize().extrude(805).union(w0.workplane(offset=695).moveTo(1,591).box(831,974,922)).union(w0.sketch().segment((235,429),(312,235)).segment((273,183)).segment((351,144)).segment((416,1)).segment((533,53)).segment((598,14)).segment((637,92)).segment((857,183)).segment((779,377)).segment((805,429)).segment((741,468)).segment((676,611)).segment((546,559)).segment((481,598)).segment((442,520)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(58,60,71))
+r=w0.sketch().segment((243,1),(949,1)).segment((949,703)).segment((905,703)).segment((905,41)).segment((243,41)).close().assemble().finalize().extrude(267).union(w0.workplane(offset=242).sketch().segment((370,1000),(442,1000)).segment((442,528)).segment((370,528)).close().assemble().finalize().extrude(112))
diff --git a/test/extrude/1485/1485.stl b/test/extrude/1485/1485.stl
index d74f7985514206f2598f0d6a0f7f2ff2cf2affb1..e6a3460c2b1b8983ceb0da74a0d6e9e2ba526796 100644
Binary files a/test/extrude/1485/1485.stl and b/test/extrude/1485/1485.stl differ
diff --git a/test/extrude/1486/1486.py b/test/extrude/1486/1486.py
index 2a124dd8528186be6acf257330419ff13790d624..602ed993be9e6dba8d61088650f1827725d61ac7 100644
--- a/test/extrude/1486/1486.py
+++ b/test/extrude/1486/1486.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().segment((61,347),(174,327)).segment((214,221)).segment((367,281)).segment((494,247)).segment((514,334)).segment((634,381)).segment((614,427)).segment((81,427)).close().assemble().finalize().extrude(867).union(w0.sketch().segment((34,234),(307,234)).segment((307,28)).segment((347,28)).segment((347,234)).segment((587,234)).arc((600,247),(614,247)).segment((614,434)).segment((347,434)).segment((347,640)).segment((307,640)).segment((307,434)).segment((34,434)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(50,23,32))
+r=w0.sketch().segment((990,303),(402,302)).segment((402,891)).segment((990,892)).close().assemble().finalize().extrude(353).union(w0.workplane(offset=146).sketch().segment((206,150),(206,691)).segment((408,150)).close().assemble().finalize().extrude(140)).translate((1,331,1))
diff --git a/test/extrude/1486/1486.stl b/test/extrude/1486/1486.stl
index 357cfb7a4b54b035c8852cce23065be7c78ff663..5f411ea64bfc353f3e32588cb5de1144ca55ff42 100644
Binary files a/test/extrude/1486/1486.stl and b/test/extrude/1486/1486.stl differ
diff --git a/test/extrude/1487/1487.py b/test/extrude/1487/1487.py
index 01891a3e936c3c105e4c1eec9e3458ef67402761..1dd184cf71883fa9b8fb79e179614183b403f770 100644
--- a/test/extrude/1487/1487.py
+++ b/test/extrude/1487/1487.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(413,413,264))
-r=w0.workplane(offset=273).moveTo(334,614).cylinder(693,649).union(w0.workplane(offset=706).moveTo(702,1).cylinder(1000,439)).translate((1,26,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(67,53,74))
+r=w0.sketch().segment((657,918),(557,918)).segment((557,304)).segment((657,304)).close().assemble().push([(599,761)]).rect(40,59,mode='s').push([(597,420)]).circle(43,mode='s').push([(615,745)]).circle(32,mode='s').push([(599,873)]).rect(70,51,mode='s').finalize().extrude(169)
diff --git a/test/extrude/1487/1487.stl b/test/extrude/1487/1487.stl
index 20554fa717270099088aab9d813f5b93a433ffae..9e72bef0aafc74a619550bee5c53676e1bfa2539 100644
Binary files a/test/extrude/1487/1487.stl and b/test/extrude/1487/1487.stl differ
diff --git a/test/extrude/1488/1488.py b/test/extrude/1488/1488.py
index f0d53b539caf7834093b8ec8a590b437d5cebec3..7b0257eababb187e5c8af49c813f0ed1385db1c5 100644
--- a/test/extrude/1488/1488.py
+++ b/test/extrude/1488/1488.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(313,313,162))
-r=w0.workplane(offset=119).moveTo(264,1).box(474,398,699).union(w0.sketch().arc((248,495),(431,560),(259,484)).segment((323,484)).segment((323,538)).segment((248,538)).close().assemble().finalize().extrude(1000)).translate((1,1,70))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(32,34,14))
+r=w0.sketch().segment((80,378),(212,718)).segment((600,718)).segment((712,366)).segment((646,366)).segment((569,657)).segment((569,368)).segment((542,368)).segment((542,630)).segment((459,368)).segment((421,368)).segment((536,658)).segment((248,658)).segment((129,376)).close().assemble().reset().segment((259,535),(535,535)).segment((535,507)).segment((259,507)).close().assemble(mode='s').finalize().extrude(326)
diff --git a/test/extrude/1488/1488.stl b/test/extrude/1488/1488.stl
index 459ee8eccf0fa492affdc70a2854ea80e4221630..a50cfe8077cc356a66e9c9bfc3e7d0b7278dade6 100644
Binary files a/test/extrude/1488/1488.stl and b/test/extrude/1488/1488.stl differ
diff --git a/test/extrude/1489/1489.py b/test/extrude/1489/1489.py
index 746c4772336860fce829d3b7a3a21cab33579e7a..2bc0e79748c20cdc9341dac5fc8286ef48ae2e33 100644
--- a/test/extrude/1489/1489.py
+++ b/test/extrude/1489/1489.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(962,641,641))
-r=w0.sketch().segment((411,744),(545,404)).segment((872,539)).segment((737,878)).close().assemble().rect(885,808,mode='s').finalize().extrude(1).union(w0.workplane(offset=462).cylinder(1000,853)).translate((1,213,213))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(13,41,66))
+r=w0.sketch().segment((922,459),(270,459)).arc((315,573),(379,677)).segment((922,677)).close().assemble().push([(639,633)]).rect(205,161,mode='s').finalize().extrude(395)
diff --git a/test/extrude/1489/1489.stl b/test/extrude/1489/1489.stl
index 70c62e41e902b5385914eed16c600cd05a26cd17..b50043b84e603a166780d36abb89dc18345231a7 100644
Binary files a/test/extrude/1489/1489.stl and b/test/extrude/1489/1489.stl differ
diff --git a/test/extrude/149/149.py b/test/extrude/149/149.py
index 1c6e9d31251df104b2e2c92ac8a620b1532d0655..8cd33114c61b2eb102c9151e3853217cd9c2951d 100644
--- a/test/extrude/149/149.py
+++ b/test/extrude/149/149.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().arc((640,514),(694,667),(640,820)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,471,501))
+r=w0.workplane(offset=265).moveTo(424,622).box(510,705,970).union(w0.workplane(offset=435).moveTo(346,451).cylinder(631,674)).union(w0.sketch().arc((660,470),(735,407),(705,316)).arc((831,430),(660,470)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/149/149.stl b/test/extrude/149/149.stl
index eb539c8c0c0f2d1258ebf1272de64bec3a22e37a..fe4da6b28996db9a0ef20bba56ab0b4364af1e03 100644
Binary files a/test/extrude/149/149.stl and b/test/extrude/149/149.stl differ
diff --git a/test/extrude/1490/1490.py b/test/extrude/1490/1490.py
index 73a616cd62cd21c142858456c23bce7e7bbc35b3..54a28f115c03fa3907709b7980eff7f22406c2f1 100644
--- a/test/extrude/1490/1490.py
+++ b/test/extrude/1490/1490.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,630))
-r=w0.sketch().segment((1,291),(311,291)).arc((500,211),(690,291)).segment((1000,291)).segment((1000,710)).segment((690,710)).arc((500,790),(311,710)).segment((1,710)).close().assemble().finalize().extrude(241)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(75,4,75))
+r=w0.sketch().segment((983,429),(353,429)).segment((353,661)).segment((509,661)).arc((668,507),(827,661)).segment((983,661)).close().assemble().push([(624,551)]).rect(213,130,mode='s').finalize().extrude(345).translate((1,342,1))
diff --git a/test/extrude/1490/1490.stl b/test/extrude/1490/1490.stl
index d603358d9e89fae60dac08f2b9ea22b0aaf75717..d857104b47834dfaee3d728886c5d6dac2fc3d83 100644
Binary files a/test/extrude/1490/1490.stl and b/test/extrude/1490/1490.stl differ
diff --git a/test/extrude/1491/1491.py b/test/extrude/1491/1491.py
index 6bbd55c8f742c0a2dcb86c629bbae7d2772c0adf..3bdbdf8779c6eee40799d52cd8c2d75a6f81f0e4 100644
--- a/test/extrude/1491/1491.py
+++ b/test/extrude/1491/1491.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,331))
-r=w0.workplane(offset=510).moveTo(750,790).box(680,860,520).union(w0.sketch().segment((1,311),(71,311)).segment((71,211)).segment((181,211)).segment((181,311)).segment((261,311)).segment((261,341)).segment((181,341)).segment((181,441)).segment((71,441)).segment((71,341)).segment((1,341)).close().assemble().finalize().extrude(710)).union(w0.sketch().push([(161,421)]).circle(620).reset().face(w0.sketch().segment((580,111),(600,111)).segment((600,201)).close().assemble()).reset().face(w0.sketch().segment((730,81),(960,31)).segment((1000,221)).segment((820,261)).segment((820,81)).close().assemble()).finalize().extrude(850))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(42,24,79))
+r=w0.sketch().segment((360,489),(1000,489)).segment((1000,716)).segment((831,889)).segment((360,889)).close().assemble().finalize().extrude(216).union(w0.workplane(offset=193).sketch().segment((504,524),(536,527)).segment((536,766)).segment((522,792)).segment((504,792)).segment((504,766)).close().assemble().finalize().extrude(106)).union(w0.workplane(offset=64).sketch().segment((286,420),(550,420)).segment((560,394)).segment((571,374)).segment((585,366)).segment((624,338)).segment((675,326)).segment((710,315)).segment((710,260)).segment((672,248)).segment((616,283)).segment((561,335)).segment((550,350)).segment((286,350)).close().assemble().finalize().extrude(34))
diff --git a/test/extrude/1491/1491.stl b/test/extrude/1491/1491.stl
index fd497e61398395ab9357591db8b54395e1bdee4e..5faed9a1dcd6bd26529c5521b9cd728b875631e8 100644
Binary files a/test/extrude/1491/1491.stl and b/test/extrude/1491/1491.stl differ
diff --git a/test/extrude/1492/1492.py b/test/extrude/1492/1492.py
index fe64e78f4553fd18ac6f55cda1825c81619a8736..239ae7b928034f2d411828d1c5689e81cc7ba723 100644
--- a/test/extrude/1492/1492.py
+++ b/test/extrude/1492/1492.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(30,353,353))
-r=w0.sketch().arc((324,619),(296,1),(504,583)).arc((439,713),(324,619)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(41,46,7))
+r=w0.sketch().segment((751,836),(479,836)).segment((479,308)).segment((751,308)).close().assemble().finalize().extrude(111).union(w0.workplane(offset=29).sketch().segment((402,492),(234,492)).segment((234,812)).segment((402,812)).close().assemble().finalize().extrude(51))
diff --git a/test/extrude/1492/1492.stl b/test/extrude/1492/1492.stl
index e0b5b0601d976694ed12700d9bb9b0d3ea326f8d..f6d8e9e7dd08f8584afd61e52a2afc2236d528c9 100644
Binary files a/test/extrude/1492/1492.stl and b/test/extrude/1492/1492.stl differ
diff --git a/test/extrude/1493/1493.py b/test/extrude/1493/1493.py
index b1419bb75a12847f3af31c2d3b0562ce7cab5d36..eb4f5519bca2ef6a58a8b169b6a4f881637c85bf 100644
--- a/test/extrude/1493/1493.py
+++ b/test/extrude/1493/1493.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(490,532,532))
-r=w0.sketch().segment((1,660),(44,660)).segment((160,543)).segment((277,660)).segment((330,660)).segment((330,947)).segment((235,947)).arc((139,1000),(33,947)).segment((1,947)).close().assemble().push([(171,798)]).circle(681,mode='s').push([(957,628)]).circle(639).finalize().extrude(235).union(w0.workplane(offset=527).moveTo(607,500).cylinder(543,607)).union(w0.workplane(offset=724).moveTo(777,203).cylinder(915,671))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(49,55,40))
+r=w0.sketch().segment((384,1),(962,1)).segment((1000,1)).segment((1000,385)).arc((673,762),(296,385)).segment((296,1)).close().assemble().push([(694,106)]).circle(117,mode='s').finalize().extrude(283).translate((1,229,1))
diff --git a/test/extrude/1493/1493.stl b/test/extrude/1493/1493.stl
index 017a8bda54ceeb9553d8f7930baf78175aa41198..fba17f5af48a909964d0779e2784e6e248004bf7 100644
Binary files a/test/extrude/1493/1493.stl and b/test/extrude/1493/1493.stl differ
diff --git a/test/extrude/1494/1494.py b/test/extrude/1494/1494.py
index 6bdb90c4f96f28e8d055180977bf72a1b6c8a3a3..2fcdd8cb08b7a422dda729767e8516ef709e24fe 100644
--- a/test/extrude/1494/1494.py
+++ b/test/extrude/1494/1494.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(599,893,599))
-w1=cq.Workplane('ZX',origin=(599,857,599))
-r=w0.sketch().push([(558,955)]).rect(964,741).push([(630,1000)]).rect(643,652,mode='s').finalize().extrude(1).union(w0.sketch().push([(554,955)]).rect(938,777).push([(563,960)]).rect(652,625,mode='s').finalize().extrude(456)).union(w1.workplane(offset=612).moveTo(715,260).cylinder(625,706))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(17,66,58))
+r=w0.sketch().segment((198,572),(948,572)).segment((948,679)).segment((198,679)).arc((203,625),(198,571)).close().assemble().reset().segment((604,670),(604,438)).arc((587,421),(570,438)).segment((570,670)).arc((587,687),(604,670)).close().assemble(mode='s').finalize().extrude(395)
diff --git a/test/extrude/1494/1494.stl b/test/extrude/1494/1494.stl
index 8789a84d9135525611af752b8c53f0213e6491d6..9b1f609e5ae0986b0dacfab13c88bcd7d46a0b52 100644
Binary files a/test/extrude/1494/1494.stl and b/test/extrude/1494/1494.stl differ
diff --git a/test/extrude/1495/1495.py b/test/extrude/1495/1495.py
index 507c48ab7133c43c31f7326206003574e73daf35..1114f92a201b04e1aa0c6861e556edb2fcf0bd72 100644
--- a/test/extrude/1495/1495.py
+++ b/test/extrude/1495/1495.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(164,414,414))
-r=w0.sketch().arc((885,827),(894,846),(894,856)).segment((885,856)).close().assemble().finalize().extrude(337).union(w0.sketch().push([(1,39)]).circle(481).reset().face(w0.sketch().arc((39,289),(107,241),(97,164)).segment((328,30)).segment((376,126)).arc((491,212),(539,337)).arc((270,260),(49,424)).arc((39,366),(49,308)).close().assemble()).finalize().extrude(1000)).translate((1,67,29))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(51,6,5))
+r=w0.sketch().segment((1,34),(1,477)).arc((1,540),(38,566)).segment((686,566)).arc((749,540),(774,477)).segment((774,34)).close().assemble().push([(147,339)]).rect(91,52,mode='s').push([(663,190)]).circle(47,mode='s').push([(522,481)]).rect(75,98,mode='s').push([(469,133)]).rect(54,104,mode='s').finalize().extrude(347).translate((1,342,1))
diff --git a/test/extrude/1495/1495.stl b/test/extrude/1495/1495.stl
index 50bba7fb24cbc28d43e35d4add8f34323914c015..883451eacd6f9c2c096f7dfd33d75b218e4226d6 100644
Binary files a/test/extrude/1495/1495.stl and b/test/extrude/1495/1495.stl differ
diff --git a/test/extrude/1496/1496.py b/test/extrude/1496/1496.py
index 41467203b28133e45818616fe1685e8f4ba5e69c..8ab6a6bf4499bd2f885833dfb6dea87dd99f5b8a 100644
--- a/test/extrude/1496/1496.py
+++ b/test/extrude/1496/1496.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(623,490,490))
-w1=cq.Workplane('XY',origin=(490,490,450))
-r=w0.sketch().push([(83,602)]).circle(562).push([(450,551)]).circle(602).finalize().extrude(42).union(w0.sketch().segment((857,1000),(867,755)).segment((949,755)).segment((939,1000)).close().assemble().finalize().extrude(276)).union(w0.workplane(offset=409).moveTo(174,1).cylinder(653,511)).union(w1.workplane(offset=358).moveTo(653,827).cylinder(755,633)).translate((1,1,22))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(14,37,77))
+r=w0.sketch().segment((196,132),(196,580)).segment((396,580)).segment((952,580)).segment((952,132)).segment((396,132)).segment((396,580)).segment((396,132)).close().assemble().push([(527,236)]).circle(49,mode='s').push([(856,198)]).rect(105,71,mode='s').push([(642,400)]).circle(74,mode='s').finalize().extrude(168).translate((1,132,1))
diff --git a/test/extrude/1496/1496.stl b/test/extrude/1496/1496.stl
index d06053908611133d62daf4b9818d4314cecb93af..6880849132ac3143b8f9e05c901c949ca20d1257 100644
Binary files a/test/extrude/1496/1496.stl and b/test/extrude/1496/1496.stl differ
diff --git a/test/extrude/1497/1497.py b/test/extrude/1497/1497.py
index 862cd0c613537c3ecaa100939d776c27196a3b78..6fb84edec2249c1eb060287de302074808abce31 100644
--- a/test/extrude/1497/1497.py
+++ b/test/extrude/1497/1497.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(331,1,331))
-r=w0.sketch().circle(444).circle(434,mode='s').finalize().extrude(629).union(w0.sketch().circle(846).rect(866,619,mode='s').finalize().extrude(1000)).translate((516,1,516))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(6,17,66))
+r=w0.sketch().segment((96,110),(517,532)).segment((96,954)).segment((105,963)).segment((527,542)).segment((949,964)).segment((958,954)).segment((537,532)).segment((958,110)).segment((949,101)).segment((527,522)).segment((105,101)).close().assemble().push([(613,689)]).circle(48,mode='s').push([(865,652)]).circle(52,mode='s').finalize().extrude(216).translate((1,200,1))
diff --git a/test/extrude/1497/1497.stl b/test/extrude/1497/1497.stl
index b2cad60d50ecff763f5565f9464dcdb84e2d6491..ae940b3c67d07e553134f1f08ef8a253103d9b56 100644
Binary files a/test/extrude/1497/1497.stl and b/test/extrude/1497/1497.stl differ
diff --git a/test/extrude/1498/1498.py b/test/extrude/1498/1498.py
index b7219213f5e1da73ee766179a2e8d2a9d1a64af5..b145fae7da65567e15c3c4c6ab9978dcfcef97a9 100644
--- a/test/extrude/1498/1498.py
+++ b/test/extrude/1498/1498.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,627).translate((294,1,294))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(51,71,69))
+r=w0.sketch().segment((156,884),(239,352)).segment((702,352)).segment((742,617)).segment((574,525)).segment((574,416)).segment((350,416)).segment((373,532)).segment((431,520)).segment((522,678)).segment((328,678)).segment((302,733)).segment((328,832)).segment((418,860)).segment((418,950)).close().assemble().push([(485,574)]).rect(158,120,mode='s').finalize().extrude(53)
diff --git a/test/extrude/1498/1498.stl b/test/extrude/1498/1498.stl
index ed31d02c0bd5b464bedb330ec4ec196cd2fb2e5d..91a8b0ab535eff3257ea226b408f686df5426916 100644
Binary files a/test/extrude/1498/1498.stl and b/test/extrude/1498/1498.stl differ
diff --git a/test/extrude/1499/1499.py b/test/extrude/1499/1499.py
index 13a2d28317bdf0f3b233ab8a8172b19a222109c3..e057597d8c47644f03eb5fe348d3c842f6efadd4 100644
--- a/test/extrude/1499/1499.py
+++ b/test/extrude/1499/1499.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(189,347,347))
-r=w0.workplane(offset=179).moveTo(357,6).box(921,357,683).union(w0.sketch().push([(268,505)]).circle(565).push([(357,1)]).circle(377).push([(372,6)]).rect(357,357,mode='s').finalize().extrude(1000)).translate((1,1,31))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(26,44,56))
+r=w0.sketch().segment((809,660),(395,660)).segment((395,321)).segment((586,321)).segment((586,1)).segment((809,1)).close().assemble().finalize().extrude(363).union(w0.workplane(offset=233).sketch().segment((46,652),(418,652)).segment((418,218)).segment((46,218)).close().assemble().finalize().extrude(156))
diff --git a/test/extrude/1499/1499.stl b/test/extrude/1499/1499.stl
index f35292a12a5ee0085eeed41c4ad9e6737aebb23f..56462e30d145e402f5b6c4e4656d8845a20358cf 100644
Binary files a/test/extrude/1499/1499.stl and b/test/extrude/1499/1499.stl differ
diff --git a/test/extrude/15/15.py b/test/extrude/15/15.py
index 1de65f7dd62523fd3714b3ff55c1b604be59cf89..3892b6f9a24fb0657cb89bff11efa2c4db547de5 100644
--- a/test/extrude/15/15.py
+++ b/test/extrude/15/15.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(618,445,618))
-r=w0.sketch().arc((211,470),(420,1),(519,507)).segment((519,655)).segment((211,655)).close().assemble().push([(396,272)]).circle(815,mode='s').push([(877,1000)]).circle(852).finalize().extrude(778).union(w0.workplane(offset=747).moveTo(914,260).box(815,741,877)).union(w0.sketch().push([(371,433)]).circle(803).push([(322,359)]).circle(642,mode='s').finalize().extrude(963))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(21,60,7))
+r=w0.sketch().segment((1,746),(1,307)).segment((756,307)).segment((756,965)).segment((537,965)).segment((537,526)).segment((209,526)).segment((209,746)).close().assemble().push([(584,821)]).rect(89,54,mode='s').push([(469,710)]).rect(59,50,mode='s').push([(553,757)]).circle(51,mode='s').push([(605,562)]).rect(66,79,mode='s').finalize().extrude(193).translate((1,134,1))
diff --git a/test/extrude/15/15.stl b/test/extrude/15/15.stl
index ccb03e21cb36753680298c8fa17c4065d9afedd0..aa2d00ae3fd9bc0e1160e9ae647d43966acb059c 100644
Binary files a/test/extrude/15/15.stl and b/test/extrude/15/15.stl differ
diff --git a/test/extrude/150/150.py b/test/extrude/150/150.py
index 5f5ebda8ca436d1e30207912f8baddef82b991a0..0d3c76d6b51665a924ee54e1aec2ebc629c9a2de 100644
--- a/test/extrude/150/150.py
+++ b/test/extrude/150/150.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(898,602,602))
-r=w0.sketch().segment((179,323),(382,323)).segment((390,636)).segment((179,636)).segment((179,560)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((644,797),(746,797)).segment((746,822)).segment((831,822)).segment((831,797)).segment((831,458)).arc((1000,771),(644,797)).assemble().finalize().extrude(306))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,680))
+r=w0.workplane(offset=322).moveTo(350,277).cylinder(860,774).union(w0.sketch().push([(641,715)]).circle(785).rect(609,521,mode='s').finalize().extrude(476))
\ No newline at end of file
diff --git a/test/extrude/150/150.stl b/test/extrude/150/150.stl
index 0b6ab73b2d6e90b8a3853850a22c7eb62552ca79..17f49c3545853ddbd004ff31ce4640b227fc9f4c 100644
Binary files a/test/extrude/150/150.stl and b/test/extrude/150/150.stl differ
diff --git a/test/extrude/151/151.py b/test/extrude/151/151.py
index 91fbdd39bc0f0074d3aeeae108088dec03f860de..4aa5af1909dc616626c2867373d182e913e5b738 100644
--- a/test/extrude/151/151.py
+++ b/test/extrude/151/151.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(412,483,412))
-w1=cq.Workplane('ZX',origin=(412,318,412))
-r=w0.workplane(offset=142).moveTo(1,988).cylinder(953,424).union(w0.workplane(offset=612).moveTo(295,107).box(671,976,812)).union(w1.workplane(offset=542).moveTo(542,730).box(1000,812,671)).translate((1,1,12))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,999,500))
+r=w0.sketch().arc((97,186),(504,490),(855,116)).arc((545,885),(95,185)).assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/151/151.stl b/test/extrude/151/151.stl
index 4d7495ef2e6031495d74eee7c550e618d48b7d9b..77e9a604567521059bfbd3f059a3668a16de0d52 100644
Binary files a/test/extrude/151/151.stl and b/test/extrude/151/151.stl differ
diff --git a/test/extrude/152/152.py b/test/extrude/152/152.py
index e9c6bd7d0d06457b28fb8be0204594e23688effd..257d27957d6884cb85483728b4f501451bbed647 100644
--- a/test/extrude/152/152.py
+++ b/test/extrude/152/152.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,495,334))
-r=w0.workplane(offset=1).moveTo(566,485).cylinder(1000,526).union(w0.workplane(offset=506).moveTo(198,77).box(909,506,677)).translate((1,5,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(384,500,500))
+r=w0.workplane(offset=403).moveTo(775,15).cylinder(696,515).union(w0.workplane(offset=461).moveTo(495,717).cylinder(580,786)).union(w0.sketch().push([(575,534)]).circle(601).push([(557,481)]).rect(586,522,mode='s').finalize().extrude(925))
\ No newline at end of file
diff --git a/test/extrude/152/152.stl b/test/extrude/152/152.stl
index 68a9c68c75fd20e4266302e2f4fdcc21ff53fe5b..5bd2061343b15bd1c9252e968536b8e6b6e6d5b6 100644
Binary files a/test/extrude/152/152.stl and b/test/extrude/152/152.stl differ
diff --git a/test/extrude/153/153.py b/test/extrude/153/153.py
index 3233da420b73a1b3e0d77324de2ca1cdf1e0a175..4d64215823fb39d97920bad6aa5b8d9e5dd7d995 100644
--- a/test/extrude/153/153.py
+++ b/test/extrude/153/153.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(429,511,511))
-r=w0.sketch().segment((1,562),(195,562)).segment((195,348)).segment((541,348)).segment((541,562)).segment((653,562)).segment((817,480)).segment((898,653)).segment((745,735)).segment((735,735)).segment((541,827)).segment((541,949)).segment((195,949)).segment((195,735)).segment((1,735)).close().assemble().reset().face(w0.sketch().arc((246,755),(307,500),(531,623)).close().assemble(),mode='s').push([(888,205)]).circle(643).finalize().extrude(195).union(w0.sketch().segment((378,592),(439,572)).segment((470,684)).segment((399,694)).arc((429,633),(378,592)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,596,501))
+r=w0.sketch().segment((262,181),(296,37)).segment((784,166)).segment((746,310)).close().assemble().push([(475,155)]).circle(535,mode='s').push([(866,874)]).circle(560).finalize().extrude(1).union(w0.sketch().push([(520,171)]).circle(556).rect(511,540,mode='s').finalize().extrude(335)).union(w0.workplane(offset=703).moveTo(425,616).cylinder(905,849))
\ No newline at end of file
diff --git a/test/extrude/153/153.stl b/test/extrude/153/153.stl
index 7dbe1af20b65b004582bf61306e7e1e7b468d85c..f0f084a87c12ef1253600a342763f330f59a3f6c 100644
Binary files a/test/extrude/153/153.stl and b/test/extrude/153/153.stl differ
diff --git a/test/extrude/154/154.py b/test/extrude/154/154.py
index 145af97bf9cc7aa5a9bb91e1b53a9651eb032451..f61a31aec62be433dd55d103eebe1ea1c70d30ec 100644
--- a/test/extrude/154/154.py
+++ b/test/extrude/154/154.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,383,334))
-w1=cq.Workplane('XY',origin=(334,334,605))
-r=w0.workplane(offset=1).moveTo(445,223).cylinder(1000,593).union(w0.sketch().push([(44,550)]).rect(494,840).push([(439,229)]).rect(766,593).finalize().extrude(186)).union(w1.workplane(offset=94).moveTo(50,772).box(704,692,815)).translate((37,117,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,366))
+r=w0.sketch().segment((48,416),(373,415)).arc((900,127),(476,551)).segment((476,1000)).segment((48,1000)).close().assemble().finalize().extrude(770)
\ No newline at end of file
diff --git a/test/extrude/154/154.stl b/test/extrude/154/154.stl
index 70237e7f4b09fa10f277ecfe0129fdaf4b19ef24..6ef3bd5801616f538afbe5fa31d215c194b27d16 100644
Binary files a/test/extrude/154/154.stl and b/test/extrude/154/154.stl differ
diff --git a/test/extrude/155/155.py b/test/extrude/155/155.py
index 440e2ab7e9ba9f3cbc3e8a015f5aa32631bce303..d8a72195e771729420a19a43e999fd68e7c60375 100644
--- a/test/extrude/155/155.py
+++ b/test/extrude/155/155.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(301,101,301))
-r=w0.sketch().push([(570,71)]).circle(391).reset().face(w0.sketch().segment((540,71),(590,51)).segment((600,71)).segment((560,101)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().push([(81,481)]).circle(441).reset().face(w0.sketch().segment((61,351),(91,351)).segment((91,371)).arc((111,401),(91,431)).segment((91,451)).segment((61,451)).segment((61,431)).arc((41,401),(61,371)).close().assemble(),mode='s').finalize().extrude(1000)).translate((21,1,60))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,705,501))
+w1=cq.Workplane('YZ',origin=(570,499,500))
+r=w0.workplane(offset=258).moveTo(451,285).box(562,552,985).union(w0.workplane(offset=442).moveTo(364,455).box(926,631,615)).union(w0.workplane(offset=537).moveTo(815,556).cylinder(576,686)).union(w1.sketch().arc((492,1),(641,195),(490,391)).segment((490,271)).segment((581,272)).segment((581,126)).segment((491,127)).close().assemble().finalize().extrude(331))
\ No newline at end of file
diff --git a/test/extrude/155/155.stl b/test/extrude/155/155.stl
index 870fe7d19575967b25beae8cd7834dfacddf6219..527f2b7c45ee481086d0d1afc5d7ff28b0245577 100644
Binary files a/test/extrude/155/155.stl and b/test/extrude/155/155.stl differ
diff --git a/test/extrude/156/156.py b/test/extrude/156/156.py
index ee4b684bd67da6f49ed3bad358b737c06b46d51a..d626764641d56f9efb3abb50394c6f7b75c295d0 100644
--- a/test/extrude/156/156.py
+++ b/test/extrude/156/156.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(932,624,624))
-r=w0.sketch().segment((354,249),(444,249)).segment((805,249)).segment((895,249)).segment((895,1000)).segment((805,1000)).segment((444,1000)).segment((354,1000)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,999))
+r=w0.sketch().arc((280,96),(481,171),(670,76)).arc((910,320),(905,665)).segment((906,641)).segment((746,639)).segment((745,711)).segment((881,710)).arc((186,795),(281,95)).assemble().push([(500,484)]).rect(1000,716,mode='s').finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/156/156.stl b/test/extrude/156/156.stl
index 88428cacc51a658afa49e039a2e77022259683a5..4c978c8ba0138e230aa6d42e8c60ad65cba36c9a 100644
Binary files a/test/extrude/156/156.stl and b/test/extrude/156/156.stl differ
diff --git a/test/extrude/157/157.py b/test/extrude/157/157.py
index 40946fc51c04511151c384c7ae31de78173c44bf..324a09de3f51449e1c37dc87c78cdf649c15a44d 100644
--- a/test/extrude/157/157.py
+++ b/test/extrude/157/157.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(36,355,355))
-r=w0.workplane(offset=525).moveTo(497,313).cylinder(695,568).union(w0.sketch().segment((1,235),(511,107)).segment((610,476)).segment((100,610)).close().assemble().push([(291,391)]).circle(490,mode='s').circle(419).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,621))
+r=w0.sketch().push([(515,131)]).circle(629).push([(551,43)]).rect(570,536,mode='s').reset().face(w0.sketch().arc((784,430),(846,360),(890,277)).segment((891,430)).close().assemble()).finalize().extrude(261).union(w0.sketch().segment((61,269),(304,271)).segment((402,207)).segment((445,271)).segment((940,272)).segment((941,1000)).segment((62,999)).close().assemble().reset().face(w0.sketch().segment((401,511),(555,741)).arc((416,669),(401,511)).assemble(),mode='s').reset().face(w0.sketch().arc((540,415),(684,491),(695,651)).close().assemble(),mode='s').finalize().extrude(351))
\ No newline at end of file
diff --git a/test/extrude/157/157.stl b/test/extrude/157/157.stl
index 0ddae7e6eefcf35d5a56ed980b5a2d5eef390bb9..1480944e799a1517f8eb703b27d0352b3c834ef5 100644
Binary files a/test/extrude/157/157.stl and b/test/extrude/157/157.stl differ
diff --git a/test/extrude/158/158.py b/test/extrude/158/158.py
index 01216495d826df4ae2212933daddd94aa7ab77dd..b9bb1d841e9877e2fd4a315aef8aa21a2f031a2a 100644
--- a/test/extrude/158/158.py
+++ b/test/extrude/158/158.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(562,562,781))
-r=w0.sketch().push([(562,377)]).rect(1000,617).circle(569,mode='s').finalize().extrude(1).union(w0.sketch().segment((514,754),(535,754)).segment((514,774)).close().assemble().finalize().extrude(685))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(115,500,500))
+r=w0.workplane(offset=840).moveTo(368,595).box(1000,829,1000).union(w0.sketch().segment((855,241),(1000,242)).segment((1000,280)).arc((931,277),(854,280)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/158/158.stl b/test/extrude/158/158.stl
index f1879b1cea096e1106654285c2dd6afe4a2de1f2..4518689177c0c22369ff7ce6509017834f8f6e1b 100644
Binary files a/test/extrude/158/158.stl and b/test/extrude/158/158.stl differ
diff --git a/test/extrude/159/159.py b/test/extrude/159/159.py
index 27ba2e1809eb4527592de46ea7b43c3e3bce00d4..cc55f1e538588a833090017245bb6fdc6e033d72 100644
--- a/test/extrude/159/159.py
+++ b/test/extrude/159/159.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().arc((654,600),(680,667),(654,734)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,501,500))
+r=w0.workplane(offset=366).moveTo(290,827).box(612,704,770).union(w0.sketch().arc((991,300),(999,335),(991,376)).close().assemble().finalize().extrude(296)).union(w0.sketch().segment((1,430),(421,432)).arc((890,165),(529,570)).segment((531,925)).segment((2,926)).close().assemble().reset().face(w0.sketch().arc((480,432),(849,205),(530,500)).segment((531,430)).close().assemble(),mode='s').finalize().extrude(770))
\ No newline at end of file
diff --git a/test/extrude/159/159.stl b/test/extrude/159/159.stl
index c779eee6a73b1e380fb4ee283eec39696c80c31d..e7047df02f4067157098adb8c1465b2d6e9f26fa 100644
Binary files a/test/extrude/159/159.stl and b/test/extrude/159/159.stl differ
diff --git a/test/extrude/16/16.py b/test/extrude/16/16.py
index e892ade46a581c031ec40262efdf0069b000c684..4c28d3373d1162e14e963ce2e210338f48e39da0 100644
--- a/test/extrude/16/16.py
+++ b/test/extrude/16/16.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(412,412,445))
-r=w0.workplane(offset=118).moveTo(528,500).box(822,589,1000).union(w0.sketch().push([(145,179)]).circle(534).circle(512,mode='s').finalize().extrude(1)).union(w0.workplane(offset=673).moveTo(534,500).cylinder(933,678))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(46,73,59))
+r=w0.sketch().segment((27,409),(27,304)).segment((27,409)).segment((237,409)).segment((321,409)).segment((321,304)).segment((427,304)).segment((637,304)).segment((637,514)).segment((27,514)).close().assemble().push([(317,421)]).rect(174,129,mode='s').finalize().extrude(117)
diff --git a/test/extrude/16/16.stl b/test/extrude/16/16.stl
index 9a86e9bfaef0a5a29fa5d7e2f7d750185427fc13..44ccf59ed8be2530837268967528e8f0113669f1 100644
Binary files a/test/extrude/16/16.stl and b/test/extrude/16/16.stl differ
diff --git a/test/extrude/160/160.py b/test/extrude/160/160.py
index 34b5b174e6f1b81cc1ddb7fae045868716555d5a..86f3e7fca0b4408ac2d7a99536e701056ed6dd73 100644
--- a/test/extrude/160/160.py
+++ b/test/extrude/160/160.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(558,558,832))
-r=w0.sketch().segment((116,903),(204,116)).segment((1000,213)).segment((912,1000)).close().assemble().reset().face(w0.sketch().segment((620,903),(655,806)).segment((823,867)).segment((788,965)).close().assemble(),mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,346,501))
+r=w0.sketch().segment((141,396),(321,395)).segment((320,1)).segment((859,2)).segment((860,535)).segment((346,534)).segment((347,1000)).segment((140,1000)).close().assemble().finalize().extrude(809)
\ No newline at end of file
diff --git a/test/extrude/160/160.stl b/test/extrude/160/160.stl
index 0bf7bc3b152d89e9affb1b2dccdbc2ecbfe71323..4e0c9e8f4e9b04ba8ba113b5bfe3867bac8e1046 100644
Binary files a/test/extrude/160/160.stl and b/test/extrude/160/160.stl differ
diff --git a/test/extrude/161/161.py b/test/extrude/161/161.py
index a4ef657f2cd91a65c837216e5bec931639f961c8..885871ec791049d9e61e088656998ef6083a628f 100644
--- a/test/extrude/161/161.py
+++ b/test/extrude/161/161.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(421,135,421))
-r=w0.sketch().segment((194,1),(631,1)).segment((631,404)).arc((438,840),(194,429)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,42,501))
+r=w0.workplane(offset=588).moveTo(426,502).cylinder(676,926).union(w0.sketch().push([(789,216)]).rect(925,610).push([(790,216)]).rect(611,520,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/161/161.stl b/test/extrude/161/161.stl
index 271c5d7fbfe1d1d1393983bf005fc5f7cd33ffe6..b2ee8ce98dfa32b1945c5c2dda2b225d56f61ded 100644
Binary files a/test/extrude/161/161.stl and b/test/extrude/161/161.stl differ
diff --git a/test/extrude/162/162.py b/test/extrude/162/162.py
index 41bf31b0e8961a66c14cad8b1bfde627dd77d82e..460dc055903bf0e6006af68c1cfe2bba222cb3c3 100644
--- a/test/extrude/162/162.py
+++ b/test/extrude/162/162.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().segment((61,221),(154,221)).arc((134,247),(121,274)).segment((61,254)).close().assemble().reset().face(w0.sketch().segment((487,221),(607,221)).segment((607,447)).segment((534,421)).arc((534,314),(487,221)).assemble()).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,411,500))
+r=w0.sketch().push([(695,276)]).circle(775).push([(471,260)]).circle(524,mode='s').finalize().extrude(272).union(w0.sketch().arc((175,805),(165,341),(551,595)).arc((555,629),(540,659)).arc((506,721),(455,770)).segment((500,771)).segment((500,761)).segment((536,761)).segment((536,770)).segment((760,770)).segment((761,999)).segment((175,1000)).close().assemble().finalize().extrude(909))
\ No newline at end of file
diff --git a/test/extrude/162/162.stl b/test/extrude/162/162.stl
index ce6baaf7ab1a3dc5aebb1dc2370f764eeaad2788..26fbc06d43f62446e74a32d46814735b133dd774 100644
Binary files a/test/extrude/162/162.stl and b/test/extrude/162/162.stl differ
diff --git a/test/extrude/163/163.py b/test/extrude/163/163.py
index 20afcacd957b800d7d8c5755eb7b4eb657b912a2..5ca392aa9179c3408bddb17eafcde18a9fe766bb 100644
--- a/test/extrude/163/163.py
+++ b/test/extrude/163/163.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(514,632,632))
-r=w0.sketch().segment((119,119),(119,303)).arc((172,1),(448,119)).close().assemble().push([(829,921)]).circle(1000).finalize().extrude(869)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,485))
+r=w0.workplane(offset=515).box(1000,1000,530)
\ No newline at end of file
diff --git a/test/extrude/163/163.stl b/test/extrude/163/163.stl
index d78892a5633467476e02911e4269bd53382ce240..5a01c7993c86ee3622cca8075960079a2a8e6826 100644
Binary files a/test/extrude/163/163.stl and b/test/extrude/163/163.stl differ
diff --git a/test/extrude/164/164.py b/test/extrude/164/164.py
index 38d26cf38657d60c365181bccafad3200707ebf1..f1f48b0150275215406c6ad7fb3df02055d81709 100644
--- a/test/extrude/164/164.py
+++ b/test/extrude/164/164.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(341,500,500))
-r=w0.sketch().segment((121,61),(500,61)).segment((790,121)).arc((710,401),(1000,431)).segment((940,730)).segment((500,640)).segment((121,640)).segment((121,251)).arc((1,171),(121,101)).close().assemble().finalize().extrude(481).union(w0.workplane(offset=670).moveTo(645,790).box(530,800,840))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,450,501))
+r=w0.sketch().segment((355,340),(455,282)).segment((644,626)).segment((645,675)).segment((565,720)).segment((550,691)).arc((616,590),(496,591)).close().assemble().finalize().extrude(51).union(w0.workplane(offset=774).moveTo(511,500).cylinder(1000,595))
\ No newline at end of file
diff --git a/test/extrude/164/164.stl b/test/extrude/164/164.stl
index 82667b07a9985a1a85e4f74fddee67fcd0730dad..d3e4c6e2a3f5ac034b7a5a936143cf602d4cdd1b 100644
Binary files a/test/extrude/164/164.stl and b/test/extrude/164/164.stl differ
diff --git a/test/extrude/165/165.py b/test/extrude/165/165.py
index 08ffef8b174b891b47465ad535b4eea1ef66df9c..fb9934213ce3a34d4a845d5f79cafa88f78cb758 100644
--- a/test/extrude/165/165.py
+++ b/test/extrude/165/165.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(432,432,489))
-w1=cq.Workplane('XY',origin=(432,432,500))
-r=w0.sketch().segment((35,489),(171,489)).segment((171,432)).segment((398,432)).segment((398,489)).segment((535,489)).segment((535,784)).segment((500,784)).arc((523,682),(444,614)).arc((149,557),(342,784)).arc((364,807),(398,818)).segment((398,830)).segment((171,830)).segment((171,784)).segment((35,784)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((989,149),(1000,217),(989,285)).close().assemble().finalize().extrude(682)).union(w0.workplane(offset=591).moveTo(92,92).box(886,546,750)).union(w1.sketch().arc((262,603),(285,671),(308,614)).segment((308,648)).segment((262,648)).close().assemble().finalize().extrude(523))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,499,446))
+r=w0.sketch().segment((216,411),(266,297)).segment((266,141)).segment((331,140)).segment((392,1)).segment((725,141)).segment((796,140)).segment((796,170)).segment((846,191)).segment((796,306)).segment((796,431)).arc((925,650),(675,585)).segment((671,606)).segment((336,462)).segment((266,461)).segment((266,431)).close().assemble().finalize().extrude(136).union(w0.workplane(offset=579).moveTo(197,849).cylinder(661,651)).union(w0.workplane(offset=740).moveTo(759,270).cylinder(981,526))
\ No newline at end of file
diff --git a/test/extrude/165/165.stl b/test/extrude/165/165.stl
index 62749e842000529b4af611a4bdf4b62e3a1c83fb..0310345b6c1998d9796898493d41acc99350c865 100644
Binary files a/test/extrude/165/165.stl and b/test/extrude/165/165.stl differ
diff --git a/test/extrude/166/166.py b/test/extrude/166/166.py
index d8be1f1bde2ff82943a3e3397f4265d6263d5b2c..00a8d947190420b8f734fea3223e338c6dab0efc 100644
--- a/test/extrude/166/166.py
+++ b/test/extrude/166/166.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(461,211,461))
-r=w0.sketch().push([(67,500)]).circle(724).reset().face(w0.sketch().arc((540,54),(606,40),(658,1)).arc((698,238),(540,54)).assemble()).reset().face(w0.sketch().arc((829,474),(1000,159),(934,514)).segment((934,921)).segment((829,921)).close().assemble()).finalize().extrude(974).translate((1,1,198))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,7))
+r=w0.sketch().segment((111,256),(506,257)).segment((504,354)).arc((615,591),(507,830)).segment((505,926)).segment((112,924)).segment((112,830)).arc((1,590),(110,355)).close().assemble().push([(308,592)]).rect(537,965,mode='s').finalize().extrude(1000).union(w0.sketch().segment((151,560),(166,241)).segment((281,245)).arc((321,191),(371,147)).segment((372,101)).segment((440,101)).arc((576,77),(716,102)).segment((786,102)).segment((785,147)).arc((840,200),(885,267)).segment((999,271)).segment((990,591)).segment((870,587)).arc((836,641),(785,685)).segment((785,730)).segment((716,729)).arc((575,754),(440,729)).segment((370,731)).segment((370,686)).arc((312,631),(272,565)).close().assemble().push([(766,176)]).circle(541,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/166/166.stl b/test/extrude/166/166.stl
index 2458e05cb728b4c8d332dbbb6e18982f3ec476cd..1158b947a42a7fa0eb2e516a54da732bdd3778b5 100644
Binary files a/test/extrude/166/166.stl and b/test/extrude/166/166.stl differ
diff --git a/test/extrude/167/167.py b/test/extrude/167/167.py
index 1a222276b6440fc84c927d8b07076006d0834a3c..ca6eca36978fa7662a3447503c0a40d8c745fb2b 100644
--- a/test/extrude/167/167.py
+++ b/test/extrude/167/167.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(375,188,188))
-r=w0.workplane(offset=1).box(1000,821,561).translate((1,313,224))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,195))
+r=w0.sketch().segment((1,251),(151,250)).arc((501,70),(851,251)).segment((1000,251)).segment((1000,751)).segment((851,750)).arc((500,930),(150,750)).segment((2,750)).close().assemble().circle(730,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/167/167.stl b/test/extrude/167/167.stl
index d1bc0ecd9f2612bb0c526fb4350e5e8c6ce89091..1fdcf45315499327007cad12c432c91e016a5912 100644
Binary files a/test/extrude/167/167.stl and b/test/extrude/167/167.stl differ
diff --git a/test/extrude/168/168.py b/test/extrude/168/168.py
index e2ca1267ae5d2ad2ecdd4bb0b8c3c0358fd2bf98..c8595070eb36beca11e349bbd7854ac590306b04 100644
--- a/test/extrude/168/168.py
+++ b/test/extrude/168/168.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,610,500))
-r=w0.sketch().segment((1,510),(830,121)).segment((1000,491)).segment((171,880)).close().assemble().finalize().extrude(281)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(474,501,501))
+w1=cq.Workplane('ZX',origin=(501,699,502))
+r=w0.sketch().push([(502,910)]).rect(1000,681).push([(470,150)]).circle(650).finalize().extrude(744).union(w1.workplane(offset=480).moveTo(493,501).box(534,1000,541))
\ No newline at end of file
diff --git a/test/extrude/168/168.stl b/test/extrude/168/168.stl
index 2c8d5de53996f1010cfa69211bef5163e41b3c62..9a239205a97fa8e604850711efd48cd40d46dc56 100644
Binary files a/test/extrude/168/168.stl and b/test/extrude/168/168.stl differ
diff --git a/test/extrude/169/169.py b/test/extrude/169/169.py
index d3fb2f6db9e2d3c4786a63b99d1ae1b1eb10fd3a..3a47c65356f41532bb6a33dd823d10277332e949 100644
--- a/test/extrude/169/169.py
+++ b/test/extrude/169/169.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(185,357,357))
-r=w0.sketch().segment((380,277),(518,231)).segment((529,288)).segment((529,300)).segment((713,885)).segment((575,931)).close().assemble().finalize().extrude(58).union(w0.sketch().push([(345,127)]).circle(701).push([(133,1)]).rect(483,449,mode='s').finalize().extrude(1000)).translate((1,1,218))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,425,501))
+r=w0.sketch().segment((160,285),(611,2)).segment((806,312)).arc((431,480),(724,770)).segment((745,820)).segment((840,850)).segment((815,940)).segment((789,936)).segment((625,999)).segment((576,871)).segment((415,819)).segment((441,729)).close().assemble().reset().face(w0.sketch().segment((490,745),(514,731)).segment((526,754)).close().assemble(),mode='s').finalize().extrude(655)
\ No newline at end of file
diff --git a/test/extrude/169/169.stl b/test/extrude/169/169.stl
index bc172c64c32512bfb5314e66516d0839cd78e2d9..63889d731c111da56d5d9ca1256b32bdd0b88138 100644
Binary files a/test/extrude/169/169.stl and b/test/extrude/169/169.stl differ
diff --git a/test/extrude/17/17.py b/test/extrude/17/17.py
index d7601d7f56f8284faec9ab3d07b9fbbcff8465ef..f92496e494ee2b4dc8417c395ba688869d6b1d7e 100644
--- a/test/extrude/17/17.py
+++ b/test/extrude/17/17.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(688,463,463))
-r=w0.sketch().arc((527,452),(119,1),(581,388)).segment((903,388)).segment((903,1000)).segment((527,1000)).close().assemble().reset().face(w0.sketch().segment((119,141),(291,141)).segment((366,87)).segment((388,141)).segment((570,141)).segment((570,291)).segment((398,291)).segment((323,334)).segment((302,291)).segment((119,291)).close().assemble(),mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(69,10,67))
+r=w0.sketch().segment((827,161),(105,161)).segment((105,883)).segment((827,883)).close().assemble().push([(212,626)]).rect(104,48,mode='s').push([(319,715)]).circle(61,mode='s').push([(391,632)]).circle(56,mode='s').push([(644,521)]).rect(67,43,mode='s').finalize().extrude(358).translate((1,349,1))
diff --git a/test/extrude/17/17.stl b/test/extrude/17/17.stl
index d81ac6571adc9dc0ba4b75a717984981e81cd8d1..316330e74c20dfec8dc7e20d5def7e3352cb873c 100644
Binary files a/test/extrude/17/17.stl and b/test/extrude/17/17.stl differ
diff --git a/test/extrude/170/170.py b/test/extrude/170/170.py
index 80f3facea37b849f9764e46455ef7f8b1c69d21b..a597251585e1c933432bae81c939247b2d7c00bd 100644
--- a/test/extrude/170/170.py
+++ b/test/extrude/170/170.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(546,702,546))
-r=w0.sketch().arc((1,416),(222,248),(351,494)).arc((92,844),(1,416)).assemble().finalize().extrude(157).union(w0.workplane(offset=585).moveTo(1000,455).cylinder(624,741))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,375))
+r=w0.sketch().segment((246,526),(290,525)).segment((291,1)).segment((690,1)).segment((691,525)).segment((756,526)).segment((756,999)).segment((245,1000)).close().assemble().finalize().extrude(751)
\ No newline at end of file
diff --git a/test/extrude/170/170.stl b/test/extrude/170/170.stl
index 89941f250c065bde1211e15bdadb68bdd1b8194a..bd3ae4b913ac6e3b7ef401d0f29155fbc34f821f 100644
Binary files a/test/extrude/170/170.stl and b/test/extrude/170/170.stl differ
diff --git a/test/extrude/171/171.py b/test/extrude/171/171.py
index 6b568348580c80e0b3a9791bd825e97a5fe03a02..db79c73163f2c658879737ba7b53b2f459af332c 100644
--- a/test/extrude/171/171.py
+++ b/test/extrude/171/171.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(538,538,313))
-r=w0.workplane(offset=753).moveTo(957,817).cylinder(968,656).union(w0.sketch().segment((1,936),(259,581)).segment((355,646)).segment((87,1000)).close().assemble().reset().face(w0.sketch().segment((581,613),(613,613)).arc((646,76),(688,613)).segment((688,850)).segment((581,850)).close().assemble()).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,631))
+r=w0.workplane(offset=335).moveTo(164,501).box(825,951,830).union(w0.sketch().segment((671,496),(704,494)).segment((704,422)).segment((960,420)).segment((960,495)).segment((1000,494)).segment((1000,552)).segment((960,550)).segment((959,626)).segment((706,624)).segment((706,550)).segment((669,550)).close().assemble().finalize().extrude(566))
\ No newline at end of file
diff --git a/test/extrude/171/171.stl b/test/extrude/171/171.stl
index 817f5f9e27d86e9d0d8039b2fa91e21686ec74b9..11574ac8f168461fcf49272bc31b4c85bc495b95 100644
Binary files a/test/extrude/171/171.stl and b/test/extrude/171/171.stl differ
diff --git a/test/extrude/172/172.py b/test/extrude/172/172.py
index 8e5efa9cfac34169edbea62de887b08375170dfe..85c747c16b426ce72bf96ae2cd867013df26b592 100644
--- a/test/extrude/172/172.py
+++ b/test/extrude/172/172.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).cylinder(1000,974).translate((641,641,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,341,501))
+r=w0.sketch().arc((315,625),(5,474),(351,474)).segment((491,476)).segment((491,685)).segment((316,686)).close().assemble().push([(166,600)]).circle(515,mode='s').reset().face(w0.sketch().segment((595,691),(886,545)).segment((999,769)).segment((709,921)).close().assemble()).finalize().extrude(811).union(w0.sketch().push([(159,511)]).circle(521).reset().face(w0.sketch().arc((350,274),(366,314),(399,336)).segment((401,366)).segment((434,366)).segment((435,329)).arc((465,85),(606,285)).arc((466,530),(350,275)).assemble()).push([(495,212)]).rect(721,634,mode='s').reset().face(w0.sketch().arc((449,334),(465,341),(480,340)).segment((500,419)).segment((475,430)).close().assemble(),mode='s').push([(496,211)]).circle(559).finalize().extrude(819))
\ No newline at end of file
diff --git a/test/extrude/172/172.stl b/test/extrude/172/172.stl
index f3b288cb7d41333309dd418ba22e77f49b0e2109..f976b7f827cf53e11e4c0c722b13d993f703749e 100644
Binary files a/test/extrude/172/172.stl and b/test/extrude/172/172.stl differ
diff --git a/test/extrude/173/173.py b/test/extrude/173/173.py
index 1bddb1ba983c449eb0f327c1eba1f10267427e94..cdde8c8011adfac4f536c6ecf47f79f9098a1563 100644
--- a/test/extrude/173/173.py
+++ b/test/extrude/173/173.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().arc((760,620),(754,634),(767,634)).arc((574,707),(760,620)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,419,501))
+w1=cq.Workplane('ZX',origin=(499,501,501))
+r=w0.sketch().push([(211,791)]).rect(870,740).circle(570,mode='s').finalize().extrude(699).union(w0.sketch().push([(745,317)]).circle(756).reset().face(w0.sketch().segment((659,420),(709,290)).arc((741,330),(791,322)).segment((741,452)).close().assemble(),mode='s').reset().face(w0.sketch().segment((726,241),(776,110)).segment((859,145)).segment((810,275)).arc((775,235),(726,241)).assemble(),mode='s').finalize().extrude(1000)).union(w1.workplane(offset=281).moveTo(216,725).cylinder(941,715))
\ No newline at end of file
diff --git a/test/extrude/173/173.stl b/test/extrude/173/173.stl
index 020332f20d29c73fabd0b56070fd3f2dea39145a..a25009581d538e82331b86edefad0c28889225a0 100644
Binary files a/test/extrude/173/173.stl and b/test/extrude/173/173.stl differ
diff --git a/test/extrude/174/174.py b/test/extrude/174/174.py
index 564269d0596ac3ef48376580050fa0b6f676f96f..40b8556143b10b93c2467c7a75cd4be85d89d31f 100644
--- a/test/extrude/174/174.py
+++ b/test/extrude/174/174.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(534,534,591))
-w1=cq.Workplane('XY',origin=(534,534,724))
-r=w0.sketch().push([(686,206)]).rect(933,829).push([(581,144)]).circle(543,mode='s').finalize().extrude(1).union(w0.sketch().segment((267,667),(267,800)).segment((448,800)).segment((448,543)).segment((467,543)).segment((467,800)).segment((648,800)).segment((648,734)).arc((401,1000),(267,667)).assemble().finalize().extrude(952)).union(w1.workplane(offset=510).moveTo(267,591).cylinder(581,619))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,560,502))
+r=w0.workplane(offset=221).moveTo(640,861).cylinder(1000,536).union(w0.sketch().push([(386,167)]).circle(561).circle(510,mode='s').finalize().extrude(939))
\ No newline at end of file
diff --git a/test/extrude/174/174.stl b/test/extrude/174/174.stl
index b36e2057719fa8da8baafb10e65f5357698b6d5c..ba5607356cdf90e00d857e27cdd740ff107f356e 100644
Binary files a/test/extrude/174/174.stl and b/test/extrude/174/174.stl differ
diff --git a/test/extrude/175/175.py b/test/extrude/175/175.py
index 8ea3b8b2dc3a9b4609b62e7bc90d65a729743ef2..0a903e7375753c17e354457432aa51b6a2926a56 100644
--- a/test/extrude/175/175.py
+++ b/test/extrude/175/175.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).moveTo(201,367).cylinder(1000,474).union(w0.sketch().arc((301,314),(281,247),(334,214)).arc((594,367),(301,314)).assemble().finalize().extrude(68))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(376,500,500))
+w1=cq.Workplane('YZ',origin=(305,501,501))
+r=w0.sketch().segment((167,475),(284,435)).segment((342,595)).segment((544,574)).segment((564,761)).segment((405,770)).segment((476,954)).segment((355,999)).close().assemble().finalize().extrude(1000).union(w1.sketch().arc((145,411),(166,225),(300,90)).segment((301,1)).segment((796,1)).segment((796,151)).arc((930,386),(680,490)).segment((671,491)).arc((464,625),(230,556)).arc((76,551),(146,410)).assemble().finalize().extrude(290))
\ No newline at end of file
diff --git a/test/extrude/175/175.stl b/test/extrude/175/175.stl
index 179017823f55be65150ee58fc569b880c1eb0b84..148b58b863f3b63b97b3e7a71bea7d5b04b12ed7 100644
Binary files a/test/extrude/175/175.stl and b/test/extrude/175/175.stl differ
diff --git a/test/extrude/176/176.py b/test/extrude/176/176.py
index a0d4c9456113b46ca0061137eda629b188f3b1a0..01da8082eaaf1a36a82d5d72e4eaeaafb8ca436b 100644
--- a/test/extrude/176/176.py
+++ b/test/extrude/176/176.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(484,495,484))
-w1=cq.Workplane('YZ',origin=(409,484,484))
-r=w0.sketch().arc((1,313),(291,603),(12,302)).segment((227,302)).segment((227,452)).segment((1,452)).close().assemble().finalize().extrude(463).union(w1.sketch().segment((205,141),(560,141)).segment((560,581)).arc((764,807),(538,1000)).arc((237,914),(280,613)).segment((205,613)).close().assemble().finalize().extrude(807))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,37))
+r=w0.sketch().segment((1,80),(292,205)).segment((356,191)).segment((360,231)).segment((1000,511)).segment((826,921)).segment((235,666)).segment((171,676)).segment((166,635)).segment((1,559)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/176/176.stl b/test/extrude/176/176.stl
index 619ee9da0beb2b59bcdab5708f0a14cc8be3df39..a6562cb4627f2cff8a947ffa416e57b77ed6c6e1 100644
Binary files a/test/extrude/176/176.stl and b/test/extrude/176/176.stl differ
diff --git a/test/extrude/177/177.py b/test/extrude/177/177.py
index 96a9ff3347101df800c0fca7781cf7c8afbf5172..a0c37da46331d88017c34733825adddeca8d5001 100644
--- a/test/extrude/177/177.py
+++ b/test/extrude/177/177.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,540))
-r=w0.workplane(offset=336).moveTo(750,890).box(1000,520,830).union(w0.sketch().segment((1,580),(101,101)).segment((640,221)).segment((540,700)).segment((510,690)).arc((361,311),(61,590)).close().assemble().finalize().extrude(750))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,406))
+r=w0.sketch().push([(941,435)]).circle(560).rect(511,560,mode='s').finalize().extrude(106).union(w0.workplane(offset=794).moveTo(305,501).cylinder(1000,804))
\ No newline at end of file
diff --git a/test/extrude/177/177.stl b/test/extrude/177/177.stl
index 2cb16dcf91be7bd1372166cf1e5f363a534f30f3..8df8cad0d74463784eff375aebf0011d280bac26 100644
Binary files a/test/extrude/177/177.stl and b/test/extrude/177/177.stl differ
diff --git a/test/extrude/178/178.py b/test/extrude/178/178.py
index 076f8ca00009fbf4df5a0af9f7aa73cdb03e6dfd..709c9bb47d33bab4d205454af31458e285f907b9 100644
--- a/test/extrude/178/178.py
+++ b/test/extrude/178/178.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,567).translate((234,1,234))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(371,501,501))
+r=w0.sketch().segment((201,31),(210,31)).segment((210,2)).segment((325,1)).segment((327,31)).segment((341,31)).segment((341,156)).arc((265,142),(201,186)).close().assemble().reset().face(w0.sketch().segment((396,829),(647,594)).segment((801,771)).segment((664,895)).segment((664,786)).segment((540,785)).segment((540,975)).segment((580,974)).segment((551,1000)).close().assemble()).finalize().extrude(685).union(w0.workplane(offset=631).moveTo(459,465).cylinder(761,656))
\ No newline at end of file
diff --git a/test/extrude/178/178.stl b/test/extrude/178/178.stl
index 2eae8419750c004d59ebe02af3ae1c8bc7f87cb7..dee9dd0b3603807f31934ca84aecebfc6fccc8da 100644
Binary files a/test/extrude/178/178.stl and b/test/extrude/178/178.stl differ
diff --git a/test/extrude/179/179.py b/test/extrude/179/179.py
index 30268537802539af715abe6b16bad3a383efbc56..bc8b53c90b2e139839c44b6ca4846e6480d17375 100644
--- a/test/extrude/179/179.py
+++ b/test/extrude/179/179.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(855,573,573))
-r=w0.sketch().segment((863,257),(863,590)).segment((1000,590)).arc((180,735),(863,257)).assemble().push([(565,274)]).circle(624,mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(496,500,501))
+r=w0.sketch().segment((2,530),(370,529)).segment((371,536)).segment((670,536)).segment((670,604)).segment((689,610)).segment((669,679)).segment((669,879)).segment((341,878)).segment((340,804)).segment((324,799)).segment((334,745)).segment((1,745)).close().assemble().reset().face(w0.sketch().segment((715,266),(759,161)).segment((904,226)).segment((858,331)).close().assemble()).finalize().extrude(430).union(w0.workplane(offset=518).moveTo(473,599).box(755,850,535)).union(w0.sketch().segment((469,122),(691,121)).segment((689,450)).segment((948,449)).segment((948,289)).arc((910,566),(660,450)).segment((470,450)).close().assemble().finalize().extrude(580))
\ No newline at end of file
diff --git a/test/extrude/179/179.stl b/test/extrude/179/179.stl
index 2bd3dab49fdc7d630c1dfec66434abf3dbf0bfa8..1e4920934141648799e2998e8c71d25f00cc17e9 100644
Binary files a/test/extrude/179/179.stl and b/test/extrude/179/179.stl differ
diff --git a/test/extrude/18/18.py b/test/extrude/18/18.py
index 17c6d734ce70340d1ae6f1668be2d8680d737e0e..5145b9da91c302520569aafe05b1d1f1bce0a81b 100644
--- a/test/extrude/18/18.py
+++ b/test/extrude/18/18.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(474,474,653))
-r=w0.sketch().segment((54,127),(495,127)).arc((937,117),(548,338)).segment((54,338)).close().assemble().finalize().extrude(117).union(w0.sketch().segment((1,537),(411,537)).segment((411,821)).segment((106,821)).segment((106,1000)).segment((54,1000)).segment((54,821)).segment((1,821)).close().assemble().push([(69,564)]).rect(506,485,mode='s').finalize().extrude(201))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(78,11,24))
+r=w0.sketch().segment((726,158),(1,158)).segment((1,838)).arc((1,981),(121,1000)).segment((726,1000)).close().assemble().push([(287,902)]).circle(86,mode='s').push([(326,749)]).circle(71,mode='s').finalize().extrude(96).translate((1,19,1))
diff --git a/test/extrude/18/18.stl b/test/extrude/18/18.stl
index 9b9c23cd652cf279f25e26805b61e5a1dc161628..2742d1080ad945ca922995beddd4878297091895 100644
Binary files a/test/extrude/18/18.stl and b/test/extrude/18/18.stl differ
diff --git a/test/extrude/180/180.py b/test/extrude/180/180.py
index 68095f8b802716571ff3dc0383dff398a16d2e2e..1df1e38b1a01ab1115a77db935ba0446c9d790a2 100644
--- a/test/extrude/180/180.py
+++ b/test/extrude/180/180.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(36,346,346))
-w1=cq.Workplane('YZ',origin=(1,346,346))
-r=w0.sketch().push([(257,717)]).circle(417).push([(257,726)]).rect(417,381,mode='s').finalize().extrude(1000).union(w1.sketch().push([(346,191)]).rect(982,920).push([(461,381)]).circle(434,mode='s').push([(509,1)]).rect(408,381,mode='s').finalize().extrude(823))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,502,455))
+r=w0.sketch().segment((236,1),(357,1)).segment((355,186)).segment((250,186)).segment((251,210)).segment((357,212)).segment((356,415)).segment((236,417)).close().assemble().push([(596,877)]).rect(741,744).reset().face(w0.sketch().arc((545,869),(595,826),(651,871)).close().assemble(),mode='s').reset().face(w0.sketch().segment((545,885),(652,884)).arc((596,931),(546,885)).assemble(),mode='s').finalize().extrude(455).union(w0.workplane(offset=570).moveTo(625,575).box(781,901,641))
\ No newline at end of file
diff --git a/test/extrude/180/180.stl b/test/extrude/180/180.stl
index dc736ddb26e274ae26496d91e56ad0d768bb4285..42d4574430f9a6660d42e748a7ef349f180d096f 100644
Binary files a/test/extrude/180/180.stl and b/test/extrude/180/180.stl differ
diff --git a/test/extrude/181/181.py b/test/extrude/181/181.py
index c34ce8b0ea375a2f8d6b372ccac89f39874b9854..ea905759be098afcbdadc0b5b12cbba1bdbd2979 100644
--- a/test/extrude/181/181.py
+++ b/test/extrude/181/181.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(385,385,451))
-r=w0.workplane(offset=78).moveTo(627,1).cylinder(1000,473).union(w0.workplane(offset=627).moveTo(275,638).cylinder(868,605)).translate((1,88,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(840,500,499))
+r=w0.sketch().segment((265,615),(427,581)).arc((610,141),(499,604)).segment((527,699)).segment((296,749)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((226,746),(262,520)).segment((271,520)).segment((272,516)).arc((377,501),(470,446)).segment((520,446)).segment((522,566)).segment((565,575)).segment((529,794)).segment((521,796)).segment((521,870)).segment((271,871)).segment((270,749)).close().assemble().finalize().extrude(660))
\ No newline at end of file
diff --git a/test/extrude/181/181.stl b/test/extrude/181/181.stl
index 016d3b198fcd201573feb545ecf60974ddd9d3a4..f47962578b4405927471e3e3f07971ade8f7bcb6 100644
Binary files a/test/extrude/181/181.stl and b/test/extrude/181/181.stl differ
diff --git a/test/extrude/182/182.py b/test/extrude/182/182.py
index b67e1ce69c5174ee4c348abb039d0adf19aee2e4..3def26182bbc59b57a1959a5ad1ff14714f55fb8 100644
--- a/test/extrude/182/182.py
+++ b/test/extrude/182/182.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(399,399,424))
-r=w0.sketch().arc((154,387),(546,326),(583,718)).arc((461,1000),(203,841)).arc((277,730),(301,620)).arc((350,473),(203,424)).arc((179,399),(154,387)).assemble().push([(320,1)]).rect(583,828).finalize().extrude(363).translate((1,15,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,771))
+r=w0.sketch().push([(700,600)]).circle(801).push([(697,601)]).rect(565,1000,mode='s').finalize().extrude(1).union(w0.sketch().arc((431,831),(40,301),(700,305)).segment((970,305)).segment((970,894)).segment((911,894)).segment((740,711)).segment((685,759)).segment((806,895)).segment((430,896)).close().assemble().finalize().extrude(325))
\ No newline at end of file
diff --git a/test/extrude/182/182.stl b/test/extrude/182/182.stl
index 646ae72458be66b332af26a05da7f320da8ea4ed..27e59b4b915df8f7087fffc2db8bb5553639b32c 100644
Binary files a/test/extrude/182/182.stl and b/test/extrude/182/182.stl differ
diff --git a/test/extrude/183/183.py b/test/extrude/183/183.py
index 9125ae947c48c74911136d4d0d8b8fe60f2fd93f..003dedfe5e21c3c69deb535dc945efdc4c9d38da 100644
--- a/test/extrude/183/183.py
+++ b/test/extrude/183/183.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().circle(700).rect(694,680,mode='s').finalize().extrude(1).translate((34,34,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,241))
+w1=cq.Workplane('YZ',origin=(706,500,500))
+r=w0.sketch().push([(810,500)]).circle(690).circle(664,mode='s').finalize().extrude(1000).union(w1.sketch().arc((382,430),(516,396),(620,296)).segment((621,656)).segment((381,655)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/183/183.stl b/test/extrude/183/183.stl
index 4f61ab1e8d375a913f17152dc2360c0b7222b1e9..9f0c10a0801f675f9f8321adc54d252c2ff705a4 100644
Binary files a/test/extrude/183/183.stl and b/test/extrude/183/183.stl differ
diff --git a/test/extrude/184/184.py b/test/extrude/184/184.py
index a1089d3f7118b6b689cabaafa89f867a73406785..d148f013193d556f6606587e3ecf9a0ee246062e 100644
--- a/test/extrude/184/184.py
+++ b/test/extrude/184/184.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(632,485,485))
-r=w0.sketch().arc((138,1),(527,54),(590,432)).arc((600,1000),(359,485)).arc((359,201),(138,1)).assemble().finalize().extrude(201)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(611,501,501))
+r=w0.sketch().segment((1,440),(42,337)).segment((240,406)).arc((587,117),(970,357)).arc((970,361),(975,371)).arc((696,881),(235,524)).close().assemble().reset().face(w0.sketch().segment((290,545),(345,566)).arc((312,561),(291,545)).assemble(),mode='s').reset().face(w0.sketch().arc((325,440),(361,440),(380,460)).close().assemble(),mode='s').reset().face(w0.sketch().segment((480,242),(545,241)).segment((545,527)).segment((479,496)).close().assemble(),mode='s').reset().face(w0.sketch().segment((481,615),(545,645)).segment((545,760)).segment((480,761)).close().assemble(),mode='s').push([(712,500)]).rect(566,1000,mode='s').finalize().extrude(281)
\ No newline at end of file
diff --git a/test/extrude/184/184.stl b/test/extrude/184/184.stl
index 6438cb9e856c6fad1397a449ed8fa9626ff9f555..51cb25ad9639001eda8e36949bc2709200fee896 100644
Binary files a/test/extrude/184/184.stl and b/test/extrude/184/184.stl differ
diff --git a/test/extrude/185/185.py b/test/extrude/185/185.py
index 8343b2c9b8ed5c8cf93f119f13ed404db045c5ce..84d4182639cba97d35b9128c64e6c81eba40dffb 100644
--- a/test/extrude/185/185.py
+++ b/test/extrude/185/185.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,301))
-w1=cq.Workplane('XY',origin=(500,500,411))
-r=w0.sketch().arc((461,401),(520,331),(620,291)).segment((620,1)).segment((670,1)).segment((670,291)).arc((830,441),(760,650)).segment((760,910)).segment((660,910)).segment((660,690)).arc((560,670),(481,610)).arc((151,530),(461,401)).assemble().finalize().extrude(760).union(w0.sketch().segment((111,530),(211,530)).arc((381,421),(371,620)).segment((540,870)).segment((351,1000)).segment((301,910)).segment((111,910)).close().assemble().finalize().extrude(910)).union(w1.sketch().push([(680,361)]).circle(710).circle(680,mode='s').finalize().extrude(481))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,125))
+r=w0.sketch().segment((46,1),(969,2)).segment((970,659)).segment((879,661)).segment((881,1000)).segment((106,1000)).segment((106,661)).segment((47,660)).close().assemble().finalize().extrude(831).union(w0.workplane(offset=876).moveTo(491,696).box(1000,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/185/185.stl b/test/extrude/185/185.stl
index ef632cbaa7740c386fe0af6135cae34b137eeec6..bde794be379fc1e50d7b4fbc0375a72737d9632d 100644
Binary files a/test/extrude/185/185.stl and b/test/extrude/185/185.stl differ
diff --git a/test/extrude/186/186.py b/test/extrude/186/186.py
index b20e5d8de41dabb896de882225e34b4bc30dcb92..62a8fd9a5f1bf251ea6661aedb74cf6685ef196f 100644
--- a/test/extrude/186/186.py
+++ b/test/extrude/186/186.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).moveTo(71,334).box(421,374,1000).union(w0.workplane(offset=111).moveTo(347,334).box(920,627,780))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(605,501,500))
+w1=cq.Workplane('YZ',origin=(421,500,499))
+r=w0.sketch().push([(490,396)]).circle(546).push([(496,392)]).circle(511,mode='s').finalize().extrude(285).union(w0.sketch().segment((768,232),(778,225)).segment((789,235)).segment((779,246)).close().assemble().finalize().extrude(345)).union(w1.sketch().arc((305,499),(11,240),(400,201)).arc((645,256),(666,509)).arc((934,849),(599,576)).arc((441,605),(306,499)).assemble().finalize().extrude(566))
\ No newline at end of file
diff --git a/test/extrude/186/186.stl b/test/extrude/186/186.stl
index 368e1611166514b96e54837591c0fd0dd3f436ee..42b64abfc6071de192485eff86a699215cbcb761 100644
Binary files a/test/extrude/186/186.stl and b/test/extrude/186/186.stl differ
diff --git a/test/extrude/187/187.py b/test/extrude/187/187.py
index cec679bea28593ce204ab67b7a076efcaf70c514..73a421dd7da76bf3cb8bce55088095d2c77f854f 100644
--- a/test/extrude/187/187.py
+++ b/test/extrude/187/187.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(741,497,497))
-r=w0.sketch().arc((518,303),(713,447),(569,641)).arc((159,533),(518,303)).assemble().finalize().extrude(1).union(w0.workplane(offset=299).moveTo(389,497).box(1000,741,892)).union(w0.sketch().segment((698,483),(813,418)).arc((835,425),(856,425)).arc((784,483),(698,483)).assemble().finalize().extrude(310))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(426,501,501))
+r=w0.sketch().segment((739,665),(840,680)).segment((840,705)).segment((746,691)).arc((751,687),(741,681)).close().assemble().finalize().extrude(162).union(w0.workplane(offset=449).moveTo(790,685).cylinder(601,709)).union(w0.sketch().segment((1,330),(141,330)).arc((196,277),(272,260)).arc((670,245),(350,485)).arc((237,520),(140,456)).segment((2,455)).close().assemble().finalize().extrude(995))
\ No newline at end of file
diff --git a/test/extrude/187/187.stl b/test/extrude/187/187.stl
index 33d109ab1790bdb24f05de2f102015cf3c2bbe75..eeefa98d14eb790c85a17996d38d3f416f131f43 100644
Binary files a/test/extrude/187/187.stl and b/test/extrude/187/187.stl differ
diff --git a/test/extrude/188/188.py b/test/extrude/188/188.py
index 02b21c744d8c62cde10c668152d9be382eeabd30..53a4f1bbee08c5972bde30e12f64ee63ba44e7ac 100644
--- a/test/extrude/188/188.py
+++ b/test/extrude/188/188.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(546,546,818))
-r=w0.sketch().segment((92,437),(446,292)).segment((446,192)).segment((646,192)).segment((646,219)).segment((800,155)).segment((1000,655)).segment((646,800)).segment((646,900)).segment((446,900)).segment((446,873)).segment((292,936)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(506,500,500))
+r=w0.sketch().segment((1,334),(575,334)).arc((949,92),(619,396)).segment((621,989)).segment((1,990)).segment((1,564)).segment((190,567)).segment((191,490)).segment((1,490)).close().assemble().reset().face(w0.sketch().segment((130,724),(354,475)).segment((489,601)).segment((265,850)).close().assemble(),mode='s').finalize().extrude(241).union(w0.sketch().push([(205,869)]).circle(555).push([(205,872)]).rect(520,586,mode='s').finalize().extrude(745))
\ No newline at end of file
diff --git a/test/extrude/188/188.stl b/test/extrude/188/188.stl
index e5074219e77ccb51650b6168dfa470726d4465a3..f23284a09a7736396b2893a8f0ee544944e47ec3 100644
Binary files a/test/extrude/188/188.stl and b/test/extrude/188/188.stl differ
diff --git a/test/extrude/189/189.py b/test/extrude/189/189.py
index 32234eec40b0f1502ea5d01ac1e9231591db2a17..72c69b382497c8772edd0f32269441cf690f7d31 100644
--- a/test/extrude/189/189.py
+++ b/test/extrude/189/189.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(540,500,500))
-r=w0.sketch().segment((111,181),(580,1)).segment((890,820)).segment((421,1000)).close().assemble().circle(530,mode='s').finalize().extrude(421)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(334,174,334))
+r=w0.workplane(offset=498).box(668,668,661)
\ No newline at end of file
diff --git a/test/extrude/189/189.stl b/test/extrude/189/189.stl
index 217213c08b570432f01296ec7c9dc274bf1cdd48..687ba2541c03acd093e446f79dd547dd3b9d691a 100644
Binary files a/test/extrude/189/189.stl and b/test/extrude/189/189.stl differ
diff --git a/test/extrude/19/19.py b/test/extrude/19/19.py
index 4d9563334eb897b42e739ab794cfba39f67599ae..05b6aafe9c60fe9c77c34b934ae0021d837a0c46 100644
--- a/test/extrude/19/19.py
+++ b/test/extrude/19/19.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(206,468,468))
-w1=cq.Workplane('ZX',origin=(468,608,468))
-r=w0.workplane(offset=365).moveTo(673,566).box(599,757,673).union(w0.workplane(offset=692).moveTo(673,561).cylinder(916,729)).union(w0.sketch().segment((1,290),(122,76)).segment((206,122)).segment((85,337)).close().assemble().push([(281,552)]).rect(897,599).finalize().extrude(1000)).union(w1.sketch().segment((412,337),(449,337)).arc((561,48),(683,337)).segment((851,337)).segment((851,561)).arc((860,636),(851,711)).segment((851,935)).segment((412,935)).segment((412,711)).arc((402,636),(412,561)).close().assemble().finalize().extrude(374))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(695,500,500))
+r=w0.sketch().segment((1,376),(999,46)).segment((1000,685)).segment((192,956)).close().assemble().finalize().extrude(106)
\ No newline at end of file
diff --git a/test/extrude/19/19.stl b/test/extrude/19/19.stl
index ed6d38658bb40df298f287c09baf0528af71757d..a50da867c1a08961b7da02521e422694da990f2d 100644
Binary files a/test/extrude/19/19.stl and b/test/extrude/19/19.stl differ
diff --git a/test/extrude/190/190.py b/test/extrude/190/190.py
index 992c346a247b3cc3b94b724cf9552be36d9adac4..862ffc8bc1286925bc492c264993062bb3afd21b 100644
--- a/test/extrude/190/190.py
+++ b/test/extrude/190/190.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,670,334))
-r=w0.workplane(offset=1).cylinder(1000,677).translate((344,1,344))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(706,500,501))
+r=w0.sketch().arc((266,799),(317,739),(380,704)).segment((379,105)).segment((999,107)).segment((1000,721)).segment((975,721)).arc((895,861),(741,890)).segment((739,800)).segment((626,801)).arc((605,765),(599,720)).segment((536,720)).arc((576,751),(604,800)).close().assemble().finalize().extrude(92).union(w0.sketch().push([(111,739)]).circle(610).reset().face(w0.sketch().segment((92,690),(126,689)).segment((125,705)).arc((151,740),(125,774)).segment((127,779)).segment((92,781)).segment((90,774)).arc((65,740),(91,706)).close().assemble(),mode='s').finalize().extrude(241))
\ No newline at end of file
diff --git a/test/extrude/190/190.stl b/test/extrude/190/190.stl
index b8622c1345e15b452afd55bbe6f819d5ebd34e8f..e12444d58f5ae2dc152eeef18668be55efa77a89 100644
Binary files a/test/extrude/190/190.stl and b/test/extrude/190/190.stl differ
diff --git a/test/extrude/191/191.py b/test/extrude/191/191.py
index aec0404118bfce2e3eab5bc0d58c58fa9dae2b79..de550978c53846df73c874435317307107b494b6 100644
--- a/test/extrude/191/191.py
+++ b/test/extrude/191/191.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(529,529,359))
-w1=cq.Workplane('YZ',origin=(670,529,529))
-r=w0.sketch().arc((614,708),(717,463),(859,689)).arc((755,1000),(614,708)).assemble().reset().face(w0.sketch().segment((632,566),(651,566)).arc((708,548),(774,566)).segment((793,566)).segment((793,585)).arc((821,661),(793,736)).segment((793,755)).segment((774,755)).arc((708,774),(651,755)).segment((632,755)).segment((632,736)).arc((604,661),(632,585)).close().assemble(),mode='s').finalize().extrude(632).union(w0.workplane(offset=623).moveTo(727,614).cylinder(717,538)).union(w1.sketch().arc((67,585),(76,510),(152,500)).arc((227,680),(67,585)).assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,784))
+w1=cq.Workplane('YZ',origin=(436,500,500))
+r=w0.workplane(offset=236).moveTo(501,821).cylinder(1000,680).union(w1.sketch().push([(240,455)]).circle(740).rect(611,612,mode='s').finalize().extrude(691))
\ No newline at end of file
diff --git a/test/extrude/191/191.stl b/test/extrude/191/191.stl
index a6c4f729ad25810c6a730db4d10c05f224006942..6cdf11c46ac9d10a49849b0b771ecd279c494fc7 100644
--- a/test/extrude/191/191.stl
+++ b/test/extrude/191/191.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3cc72016ddb901ba4eb0434024ff9dc24f6087b6bf9e20381aa994c184f84b0e
-size 115084
+oid sha256:75bdc075d2f7af7fda7bf8386c4c5b80b6000ccdf2e2b8196f8d7bdb1cbaaf26
+size 45684
diff --git a/test/extrude/192/192.py b/test/extrude/192/192.py
index ce6f52331465f15d69f25ab75f7b2089016cfd90..8816bca4b4c25c80d789cc7b02bb9cf25f6be132 100644
--- a/test/extrude/192/192.py
+++ b/test/extrude/192/192.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(405,469,469))
-r=w0.sketch().arc((150,787),(1,245),(554,182)).arc((628,203),(692,224)).segment((915,224)).segment((915,256)).segment((1000,256)).segment((1000,841)).segment((628,841)).arc((532,851),(437,841)).segment((277,841)).segment((277,819)).arc((267,819),(256,809)).segment((150,809)).close().assemble().finalize().extrude(607)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,481))
+r=w0.sketch().push([(881,835)]).circle(619).push([(896,922)]).rect(510,534,mode='s').finalize().extrude(231).union(w0.sketch().push([(157,240)]).rect(811,890).push([(97,231)]).circle(585,mode='s').push([(301,276)]).rect(510,510,mode='s').finalize().extrude(811))
\ No newline at end of file
diff --git a/test/extrude/192/192.stl b/test/extrude/192/192.stl
index 1fada6809245a947900475a3dd0fbfae26b66822..635d7c7ba6118bcbfc23656a2675018e61995828 100644
Binary files a/test/extrude/192/192.stl and b/test/extrude/192/192.stl differ
diff --git a/test/extrude/193/193.py b/test/extrude/193/193.py
index c3f53d4bad2baf2492a69e9de302884b5bb2c065..16e4dd6e6f3eb0cbe03b44786ef94559aa9d03c8 100644
--- a/test/extrude/193/193.py
+++ b/test/extrude/193/193.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(360,360,539))
-r=w0.sketch().segment((257,526),(334,488)).segment((347,488)).segment((283,526)).arc((244,1000),(257,526)).assemble().push([(398,1)]).circle(641).finalize().extrude(1).translate((1,281,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,181,500))
+r=w0.workplane(offset=821).box(740,1000,1000)
\ No newline at end of file
diff --git a/test/extrude/193/193.stl b/test/extrude/193/193.stl
index a1d43504c37b776df055de3c231489208689d9dd..7778506c3db8f09ef52722dca30117071bd1aa50 100644
Binary files a/test/extrude/193/193.stl and b/test/extrude/193/193.stl differ
diff --git a/test/extrude/194/194.py b/test/extrude/194/194.py
index 4e42675abc935096335bea14642b3f9833c1b3ac..f9222f046a2a7a120879066b9b2b735f0c806c12 100644
--- a/test/extrude/194/194.py
+++ b/test/extrude/194/194.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(314,314,1))
-w1=cq.Workplane('ZX',origin=(314,240,314))
-r=w0.sketch().segment((254,284),(314,180)).segment((389,225)).segment((389,232)).segment((471,284)).close().assemble().finalize().extrude(254).union(w0.workplane(offset=657).moveTo(247,463).cylinder(1000,404)).union(w1.sketch().arc((113,195),(120,195),(120,202)).segment((128,202)).arc((135,195),(135,187)).arc((143,232),(113,195)).assemble().finalize().extrude(150))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,710))
+r=w0.sketch().segment((80,42),(136,42)).segment((136,107)).arc((180,181),(136,262)).segment((135,409)).segment((81,410)).segment((80,276)).segment((85,271)).arc((1,186),(82,96)).close().assemble().finalize().extrude(82).union(w0.workplane(offset=392).moveTo(650,485).box(751,670,715)).union(w0.sketch().push([(593,830)]).rect(546,759).push([(830,625)]).rect(839,861).finalize().extrude(441))
\ No newline at end of file
diff --git a/test/extrude/194/194.stl b/test/extrude/194/194.stl
index 7657937629414b45b79322f7759d0d0e9b170980..5216c5af81a88c5efe927cd8614881bcb089e6d8 100644
Binary files a/test/extrude/194/194.stl and b/test/extrude/194/194.stl differ
diff --git a/test/extrude/195/195.py b/test/extrude/195/195.py
index d44d1443832f0a5180acf5f49f0c9f8f9b2b8384..fe3f7efb99645e754ee2b03b0b6401b9b2706ca3 100644
--- a/test/extrude/195/195.py
+++ b/test/extrude/195/195.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(527,527,506))
-r=w0.sketch().segment((64,485),(117,485)).segment((117,1)).segment((674,1)).segment((674,285)).arc((663,327),(663,369)).arc((937,895),(348,874)).segment((348,926)).segment((64,926)).close().assemble().reset().face(w0.sketch().segment((348,506),(380,506)).arc((359,527),(348,548)).close().assemble(),mode='s').push([(653,706)]).circle(600,mode='s').finalize().extrude(106).union(w0.workplane(offset=763).moveTo(390,253).cylinder(1000,537))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(655,500,501))
+r=w0.sketch().segment((1,711),(17,710)).segment((16,720)).segment((27,721)).segment((21,711)).segment((210,711)).segment((211,750)).segment((2,751)).close().assemble().finalize().extrude(190).union(w0.sketch().push([(531,336)]).circle(585).push([(995,644)]).circle(504).finalize().extrude(386))
\ No newline at end of file
diff --git a/test/extrude/195/195.stl b/test/extrude/195/195.stl
index be3741f1dd03c3291d76c1c2e613233f31a58d43..b6ab2c005c8f28a0bc65478a79b9ad49f8ab19bb 100644
Binary files a/test/extrude/195/195.stl and b/test/extrude/195/195.stl differ
diff --git a/test/extrude/196/196.py b/test/extrude/196/196.py
index b716c796fc5289085ff2af4e27d722206eba4fe8..f381c579d082336d27e771255fca7f1048415b28 100644
--- a/test/extrude/196/196.py
+++ b/test/extrude/196/196.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(396,124,396))
-r=w0.sketch().segment((297,161),(766,1)).segment((803,124)).arc((988,322),(963,605)).segment((1000,716)).segment((531,877)).segment((494,753)).arc((309,556),(334,272)).close().assemble().push([(673,982)]).rect(901,457).finalize().extrude(433).union(w0.workplane(offset=667).moveTo(38,26).cylinder(938,642)).translate((221,1,209))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,406,499))
+r=w0.workplane(offset=385).moveTo(361,240).cylinder(729,739).union(w0.sketch().segment((494,491),(700,490)).segment((700,397)).arc((764,796),(496,491)).assemble().finalize().extrude(470)).union(w0.sketch().push([(586,765)]).circle(736).push([(736,755)]).circle(561,mode='s').finalize().extrude(921))
\ No newline at end of file
diff --git a/test/extrude/196/196.stl b/test/extrude/196/196.stl
index 01a378f20261bbf27fac8962a662944cb744d85b..1f8b6bdf7e164e4a6cf44f3e8316042021f0865e 100644
Binary files a/test/extrude/196/196.stl and b/test/extrude/196/196.stl differ
diff --git a/test/extrude/197/197.py b/test/extrude/197/197.py
index 96ac02ba4ad8acacd1a320b6beea35148ae4fb68..bf66f28ce8fcd345f075b9edd8652be78d9e5b5b 100644
--- a/test/extrude/197/197.py
+++ b/test/extrude/197/197.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(635,952,635))
-r=w0.sketch().push([(683,834)]).circle(834).circle(786,mode='s').finalize().extrude(1).union(w0.sketch().segment((271,382),(437,382)).segment((437,239)).segment((834,239)).segment((834,382)).segment((1000,382)).segment((1000,826)).segment((834,826)).segment((834,968)).segment((437,968)).segment((437,826)).segment((271,826)).close().assemble().finalize().extrude(390))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,466,502))
+r=w0.sketch().arc((229,415),(467,531),(255,691)).arc((279,551),(232,415)).assemble().reset().face(w0.sketch().segment((300,516),(335,517)).segment((336,399)).segment((355,400)).segment((356,516)).segment((400,516)).segment((401,555)).segment((301,555)).close().assemble(),mode='s').push([(350,842)]).circle(530).circle(525,mode='s').finalize().extrude(290).union(w0.sketch().segment((161,266),(315,264)).segment((315,416)).arc((401,395),(486,405)).arc((752,24),(601,465)).arc((701,601),(705,771)).segment((891,890)).segment((887,901)).segment((707,777)).arc((284,972),(161,530)).close().assemble().finalize().extrude(785))
\ No newline at end of file
diff --git a/test/extrude/197/197.stl b/test/extrude/197/197.stl
index 9f245ef73afb25c8a7bc175343a5f8742e822071..c48c4120128b805048b104a03667cb361e6ebb80 100644
Binary files a/test/extrude/197/197.stl and b/test/extrude/197/197.stl differ
diff --git a/test/extrude/198/198.py b/test/extrude/198/198.py
index f7f4396ef362e2b56460a50f6daaa9df0bec89eb..7f76416b453b678f16246294c619835b935b7852 100644
--- a/test/extrude/198/198.py
+++ b/test/extrude/198/198.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(533,696,533))
-w1=cq.Workplane('YZ',origin=(435,533,533))
-r=w0.sketch().segment((587,229),(653,283)).segment((718,207)).segment((696,186)).arc((490,587),(653,164)).close().assemble().finalize().extrude(66).union(w0.sketch().arc((468,837),(435,870),(468,913)).arc((424,870),(468,837)).assemble().finalize().extrude(283)).union(w1.sketch().arc((359,457),(490,381),(631,381)).arc((1000,131),(794,533)).arc((750,805),(490,881)).arc((1,783),(359,457)).assemble().reset().face(w1.sketch().arc((696,414),(967,164),(750,468)).arc((729,435),(696,414)).assemble(),mode='s').finalize().extrude(783))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(656,501,500))
+r=w0.sketch().segment((1,266),(262,266)).segment((261,185)).segment((586,187)).segment((585,266)).segment((710,265)).arc((845,201),(1000,205)).segment((595,326)).segment((605,360)).arc((371,531),(355,816)).segment((261,814)).segment((260,736)).segment((2,735)).close().assemble().finalize().extrude(185).union(w0.workplane(offset=433).moveTo(539,284).box(1000,636,634))
\ No newline at end of file
diff --git a/test/extrude/198/198.stl b/test/extrude/198/198.stl
index 2900099b4827490a96434655747a6b01794b77b5..2ea5dd4930669bbd8c7eef0d94190034169984db 100644
--- a/test/extrude/198/198.stl
+++ b/test/extrude/198/198.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab30aac43bf33a4b052852414184ad6e234c106125ff9329f25016e6f0048138
-size 114484
+oid sha256:cb14e0c553f7ffde521e5c147e3ebe40e3227b6458bdc24065a35dd8d03e1ee5
+size 14184
diff --git a/test/extrude/199/199.py b/test/extrude/199/199.py
index 9137f543c835101399cab9d94a2be14aa8577b60..08444dfd837584a18c402bc847f16969604a28e8 100644
--- a/test/extrude/199/199.py
+++ b/test/extrude/199/199.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(532,532,479))
-r=w0.sketch().push([(415,830)]).circle(766).reset().face(w0.sketch().segment((469,171),(532,171)).segment((522,22)).segment((745,1)).segment((766,171)).segment((841,171)).segment((841,299)).segment((777,299)).segment((787,447)).segment((564,469)).segment((543,299)).segment((469,299)).close().assemble()).finalize().extrude(203).union(w0.workplane(offset=384).moveTo(660,235).box(979,957,830)).union(w0.sketch().push([(655,235)]).rect(904,1000).push([(660,235)]).circle(554,mode='s').finalize().extrude(979))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,570,500))
+r=w0.sketch().segment((1,835),(16,501)).segment((505,530)).arc((465,455),(455,386)).segment((401,385)).segment((401,369)).segment((456,371)).arc((661,140),(921,306)).segment((1000,306)).segment((999,345)).segment((934,346)).arc((896,509),(756,606)).segment((750,865)).close().assemble().push([(382,683)]).rect(556,576,mode='s').finalize().extrude(361)
\ No newline at end of file
diff --git a/test/extrude/199/199.stl b/test/extrude/199/199.stl
index c9a32f864bca54dd9160c3d502bfc4ce34511d4d..ab8c98ac960950b65e24e928f9dca0e053627a5a 100644
Binary files a/test/extrude/199/199.stl and b/test/extrude/199/199.stl differ
diff --git a/test/extrude/2/2.py b/test/extrude/2/2.py
index 228b7fb42fc0aa1b7e6a5d6c5ee4ca984c03a25b..c6c9038f898f32e6fca73e79b09151ea3e0d8540 100644
--- a/test/extrude/2/2.py
+++ b/test/extrude/2/2.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(878,586,586))
-w1=cq.Workplane('XY',origin=(586,586,261))
-r=w0.sketch().arc((829,180),(854,196),(878,220)).segment((829,220)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((285,919),(310,748)).segment((886,821)).segment((862,992)).close().assemble().finalize().extrude(237)).union(w1.workplane(offset=793).moveTo(801,679).box(659,610,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(72,35,38))
+r=w0.sketch().segment((343,870),(752,870)).segment((752,721)).segment((893,721)).segment((893,36)).segment((343,36)).close().assemble().push([(661,531)]).circle(123,mode='s').finalize().extrude(90)
diff --git a/test/extrude/2/2.stl b/test/extrude/2/2.stl
index da50ebe7c967f913dce31a6e6b1ca08508c889c1..492ca7349bd885acf45769b3ec539cc28369add8 100644
Binary files a/test/extrude/2/2.stl and b/test/extrude/2/2.stl differ
diff --git a/test/extrude/20/20.py b/test/extrude/20/20.py
index dbd9b9521e601d8719a63d000521fe4c315a4c86..c6a8c26e45f7d1b2d01321c89b16fc86bce3c9f7 100644
--- a/test/extrude/20/20.py
+++ b/test/extrude/20/20.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(516,547,516))
-r=w0.sketch().arc((1,650),(135,351),(454,320)).arc((1000,279),(619,670)).arc((372,918),(42,773)).arc((32,712),(1,650)).assemble().finalize().extrude(258).union(w0.sketch().push([(145,341)]).circle(578).push([(166,372)]).circle(526,mode='s').finalize().extrude(722))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,195,500))
+w1=cq.Workplane('ZX',origin=(500,310,501))
+r=w0.sketch().segment((61,504),(196,505)).segment((197,636)).arc((202,676),(197,714)).segment((197,820)).segment((62,820)).segment((61,766)).arc((1,676),(62,586)).close().assemble().finalize().extrude(1000).union(w1.sketch().push([(807,384)]).rect(886,906).push([(812,381)]).rect(786,871,mode='s').finalize().extrude(691))
\ No newline at end of file
diff --git a/test/extrude/20/20.stl b/test/extrude/20/20.stl
index 02462199365edf82a8a361bdc8fb621d9d6a68a7..40e7269e1cc6c25753b8284950a6fc5ac7c8e45a 100644
Binary files a/test/extrude/20/20.stl and b/test/extrude/20/20.stl differ
diff --git a/test/extrude/200/200.py b/test/extrude/200/200.py
index 5f492085db8f3ddf2b7bbb2a5b9c45bd0a9e5fbe..3ba4596bcfdbabef5fb8ccf60725f543529e2c7c 100644
--- a/test/extrude/200/200.py
+++ b/test/extrude/200/200.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,263,506))
-r=w0.sketch().segment((284,233),(314,233)).segment((314,1)).segment((707,1)).segment((707,233)).segment((728,233)).segment((728,364)).segment((707,364)).segment((707,596)).segment((314,596)).segment((314,364)).segment((284,364)).close().assemble().push([(591,909)]).rect(758,707).reset().face(w0.sketch().segment((526,869),(556,849)).segment((556,839)).segment((586,828)).segment((586,849)).segment((667,939)).segment((627,980)).segment((606,990)).segment((596,970)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(261,262,111))
+w1=cq.Workplane('YZ',origin=(334,261,260))
+r=w0.workplane(offset=370).moveTo(357,466).cylinder(479,276).union(w0.sketch().segment((62,391),(83,57)).segment((119,59)).segment((118,184)).segment((241,183)).segment((241,67)).segment((460,83)).segment((439,417)).close().assemble().finalize().extrude(520)).union(w1.sketch().push([(235,196)]).circle(455).circle(435,mode='s').finalize().extrude(241))
\ No newline at end of file
diff --git a/test/extrude/200/200.stl b/test/extrude/200/200.stl
index 2daf91c02a01da02f40bbfceab51df167940b5e4..39ccbb6ac35011f1bb8676f5d0244adb03145349 100644
Binary files a/test/extrude/200/200.stl and b/test/extrude/200/200.stl differ
diff --git a/test/extrude/201/201.py b/test/extrude/201/201.py
index 1ea7a3fececdd692ab49af7fa643e26a860e9ecb..6a691f5065b5621b38dfe74300c1e4092dc15515 100644
--- a/test/extrude/201/201.py
+++ b/test/extrude/201/201.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(404,404,106))
-r=w0.sketch().segment((106,468),(154,468)).segment((154,219)).segment((654,219)).segment((654,468)).segment((702,468)).segment((702,557)).segment((654,557)).segment((654,807)).segment((154,807)).segment((154,557)).segment((106,557)).close().assemble().finalize().extrude(581).union(w0.sketch().arc((380,1),(444,219),(380,436)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,685))
+r=w0.sketch().segment((126,87),(185,87)).arc((317,1),(447,85)).segment((501,85)).segment((501,200)).segment((445,200)).arc((315,282),(186,201)).segment((127,201)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=597).moveTo(502,632).box(1000,1000,690))
\ No newline at end of file
diff --git a/test/extrude/201/201.stl b/test/extrude/201/201.stl
index 0568d38ce7f35c0e66d098ea7f44726c24904c2c..a9bda65e543bc73da731182a879504de69a0d7cd 100644
Binary files a/test/extrude/201/201.stl and b/test/extrude/201/201.stl differ
diff --git a/test/extrude/202/202.py b/test/extrude/202/202.py
index 6978043ea0c2f7970e52f0956497c3dd678feec0..705c48ae63a6e717dc2fd0fe856d5fec33c5bab2 100644
--- a/test/extrude/202/202.py
+++ b/test/extrude/202/202.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(447,447,563))
-w1=cq.Workplane('XY',origin=(447,447,554))
-r=w0.workplane(offset=327).moveTo(616,599).box(1000,893,688).union(w0.workplane(offset=385).moveTo(723,197).cylinder(572,456)).union(w1.sketch().segment((1,349),(90,349)).arc((46,411),(81,474)).segment((81,545)).segment((242,545)).segment((242,402)).segment((179,402)).arc((162,367),(117,349)).arc((224,72),(322,349)).segment((322,402)).arc((269,429),(322,456)).segment((322,590)).segment((1,590)).close().assemble().finalize().extrude(251))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,322))
+r=w0.sketch().arc((2,640),(206,510),(261,276)).segment((345,275)).arc((400,246),(455,230)).segment((1000,389)).segment((1000,721)).segment((656,720)).arc((501,771),(347,720)).segment((1,721)).close().assemble().finalize().extrude(860)
\ No newline at end of file
diff --git a/test/extrude/202/202.stl b/test/extrude/202/202.stl
index ec045909f07f863170a77878d0f99409900db4ae..e030229f175318a66246f85aa1ccc88929f41d6c 100644
Binary files a/test/extrude/202/202.stl and b/test/extrude/202/202.stl differ
diff --git a/test/extrude/203/203.py b/test/extrude/203/203.py
index fac8761cf6898a08a9e7a2e4b20ac2a73292370c..d47025c0032e59370035cfb6ce0f0543143d07a0 100644
--- a/test/extrude/203/203.py
+++ b/test/extrude/203/203.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(517,517,360))
-r=w0.workplane(offset=433).moveTo(186,759).box(731,776,686).union(w0.sketch().push([(663,787)]).circle(809).reset().face(w0.sketch().arc((506,764),(820,753),(529,888)).arc((495,832),(506,764)).assemble(),mode='s').push([(854,1)]).circle(562).finalize().extrude(1000)).translate((1,45,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(376,499,500))
+r=w0.sketch().segment((92,121),(706,120)).arc((780,1),(861,121)).segment((910,122)).segment((910,581)).arc((700,745),(617,999)).segment((92,999)).close().assemble().push([(806,206)]).circle(525,mode='s').finalize().extrude(755)
\ No newline at end of file
diff --git a/test/extrude/203/203.stl b/test/extrude/203/203.stl
index 542845a7490cc9eac8248df434cc1d7d98cbc1e1..1daa3646b6a983e91decd07187e99d5237a37031 100644
Binary files a/test/extrude/203/203.stl and b/test/extrude/203/203.stl differ
diff --git a/test/extrude/204/204.py b/test/extrude/204/204.py
index 291073f56fa2686b395aa2ad4c8b724d93601c0d..da5f76c66b9cda70360126277b67a0ec8bf14553 100644
--- a/test/extrude/204/204.py
+++ b/test/extrude/204/204.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(352,258,352))
-w1=cq.Workplane('ZX',origin=(352,379,352))
-r=w0.workplane(offset=62).moveTo(413,352).box(662,622,932).union(w0.sketch().arc((420,716),(325,1),(595,662)).arc((474,582),(420,716)).assemble().finalize().extrude(14)).union(w0.workplane(offset=608).moveTo(42,244).box(595,379,865)).union(w1.sketch().segment((55,150),(217,150)).segment((217,446)).segment((312,446)).segment((312,474)).segment((622,474)).segment((622,446)).segment((636,446)).arc((676,460),(730,446)).segment((784,446)).segment((784,554)).segment((55,554)).close().assemble().finalize().extrude(1000)).translate((1,147,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,480,499))
+w1=cq.Workplane('ZX',origin=(498,309,500))
+r=w0.sketch().arc((818,858),(822,518),(842,858)).arc((839,907),(818,952)).close().assemble().finalize().extrude(166).union(w0.workplane(offset=441).moveTo(530,434).cylinder(613,579)).union(w0.sketch().arc((545,589),(438,304),(663,505)).arc((619,570),(543,588)).assemble().finalize().extrude(877)).union(w1.sketch().push([(148,101)]).rect(792,609).rect(515,549,mode='s').finalize().extrude(958))
\ No newline at end of file
diff --git a/test/extrude/204/204.stl b/test/extrude/204/204.stl
index d178b11364d77b3d26a1165039f929d262ee7027..8bd1d3245ae2c973f0faf790f8d5acd65fe022fc 100644
Binary files a/test/extrude/204/204.stl and b/test/extrude/204/204.stl differ
diff --git a/test/extrude/205/205.py b/test/extrude/205/205.py
index 4626881dce7909f51b043eb7028e32bb4315f149..a49767627547dd6bcccbc30e51d38821a632a3c7 100644
--- a/test/extrude/205/205.py
+++ b/test/extrude/205/205.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(591,885,591))
-r=w0.sketch().segment((238,787),(836,787)).segment((943,787)).segment((943,836)).segment((836,836)).segment((836,1000)).segment((238,1000)).close().assemble().push([(259,840)]).rect(632,599,mode='s').finalize().extrude(1).union(w0.sketch().segment((615,181),(656,189)).arc((632,198),(615,181)).assemble().finalize().extrude(550))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(760,500,501))
+w1=cq.Workplane('XY',origin=(500,501,112))
+r=w0.sketch().segment((2,796),(795,736)).segment((805,900)).segment((15,960)).close().assemble().finalize().extrude(15).union(w0.sketch().push([(831,212)]).circle(670).circle(585,mode='s').finalize().extrude(276)).union(w1.workplane(offset=597).moveTo(321,830).box(661,580,691))
\ No newline at end of file
diff --git a/test/extrude/205/205.stl b/test/extrude/205/205.stl
index ad5b558eb50c66985ed02836580ac11889b16eef..8aca7e85bffb31add05aa6fe863e2f21a9535896 100644
Binary files a/test/extrude/205/205.stl and b/test/extrude/205/205.stl differ
diff --git a/test/extrude/206/206.py b/test/extrude/206/206.py
index 7fec62b60d90d5cd1cc9e4e697c493a5b7faa87f..cf7ca777e532f496f3794481411e28cedaac6e40 100644
--- a/test/extrude/206/206.py
+++ b/test/extrude/206/206.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(570,500,500))
-r=w0.sketch().segment((1,770),(500,770)).segment((481,630)).segment((481,600)).arc((471,520),(471,451)).segment((471,341)).arc((331,151),(580,191)).segment((950,161)).segment((970,371)).segment((980,371)).segment((980,421)).arc((1000,491),(980,570)).segment((1000,810)).segment((560,840)).segment((560,870)).segment((1,870)).close().assemble().push([(281,820)]).rect(640,580,mode='s').finalize().extrude(301).union(w0.workplane(offset=530).moveTo(351,770).cylinder(560,650))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,801,499))
+w1=cq.Workplane('YZ',origin=(826,500,499))
+r=w0.sketch().segment((14,279),(15,330)).segment((100,330)).segment((100,245)).segment((34,244)).arc((261,195),(339,404)).segment((290,430)).segment((304,470)).arc((79,495),(14,280)).assemble().finalize().extrude(1).union(w1.sketch().push([(377,744)]).rect(695,1000).push([(288,676)]).rect(505,510,mode='s').finalize().extrude(360))
\ No newline at end of file
diff --git a/test/extrude/206/206.stl b/test/extrude/206/206.stl
index 526f0cef9046bb9dd59a47e56299947d34b659eb..5e829346dd7d5ff786a9d7dbe82dfe63868cc688 100644
Binary files a/test/extrude/206/206.stl and b/test/extrude/206/206.stl differ
diff --git a/test/extrude/207/207.py b/test/extrude/207/207.py
index ba88e1b413aea4518d16d8fa09c3d7e91334a1b9..7ccfb109ef9c780ec379056d80e02aa6b381bab9 100644
--- a/test/extrude/207/207.py
+++ b/test/extrude/207/207.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(334,495,495))
-r=w0.sketch().arc((122,717),(142,828),(223,909)).arc((1,889),(122,717)).assemble().reset().face(w0.sketch().segment((526,344),(879,344)).segment((879,576)).arc((939,506),(919,415)).segment((1000,425)).segment((960,617)).segment((879,606)).segment((707,606)).segment((707,405)).segment((586,405)).segment((586,606)).segment((526,606)).close().assemble()).finalize().extrude(435).union(w0.sketch().push([(213,152)]).circle(627).push([(738,213)]).circle(506).finalize().extrude(879))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,880))
+r=w0.sketch().segment((180,1),(652,1)).segment((652,552)).segment((821,552)).segment((820,1000)).segment((616,999)).segment((615,660)).segment((181,661)).close().assemble().push([(801,736)]).circle(520,mode='s').finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/207/207.stl b/test/extrude/207/207.stl
index f0280179cfa7643530173afda32303a31ae75750..617bc2d4a2202c04a04be728afb18510dbd36768 100644
Binary files a/test/extrude/207/207.stl and b/test/extrude/207/207.stl differ
diff --git a/test/extrude/208/208.py b/test/extrude/208/208.py
index 8ef068532c3875050b043eacd6c6e8d0390acf29..240482c34aef4fd2f06421c9a70f66e6a3043b08 100644
--- a/test/extrude/208/208.py
+++ b/test/extrude/208/208.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(480,740,480))
-w1=cq.Workplane('XY',origin=(480,480,532))
-r=w0.sketch().arc((261,542),(376,438),(532,428)).segment((636,428)).arc((917,646),(615,834)).arc((469,875),(334,834)).arc((168,719),(261,542)).assemble().reset().face(w0.sketch().arc((292,147),(324,105),(324,53)).arc((709,220),(292,147)).assemble()).push([(376,74)]).circle(490,mode='s').finalize().extrude(84).union(w1.sketch().segment((948,220),(1000,220)).segment((1000,396)).segment((948,396)).segment((948,355)).arc((990,303),(948,251)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,660))
+r=w0.sketch().segment((2,345),(11,345)).segment((10,291)).segment((334,289)).segment((334,345)).segment((344,346)).segment((345,361)).segment((336,359)).segment((336,419)).segment((10,419)).segment((11,359)).segment((2,361)).close().assemble().reset().face(w0.sketch().segment((654,688),(680,430)).segment((828,446)).arc((992,526),(903,689)).segment((903,710)).close().assemble()).finalize().extrude(179)
\ No newline at end of file
diff --git a/test/extrude/208/208.stl b/test/extrude/208/208.stl
index f434c4a23903f2b24cfffaee19b883e137f96e14..3efc73ecdad15cc1c7bc9e00cc0a99ca2b67c9e9 100644
Binary files a/test/extrude/208/208.stl and b/test/extrude/208/208.stl differ
diff --git a/test/extrude/209/209.py b/test/extrude/209/209.py
index 5a70c584047a392ab62ec29373635e93109f5ec9..6dfc69689f52de99d0c39ba912709e2bb5ce48e2 100644
--- a/test/extrude/209/209.py
+++ b/test/extrude/209/209.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(451,226,451))
-r=w0.workplane(offset=406).moveTo(550,316).box(757,577,541).union(w0.workplane(offset=577).moveTo(550,316).box(811,577,703)).union(w0.sketch().segment((172,532),(271,532)).arc((208,235),(388,1)).segment((388,262)).segment((226,262)).segment((226,370)).segment((460,370)).segment((460,514)).arc((298,694),(406,901)).segment((172,901)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,462,501))
+w1=cq.Workplane('YZ',origin=(266,500,500))
+r=w0.sketch().arc((406,526),(172,127),(625,220)).segment((826,201)).arc((831,260),(854,316)).segment((870,491)).segment((405,535)).close().assemble().reset().face(w0.sketch().arc((587,421),(614,366),(630,301)).arc((686,391),(586,420)).assemble(),mode='s').finalize().extrude(261).union(w0.sketch().push([(305,676)]).circle(804).push([(287,568)]).rect(551,646,mode='s').finalize().extrude(317)).union(w1.workplane(offset=806).moveTo(608,672).box(845,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/209/209.stl b/test/extrude/209/209.stl
index e818e930ff5f34a035f650c67534ea8793a18f74..e020c6ab3baa800a7337474cb4d848300a27aa0a 100644
Binary files a/test/extrude/209/209.stl and b/test/extrude/209/209.stl differ
diff --git a/test/extrude/21/21.py b/test/extrude/21/21.py
index eb9b5ba98dcae6bfa7dd4dd6cc5f65564866c1ba..ddf78062a0d85605d9abf160fd723bd7a79517f7 100644
--- a/test/extrude/21/21.py
+++ b/test/extrude/21/21.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,521,500))
-r=w0.sketch().arc((307,460),(327,1),(592,378)).arc((623,1000),(307,460)).assemble().reset().face(w0.sketch().segment((184,256),(602,205)).segment((602,215)).segment((184,276)).close().assemble(),mode='s').push([(531,694)]).circle(613,mode='s').finalize().extrude(460)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(70,36,72))
+r=w0.sketch().segment((863,297),(151,297)).segment((151,653)).segment((863,653)).close().assemble().finalize().extrude(148).union(w0.workplane(offset=27).sketch().segment((475,453),(475,598)).arc((447,655),(437,718)).segment((437,396)).segment((475,396)).close().assemble().finalize().extrude(181)).union(w0.workplane(offset=201).sketch().segment((121,827),(295,827)).segment((295,437)).segment((121,437)).close().assemble().finalize().extrude(187)).translate((1,353,1))
diff --git a/test/extrude/21/21.stl b/test/extrude/21/21.stl
index fb190492f56c58e193206eeb2e72188b3147a425..494b938d7398f33b0a1678dc50aa8da5cc74e235 100644
Binary files a/test/extrude/21/21.stl and b/test/extrude/21/21.stl differ
diff --git a/test/extrude/210/210.py b/test/extrude/210/210.py
index 01c9b29d5b2e688321e69fdcbf889fb3bb090922..0ac12bcfc86314b38edfcd7fa5a917c4cffb086f 100644
--- a/test/extrude/210/210.py
+++ b/test/extrude/210/210.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((387,547),(574,547)).arc((667,514),(760,547)).segment((947,547)).segment((947,787)).segment((760,787)).arc((667,820),(574,787)).segment((387,787)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,521))
+w1=cq.Workplane('XY',origin=(499,500,460))
+r=w0.workplane(offset=284).moveTo(164,303).box(614,706,936).union(w0.workplane(offset=741).moveTo(162,307).cylinder(981,539)).union(w1.workplane(offset=271).moveTo(657,594).box(975,911,961))
\ No newline at end of file
diff --git a/test/extrude/210/210.stl b/test/extrude/210/210.stl
index 2a228207f1f397222c8ad1a41d5783870f400334..40ca80d14ef8ee23303d7b96476e72a2c815d556 100644
Binary files a/test/extrude/210/210.stl and b/test/extrude/210/210.stl differ
diff --git a/test/extrude/211/211.py b/test/extrude/211/211.py
index 4f5da8ca00e540c8c6d1945d4bac3334120a7ff5..875f0d50b63b305a62e900f4a2b29bd1716169db 100644
--- a/test/extrude/211/211.py
+++ b/test/extrude/211/211.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,871,334))
-w1=cq.Workplane('ZX',origin=(334,463,334))
-r=w0.workplane(offset=76).moveTo(667,98).cylinder(850,409).union(w1.workplane(offset=1).moveTo(12,560).cylinder(1000,420)).translate((1,37,75))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,1))
+r=w0.sketch().arc((811,270),(716,386),(859,360)).arc((160,696),(810,272)).assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/211/211.stl b/test/extrude/211/211.stl
index 61694bfe60c073a966d603d23303a38ffc74d093..0737146acb3d00aa16e06db4b9067e3465330ae4 100644
Binary files a/test/extrude/211/211.stl and b/test/extrude/211/211.stl differ
diff --git a/test/extrude/212/212.py b/test/extrude/212/212.py
index 705a863b5dd6c9c6bc451cc7b80b4a377707e621..c9b5c958b84768014353d44a8557b4f6c903ecdb 100644
--- a/test/extrude/212/212.py
+++ b/test/extrude/212/212.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,321,500))
-r=w0.sketch().segment((271,850),(461,500)).segment((461,461)).arc((321,271),(461,71)).segment((461,1)).segment((580,1)).segment((580,71)).arc((720,271),(580,461)).segment((580,530)).segment((540,530)).segment((730,640)).segment((540,1000)).close().assemble().finalize().extrude(421).union(w0.sketch().segment((381,760),(421,760)).arc((491,680),(590,710)).arc((580,720),(570,740)).segment((520,740)).segment((520,790)).segment((590,790)).segment((590,770)).arc((600,770),(600,780)).arc((510,860),(421,770)).segment((381,770)).close().assemble().reset().face(w0.sketch().segment((431,740),(500,740)).segment((500,790)).segment((431,790)).segment((431,770)).segment((431,760)).close().assemble(),mode='s').finalize().extrude(950))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,817,500))
+r=w0.sketch().segment((798,497),(942,495)).arc((651,751),(966,526)).segment((968,671)).segment((796,671)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((236,711),(4,401),(326,181)).arc((190,432),(235,711)).assemble().finalize().extrude(426))
\ No newline at end of file
diff --git a/test/extrude/212/212.stl b/test/extrude/212/212.stl
index 80704f634cd934180f0939c0a72616468a01f757..6c025e7ece132294e6b88d87fe63c3dfe82d656d 100644
Binary files a/test/extrude/212/212.stl and b/test/extrude/212/212.stl differ
diff --git a/test/extrude/213/213.py b/test/extrude/213/213.py
index fa002f03aeaf637a6b185fcca99469e5f974299f..5d19bf930d3cb000f5f712838e597a1750977196 100644
--- a/test/extrude/213/213.py
+++ b/test/extrude/213/213.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(273,351,351))
-r=w0.sketch().push([(144,1)]).circle(650).reset().face(w0.sketch().segment((170,844),(702,338)).segment((857,494)).segment((585,741)).arc((455,741),(455,870)).segment((325,1000)).close().assemble()).finalize().extrude(338).union(w0.sketch().push([(507,663)]).rect(663,922).reset().face(w0.sketch().segment((351,611),(377,611)).arc((442,676),(351,637)).close().assemble(),mode='s').finalize().extrude(520)).translate((1,156,299))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,235,501))
+r=w0.workplane(offset=528).moveTo(774,192).cylinder(557,591).union(w0.workplane(offset=749).moveTo(296,794).box(1000,714,1000)).union(w0.workplane(offset=765).moveTo(690,464).cylinder(1000,811))
\ No newline at end of file
diff --git a/test/extrude/213/213.stl b/test/extrude/213/213.stl
index 82d9d532aa15cb465b1e90735b3fb4b92daca996..d406c4e8c3010d3ff94c378fe1ee36a784b821c2 100644
Binary files a/test/extrude/213/213.stl and b/test/extrude/213/213.stl differ
diff --git a/test/extrude/214/214.py b/test/extrude/214/214.py
index ca0acc9c5698ad3649630e771930f3cdb8743105..b7d6da129566dba1b8d3e2366d4887979a0bc12e 100644
--- a/test/extrude/214/214.py
+++ b/test/extrude/214/214.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(643,964,643))
-r=w0.sketch().segment((286,729),(443,336)).segment((1000,558)).segment((843,950)).close().assemble().rect(743,1000,mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,196))
+r=w0.workplane(offset=642).moveTo(746,132).cylinder(786,631).union(w0.sketch().arc((606,916),(76,635),(665,525)).segment((932,527)).segment((931,915)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/214/214.stl b/test/extrude/214/214.stl
index ab350cc95026e39632cc21aa15682312cc7a6a3b..a619109254f4e0f7aa7047e9f01fa69f998b26aa 100644
Binary files a/test/extrude/214/214.stl and b/test/extrude/214/214.stl differ
diff --git a/test/extrude/215/215.py b/test/extrude/215/215.py
index 9458e207e141afd8a7056a0f73b5a51af6cb346f..f38e1098f87c49340199b3438285d92c1f9af968 100644
--- a/test/extrude/215/215.py
+++ b/test/extrude/215/215.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(680,500,500))
-r=w0.sketch().segment((381,1),(620,1)).segment((620,421)).arc((650,500),(620,580)).segment((620,1000)).segment((381,1000)).segment((381,580)).arc((351,500),(381,421)).close().assemble().finalize().extrude(131)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(505,501,500))
+w1=cq.Workplane('YZ',origin=(792,501,501))
+r=w0.sketch().arc((582,201),(997,235),(620,422)).arc((531,322),(580,202)).assemble().finalize().extrude(715).union(w1.sketch().segment((1,357),(17,357)).segment((15,297)).segment((510,295)).arc((801,267),(527,365)).segment((525,876)).segment((516,877)).segment((517,940)).segment((15,940)).segment((16,877)).segment((1,875)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/215/215.stl b/test/extrude/215/215.stl
index 46f287faa30d9146982755f568e1f48c9ff99b8b..a68b7f29252f92c6ac51fce89ec7ac7509a378c6 100644
Binary files a/test/extrude/215/215.stl and b/test/extrude/215/215.stl differ
diff --git a/test/extrude/216/216.py b/test/extrude/216/216.py
index b754a137f6df9a3eafc0e0d448524b915fe257ed..c4b68a8fb63c749be868594322612eb8aad7c6f8 100644
--- a/test/extrude/216/216.py
+++ b/test/extrude/216/216.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,710))
-r=w0.sketch().segment((121,550),(251,520)).arc((461,1),(770,471)).segment((880,500)).segment((790,830)).segment((790,840)).segment((780,860)).segment((760,860)).segment((760,930)).segment((491,930)).segment((251,1000)).segment((231,930)).segment((171,930)).segment((171,730)).close().assemble().finalize().extrude(81)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,759))
+w1=cq.Workplane('YZ',origin=(315,501,500))
+r=w0.sketch().push([(585,275)]).circle(600).circle(580,mode='s').finalize().extrude(257).union(w1.sketch().segment((1,464),(76,464)).arc((96,389),(141,326)).segment((140,275)).segment((474,274)).segment((474,466)).segment((519,465)).arc((988,320),(524,481)).segment((474,479)).segment((475,854)).segment((142,855)).segment((140,620)).arc((96,554),(76,479)).segment((2,479)).close().assemble().reset().face(w1.sketch().segment((260,325),(260,619)).arc((122,471),(260,325)).assemble(),mode='s').reset().face(w1.sketch().arc((275,325),(420,470),(276,619)).close().assemble(),mode='s').finalize().extrude(703))
\ No newline at end of file
diff --git a/test/extrude/216/216.stl b/test/extrude/216/216.stl
index 2f88b57606cc96ef4910297a05e7c805ee790f2e..7cdb79e6ff090590c055ba98d0f355b9267ca3b0 100644
Binary files a/test/extrude/216/216.stl and b/test/extrude/216/216.stl differ
diff --git a/test/extrude/217/217.py b/test/extrude/217/217.py
index e55a8d0ff1caf971970934ab7a7341406eb9f08f..c07b5091d9ea3fe544a8709a18efe8378266b591 100644
--- a/test/extrude/217/217.py
+++ b/test/extrude/217/217.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(569,569,852))
-r=w0.sketch().segment((461,625),(466,506)).segment((472,506)).segment((472,518)).segment((608,518)).segment((608,625)).close().assemble().reset().face(w0.sketch().segment((466,569),(478,552)).segment((557,603)).segment((546,620)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=353).moveTo(659,569).box(603,762,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,456,503))
+r=w0.sketch().arc((386,582),(12,277),(495,247)).segment((701,247)).segment((702,601)).segment((991,601)).segment((990,700)).segment((535,700)).segment((536,685)).segment((386,687)).close().assemble().reset().face(w0.sketch().segment((163,336),(306,268)).segment((361,372)).segment((213,441)).close().assemble(),mode='s').push([(543,467)]).rect(576,522,mode='s').finalize().extrude(218).union(w0.sketch().segment((511,585),(781,397)).segment((821,452)).segment((811,472)).segment((850,491)).segment((881,536)).segment((906,521)).segment((961,546)).segment((965,541)).segment((1000,595)).arc((890,666),(901,790)).segment((742,905)).close().assemble().finalize().extrude(880))
\ No newline at end of file
diff --git a/test/extrude/217/217.stl b/test/extrude/217/217.stl
index da97d075eb0fffff1336395b7e9cfd50df68d234..5884ece0b191cefc0b5e781b727f1c5cac01e258 100644
Binary files a/test/extrude/217/217.stl and b/test/extrude/217/217.stl differ
diff --git a/test/extrude/218/218.py b/test/extrude/218/218.py
index b48900937c67553c0d657d318f91f5c7ec1a233e..759023f7e6e581f50bf382d79b0393d22cea8fcb 100644
--- a/test/extrude/218/218.py
+++ b/test/extrude/218/218.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().circle(774).circle(727,mode='s').finalize().extrude(1).translate((108,1,108))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,706,500))
+r=w0.sketch().arc((256,739),(395,512),(392,784)).arc((326,745),(255,740)).assemble().finalize().extrude(91).union(w0.sketch().arc((636,251),(645,1),(641,251)).segment((640,589)).segment((636,591)).close().assemble().finalize().extrude(200)).union(w0.workplane(offset=434).moveTo(598,719).box(865,1000,636))
\ No newline at end of file
diff --git a/test/extrude/218/218.stl b/test/extrude/218/218.stl
index d7a63fca84f578847eee5c8b8984a5101ac1a001..9093edf94d448f288b076e50f9b7f537af047b47 100644
Binary files a/test/extrude/218/218.stl and b/test/extrude/218/218.stl differ
diff --git a/test/extrude/219/219.py b/test/extrude/219/219.py
index db2b8abb8a716882e05b023c4c107e6a0d39eec3..1ad3089bb3cd7e70cddcc2c8c3c394118bb44a08 100644
--- a/test/extrude/219/219.py
+++ b/test/extrude/219/219.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(532,584,584))
-w1=cq.Workplane('XY',origin=(584,584,646))
-r=w0.sketch().arc((886,979),(188,542),(1000,688)).arc((917,834),(886,979)).assemble().finalize().extrude(969).union(w1.sketch().segment((251,209),(584,209)).segment((584,948)).segment((251,948)).segment((251,886)).arc((272,875),(251,854)).close().assemble().reset().face(w1.sketch().arc((344,584),(313,407),(448,521)).arc((459,646),(344,584)).assemble(),mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,580))
+r=w0.sketch().segment((256,154),(269,145)).arc((659,254),(265,164)).close().assemble().finalize().extrude(180).union(w0.sketch().segment((281,950),(440,951)).arc((565,580),(605,971)).segment((606,1000)).segment((279,999)).close().assemble().finalize().extrude(659))
\ No newline at end of file
diff --git a/test/extrude/219/219.stl b/test/extrude/219/219.stl
index 4ae1ce7bc0182e05e48b449e649eea439e7c519b..38ed8ded5d7ead191435a3a6d6554528c925afea 100644
Binary files a/test/extrude/219/219.stl and b/test/extrude/219/219.stl differ
diff --git a/test/extrude/22/22.py b/test/extrude/22/22.py
index 79991af613ff2c5e9968d079f9a1f1b202d42180..109d9d2ad767e5da2cef6e90d4c9d3910705a080 100644
--- a/test/extrude/22/22.py
+++ b/test/extrude/22/22.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(183,455,455))
-r=w0.sketch().push([(319,827)]).circle(537).push([(323,827)]).rect(555,564,mode='s').finalize().extrude(764).union(w0.workplane(offset=705).moveTo(591,237).cylinder(955,537)).union(w0.sketch().segment((564,1),(619,1)).segment((619,46)).arc((591,55),(564,74)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(36,73,4))
+r=w0.sketch().segment((366,864),(1000,864)).segment((1000,482)).segment((366,482)).close().assemble().finalize().extrude(168).union(w0.workplane(offset=89).sketch().segment((439,788),(871,788)).segment((871,702)).segment((439,702)).close().assemble().finalize().extrude(63)).union(w0.workplane(offset=110).sketch().segment((512,413),(934,413)).segment((934,137)).segment((512,137)).segment((511,413)).close().assemble().finalize().extrude(79))
diff --git a/test/extrude/22/22.stl b/test/extrude/22/22.stl
index 08e9ddca007fd72205f46e5e96eaf6c452865b62..d2902d0578a338e9dfba2c24838591d91bacb406 100644
Binary files a/test/extrude/22/22.stl and b/test/extrude/22/22.stl differ
diff --git a/test/extrude/220/220.py b/test/extrude/220/220.py
index 341719689efa3db6297a0bed4626d467685c9a74..97aaaab85a97c580a4d5c2e18a55c7d6da6916b9 100644
--- a/test/extrude/220/220.py
+++ b/test/extrude/220/220.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(730,500,500))
-r=w0.sketch().segment((51,930),(281,1)).segment((570,71)).segment((550,131)).arc((750,161),(950,111)).segment((940,241)).segment((530,201)).segment((341,1000)).close().assemble().finalize().extrude(41)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,765,500))
+r=w0.sketch().segment((2,380),(151,380)).arc((242,356),(330,380)).segment((481,381)).segment((480,680)).segment((331,682)).arc((240,706),(151,680)).segment((1,681)).close().assemble().push([(920,376)]).circle(580).finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/220/220.stl b/test/extrude/220/220.stl
index 6304308f4a85f375db85b8a4f7b5d8687b6615fa..9ad09f4df9da6c86cffa91d3112b77d1af7022f9 100644
Binary files a/test/extrude/220/220.stl and b/test/extrude/220/220.stl differ
diff --git a/test/extrude/221/221.py b/test/extrude/221/221.py
index 8edba52d33f948a0caa51848114997e272f711ff..4b7a9e0458b7d6e00e3de58e9203c60cf0d5a1ab 100644
--- a/test/extrude/221/221.py
+++ b/test/extrude/221/221.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,600,500))
-w1=cq.Workplane('YZ',origin=(510,500,500))
-r=w0.sketch().segment((1,630),(111,630)).segment((111,91)).segment((1000,91)).segment((1000,660)).segment((830,660)).segment((830,880)).segment((471,880)).segment((471,910)).segment((351,910)).segment((351,880)).segment((1,880)).close().assemble().finalize().extrude(530).union(w1.sketch().push([(496,565)]).rect(750,510).push([(500,565)]).rect(520,510,mode='s').finalize().extrude(331))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(425,501,500))
+r=w0.workplane(offset=333).moveTo(391,220).cylinder(835,720).union(w0.sketch().push([(595,357)]).circle(540).reset().face(w0.sketch().segment((565,350),(570,350)).arc((580,359),(572,371)).segment((566,371)).close().assemble(),mode='s').finalize().extrude(636)).union(w0.sketch().push([(542,791)]).circle(709).reset().face(w0.sketch().segment((577,216),(821,217)).segment((821,321)).segment((829,320)).segment((831,450)).segment((819,451)).segment((820,465)).arc((801,466),(781,471)).segment((716,386)).segment((719,375)).segment((701,366)).segment((636,280)).segment((605,301)).segment((635,335)).segment((615,380)).segment((701,421)).segment((746,482)).arc((706,516),(680,561)).segment((575,560)).close().assemble()).finalize().extrude(991))
\ No newline at end of file
diff --git a/test/extrude/221/221.stl b/test/extrude/221/221.stl
index 7d9f3c40a7d77460543209a06dd9149ec89fac92..f9c58d18c02c97cafb878850124386aa0658f3c6 100644
Binary files a/test/extrude/221/221.stl and b/test/extrude/221/221.stl differ
diff --git a/test/extrude/222/222.py b/test/extrude/222/222.py
index 8c523f72c1ce69a370021411489c80509d1fec0d..c9f319b17b085465d06c0868ef1974a3c981eda8 100644
--- a/test/extrude/222/222.py
+++ b/test/extrude/222/222.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(895,597,597))
-r=w0.sketch().arc((581,895),(581,194),(637,895)).segment((637,1000)).segment((581,1000)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(466,501,501))
+r=w0.sketch().segment((340,25),(530,1)).segment((575,335)).arc((680,476),(615,640)).segment((660,975)).segment((471,1000)).segment((426,665)).arc((321,526),(386,361)).close().assemble().finalize().extrude(571)
\ No newline at end of file
diff --git a/test/extrude/222/222.stl b/test/extrude/222/222.stl
index 7df95508954bcf1e9e20492e695e98b46f414c7d..1016c50cbaa9f9e4d81324bd7536421ade309ee1 100644
Binary files a/test/extrude/222/222.stl and b/test/extrude/222/222.stl differ
diff --git a/test/extrude/223/223.py b/test/extrude/223/223.py
index 7a893d097a3736870b2fd45e1f47b54a28c59429..6ea3d9d7775bf6a3659450309ad25a733d248813 100644
--- a/test/extrude/223/223.py
+++ b/test/extrude/223/223.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(710,500,500))
-w1=cq.Workplane('XY',origin=(500,500,141))
-r=w0.sketch().segment((381,131),(441,1)).segment((520,41)).segment((461,171)).close().assemble().finalize().extrude(261).union(w0.sketch().segment((441,481),(471,481)).segment((471,441)).segment((700,441)).segment((700,481)).segment((750,481)).segment((750,1000)).segment((441,1000)).close().assemble().finalize().extrude(790)).union(w1.sketch().segment((1,251),(51,251)).arc((11,391),(51,530)).segment((1,530)).close().assemble().finalize().extrude(750))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,501))
+r=w0.sketch().push([(90,704)]).circle(525).circle(510,mode='s').reset().face(w0.sketch().segment((416,839),(654,416)).segment((934,577)).segment((696,1000)).close().assemble()).push([(675,711)]).circle(570,mode='s').finalize().extrude(226).union(w0.sketch().segment((105,1),(126,170)).segment((201,160)).segment((202,222)).arc((102,136),(107,2)).assemble().finalize().extrude(770))
\ No newline at end of file
diff --git a/test/extrude/223/223.stl b/test/extrude/223/223.stl
index 8a73803d9092edafd39b808dab95e80d6609a971..ab5f1234121f936e0913c05fc704052584045906 100644
Binary files a/test/extrude/223/223.stl and b/test/extrude/223/223.stl differ
diff --git a/test/extrude/224/224.py b/test/extrude/224/224.py
index f26a92f03a9d331225c8ee37f374a8165342a7c7..967cf1a326b096832d2ae5181d4deecce5ad73d0 100644
--- a/test/extrude/224/224.py
+++ b/test/extrude/224/224.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,260,260))
-r=w0.workplane(offset=150).cylinder(481,558).union(w0.sketch().arc((356,462),(20,289),(385,184)).segment((433,184)).segment((433,462)).close().assemble().reset().face(w0.sketch().segment((193,193),(193,433)).arc((97,308),(193,193)).assemble(),mode='s').finalize().extrude(1000)).translate((91,299,299))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,715,502))
+r=w0.sketch().segment((1,431),(31,320)).segment((426,429)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=556).moveTo(896,673).box(709,516,609))
\ No newline at end of file
diff --git a/test/extrude/224/224.stl b/test/extrude/224/224.stl
index 26186d3ee4adb22d8335a5587e65d3b4e87bb4c0..db9267b29bd549d7f1e1cebad161ab22972f13ee 100644
Binary files a/test/extrude/224/224.stl and b/test/extrude/224/224.stl differ
diff --git a/test/extrude/225/225.py b/test/extrude/225/225.py
index e7e05210c2d6aa13d30011d24d3d4c1560cc5f8e..31c847538620ef3d1ef8d51191fc766b71cbf53e 100644
--- a/test/extrude/225/225.py
+++ b/test/extrude/225/225.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(463,849,463))
-w1=cq.Workplane('YZ',origin=(199,463,463))
-r=w0.sketch().arc((435,444),(1,227),(472,95)).segment((925,95)).segment((925,576)).segment((435,576)).close().assemble().finalize().extrude(67).union(w0.sketch().segment((227,416),(246,340)).segment((246,312)).segment((255,312)).segment((274,312)).segment((585,312)).segment((585,397)).segment((642,416)).segment((585,642)).segment((585,670)).segment((576,670)).segment((557,670)).segment((340,670)).arc((76,632),(227,416)).assemble().finalize().extrude(208)).union(w0.sketch().push([(246,717)]).circle(680).push([(251,722)]).rect(717,604,mode='s').finalize().extrude(227)).union(w1.sketch().segment((566,237),(755,237)).segment((755,595)).segment((576,595)).arc((76,435),(566,237)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,498,130))
+w1=cq.Workplane('YZ',origin=(98,498,499))
+r=w0.sketch().arc((789,458),(900,730),(791,1000)).close().assemble().finalize().extrude(1000).union(w1.sketch().arc((214,118),(399,425),(694,240)).arc((298,836),(214,119)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/225/225.stl b/test/extrude/225/225.stl
index fb7fcbcd3df03b9ee12cb9a303e71915be8d4fd3..24e756084178549489166a1cda44e96d8e4fe346 100644
Binary files a/test/extrude/225/225.stl and b/test/extrude/225/225.stl differ
diff --git a/test/extrude/226/226.py b/test/extrude/226/226.py
index ad6f21efbf134feaefd0bc6cca918b671a3a4845..8d302b70b86f0851f7d3576cd73dd8add6a2a948 100644
--- a/test/extrude/226/226.py
+++ b/test/extrude/226/226.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(359,134,359))
-w1=cq.Workplane('ZX',origin=(359,192,359))
-r=w0.sketch().push([(509,567)]).circle(509).circle(426,mode='s').finalize().extrude(168).union(w0.workplane(offset=679).moveTo(509,567).cylinder(1000,459)).union(w1.sketch().segment((59,267),(201,267)).segment((201,1)).segment((317,1)).segment((317,334)).segment((59,334)).close().assemble().finalize().extrude(617))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(275,499,499))
+w1=cq.Workplane('YZ',origin=(359,499,499))
+r=w0.sketch().arc((495,694),(2,528),(500,376)).segment((600,375)).segment((599,535)).arc((959,885),(495,693)).assemble().reset().face(w0.sketch().segment((630,194),(665,186)).segment((703,334)).segment((669,345)).close().assemble()).finalize().extrude(396).union(w1.workplane(offset=735).moveTo(667,268).box(534,1000,970))
\ No newline at end of file
diff --git a/test/extrude/226/226.stl b/test/extrude/226/226.stl
index 0910a40d44630524da01bc210844563266e1d7be..9b3f92448267cf07d0ec5864f5708af134c1e4f2 100644
Binary files a/test/extrude/226/226.stl and b/test/extrude/226/226.stl differ
diff --git a/test/extrude/227/227.py b/test/extrude/227/227.py
index d365fd6e30985ae2be737d04265a5b0e47d99087..a4f83c5441557d02edf412962b1cba19bb5a64ae 100644
--- a/test/extrude/227/227.py
+++ b/test/extrude/227/227.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(407,115,407))
-r=w0.sketch().segment((9,1),(626,1)).segment((626,33)).arc((805,220),(626,383)).segment((626,813)).segment((9,813)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(379,501,501))
+r=w0.workplane(offset=535).moveTo(161,500).box(819,1000,571).union(w0.workplane(offset=621).moveTo(990,525).cylinder(741,510))
\ No newline at end of file
diff --git a/test/extrude/227/227.stl b/test/extrude/227/227.stl
index cc0c5bb101e39e90c709826a5db8b9b5c20f076a..188bbb4988091a035b5d2805bde9e909bf587ffe 100644
Binary files a/test/extrude/227/227.stl and b/test/extrude/227/227.stl differ
diff --git a/test/extrude/228/228.py b/test/extrude/228/228.py
index e57b6c31e2cabe3322a31ef809766b78c05710b1..6778434c2be6e8b1136ef1d1278add09e5d5f306 100644
--- a/test/extrude/228/228.py
+++ b/test/extrude/228/228.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(166,418,418))
-w1=cq.Workplane('ZX',origin=(418,544,418))
-r=w0.sketch().segment((525,825),(738,864)).arc((622,903),(525,825)).assemble().finalize().extrude(1000).union(w1.workplane(offset=195).moveTo(1,166).cylinder(864,486)).translate((1,1,68))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,700,501))
+w1=cq.Workplane('XY',origin=(500,501,315))
+r=w0.sketch().segment((171,150),(176,116)).segment((325,126)).segment((325,121)).segment((721,120)).segment((721,162)).segment((916,182)).segment((900,356)).segment((999,356)).segment((1000,886)).segment((402,885)).segment((401,830)).arc((592,386),(171,151)).assemble().finalize().extrude(221).union(w1.workplane(offset=344).moveTo(400,315).cylinder(814,515))
\ No newline at end of file
diff --git a/test/extrude/228/228.stl b/test/extrude/228/228.stl
index cda23693275acd5d65a8989cefbe91a2d2c6028f..16df5d553454581d471a200a85d5851953553bae 100644
Binary files a/test/extrude/228/228.stl and b/test/extrude/228/228.stl differ
diff --git a/test/extrude/229/229.py b/test/extrude/229/229.py
index 6ce7f40bdff2c0001e2c4b5ed149c2549447695a..1dd943b1a2d5a9ed98db7876270fbf4ab6fac8cb 100644
--- a/test/extrude/229/229.py
+++ b/test/extrude/229/229.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,451,500))
-r=w0.sketch().segment((1,570),(231,191)).segment((391,291)).segment((371,321)).segment((431,321)).arc((650,201),(890,281)).segment((960,281)).segment((960,321)).segment((1000,321)).segment((1000,690)).segment((960,690)).segment((920,690)).arc((670,810),(431,690)).segment((341,690)).segment((341,361)).segment((161,660)).close().assemble().push([(840,486)]).rect(760,590,mode='s').finalize().extrude(600)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(257,502,501))
+r=w0.sketch().arc((127,555),(385,26),(871,365)).arc((965,699),(621,766)).arc((542,791),(456,792)).arc((96,944),(126,557)).assemble().push([(483,405)]).rect(1000,542,mode='s').finalize().extrude(994)
\ No newline at end of file
diff --git a/test/extrude/229/229.stl b/test/extrude/229/229.stl
index d8005473ee9879d13b093e0f4a6c19a375b7867e..bc166ebcfd0dda4ec554d7eaa01052c0d59aeb9c 100644
Binary files a/test/extrude/229/229.stl and b/test/extrude/229/229.stl differ
diff --git a/test/extrude/23/23.py b/test/extrude/23/23.py
index 92f98bf53f37cfaa7a0172bd2f9b7b8026228df7..2bca00c8223654304413a65df858c2e716987bf5 100644
--- a/test/extrude/23/23.py
+++ b/test/extrude/23/23.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().circle(794).circle(700,mode='s').finalize().extrude(1).union(w0.workplane(offset=574).cylinder(853,707)).translate((128,1,128))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(64,21,35))
+r=w0.sketch().segment((1,689),(702,689)).segment((702,43)).segment((1,43)).close().assemble().finalize().extrude(169).union(w0.workplane(offset=56).sketch().segment((226,365),(242,747)).segment((226,747)).close().assemble().finalize().extrude(173)).union(w0.sketch().segment((662,314),(900,343)).segment((900,439)).segment((662,468)).close().assemble().finalize().extrude(138))
diff --git a/test/extrude/23/23.stl b/test/extrude/23/23.stl
index 3db88e2b2f5c65aa998f3ce1d37c8cd7f73abb1d..5c87e915e04d6de60a84d8ed68a22f4f9d588acd 100644
Binary files a/test/extrude/23/23.stl and b/test/extrude/23/23.stl differ
diff --git a/test/extrude/230/230.py b/test/extrude/230/230.py
index 506096b8d9c0fd13929e5a4eef57606897d55f7b..9dc5b9f3cb285b15593243b49656a87ceb042d5c 100644
--- a/test/extrude/230/230.py
+++ b/test/extrude/230/230.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(665,665,1000))
-r=w0.sketch().segment((330,765),(819,765)).segment((819,343)).arc((879,906),(330,765)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(649,499,500))
+r=w0.sketch().push([(516,616)]).circle(629).push([(795,275)]).circle(680).finalize().extrude(66).union(w0.sketch().push([(125,901)]).circle(599).reset().face(w0.sketch().segment((62,896),(110,894)).segment((112,845)).segment((142,844)).segment((140,895)).segment((190,896)).segment((190,906)).segment((142,905)).segment((140,955)).segment((112,954)).segment((110,906)).segment((61,904)).close().assemble(),mode='s').push([(660,133)]).rect(801,765).finalize().extrude(630))
\ No newline at end of file
diff --git a/test/extrude/230/230.stl b/test/extrude/230/230.stl
index 429d3351146a3d9c153ac6001b18e048a5c4b3be..f3084c13270e1ee3cf2fdd31352de137b72e9247 100644
Binary files a/test/extrude/230/230.stl and b/test/extrude/230/230.stl differ
diff --git a/test/extrude/231/231.py b/test/extrude/231/231.py
index 885d997d23e49e70cc49fd02b291547ecd1c2d64..abc5f1cb7b421c68e64557beab195d2bc2cf19f7 100644
--- a/test/extrude/231/231.py
+++ b/test/extrude/231/231.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(451,181,451))
-r=w0.sketch().push([(856,370)]).circle(496).push([(856,366)]).rect(469,514,mode='s').finalize().extrude(487).union(w0.sketch().segment((28,460),(28,568)).arc((1,514),(28,460)).assemble().reset().face(w0.sketch().arc((37,451),(64,442),(100,451)).close().assemble()).reset().face(w0.sketch().segment((37,568),(100,568)).arc((64,577),(37,568)).assemble()).reset().face(w0.sketch().arc((109,460),(136,514),(109,568)).close().assemble()).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1000,500,502))
+r=w0.sketch().segment((1,491),(741,61)).segment((999,511)).segment((507,796)).segment((505,839)).segment((432,841)).segment((261,939)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/231/231.stl b/test/extrude/231/231.stl
index 6027436ee16d39862fcaa49193135d798f0c181e..3da902ad94f84ed77b093e5a627db1a35ed4c9e8 100644
Binary files a/test/extrude/231/231.stl and b/test/extrude/231/231.stl differ
diff --git a/test/extrude/232/232.py b/test/extrude/232/232.py
index f6c4db8ba54aa178ba17de25a447d0f00cac6f01..bd31e3a09394cde823720eb8dca9bc212bce03b6 100644
--- a/test/extrude/232/232.py
+++ b/test/extrude/232/232.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(466,415,466))
-r=w0.workplane(offset=389).moveTo(917,96).box(809,1000,618).union(w0.workplane(offset=599).moveTo(1,943).box(784,784,733))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,465))
+w1=cq.Workplane('YZ',origin=(161,501,501))
+r=w0.sketch().segment((441,562),(526,561)).arc((640,486),(751,561)).segment((841,562)).segment((839,646)).segment((750,644)).arc((716,695),(654,726)).segment((655,1000)).segment((556,1000)).segment((556,690)).arc((542,670),(525,645)).segment((441,646)).close().assemble().finalize().extrude(421).union(w0.sketch().segment((272,551),(366,415)).arc((649,122),(591,531)).segment((671,586)).segment((555,751)).close().assemble().finalize().extrude(684)).union(w1.workplane(offset=534).moveTo(71,361).box(641,521,565))
\ No newline at end of file
diff --git a/test/extrude/232/232.stl b/test/extrude/232/232.stl
index f2f6e87ba576e880aaf6cb94661596d3e4d4dedc..0b0bb693b64ab5952aa5db7089dc08cf2326aae3 100644
Binary files a/test/extrude/232/232.stl and b/test/extrude/232/232.stl differ
diff --git a/test/extrude/233/233.py b/test/extrude/233/233.py
index 699e122d2ccd2487f1cc35cc18da7e449ae0ec50..a4a324041db0560e938c388828cb661a5129339f 100644
--- a/test/extrude/233/233.py
+++ b/test/extrude/233/233.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,391))
-r=w0.sketch().segment((201,271),(481,1)).segment((700,231)).segment((770,231)).segment((770,301)).segment((800,341)).segment((770,371)).segment((770,1000)).segment((381,1000)).segment((381,950)).arc((590,770),(640,491)).segment((341,770)).segment((341,271)).close().assemble().finalize().extrude(720)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,642))
+r=w0.sketch().push([(372,870)]).circle(630).reset().face(w0.sketch().segment((330,250),(421,251)).segment((420,306)).segment((475,306)).arc((539,325),(611,306)).segment((666,307)).segment((664,122)).segment((609,120)).arc((539,102),(477,120)).segment((457,121)).segment((455,26)).segment((445,26)).arc((760,206),(456,410)).segment((455,406)).segment((447,406)).arc((372,340),(331,250)).assemble()).push([(451,539)]).circle(539).finalize().extrude(220)
\ No newline at end of file
diff --git a/test/extrude/233/233.stl b/test/extrude/233/233.stl
index 5ae3c42b988c1d09b920dd9aaa05ff3d2f8d5cfd..92981a7ef63692dd594f59837f8825d8b0ee80c1 100644
Binary files a/test/extrude/233/233.stl and b/test/extrude/233/233.stl differ
diff --git a/test/extrude/234/234.py b/test/extrude/234/234.py
index 9d1e05eea500ab7eec971d830a440df64f072f93..0e96592ab4bb14b11cb2bfd0f4e2f4051dcdcc2d 100644
--- a/test/extrude/234/234.py
+++ b/test/extrude/234/234.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(429,278,429))
-r=w0.sketch().push([(344,1)]).rect(599,465).push([(278,10)]).rect(447,447,mode='s').push([(434,590)]).rect(759,1000).finalize().extrude(741)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,560))
+r=w0.sketch().arc((496,774),(520,765),(541,750)).segment((541,760)).segment((910,761)).segment((911,731)).segment((559,730)).arc((595,601),(525,491)).segment((949,492)).segment((950,1000)).segment((497,999)).close().assemble().finalize().extrude(292).union(w0.sketch().segment((185,914),(191,891)).arc((52,646),(265,457)).segment((272,431)).segment((366,445)).segment((366,469)).arc((499,720),(290,911)).segment((287,935)).close().assemble().push([(272,170)]).circle(671).finalize().extrude(591))
\ No newline at end of file
diff --git a/test/extrude/234/234.stl b/test/extrude/234/234.stl
index dd88f686682fcbd12cd4e42f8c9612b341758628..e6cb64332fbd0be3c076acd9aa56d443dd701e20 100644
Binary files a/test/extrude/234/234.stl and b/test/extrude/234/234.stl differ
diff --git a/test/extrude/235/235.py b/test/extrude/235/235.py
index ae480ee5657acf6f036ea146a824ee2bfe315696..91a02d08710ad1fe2dbd97444dda72553784f2e5 100644
--- a/test/extrude/235/235.py
+++ b/test/extrude/235/235.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(349,349,431))
-r=w0.workplane(offset=82).moveTo(866,129).box(454,1000,884).union(w0.workplane(offset=286).moveTo(895,884).cylinder(477,384)).union(w0.workplane(offset=535).moveTo(1,13).cylinder(721,582)).translate((233,221,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,376))
+r=w0.sketch().segment((156,655),(301,656)).segment((301,665)).segment((317,666)).segment((316,656)).segment((700,656)).segment((701,970)).segment((845,970)).segment((844,999)).segment((156,1000)).close().assemble().push([(450,291)]).circle(789).finalize().extrude(755)
\ No newline at end of file
diff --git a/test/extrude/235/235.stl b/test/extrude/235/235.stl
index ca894ef1a025d540d9e91d48b92c2dd1dd9e27a2..dd343463ce58f92f6f42a4cd5aa52187e06f1f10 100644
Binary files a/test/extrude/235/235.stl and b/test/extrude/235/235.stl differ
diff --git a/test/extrude/236/236.py b/test/extrude/236/236.py
index a82ba0aeda8119a5f058fb14ec59a65fde3ee5b8..ce592950c1cfa159f3c0e9e9b0098e1e58b34821 100644
--- a/test/extrude/236/236.py
+++ b/test/extrude/236/236.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(463,463,688))
-r=w0.sketch().push([(178,329)]).rect(603,796).reset().face(w0.sketch().segment((463,420),(699,216)).segment((1000,560)).segment((764,764)).close().assemble()).push([(731,484)]).circle(603,mode='s').finalize().extrude(1).union(w0.workplane(offset=280).moveTo(87,452).cylinder(828,624)).union(w0.workplane(offset=339).moveTo(500,345).box(839,570,710)).translate((75,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(445,502,499))
+w1=cq.Workplane('ZX',origin=(500,406,499))
+r=w0.sketch().arc((1,611),(106,645),(210,625)).arc((100,700),(1,610)).assemble().reset().face(w0.sketch().arc((694,625),(760,565),(756,474)).segment((1000,477)).segment((1000,871)).segment((696,871)).close().assemble()).finalize().extrude(905).union(w1.sketch().arc((476,629),(135,355),(545,210)).arc((791,444),(516,646)).segment((515,641)).segment((506,640)).close().assemble().finalize().extrude(155))
\ No newline at end of file
diff --git a/test/extrude/236/236.stl b/test/extrude/236/236.stl
index 756115c79526e4801b6e96a0eaef68414a9d8ded..5867a3ccaf9f8c8cc1b9bcfb9f6e829406eb1787 100644
Binary files a/test/extrude/236/236.stl and b/test/extrude/236/236.stl differ
diff --git a/test/extrude/237/237.py b/test/extrude/237/237.py
index 8ebee638618927c40352d83d3428bd84f3ece4e1..83a3a414d0fe1820551be029a8a00288bd0e8aaf 100644
--- a/test/extrude/237/237.py
+++ b/test/extrude/237/237.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(87,363,363))
-r=w0.sketch().arc((515,610),(572,543),(581,458)).arc((591,562),(515,629)).close().assemble().finalize().extrude(267).union(w0.sketch().arc((125,562),(1,39),(486,286)).segment((838,286)).segment((838,753)).segment((125,753)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,451,501))
+r=w0.sketch().segment((220,590),(232,581)).segment((316,626)).segment((312,640)).close().assemble().finalize().extrude(50).union(w0.sketch().segment((116,315),(277,166)).segment((415,316)).segment((275,446)).segment((251,446)).arc((202,365),(116,315)).assemble().finalize().extrude(342)).union(w0.workplane(offset=775).moveTo(541,500).box(1000,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/237/237.stl b/test/extrude/237/237.stl
index 13a7ce5894285d8eb39a86c13213205bbe90ccee..afd0d15444d4db92633a027cd290b1723d08eb45 100644
Binary files a/test/extrude/237/237.stl and b/test/extrude/237/237.stl differ
diff --git a/test/extrude/238/238.py b/test/extrude/238/238.py
index 302e02f996e0c73404bedf3065bf7bb27af482da..ad607d0c9f3bdfced65dde7f37dcbbd5f7f92935 100644
--- a/test/extrude/238/238.py
+++ b/test/extrude/238/238.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(367,367,47))
-r=w0.sketch().segment((62,131),(481,733)).arc((54,588),(62,131)).assemble().reset().face(w0.sketch().arc((253,1),(680,146),(672,603)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,615,500))
+r=w0.sketch().segment((420,2),(581,2)).segment((580,37)).arc((970,500),(582,965)).segment((582,999)).segment((422,1000)).segment((422,965)).arc((31,500),(421,37)).close().assemble().finalize().extrude(265)
\ No newline at end of file
diff --git a/test/extrude/238/238.stl b/test/extrude/238/238.stl
index 9140ec487c9bd5e9a22a9f44c341c3f3d28e7d45..27ed9a9ddbd79d22e898364533227a94a09b1453 100644
Binary files a/test/extrude/238/238.stl and b/test/extrude/238/238.stl differ
diff --git a/test/extrude/239/239.py b/test/extrude/239/239.py
index cf458f2080d63a84bf348c8c1a960f17ae29faa5..4c8e73c855b12a41ad03c6ba889e9fefaaed2e64 100644
--- a/test/extrude/239/239.py
+++ b/test/extrude/239/239.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,371,500))
-r=w0.sketch().arc((111,750),(530,530),(411,71)).segment((570,1)).segment((620,111)).arc((840,331),(850,640)).segment((890,750)).segment((710,830)).arc((610,890),(510,920)).segment((321,1000)).segment((271,890)).arc((181,830),(111,750)).assemble().finalize().extrude(760)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,540))
+r=w0.sketch().arc((350,580),(361,411),(516,336)).arc((491,345),(466,360)).arc((381,422),(357,524)).arc((351,550),(351,581)).assemble().finalize().extrude(1).union(w0.sketch().segment((300,426),(362,345)).segment((701,585)).segment((640,666)).close().assemble().finalize().extrude(960))
\ No newline at end of file
diff --git a/test/extrude/239/239.stl b/test/extrude/239/239.stl
index ef4beffb84d5acbf84c2f231f3128d6de2f049d2..2bc2f0ca33000cd927659dd53d2d8647e0c35aa5 100644
Binary files a/test/extrude/239/239.stl and b/test/extrude/239/239.stl differ
diff --git a/test/extrude/24/24.py b/test/extrude/24/24.py
index e4f7773a36b6104694ae3961c527c1c0433de0c4..36229e346699d6fb32ace7b5969149acb9245006 100644
--- a/test/extrude/24/24.py
+++ b/test/extrude/24/24.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(39,360,360))
-r=w0.sketch().segment((206,513),(296,219)).segment((577,296)).segment((488,590)).close().assemble().finalize().extrude(436).union(w0.workplane(offset=609).moveTo(244,1).box(795,923,859)).union(w0.workplane(offset=680).moveTo(443,757).box(859,846,1000)).translate((1,1,102))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(18,41,44))
+r=w0.sketch().segment((284,705),(828,705)).arc((951,654),(1000,530)).segment((1000,462)).arc((951,338),(828,287)).segment((284,287)).close().assemble().push([(564,527)]).rect(84,47,mode='s').push([(882,388)]).circle(39,mode='s').push([(516,596)]).rect(106,103,mode='s').finalize().extrude(297).translate((1,257,1))
diff --git a/test/extrude/24/24.stl b/test/extrude/24/24.stl
index 1832e208cfe9db2ab3e85c4284af9f230ab3c5c8..77e49d111d91668ee8935804ff032eddf7ddacfb 100644
Binary files a/test/extrude/24/24.stl and b/test/extrude/24/24.stl differ
diff --git a/test/extrude/240/240.py b/test/extrude/240/240.py
index 3cf9917235b891e66b6d55a9372cb890d58752c4..4605633c604a58492bceb8942a10bcd68e17335c 100644
--- a/test/extrude/240/240.py
+++ b/test/extrude/240/240.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(479,479,320))
-r=w0.workplane(offset=548).moveTo(554,511).cylinder(617,596).union(w0.sketch().segment((192,586),(192,766)).segment((362,766)).arc((1,926),(192,586)).assemble().finalize().extrude(713)).union(w0.sketch().push([(192,500)]).circle(586).push([(750,107)]).rect(1000,777).finalize().extrude(798))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(288,265,287))
+r=w0.sketch().push([(145,180)]).circle(431).push([(466,417)]).rect(501,530).push([(464,418)]).rect(346,319,mode='s').finalize().extrude(336)
\ No newline at end of file
diff --git a/test/extrude/240/240.stl b/test/extrude/240/240.stl
index 500c4b98be70f77525e385039a1f9a834225c4d9..cf7ab1d22bd5cd5d7683e6e6fd2ff8fc0ef05942 100644
Binary files a/test/extrude/240/240.stl and b/test/extrude/240/240.stl differ
diff --git a/test/extrude/241/241.py b/test/extrude/241/241.py
index 2cb958a555bfb717f94f8bb39d012396547a88a4..1d03d98ef5ee01158ba81f4f4b42fdd342c6f506 100644
--- a/test/extrude/241/241.py
+++ b/test/extrude/241/241.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).box(694,920,1000).translate((127,1,14))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(506,499,502))
+r=w0.workplane(offset=249).moveTo(661,689).cylinder(1000,600).union(w0.workplane(offset=749).moveTo(257,225).cylinder(994,516))
\ No newline at end of file
diff --git a/test/extrude/241/241.stl b/test/extrude/241/241.stl
index bd911c24f1ed9747872bbbcfcf2e8aca393c336a..50e9ef56c4d86f15443f380e9bb673c3625a5bb7 100644
Binary files a/test/extrude/241/241.stl and b/test/extrude/241/241.stl differ
diff --git a/test/extrude/242/242.py b/test/extrude/242/242.py
index 9eb2ef928661513847a030e5b5720a9d144bcf5b..271320cf25de79425f508be06543a20ab5099452 100644
--- a/test/extrude/242/242.py
+++ b/test/extrude/242/242.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,423,495))
-w1=cq.Workplane('YZ',origin=(794,495,495))
-r=w0.sketch().segment((526,763),(743,763)).arc((856,660),(969,763)).segment((990,763)).segment((990,784)).segment((979,784)).arc((856,897),(743,784)).segment((526,784)).close().assemble().finalize().extrude(166).union(w0.sketch().arc((279,495),(145,1),(454,403)).arc((403,526),(279,495)).assemble().reset().face(w0.sketch().segment((526,629),(918,547)).segment((990,918)).segment((609,1000)).close().assemble()).finalize().extrude(969)).union(w1.sketch().segment((701,310),(712,310)).arc((712,392),(743,464)).segment((701,464)).close().assemble().finalize().extrude(712))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,255))
+w1=cq.Workplane('XY',origin=(500,501,165))
+r=w0.sketch().push([(202,754)]).rect(905,659).reset().face(w0.sketch().segment((440,466),(526,414)).segment((686,395)).arc((704,421),(715,395)).segment((800,386)).segment((791,276)).segment((889,221)).segment((999,421)).segment((550,666)).close().assemble()).finalize().extrude(671).union(w1.sketch().push([(285,354)]).rect(849,874).push([(287,256)]).rect(551,601,mode='s').push([(286,450)]).rect(551,601,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/242/242.stl b/test/extrude/242/242.stl
index 86d5653502a94c873ddf46834399ee682e150dba..b1180c523ad0a47a6875ad1bda4300e2e8544a12 100644
Binary files a/test/extrude/242/242.stl and b/test/extrude/242/242.stl differ
diff --git a/test/extrude/243/243.py b/test/extrude/243/243.py
index 98afe1e6ac822acd431761dee881e59c313fb60f..3d57ab32fc124708df21ac781cb99aa9aa469ab4 100644
--- a/test/extrude/243/243.py
+++ b/test/extrude/243/243.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,260,260))
-w1=cq.Workplane('YZ',origin=(68,260,260))
-r=w0.workplane(offset=150).cylinder(481,510).union(w0.sketch().segment((222,232),(260,212)).segment((280,232)).segment((241,232)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=472).box(568,798,683)).translate((91,251,251))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,195))
+r=w0.sketch().arc((460,551),(710,15),(875,581)).arc((642,985),(461,549)).assemble().push([(655,725)]).circle(571,mode='s').finalize().extrude(842).union(w0.sketch().push([(51,711)]).circle(551).circle(515,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/243/243.stl b/test/extrude/243/243.stl
index c99ee61a492255f1fd3160a7b5e5da708db6f618..e5f8a5c4362a9c59480f97ab01aa2be22397e306 100644
Binary files a/test/extrude/243/243.stl and b/test/extrude/243/243.stl differ
diff --git a/test/extrude/244/244.py b/test/extrude/244/244.py
index bcfb0d8679e72be8195509bcf405cf05a24b6b28..601062f10d41c78110968bc6ff4822b6bd14fa80 100644
--- a/test/extrude/244/244.py
+++ b/test/extrude/244/244.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,647).translate((314,1,314))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,311))
+r=w0.sketch().segment((325,421),(331,422)).arc((631,187),(936,416)).segment((975,377)).segment((1000,400)).segment((944,454)).arc((945,516),(936,579)).segment((676,810)).arc((626,815),(581,811)).segment((510,874)).segment((487,856)).segment((540,799)).arc((406,715),(332,581)).segment((326,581)).close().assemble().finalize().extrude(736).union(w0.sketch().push([(291,415)]).circle(791).push([(103,484)]).rect(676,525,mode='s').finalize().extrude(880))
\ No newline at end of file
diff --git a/test/extrude/244/244.stl b/test/extrude/244/244.stl
index 5a172c91a48d7263228a86e5882c5bbda0ce8504..43b67ab7954cd548b790a721aab517bc3e18834b 100644
Binary files a/test/extrude/244/244.stl and b/test/extrude/244/244.stl differ
diff --git a/test/extrude/245/245.py b/test/extrude/245/245.py
index 803b0535635df0b3424dbecf6f1817a50ec8622a..6d4132acef4370a311b639a3860e2f53939e9ab4 100644
--- a/test/extrude/245/245.py
+++ b/test/extrude/245/245.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(198,198,390))
-r=w0.workplane(offset=1).box(1000,952,591).translate((303,279,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,420))
+r=w0.workplane(offset=386).moveTo(141,361).cylinder(729,639).union(w0.sketch().segment((561,609),(564,424)).segment((999,440)).segment((996,626)).close().assemble().push([(776,196)]).circle(654).circle(640,mode='s').finalize().extrude(587)).union(w0.workplane(offset=698).moveTo(720,755).cylinder(895,705))
\ No newline at end of file
diff --git a/test/extrude/245/245.stl b/test/extrude/245/245.stl
index 4bbe9a93c35960f2e622a1c820ce73533604b7a1..b69501425aa6c9c0a5411d4a15cdc055a3336e2c 100644
Binary files a/test/extrude/245/245.stl and b/test/extrude/245/245.stl differ
diff --git a/test/extrude/246/246.py b/test/extrude/246/246.py
index 3945e2167be0d74576df9fd970cc0f124c8f5563..98431fe3afe78442250ba1c1a029d99e5281a39d 100644
--- a/test/extrude/246/246.py
+++ b/test/extrude/246/246.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(482,482,472))
-r=w0.sketch().segment((814,513),(834,513)).arc((855,503),(865,503)).segment((865,462)).segment((938,462)).segment((938,503)).arc((948,503),(969,513)).segment((990,513)).segment((990,555)).arc((1000,596),(990,627)).segment((990,669)).segment((969,669)).arc((948,679),(938,689)).segment((938,720)).segment((865,720)).segment((865,689)).arc((855,679),(834,669)).segment((814,669)).segment((814,627)).arc((803,596),(814,555)).close().assemble().finalize().extrude(48).union(w0.workplane(offset=710).moveTo(1,400).box(555,793,938))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(765,501,502))
+r=w0.sketch().push([(781,167)]).circle(666).reset().face(w0.sketch().segment((746,151),(756,42)).segment((801,46)).segment((785,157)).close().assemble(),mode='s').circle(511,mode='s').finalize().extrude(1).union(w0.sketch().segment((56,280),(651,280)).segment((650,670)).segment((761,669)).segment((761,999)).segment((147,1000)).segment((145,889)).arc((86,791),(76,681)).segment((56,681)).close().assemble().reset().face(w0.sketch().segment((121,545),(310,431)).segment((405,585)).segment((172,630)).close().assemble(),mode='s').finalize().extrude(477))
\ No newline at end of file
diff --git a/test/extrude/246/246.stl b/test/extrude/246/246.stl
index dcf3aff94a75e0996835c67f8758ff7f5af367be..a5433e5b39a0f153ede74736ba345a3aa3fc9d7f 100644
Binary files a/test/extrude/246/246.stl and b/test/extrude/246/246.stl differ
diff --git a/test/extrude/247/247.py b/test/extrude/247/247.py
index a66c7ff13841381837281d108cbe7887fe1d0cd2..b08b50bbbb0f22f1269c8a3d3ca32a28d28f1dff 100644
--- a/test/extrude/247/247.py
+++ b/test/extrude/247/247.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).cylinder(1000,487).translate((154,154,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,676))
+r=w0.sketch().segment((32,71),(122,71)).arc((270,32),(415,72)).segment((510,70)).segment((511,177)).arc((540,296),(510,416)).segment((511,526)).segment((416,526)).arc((271,565),(121,524)).segment((30,526)).segment((30,415)).arc((2,297),(31,177)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=608).moveTo(941,762).box(619,916,716))
\ No newline at end of file
diff --git a/test/extrude/247/247.stl b/test/extrude/247/247.stl
index 04cc6f784aeda5bb550537261eba31918a568546..f77dceaadb17e103318be7a00b22d3015bec21f6 100644
Binary files a/test/extrude/247/247.stl and b/test/extrude/247/247.stl differ
diff --git a/test/extrude/248/248.py b/test/extrude/248/248.py
index 21c73cd587118a8b2de4a92a97b49e43520d5efc..b1354fcc6a1899cce9a3c90edf6b0c1511c6d9ed 100644
--- a/test/extrude/248/248.py
+++ b/test/extrude/248/248.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(459,468,459))
-r=w0.sketch().segment((102,1),(395,1)).segment((395,111)).arc((248,10),(102,111)).close().assemble().reset().face(w0.sketch().arc((102,239),(248,340),(395,239)).segment((395,349)).segment((102,349)).close().assemble()).finalize().extrude(193).union(w0.workplane(offset=578).moveTo(675,647).box(743,1000,698))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,177))
+r=w0.sketch().arc((107,555),(710,56),(577,831)).arc((251,846),(107,555)).assemble().finalize().extrude(626).union(w0.sketch().segment((277,785),(290,785)).segment((292,522)).segment((861,521)).segment((860,1000)).segment((291,1000)).segment((290,839)).segment((277,842)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/248/248.stl b/test/extrude/248/248.stl
index 284beecd378fc54d660a5fd3c577ef3f096ef0d1..e7bd38708ae19157d70d04341ae9ceec90fda542 100644
Binary files a/test/extrude/248/248.stl and b/test/extrude/248/248.stl differ
diff --git a/test/extrude/249/249.py b/test/extrude/249/249.py
index 553f9dc67743f66b21f1fca29a9e3eea74c58c11..85ef5486b544db6b37609a7dd8f4b3f5c3f9b82f 100644
--- a/test/extrude/249/249.py
+++ b/test/extrude/249/249.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(566,687,566))
-w1=cq.Workplane('XY',origin=(566,566,696))
-r=w0.sketch().segment((670,792),(670,800)).arc((522,514),(800,340)).arc((861,383),(931,409)).arc((991,514),(991,626)).arc((1000,653),(983,670)).arc((852,800),(679,809)).segment((705,809)).segment((705,792)).close().assemble().finalize().extrude(713).union(w1.sketch().segment((262,348),(401,348)).arc((574,288),(757,348)).segment((887,348)).segment((887,783)).segment((757,783)).arc((618,844),(461,818)).arc((383,818),(305,783)).segment((262,783)).segment((262,731)).arc((244,644),(262,548)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,651,500))
+r=w0.sketch().segment((20,382),(157,380)).arc((215,280),(301,200)).segment((301,15)).segment((405,16)).segment((406,1)).segment((601,1)).segment((601,150)).arc((749,236),(846,381)).segment((981,381)).segment((979,620)).segment((844,620)).arc((751,766),(600,849)).segment((600,1000)).segment((406,1000)).segment((407,851)).arc((251,765),(156,621)).segment((21,620)).close().assemble().finalize().extrude(201)
\ No newline at end of file
diff --git a/test/extrude/249/249.stl b/test/extrude/249/249.stl
index d7479824469ca205d2773db1ee6d1029f95db690..a1d351f67a2b8315d864eb7f26e3d7f5c345be06 100644
Binary files a/test/extrude/249/249.stl and b/test/extrude/249/249.stl differ
diff --git a/test/extrude/25/25.py b/test/extrude/25/25.py
index 72f7f790b8997861da8a62b77d0e4fa769c8240c..1a1b0d08bf61ee1565f2c080fa6ec33cc9247cbb 100644
--- a/test/extrude/25/25.py
+++ b/test/extrude/25/25.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(443,164,443))
-r=w0.sketch().arc((376,568),(1,193),(510,328)).arc((885,693),(376,568)).assemble().finalize().extrude(462).union(w0.workplane(offset=721).moveTo(654,558).cylinder(1000,481))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(55,17,58))
+r=w0.sketch().segment((393,1000),(615,1000)).segment((615,298)).segment((393,298)).close().assemble().push([(578,962)]).rect(111,51,mode='s').push([(421,831)]).rect(88,104,mode='s').push([(477,757)]).circle(65,mode='s').push([(537,650)]).rect(85,58,mode='s').finalize().extrude(157)
diff --git a/test/extrude/25/25.stl b/test/extrude/25/25.stl
index 06c7eb279d829f606b540d3b6748f5018dd653a0..90b0210a5d27783012f40d81c4dd48ec8152d729 100644
Binary files a/test/extrude/25/25.stl and b/test/extrude/25/25.stl differ
diff --git a/test/extrude/250/250.py b/test/extrude/250/250.py
index f770fb76f7720b48b76fdc13de4c309a0053db43..f5f2ec60f9b59f89a267de876fe0bb87a2145a6e 100644
--- a/test/extrude/250/250.py
+++ b/test/extrude/250/250.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,654).translate((321,1,321))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,690,500))
+r=w0.sketch().segment((1,355),(137,357)).segment((157,162)).segment((240,171)).segment((221,357)).segment((346,355)).segment((347,475)).segment((211,477)).segment((191,671)).segment((106,660)).segment((127,476)).segment((1,475)).close().assemble().push([(307,409)]).rect(545,565,mode='s').finalize().extrude(122).union(w0.workplane(offset=391).moveTo(725,565).cylinder(719,776))
\ No newline at end of file
diff --git a/test/extrude/250/250.stl b/test/extrude/250/250.stl
index f3752f0b577126540731f3189557e787c1a7da9f..a3aa95b2595538f7560bdddb304bfd59ff3060b4 100644
Binary files a/test/extrude/250/250.stl and b/test/extrude/250/250.stl differ
diff --git a/test/extrude/251/251.py b/test/extrude/251/251.py
index 3c70eca870ec6d3f69de708b8a5fcd95fe3fc0cb..c65e7c3df658ef95eb91a8e4c480bf28779a186f 100644
--- a/test/extrude/251/251.py
+++ b/test/extrude/251/251.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(500,500,500))
-r=w0.sketch().segment((710,1),(940,1)).segment((940,441)).segment((830,441)).arc((790,361),(710,331)).close().assemble().finalize().extrude(431).union(w0.sketch().segment((61,970),(101,560)).segment((381,590)).segment((361,800)).segment((441,680)).segment((481,700)).segment((361,890)).segment((351,1000)).close().assemble().push([(820,221)]).circle(610).finalize().extrude(560))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(745,500,500))
+r=w0.sketch().segment((485,236),(501,175)).arc((501,106),(542,52)).segment((556,2)).arc((456,500),(716,62)).segment((705,102)).arc((705,172),(665,220)).segment((644,286)).close().assemble().finalize().extrude(11).union(w0.sketch().segment((286,366),(321,366)).segment((321,580)).arc((409,684),(321,791)).segment((321,999)).segment((285,1000)).segment((285,791)).arc((196,685),(287,580)).close().assemble().reset().face(w0.sketch().segment((320,745),(342,727)).segment((377,750)).segment((356,776)).close().assemble(),mode='s').finalize().extrude(167))
\ No newline at end of file
diff --git a/test/extrude/251/251.stl b/test/extrude/251/251.stl
index 565b8a9c9e8e9cd1697854c4ac5d125830c90ca9..86c492e4d149c4f1a7b8b3c473b025b20772a27c 100644
Binary files a/test/extrude/251/251.stl and b/test/extrude/251/251.stl differ
diff --git a/test/extrude/252/252.py b/test/extrude/252/252.py
index e99b71e4c5ad6f544136d33daaa2321886e666d9..f8d99336ff6fa3f7f0b7f40330c30e536d1cec65 100644
--- a/test/extrude/252/252.py
+++ b/test/extrude/252/252.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(474,285,474))
-w1=cq.Workplane('ZX',origin=(474,264,474))
-r=w0.sketch().arc((54,380),(401,316),(348,663)).arc((12,716),(54,380)).assemble().reset().face(w0.sketch().segment((33,653),(169,411)).segment((295,485)).segment((148,727)).close().assemble(),mode='s').reset().face(w0.sketch().arc((64,369),(390,327),(359,653)).arc((306,411),(64,369)).assemble(),mode='s').finalize().extrude(621).union(w1.sketch().arc((453,327),(1000,474),(453,621)).arc((1,474),(453,327)).assemble().push([(253,474)]).circle(611,mode='s').finalize().extrude(895))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(340,501,500))
+r=w0.sketch().segment((495,1),(506,1)).segment((506,161)).arc((840,500),(505,840)).segment((507,999)).segment((496,999)).segment((494,840)).arc((162,499),(494,161)).close().assemble().finalize().extrude(826)
\ No newline at end of file
diff --git a/test/extrude/252/252.stl b/test/extrude/252/252.stl
index 6ba4086056d0cb03fd2785ee2f5b6040238b0ee5..8cab314595a434604e575183218d17330b4b73da 100644
Binary files a/test/extrude/252/252.stl and b/test/extrude/252/252.stl differ
diff --git a/test/extrude/253/253.py b/test/extrude/253/253.py
index d69bb4a8ed7a199da1cd357194ba445c1167fce1..6da065825bdb76633331a1892f6a3e3ea2bb7bc0 100644
--- a/test/extrude/253/253.py
+++ b/test/extrude/253/253.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(464,464,392))
-r=w0.sketch().segment((217,300),(351,258)).arc((444,1),(681,145)).segment((712,135)).segment((804,413)).segment((310,578)).close().assemble().push([(866,866)]).circle(578).finalize().extrude(145).union(w0.sketch().push([(73,629)]).circle(588).reset().face(w0.sketch().segment((341,382),(351,310)).segment((670,331)).segment((670,403)).close().assemble()).finalize().extrude(753)).union(w0.workplane(offset=696).moveTo(748,217).box(722,1000,928)).translate((52,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,380,500))
+r=w0.workplane(offset=518).moveTo(561,703).box(700,1000,536).union(w0.sketch().segment((66,660),(240,660)).segment((242,530)).segment((636,530)).segment((636,81)).segment((282,80)).segment((280,1)).segment((934,1)).segment((935,706)).segment((596,706)).segment((695,974)).segment((636,1000)).segment((525,705)).segment((281,704)).segment((105,706)).close().assemble().finalize().extrude(746))
\ No newline at end of file
diff --git a/test/extrude/253/253.stl b/test/extrude/253/253.stl
index 341173b3441b4ff1a483605ac25488e51a6495db..043ba008659e00701a3e356beb596e8f04a2211c 100644
Binary files a/test/extrude/253/253.stl and b/test/extrude/253/253.stl differ
diff --git a/test/extrude/254/254.py b/test/extrude/254/254.py
index 99626bd5a9bfcb3420b1b7a6ae73a7144eb4162f..29e6e40f65c0f9a7fbedd3746664c91e2c46a1fb 100644
--- a/test/extrude/254/254.py
+++ b/test/extrude/254/254.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(634,456,456))
-w1=cq.Workplane('ZX',origin=(456,500,456))
-r=w0.sketch().arc((600,1000),(378,567),(822,767)).arc((778,956),(600,1000)).assemble().reset().face(w0.sketch().segment((534,778),(545,711)).segment((600,722)).segment((589,778)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=623).moveTo(356,179).cylinder(789,734)).union(w1.workplane(offset=484).moveTo(295,162).box(556,889,512)).translate((1,1,100))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,501,501))
+r=w0.sketch().arc((265,725),(502,275),(735,725)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/254/254.stl b/test/extrude/254/254.stl
index 3239471746c408eccb5aeb38907fe0816f81a379..3a3b4d128c7689db34563867418a34e8baeb3994 100644
Binary files a/test/extrude/254/254.stl and b/test/extrude/254/254.stl differ
diff --git a/test/extrude/255/255.py b/test/extrude/255/255.py
index 73032dae33669afa821b45adb940e88f4ec6c291..cd7b8decdbb9ad59e8960a3b53553b4cd0fe0a72 100644
--- a/test/extrude/255/255.py
+++ b/test/extrude/255/255.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(599,607,607))
-w1=cq.Workplane('ZX',origin=(607,906,607))
-r=w0.workplane(offset=485).moveTo(803,520).cylinder(851,693).union(w1.sketch().segment((607,213),(756,213)).arc((615,426),(717,662)).segment((780,662)).segment((780,1000)).segment((717,1000)).segment((717,685)).segment((607,685)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(283,138,283))
+w1=cq.Workplane('YZ',origin=(98,284,284))
+r=w0.workplane(offset=466).moveTo(284,140).cylinder(565,422).union(w1.sketch().push([(219,283)]).circle(436).rect(289,520,mode='s').finalize().extrude(565))
\ No newline at end of file
diff --git a/test/extrude/255/255.stl b/test/extrude/255/255.stl
index 3e3d14ff2a27b022ed7b237de6c5427c266c7f76..ddec8467567e7928622db22ed40c99441b98f511 100644
Binary files a/test/extrude/255/255.stl and b/test/extrude/255/255.stl differ
diff --git a/test/extrude/256/256.py b/test/extrude/256/256.py
index d86fee5caa48e54c5eaab9ac6c6f13ffa8a8f25f..b5768f4b7fcffbc75631bf10d57f75cb1ae79d7b 100644
--- a/test/extrude/256/256.py
+++ b/test/extrude/256/256.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(58,1,58))
-r=w0.workplane(offset=119).box(472,1000,180).translate((443,1,179))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,499,230))
+r=w0.sketch().segment((447,72),(595,72)).segment((591,12)).segment((765,1)).segment((771,70)).segment((960,72)).segment((961,664)).segment((810,666)).segment((811,730)).segment((637,741)).segment((630,666)).segment((446,665)).close().assemble().push([(757,36)]).rect(516,519,mode='s').finalize().extrude(316).union(w0.workplane(offset=606).moveTo(406,731).box(1000,641,710)).union(w0.workplane(offset=864).moveTo(405,731).cylinder(1000,771))
\ No newline at end of file
diff --git a/test/extrude/256/256.stl b/test/extrude/256/256.stl
index ff088e3f0fbdf748846b27286a4a2e1435a8ad09..6a742ec3ac4bdc7ce6775f72d08a13025f14d17f 100644
Binary files a/test/extrude/256/256.stl and b/test/extrude/256/256.stl differ
diff --git a/test/extrude/257/257.py b/test/extrude/257/257.py
index 074c589c11782486f496c3eb6c12544b5a427f20..4f66e518b82511e31d652030e4507da556bdbc4e 100644
--- a/test/extrude/257/257.py
+++ b/test/extrude/257/257.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(491,491,236))
-r=w0.sketch().segment((1,275),(941,236)).segment((912,393)).segment((971,403)).segment((980,706)).segment((21,745)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,442))
+r=w0.sketch().segment((496,122),(999,121)).segment((1000,621)).segment((577,621)).arc((17,691),(497,397)).close().assemble().finalize().extrude(566).union(w0.workplane(offset=560).moveTo(747,368).box(656,557,622))
\ No newline at end of file
diff --git a/test/extrude/257/257.stl b/test/extrude/257/257.stl
index 649c15f1b2a29509417267587f98b21871c4272b..3b932267be657cbcc3b0307b6b1cf166666389c8 100644
Binary files a/test/extrude/257/257.stl and b/test/extrude/257/257.stl differ
diff --git a/test/extrude/258/258.py b/test/extrude/258/258.py
index 0672b504f997f322601dae9819172bc148f9fd13..9a1409e609729cf9871e98ec094afbfadc70173c 100644
--- a/test/extrude/258/258.py
+++ b/test/extrude/258/258.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(429,446,429))
-w1=cq.Workplane('XY',origin=(429,429,646))
-r=w0.sketch().rect(1000,498).rect(498,463,mode='s').finalize().extrude(675).union(w1.sketch().segment((406,167),(452,167)).segment((452,269)).segment((441,269)).segment((441,264)).segment((429,264)).segment((429,269)).segment((406,269)).close().assemble().finalize().extrude(1)).translate((1,1,72))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(665,501,501))
+w1=cq.Workplane('ZX',origin=(499,400,500))
+r=w0.sketch().push([(320,508)]).rect(880,886).reset().face(w0.sketch().arc((271,590),(301,556),(321,595)).arc((291,651),(270,591)).assemble(),mode='s').finalize().extrude(461).union(w0.sketch().segment((156,485),(174,449)).segment((464,450)).segment((464,411)).segment((191,411)).segment((291,200)).segment((736,404)).segment((714,445)).arc((516,440),(389,591)).close().assemble().finalize().extrude(620)).union(w0.workplane(offset=669).moveTo(572,279).box(615,940,836)).union(w1.sketch().segment((291,341),(534,341)).arc((821,25),(725,441)).segment((726,736)).segment((460,735)).arc((204,831),(290,571)).close().assemble().finalize().extrude(971))
\ No newline at end of file
diff --git a/test/extrude/258/258.stl b/test/extrude/258/258.stl
index e791951ac234e6778a51814af4a9ea4536c7bf00..6ef5a77baeeb9f47cfc52f7967fb5e5f6434a4cd 100644
Binary files a/test/extrude/258/258.stl and b/test/extrude/258/258.stl differ
diff --git a/test/extrude/259/259.py b/test/extrude/259/259.py
index 4af339092b52fe4ac6dfd2e3ef69f089c65b8053..28577e4e7ca0161a7bbde86644520508312b36f9 100644
--- a/test/extrude/259/259.py
+++ b/test/extrude/259/259.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,546,495))
-r=w0.sketch().arc((284,667),(304,516),(455,475)).arc((495,415),(556,364)).segment((566,445)).segment((879,395)).arc((919,768),(536,818)).arc((354,839),(284,667)).assemble().push([(405,606)]).circle(506,mode='s').finalize().extrude(384).union(w0.sketch().segment((324,1),(324,415)).segment((526,415)).segment((526,566)).arc((596,697),(526,828)).segment((526,1000)).segment((344,1000)).segment((344,828)).arc((273,697),(344,566)).segment((344,425)).arc((11,233),(324,1)).assemble().reset().face(w0.sketch().segment((344,627),(344,768)).arc((324,697),(344,627)).assemble(),mode='s').reset().face(w0.sketch().arc((526,627),(556,697),(526,768)).close().assemble(),mode='s').finalize().extrude(455))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,516,500))
+r=w0.sketch().push([(210,716)]).rect(921,780).push([(741,441)]).circle(761).reset().face(w0.sketch().segment((719,216),(769,216)).segment((770,256)).arc((736,631),(719,256)).close().assemble(),mode='s').finalize().extrude(135).union(w0.workplane(offset=665).moveTo(739,440).box(1000,1000,830))
\ No newline at end of file
diff --git a/test/extrude/259/259.stl b/test/extrude/259/259.stl
index d0c7d28cbeac184612b849b6b21268a132686768..59c2bb5545bd40ebcc89b5087832aed5752742ea 100644
Binary files a/test/extrude/259/259.stl and b/test/extrude/259/259.stl differ
diff --git a/test/extrude/26/26.py b/test/extrude/26/26.py
index d7e5923fbcd70892620b8b864b0b35a9edd3d16c..d73ee5c04527f89ac90142c6a240191c48cdb073 100644
--- a/test/extrude/26/26.py
+++ b/test/extrude/26/26.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(368,285,368))
-w1=cq.Workplane('ZX',origin=(368,184,368))
-r=w0.sketch().push([(358,230)]).circle(688).circle(624,mode='s').finalize().extrude(1).union(w0.sketch().arc((679,780),(679,789),(688,789)).arc((652,798),(679,780)).assemble().finalize().extrude(542)).union(w1.sketch().segment((267,588),(386,588)).segment((386,569)).segment((276,569)).arc((496,633),(267,588)).assemble().finalize().extrude(1000)).translate((91,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(78,48,27))
+r=w0.sketch().segment((190,888),(920,888)).segment((920,158)).segment((190,158)).close().assemble().push([(515,489)]).circle(143,mode='s').finalize().extrude(307)
diff --git a/test/extrude/26/26.stl b/test/extrude/26/26.stl
index d6deecb54bc293092a9c7f3ba797419d4d562f1d..261a25b9f066d7da233760dd3d24868322368216 100644
--- a/test/extrude/26/26.stl
+++ b/test/extrude/26/26.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:259b2f85e9291158b67881e8f2ee3dc3bcb3cf65f52650b2d6c962a49150e018
-size 110484
+oid sha256:2ff5bd4b087bf698b45996852170823609e554651e0f2b8a76ceb90971ac8b8a
+size 26084
diff --git a/test/extrude/260/260.py b/test/extrude/260/260.py
index fe5ad33fdd43da6315a5e0a3a13c982e3005e385..e19845c6e573f3d7af387e10a238f3a467ba7133 100644
--- a/test/extrude/260/260.py
+++ b/test/extrude/260/260.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(384,208,384))
-w1=cq.Workplane('ZX',origin=(384,32,384))
-r=w0.sketch().arc((393,384),(578,287),(754,384)).close().assemble().reset().face(w0.sketch().segment((393,613),(754,613)).arc((578,710),(393,613)).assemble()).finalize().extrude(120).union(w0.workplane(offset=692).moveTo(573,498).box(833,754,1000)).union(w1.sketch().push([(14,225)]).rect(472,718).push([(1,181)]).rect(428,401,mode='s').finalize().extrude(578))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(261,260,315))
+r=w0.sketch().segment((417,186),(417,245)).segment((422,245)).arc((417,271),(417,297)).arc((378,161),(520,181)).arc((492,183),(469,191)).segment((469,186)).close().assemble().finalize().extrude(121).union(w0.sketch().push([(147,336)]).circle(407).reset().face(w0.sketch().segment((419,41),(445,41)).segment((446,46)).arc((495,106),(445,169)).segment((445,172)).segment((419,173)).segment((419,168)).arc((371,106),(419,47)).close().assemble()).push([(422,56)]).circle(267,mode='s').finalize().extrude(293))
\ No newline at end of file
diff --git a/test/extrude/260/260.stl b/test/extrude/260/260.stl
index 6f351a1433046e29cfca3c81d963da872ccade4e..1ff03588ca3fabe967423c298ffe649205a17f09 100644
Binary files a/test/extrude/260/260.stl and b/test/extrude/260/260.stl differ
diff --git a/test/extrude/261/261.py b/test/extrude/261/261.py
index f281d62824ea86d16ad9feb00d2a85ed28814710..9c61fd78fd14a8d9846a2e13cbed70a53c205255 100644
--- a/test/extrude/261/261.py
+++ b/test/extrude/261/261.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(463,592,463))
-r=w0.workplane(offset=286).moveTo(468,151).box(774,807,817).union(w0.sketch().push([(313,151)]).circle(688).circle(603,mode='s').push([(280,1)]).circle(474,mode='s').reset().face(w0.sketch().arc((495,753),(667,635),(839,753)).segment((817,753)).arc((828,817),(817,882)).segment((839,882)).arc((667,1000),(495,882)).segment((517,882)).arc((506,817),(517,753)).close().assemble()).finalize().extrude(549)).translate((76,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(605,502,502))
+r=w0.sketch().segment((202,103),(586,102)).segment((586,192)).arc((735,328),(586,455)).segment((586,546)).segment((293,547)).arc((79,780),(201,486)).close().assemble().push([(988,767)]).rect(527,765).finalize().extrude(287)
\ No newline at end of file
diff --git a/test/extrude/261/261.stl b/test/extrude/261/261.stl
index cae1c4707f311288756ae80e63f8f0ac53183de8..ea013c39755a573ad72e06cf05f43cd8b3a173da 100644
Binary files a/test/extrude/261/261.stl and b/test/extrude/261/261.stl differ
diff --git a/test/extrude/262/262.py b/test/extrude/262/262.py
index d577b2c67bbea7b079dc826b4226c694ec31e6ae..ef93029302370ca46ec51eb4a3a241bc69d1ce48 100644
--- a/test/extrude/262/262.py
+++ b/test/extrude/262/262.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(213,426,213))
-r=w0.workplane(offset=1).box(701,1000,638).translate((288,1,139))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(486,500,499))
+r=w0.sketch().push([(171,256)]).circle(571).reset().face(w0.sketch().segment((505,195),(602,2)).segment((900,145)).segment((686,591)).segment((594,545)).arc((217,450),(504,195)).assemble()).push([(460,72)]).circle(556).push([(684,944)]).circle(555).finalize().extrude(530)
\ No newline at end of file
diff --git a/test/extrude/262/262.stl b/test/extrude/262/262.stl
index 27aefd3febfca25c58c08bcecbbe02a6e32822a9..3edf6c28d74945cf41ad541fb824530338ecf1ab 100644
Binary files a/test/extrude/262/262.stl and b/test/extrude/262/262.stl differ
diff --git a/test/extrude/263/263.py b/test/extrude/263/263.py
index 2be94ff721ba1e9d42817ce5f023b356d4bd70ff..ea5da7e74a54732041f0dd3613f6fa4a82135f38 100644
--- a/test/extrude/263/263.py
+++ b/test/extrude/263/263.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).cylinder(1000,607).translate((274,274,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(167,501,499))
+r=w0.sketch().segment((1,306),(120,306)).arc((500,130),(880,305)).segment((1000,306)).segment((1000,870)).arc((820,674),(575,564)).segment((574,475)).segment((425,475)).segment((425,550)).arc((195,600),(2,730)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/263/263.stl b/test/extrude/263/263.stl
index c2d52467332bda1f39d9c27f0bbda1425e473bcc..52eb68b6ca6df04f20c15362f6905265b3f2a2b3 100644
Binary files a/test/extrude/263/263.stl and b/test/extrude/263/263.stl differ
diff --git a/test/extrude/264/264.py b/test/extrude/264/264.py
index d409e366bf7c7ef8ea1cbba01a22d90b841b2b84..7bbfccb04d3c97b8f71456a8129ae27fc237181b 100644
--- a/test/extrude/264/264.py
+++ b/test/extrude/264/264.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(448,205,448))
-w1=cq.Workplane('XY',origin=(448,448,581))
-r=w0.workplane(offset=327).moveTo(84,360).box(492,713,691).union(w0.sketch().segment((757,371),(790,371)).segment((790,393)).segment((1000,393)).segment((1000,581)).segment((901,581)).arc((879,592),(845,581)).segment((757,581)).close().assemble().finalize().extrude(636)).union(w0.workplane(offset=586).moveTo(1,244).box(658,768,724)).union(w1.sketch().push([(707,752)]).rect(658,812).push([(713,807)]).rect(581,569,mode='s').push([(779,592)]).circle(470,mode='s').finalize().extrude(625))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,535,500))
+r=w0.sketch().segment((420,586),(491,586)).arc((771,389),(581,671)).segment((580,765)).segment((420,765)).close().assemble().finalize().extrude(266).union(w0.sketch().push([(172,686)]).circle(669).push([(311,635)]).circle(510,mode='s').finalize().extrude(542)).union(w0.sketch().segment((580,147),(1000,147)).segment((1000,375)).segment((989,376)).segment((990,501)).segment((975,500)).segment((975,376)).segment((580,376)).close().assemble().finalize().extrude(660))
\ No newline at end of file
diff --git a/test/extrude/264/264.stl b/test/extrude/264/264.stl
index 81078f223fb9fc5219690a218f2b1a9b3ab4e420..be889d3d57df41cde43fa40e6b8f73b0426a7d8d 100644
Binary files a/test/extrude/264/264.stl and b/test/extrude/264/264.stl differ
diff --git a/test/extrude/265/265.py b/test/extrude/265/265.py
index 71298f8a252e2049a144112bb61a03b3af11afcd..0af2bd74b3ab7c4152ecaef41032a1fcf11d1e4d 100644
--- a/test/extrude/265/265.py
+++ b/test/extrude/265/265.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,331,500))
-r=w0.sketch().segment((1,471),(321,161)).segment((471,321)).segment((690,411)).segment((750,181)).segment((1000,251)).segment((950,431)).arc((960,510),(900,580)).segment((890,610)).segment((680,550)).segment((560,840)).segment((281,720)).segment((261,740)).close().assemble().reset().face(w0.sketch().segment((421,590),(491,520)).segment((530,520)).segment((530,600)).segment((421,600)).close().assemble(),mode='s').finalize().extrude(820).union(w0.workplane(offset=670).moveTo(471,560).cylinder(840,600))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(548,498,499))
+r=w0.sketch().arc((98,897),(457,104),(953,812)).segment((952,644)).segment((247,642)).segment((215,627)).segment((208,642)).segment((157,642)).segment((158,762)).close().assemble().finalize().extrude(403)
\ No newline at end of file
diff --git a/test/extrude/265/265.stl b/test/extrude/265/265.stl
index 71346458a567ef48c83b6d0356a00822580fc0b7..b30a777c4cc5ce8666d434543fb3784e3872523e 100644
Binary files a/test/extrude/265/265.stl and b/test/extrude/265/265.stl differ
diff --git a/test/extrude/266/266.py b/test/extrude/266/266.py
index e35e1dda011a145e8744c5f8e49ce5d6944ac64d..773940d1ffcc0752792c4ab54f4ee7ebf90a96ac 100644
--- a/test/extrude/266/266.py
+++ b/test/extrude/266/266.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(558,758,558))
-w1=cq.Workplane('YZ',origin=(558,558,558))
-r=w0.sketch().push([(348,642)]).circle(769).rect(748,727,mode='s').finalize().extrude(1).union(w0.sketch().push([(180,348)]).circle(706).circle(600,mode='s').reset().face(w0.sketch().segment((180,579),(243,579)).arc((348,527),(453,579)).segment((506,579)).segment((506,695)).segment((453,695)).arc((348,758),(243,695)).segment((180,695)).close().assemble()).finalize().extrude(359)).union(w0.sketch().push([(348,642)]).circle(832).circle(748,mode='s').finalize().extrude(716)).union(w1.workplane(offset=653).moveTo(685,900).box(1000,926,748))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,780))
+r=w0.sketch().segment((1,665),(81,410)).segment((450,530)).arc((706,220),(731,621)).segment((1000,711)).segment((920,961)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=588).moveTo(641,148).box(899,716,674))
\ No newline at end of file
diff --git a/test/extrude/266/266.stl b/test/extrude/266/266.stl
index 2588f104a3e8b8fdcf61510ab8c81e9dbd6b5b9a..60fde365550bc26e789139a1eb80cb55e31ac482 100644
Binary files a/test/extrude/266/266.stl and b/test/extrude/266/266.stl differ
diff --git a/test/extrude/267/267.py b/test/extrude/267/267.py
index 1ae1ff66fb6dd419f3ac960d2ae5f76ab3dd71c0..1a6b705f3b0f07ac147212e73334602dac1a6bc2 100644
--- a/test/extrude/267/267.py
+++ b/test/extrude/267/267.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(720,500,500))
-r=w0.sketch().segment((1,600),(211,211)).segment((630,431)).segment((1000,431)).segment((1000,461)).segment((680,461)).segment((840,550)).segment((800,630)).arc((540,610),(351,790)).close().assemble().finalize().extrude(61)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(826,500,500))
+r=w0.sketch().arc((145,451),(246,506),(359,511)).segment((360,1000)).segment((147,999)).close().assemble().push([(794,62)]).circle(560).finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/267/267.stl b/test/extrude/267/267.stl
index db3bb619e4c9f306fc3412da2f2a94b55096e934..604389248082e4afa72bca591eefd41b43a450a6 100644
Binary files a/test/extrude/267/267.stl and b/test/extrude/267/267.stl differ
diff --git a/test/extrude/268/268.py b/test/extrude/268/268.py
index 319c824c0dc1c9d492dbf0e4ff5bf5b03b0e8015..dbfdb76afd59aaaa54d139de013b9e39a4e926d4 100644
--- a/test/extrude/268/268.py
+++ b/test/extrude/268/268.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(401,401,161))
-w1=cq.Workplane('XY',origin=(401,401,41))
-r=w0.sketch().segment((1,473),(233,145)).segment((393,257)).segment((161,584)).close().assemble().finalize().extrude(1000).union(w1.sketch().segment((433,369),(441,369)).segment((441,297)).segment((800,297)).segment((800,369)).segment((800,584)).segment((800,656)).segment((441,656)).segment((441,584)).segment((433,584)).close().assemble().reset().face(w1.sketch().segment((441,528),(449,528)).arc((784,417),(457,544)).segment((441,544)).close().assemble(),mode='s').finalize().extrude(441))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(440,501,502))
+w1=cq.Workplane('XY',origin=(500,500,425))
+r=w0.sketch().push([(146,252)]).circle(645).reset().face(w0.sketch().segment((725,320),(1000,320)).segment((999,631)).segment((725,630)).segment((726,589)).arc((411,501),(725,406)).close().assemble()).finalize().extrude(221).union(w0.workplane(offset=460).moveTo(440,709).cylinder(580,731)).union(w0.workplane(offset=503).moveTo(306,66).box(890,510,507)).union(w1.sketch().segment((285,551),(596,550)).arc((830,486),(620,611)).segment((285,611)).close().assemble().finalize().extrude(800))
\ No newline at end of file
diff --git a/test/extrude/268/268.stl b/test/extrude/268/268.stl
index b6ff395c2732c7589a71fbecf8308a77532a46a6..4bb2cb2bccca0688e6518d6fb3962379f80fea9d 100644
Binary files a/test/extrude/268/268.stl and b/test/extrude/268/268.stl differ
diff --git a/test/extrude/269/269.py b/test/extrude/269/269.py
index 3519e9c3cb9f97460f358df54579b2e940ebcac0..ef05fe820ae91a5880f13ae117cfbc80bca5c1f0 100644
--- a/test/extrude/269/269.py
+++ b/test/extrude/269/269.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(606,572,572))
-r=w0.sketch().push([(509,1000)]).rect(880,857).push([(486,977)]).rect(583,743,mode='s').finalize().extrude(115).union(w0.sketch().segment((618,12),(629,1)).segment((789,184)).segment((777,195)).close().assemble().finalize().extrude(949))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(447,500,500))
+r=w0.sketch().push([(614,198)]).rect(945,746).reset().face(w0.sketch().segment((516,206),(525,196)).segment((526,90)).segment((611,91)).segment((621,82)).segment((635,91)).segment((680,91)).segment((681,131)).segment((689,140)).segment((679,156)).segment((680,255)).segment((596,257)).segment((584,272)).segment((570,257)).segment((526,256)).segment((526,222)).close().assemble(),mode='s').finalize().extrude(57).union(w0.sketch().segment((165,206),(315,205)).segment((315,594)).arc((462,590),(559,696)).segment((714,694)).segment((716,786)).segment((565,784)).arc((391,925),(220,786)).segment((166,785)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/269/269.stl b/test/extrude/269/269.stl
index e5013a0434abb9674cab1e816efbea3ca652c7c6..c323e35a6ced233e7943c3df9e1b785554066198 100644
Binary files a/test/extrude/269/269.stl and b/test/extrude/269/269.stl differ
diff --git a/test/extrude/27/27.py b/test/extrude/27/27.py
index 15a12c8cb59e97bb38ed5e15c4d6201c7ad20a08..33a59cb9194d150b533710fb7d041cc21e738a17 100644
--- a/test/extrude/27/27.py
+++ b/test/extrude/27/27.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(422,494,422))
-r=w0.sketch().segment((446,398),(723,398)).arc((1000,434),(868,687)).segment((868,844)).segment((446,844)).close().assemble().reset().face(w0.sketch().segment((494,711),(555,603)).segment((771,711)).segment((711,819)).close().assemble(),mode='s').finalize().extrude(49).union(w0.sketch().segment((49,1),(338,1)).segment((49,109)).close().assemble().finalize().extrude(494)).union(w0.workplane(offset=531).moveTo(1,639).cylinder(639,603)).translate((1,1,181))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(75,8,15))
+r=w0.sketch().segment((978,116),(366,116)).segment((366,534)).segment((978,534)).close().assemble().push([(642,328)]).rect(153,94,mode='s').finalize().extrude(105)
diff --git a/test/extrude/27/27.stl b/test/extrude/27/27.stl
index 08842c01ab65ff3284a1db48be24094e6936dc42..ddf1160ead1d39e588b2f70725478f17d081976f 100644
Binary files a/test/extrude/27/27.stl and b/test/extrude/27/27.stl differ
diff --git a/test/extrude/270/270.py b/test/extrude/270/270.py
index 578bb1334877d4df16c41eb3cd9d68463f327ba4..2498dd261340de767d7216b0c1768543806fe19f 100644
--- a/test/extrude/270/270.py
+++ b/test/extrude/270/270.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,796).translate((463,1,463))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(366,499,501))
+w1=cq.Workplane('ZX',origin=(500,419,500))
+r=w0.sketch().segment((1,565),(176,566)).segment((176,497)).segment((386,491)).segment((392,564)).segment((571,565)).segment((570,695)).segment((396,696)).segment((396,766)).segment((181,771)).segment((181,695)).segment((2,695)).close().assemble().finalize().extrude(1000).union(w1.sketch().segment((240,102),(637,101)).segment((634,350)).arc((646,421),(636,491)).segment((635,739)).segment((241,740)).segment((242,490)).arc((232,421),(241,352)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/270/270.stl b/test/extrude/270/270.stl
index 0e7fe5e5d598f157c0c788e6f77f8ba15afdac82..978a9c4d6f14a5ac74deddd01b5ce6d83c9a842f 100644
Binary files a/test/extrude/270/270.stl and b/test/extrude/270/270.stl differ
diff --git a/test/extrude/271/271.py b/test/extrude/271/271.py
index 880a773adbfff401fc0567cde83f854f79ffe34e..f325a3217f57ba08f1a699cc0d57ad1a32620b4a 100644
--- a/test/extrude/271/271.py
+++ b/test/extrude/271/271.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((28,128),(101,128)).arc((274,68),(441,128)).segment((520,128)).segment((520,227)).arc((540,334),(520,441)).segment((520,540)).segment((441,540)).arc((274,600),(101,540)).segment((28,540)).segment((28,441)).arc((8,334),(28,227)).close().assemble().finalize().extrude(973).union(w0.workplane(offset=667).moveTo(474,384).box(707,381,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,571))
+w1=cq.Workplane('ZX',origin=(500,320,500))
+r=w0.workplane(offset=603).moveTo(683,138).box(616,514,704).union(w0.sketch().arc((675,451),(495,626),(740,572)).arc((286,739),(676,451)).assemble().finalize().extrude(931)).union(w1.sketch().segment((1,406),(442,405)).arc((221,574),(1,406)).assemble().finalize().extrude(471))
\ No newline at end of file
diff --git a/test/extrude/271/271.stl b/test/extrude/271/271.stl
index 67bb9ee18facfde412d0df7b98c78eb58ea4cf3f..8e7132e02529482e73432c87999f20d5bd4d613b 100644
Binary files a/test/extrude/271/271.stl and b/test/extrude/271/271.stl differ
diff --git a/test/extrude/272/272.py b/test/extrude/272/272.py
index c9e3e330b689c9be3e2b494180ee9d89d6206385..0e98877f7706a13e1aea1a5f2c2f100980435569 100644
--- a/test/extrude/272/272.py
+++ b/test/extrude/272/272.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(485,653,485))
-r=w0.sketch().push([(33,117)]).circle(506).push([(522,1)]).rect(558,569).reset().face(w0.sketch().arc((779,1000),(895,926),(926,790)).arc((937,958),(779,1000)).assemble()).finalize().extrude(148)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,750))
+r=w0.sketch().segment((414,621),(420,621)).arc((704,407),(990,620)).segment((996,621)).segment((994,640)).arc((1000,701),(996,761)).segment((994,785)).segment((990,785)).arc((704,994),(420,785)).segment((415,785)).segment((417,761)).arc((410,700),(416,640)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=405).moveTo(364,371).cylinder(690,865))
\ No newline at end of file
diff --git a/test/extrude/272/272.stl b/test/extrude/272/272.stl
index 45dbea0017876beece5273b2a0bf1ac9517fc6e4..f701d07ade967eff74ae0d9e044c1349da0f181c 100644
Binary files a/test/extrude/272/272.stl and b/test/extrude/272/272.stl differ
diff --git a/test/extrude/273/273.py b/test/extrude/273/273.py
index d626b10c481e8b64983eca401aa2b5d9b0e8cedf..3b4f9c3f549ab02c360ba22f5708cc59a88fb15b 100644
--- a/test/extrude/273/273.py
+++ b/test/extrude/273/273.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(541,786,541))
-w1=cq.Workplane('XY',origin=(541,541,592))
-r=w0.sketch().segment((541,368),(817,368)).segment((817,429)).arc((1000,827),(562,898)).segment((541,898)).segment((541,867)).arc((480,704),(541,531)).close().assemble().finalize().extrude(786).union(w0.workplane(offset=674).moveTo(388,134).cylinder(806,551)).union(w1.sketch().push([(174,210)]).rect(684,898).push([(195,174)]).circle(582,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(85,502,500))
+w1=cq.Workplane('XY',origin=(500,501,714))
+r=w0.sketch().arc((725,625),(751,715),(726,805)).close().assemble().finalize().extrude(821).union(w0.workplane(offset=957).moveTo(586,715).box(589,591,1000)).union(w1.workplane(offset=242).moveTo(176,258).box(850,515,1000))
\ No newline at end of file
diff --git a/test/extrude/273/273.stl b/test/extrude/273/273.stl
index 37a8bf0138b92835c1efa684062fc4b07e64984e..98ea9094ac7f94369c558e45737eba7748cb9c13 100644
Binary files a/test/extrude/273/273.stl and b/test/extrude/273/273.stl differ
diff --git a/test/extrude/274/274.py b/test/extrude/274/274.py
index c2ea16cb5302d79f55a26fcfd6d14b9a0de04a67..d6d9f812771303e2d313681a55af6a35c10655d0 100644
--- a/test/extrude/274/274.py
+++ b/test/extrude/274/274.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,491,500))
-r=w0.sketch().arc((401,1),(600,500),(401,1000)).close().assemble().finalize().extrude(530)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,440,500))
+r=w0.sketch().push([(248,806)]).rect(995,829).reset().face(w0.sketch().segment((541,142),(710,31)).segment((1000,475)).segment((834,586)).close().assemble()).finalize().extrude(626)
\ No newline at end of file
diff --git a/test/extrude/274/274.stl b/test/extrude/274/274.stl
index 576eeb9bf5f845226e0692cd5800267057695509..f41c8e2b21aa8e1a0fe25276da2c1498873c6047 100644
Binary files a/test/extrude/274/274.stl and b/test/extrude/274/274.stl differ
diff --git a/test/extrude/275/275.py b/test/extrude/275/275.py
index d45a38ef1e2efba5e2ec9792bf5734f8f0af0ad7..0c546d1a15c1de10e89a5b50477fe8f104521a2f 100644
--- a/test/extrude/275/275.py
+++ b/test/extrude/275/275.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(432,452,452))
-w1=cq.Workplane('YZ',origin=(608,452,452))
-r=w0.workplane(offset=319).moveTo(647,1).cylinder(716,491).union(w1.workplane(offset=515).moveTo(452,868).box(1000,598,579)).translate((1,1,39))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,626))
+r=w0.workplane(offset=197).moveTo(141,582).cylinder(1000,640).union(w0.workplane(offset=682).moveTo(915,372).cylinder(865,585))
\ No newline at end of file
diff --git a/test/extrude/275/275.stl b/test/extrude/275/275.stl
index ae9cdca104ccda2df77850b62397a80e52688aba..905baa0a6826a92584636f5ab128e31e2d621df3 100644
Binary files a/test/extrude/275/275.stl and b/test/extrude/275/275.stl differ
diff --git a/test/extrude/276/276.py b/test/extrude/276/276.py
index 5b1e8d33e0c3eda231a7805184f9bcb9957121fc..93da67f171a1290b4cd31c35ae8c611502fc97c6 100644
--- a/test/extrude/276/276.py
+++ b/test/extrude/276/276.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,700,500))
-r=w0.sketch().segment((481,1),(670,361)).segment((920,231)).arc((970,341),(1000,461)).arc((720,660),(610,990)).arc((1,560),(481,1)).assemble().finalize().extrude(91)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(247,501,501))
+r=w0.sketch().segment((2,171),(445,170)).segment((444,566)).segment((756,565)).segment((756,989)).segment((350,991)).segment((351,670)).segment((1,671)).close().assemble().reset().face(w0.sketch().segment((606,676),(646,631)).segment((655,645)).segment((620,686)).close().assemble(),mode='s').push([(736,276)]).circle(765).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/276/276.stl b/test/extrude/276/276.stl
index 8c68cde168acca999fa6285b0d73b0fd194650d1..fc6dfee9b2b3cb6e9b3c135bddbdb90fcf73b565 100644
Binary files a/test/extrude/276/276.stl and b/test/extrude/276/276.stl differ
diff --git a/test/extrude/277/277.py b/test/extrude/277/277.py
index 854491ee5e889bdb41317ce34113a536b79765e4..852e7aa5d855c58db8008a706ca468d362d29462 100644
--- a/test/extrude/277/277.py
+++ b/test/extrude/277/277.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().segment((434,554),(880,554)).segment((880,714)).arc((893,747),(900,780)).arc((680,654),(434,714)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(385,500,499))
+w1=cq.Workplane('ZX',origin=(501,680,501))
+r=w0.sketch().push([(505,315)]).circle(521).reset().face(w0.sketch().arc((495,325),(490,311),(506,302)).segment((506,296)).segment((516,301)).segment((506,331)).segment((496,331)).close().assemble(),mode='s').finalize().extrude(115).union(w1.sketch().segment((326,580),(549,581)).segment((550,706)).arc((706,889),(480,975)).segment((325,976)).close().assemble().reset().face(w1.sketch().arc((549,755),(659,850),(551,950)).close().assemble(),mode='s').finalize().extrude(142))
\ No newline at end of file
diff --git a/test/extrude/277/277.stl b/test/extrude/277/277.stl
index 5b5b38afd6b940f66178fbe8d24918a9443e9521..c99cdeeddb67bc4aeda1211b2c54df60eabcba9e 100644
Binary files a/test/extrude/277/277.stl and b/test/extrude/277/277.stl differ
diff --git a/test/extrude/278/278.py b/test/extrude/278/278.py
index 6ea28375fbee0a86c839e708deb4c1b598d9214e..d071f763c567ad07d6f7043026a0745571952765 100644
--- a/test/extrude/278/278.py
+++ b/test/extrude/278/278.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).box(494,734,1000).translate((34,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,296,501))
+w1=cq.Workplane('YZ',origin=(830,500,501))
+r=w0.workplane(offset=354).moveTo(500,341).cylinder(796,670).union(w1.sketch().segment((335,590),(620,590)).arc((671,556),(716,591)).segment((1000,590)).segment((1000,631)).segment((715,631)).arc((669,660),(621,631)).segment((335,631)).close().assemble().finalize().extrude(106))
\ No newline at end of file
diff --git a/test/extrude/278/278.stl b/test/extrude/278/278.stl
index 56535e1146ef2cc46bd55d3cd83565208c68732d..fbc4ddab48a881c01e04ce8f42706980e9d1a96f 100644
Binary files a/test/extrude/278/278.stl and b/test/extrude/278/278.stl differ
diff --git a/test/extrude/279/279.py b/test/extrude/279/279.py
index 313dd496d06cc60b61cf28e2da371f85aad6ce5b..14727fbd6062d594c069c13cc1980db785453789 100644
--- a/test/extrude/279/279.py
+++ b/test/extrude/279/279.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,510))
-w1=cq.Workplane('YZ',origin=(500,500,500))
-r=w0.sketch().segment((580,251),(610,251)).segment((610,331)).arc((770,500),(610,670)).segment((610,750)).segment((580,750)).segment((580,670)).arc((421,500),(580,331)).close().assemble().finalize().extrude(161).union(w0.sketch().segment((341,451),(540,451)).arc((780,331),(1000,491)).segment((950,491)).arc((930,461),(900,441)).segment((610,441)).segment((570,491)).segment((510,491)).segment((510,670)).arc((500,610),(500,550)).segment((341,550)).close().assemble().finalize().extrude(810)).union(w1.sketch().segment((331,530),(670,530)).arc((500,660),(331,530)).assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,502,501))
+r=w0.sketch().segment((120,600),(177,400)).segment((879,601)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/279/279.stl b/test/extrude/279/279.stl
index 65c3a5cf0ed8a62e8262b6d686ccb1a2cc97de90..d14b05bd0ffa58fd19725324a9b44d0041d282de 100644
Binary files a/test/extrude/279/279.stl and b/test/extrude/279/279.stl differ
diff --git a/test/extrude/28/28.py b/test/extrude/28/28.py
index db53aa0aaa8edbb9c09a4ea28c8d7e56a110ae51..3ea6f0b729ad0c47238b7e9ddb463a40676e48fd 100644
--- a/test/extrude/28/28.py
+++ b/test/extrude/28/28.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(625,625,625))
-r=w0.workplane(offset=514).moveTo(944,778).cylinder(847,1000).union(w0.sketch().segment((70,98),(112,98)).segment((140,98)).arc((112,168),(70,98)).assemble().finalize().extrude(542)).union(w0.workplane(offset=729).moveTo(1,931).cylinder(834,695)).translate((1,70,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(35,53,38))
+r=w0.sketch().segment((530,770),(148,770)).segment((148,92)).segment((189,92)).segment((274,176)).segment((274,686)).segment((530,686)).close().assemble().finalize().extrude(319).union(w0.workplane(offset=123).sketch().segment((1,755),(578,755)).segment((578,439)).segment((1,439)).close().assemble().finalize().extrude(204))
diff --git a/test/extrude/28/28.stl b/test/extrude/28/28.stl
index c28960a847472691c55adeaf5972d0b2441f3275..54fd49894219e22898014790de9472abcf922172 100644
Binary files a/test/extrude/28/28.stl and b/test/extrude/28/28.stl differ
diff --git a/test/extrude/280/280.py b/test/extrude/280/280.py
index 71311c9be9242720550285ed83ff6f404ba2f5cd..f740410bc3ed258019bfaa82c255a7f7e15a8cf0 100644
--- a/test/extrude/280/280.py
+++ b/test/extrude/280/280.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(183,455,455))
-r=w0.sketch().segment((1,183),(128,183)).segment((128,164)).segment((718,164)).segment((718,273)).segment((909,292)).segment((873,746)).segment((264,700)).segment((301,283)).segment((137,283)).segment((137,655)).segment((1,655)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,756))
+r=w0.workplane(offset=242).moveTo(57,684).cylinder(1000,555).union(w0.workplane(offset=418).moveTo(935,326).cylinder(666,565))
\ No newline at end of file
diff --git a/test/extrude/280/280.stl b/test/extrude/280/280.stl
index c6f86f04d4c540f7fe431b729981fd095397e309..28da7250256462e60629090f54654daf6781810f 100644
Binary files a/test/extrude/280/280.stl and b/test/extrude/280/280.stl differ
diff --git a/test/extrude/281/281.py b/test/extrude/281/281.py
index 8ef28273e949ad12d19329025d3f570d035d9ad8..a2656363ea75a7c98c6d2765a576f87262a79e85 100644
--- a/test/extrude/281/281.py
+++ b/test/extrude/281/281.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(530,794,530))
-r=w0.sketch().arc((354,530),(432,618),(559,647)).arc((246,1000),(354,530)).assemble().finalize().extrude(1).union(w0.sketch().segment((500,50),(657,50)).arc((716,40),(785,50)).segment((941,50)).segment((941,177)).arc((951,275),(941,373)).segment((941,500)).segment((785,500)).arc((716,520),(657,500)).segment((500,500)).segment((500,373)).arc((491,275),(500,177)).close().assemble().finalize().extrude(393))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,525,502))
+r=w0.sketch().segment((231,160),(230,172)).segment((240,171)).arc((190,165),(242,161)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=619).moveTo(215,167).cylinder(735,667)).union(w0.sketch().segment((312,645),(326,646)).segment((325,436)).segment((546,436)).arc((655,416),(761,436)).segment((811,436)).segment((810,461)).arc((890,881),(465,930)).segment((326,931)).segment((325,720)).segment((312,720)).close().assemble().finalize().extrude(971))
\ No newline at end of file
diff --git a/test/extrude/281/281.stl b/test/extrude/281/281.stl
index 03aeee97b13ece744322c3e536fb3ac31fee6019..bcf120186a633039d751b5857bcb482821668938 100644
Binary files a/test/extrude/281/281.stl and b/test/extrude/281/281.stl differ
diff --git a/test/extrude/282/282.py b/test/extrude/282/282.py
index 845bd7904c678749e97a7625616eb327b8586f2d..b8426f5d1fff3fd0203e672dc01fd380f80a877d 100644
--- a/test/extrude/282/282.py
+++ b/test/extrude/282/282.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(617,500,500))
-r=w0.sketch().push([(357,782)]).rect(766,1000).push([(708,198)]).rect(639,957).reset().face(w0.sketch().segment((660,330),(671,235)).segment((766,235)).segment((756,341)).close().assemble(),mode='s').push([(702,373)]).circle(522,mode='s').push([(766,1)]).circle(511,mode='s').finalize().extrude(256)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,550))
+r=w0.workplane(offset=406).moveTo(809,321).cylinder(690,689).union(w0.sketch().segment((1,625),(86,626)).arc((185,556),(280,625)).segment((366,626)).segment((364,691)).segment((280,690)).arc((187,761),(85,690)).segment((1,690)).close().assemble().reset().face(w0.sketch().segment((400,740),(526,739)).segment((529,735)).segment((531,740)).segment((760,740)).segment((759,870)).segment((634,871)).segment((630,870)).segment((400,869)).close().assemble()).finalize().extrude(591))
\ No newline at end of file
diff --git a/test/extrude/282/282.stl b/test/extrude/282/282.stl
index 0a0fdea7ea71a3cbb022247bc89258b92aba95d9..136afea4dce9b5523ed8ac9f39f294fb0346baa4 100644
Binary files a/test/extrude/282/282.stl and b/test/extrude/282/282.stl differ
diff --git a/test/extrude/283/283.py b/test/extrude/283/283.py
index 4e6fb467ba42050a9a3409ac79f10c4be4d56b48..e89ee32f24a3c153b8c7a00a7606c43c29da04db 100644
--- a/test/extrude/283/283.py
+++ b/test/extrude/283/283.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(544,544,511))
-r=w0.workplane(offset=348).moveTo(957,696).cylinder(935,674).union(w0.sketch().segment((1,392),(77,262)).segment((240,359)).segment((153,359)).segment((153,479)).close().assemble().reset().face(w0.sketch().segment((175,500),(262,500)).segment((262,381)).segment((414,468)).segment((348,598)).close().assemble()).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(575,502,500))
+w1=cq.Workplane('ZX',origin=(500,256,502))
+r=w0.workplane(offset=275).moveTo(191,694).box(560,536,951).union(w0.sketch().segment((481,192),(506,190)).segment((505,10)).segment((637,12)).segment((637,1)).segment((690,1)).segment((691,11)).segment((821,10)).segment((821,181)).segment((835,180)).segment((840,335)).segment((820,337)).segment((822,516)).segment((691,516)).segment((690,526)).segment((635,526)).segment((636,516)).segment((507,515)).segment((506,345)).segment((486,346)).close().assemble().finalize().extrude(807)).union(w1.sketch().arc((742,746),(725,277),(859,725)).arc((820,857),(742,745)).assemble().finalize().extrude(425))
\ No newline at end of file
diff --git a/test/extrude/283/283.stl b/test/extrude/283/283.stl
index 299a250c3d9f22d3ab53c0d392e0b3ca0d30d722..55c4cd2b413165be2b0a2204d842ccc5aa6af777 100644
Binary files a/test/extrude/283/283.stl and b/test/extrude/283/283.stl differ
diff --git a/test/extrude/284/284.py b/test/extrude/284/284.py
index ea03d3bedf5085ffd5324a3ecba2de7c6d155258..1f757321aa8cc4942e767bb0da6d8fdec21f4161 100644
--- a/test/extrude/284/284.py
+++ b/test/extrude/284/284.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(692,552,552))
-r=w0.sketch().segment((272,804),(402,804)).segment((402,664)).segment((290,664)).segment((309,449)).arc((767,132),(683,683)).segment((664,804)).arc((645,813),(664,832)).segment((655,944)).segment((412,916)).arc((244,1000),(272,813)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((374,374),(599,374)).segment((599,412)).arc((533,981),(374,430)).close().assemble().finalize().extrude(823))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(320,501,500))
+r=w0.sketch().segment((1,187),(80,185)).segment((80,67)).segment((112,65)).segment((101,187)).segment((501,187)).segment((502,400)).segment((420,400)).segment((420,450)).segment((527,450)).segment((524,496)).arc((1000,665),(525,835)).segment((526,851)).segment((252,851)).segment((252,450)).segment((401,450)).segment((400,401)).segment((1,400)).close().assemble().finalize().extrude(396).union(w0.workplane(offset=733).moveTo(250,290).cylinder(965,591))
\ No newline at end of file
diff --git a/test/extrude/284/284.stl b/test/extrude/284/284.stl
index 3aa05fa5db63d10894ed4f194b3d0f7641797ec6..0f29b00aef3c7b9e40c3ea1e5a7079762b0d140f 100644
Binary files a/test/extrude/284/284.stl and b/test/extrude/284/284.stl differ
diff --git a/test/extrude/285/285.py b/test/extrude/285/285.py
index a0eaa52214c1a6167059a2b57d6249dcbc839b95..4b1e5f76d7abc219d003b351018905bd0fb7d3dd 100644
--- a/test/extrude/285/285.py
+++ b/test/extrude/285/285.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(906,607,607))
-r=w0.sketch().segment((221,693),(261,630)).arc((213,520),(253,410)).segment((229,379)).segment((331,324)).segment((347,355)).arc((386,355),(418,363)).segment((504,221)).segment((1000,520)).segment((906,677)).segment((921,685)).segment((866,748)).segment((866,740)).segment((717,992)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,611,500))
+w1=cq.Workplane('YZ',origin=(550,502,501))
+r=w0.workplane(offset=293).moveTo(716,835).cylinder(914,664).union(w0.sketch().push([(311,511)]).rect(880,699).push([(256,546)]).circle(561,mode='s').finalize().extrude(266)).union(w0.sketch().push([(591,166)]).circle(664).push([(539,145)]).circle(511,mode='s').push([(645,221)]).circle(580,mode='s').finalize().extrude(691)).union(w1.workplane(offset=612).moveTo(665,312).cylinder(725,560))
\ No newline at end of file
diff --git a/test/extrude/285/285.stl b/test/extrude/285/285.stl
index 8d36196366854473d03a7ff9da0db4a5d4452e41..c0f6b5f74aa952cc3693d1c7eca17ec6c6454af5 100644
Binary files a/test/extrude/285/285.stl and b/test/extrude/285/285.stl differ
diff --git a/test/extrude/286/286.py b/test/extrude/286/286.py
index e733c4acd87844a460ded15434207fa87fc5bd53..79e056e20d92cbe3d0033a8732034311c980439a 100644
--- a/test/extrude/286/286.py
+++ b/test/extrude/286/286.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(662,662,993))
-r=w0.sketch().arc((582,953),(474,392),(919,744)).segment((1000,744)).segment((1000,980)).segment((892,980)).segment((939,811)).segment((899,798)).arc((824,885),(723,939)).segment((858,980)).segment((582,980)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(651,501,502))
+w1=cq.Workplane('XY',origin=(500,501,734))
+r=w0.sketch().push([(221,315)]).circle(721).circle(661,mode='s').push([(755,574)]).circle(746).circle(686,mode='s').finalize().extrude(689).union(w1.sketch().segment((161,251),(450,252)).segment((452,639)).segment((252,641)).segment((250,636)).segment((241,636)).segment((241,640)).segment((160,640)).close().assemble().push([(430,432)]).rect(532,520,mode='s').finalize().extrude(670))
\ No newline at end of file
diff --git a/test/extrude/286/286.stl b/test/extrude/286/286.stl
index 56efbfe9a774a1244c1a4003cb5a05b5ea8299af..adcf23bfa17fbd95fb611b86e58affa4cd8f9238 100644
Binary files a/test/extrude/286/286.stl and b/test/extrude/286/286.stl differ
diff --git a/test/extrude/287/287.py b/test/extrude/287/287.py
index b44c5d9ba0353de2b0d6357f5d3192c924bd1dfa..862d807fba3fa4f7083543d31dc9ffffb9e025f4 100644
--- a/test/extrude/287/287.py
+++ b/test/extrude/287/287.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,253))
-r=w0.sketch().segment((102,495),(364,435)).segment((485,939)).segment((213,1000)).close().assemble().push([(546,56)]).rect(1000,627).push([(536,1)]).circle(506,mode='s').push([(667,506)]).circle(717).finalize().extrude(980)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(850,500,500))
+w1=cq.Workplane('XY',origin=(501,499,111))
+r=w0.sketch().segment((350,40),(370,5)).segment((900,350)).segment((879,385)).close().assemble().reset().face(w0.sketch().segment((393,550),(611,365)).segment((1000,810)).segment((789,995)).close().assemble()).finalize().extrude(248).union(w1.sketch().segment((150,165),(203,165)).arc((499,15),(636,314)).segment((634,409)).segment((560,409)).arc((424,456),(290,411)).segment((149,409)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/287/287.stl b/test/extrude/287/287.stl
index 7a2419a3419aaca72d5fd2becc6e0f2667de14f6..ac714e94f45c0a193175a6a89471488cbc1469d4 100644
Binary files a/test/extrude/287/287.stl and b/test/extrude/287/287.stl differ
diff --git a/test/extrude/288/288.py b/test/extrude/288/288.py
index e20752f6c1158b02778102fa8d00b829fb86eec1..a6b9ae122b6bb2de677273161a3a7da63448ef69 100644
--- a/test/extrude/288/288.py
+++ b/test/extrude/288/288.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(251,500,500))
-r=w0.sketch().arc((21,71),(111,121),(191,201)).arc((271,141),(351,101)).segment((351,1)).segment((750,1)).segment((750,131)).arc((860,840),(141,810)).arc((81,860),(21,890)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,422,501))
+r=w0.sketch().segment((36,186),(150,185)).segment((150,267)).arc((192,340),(150,415)).segment((151,491)).segment((35,490)).segment((37,415)).arc((2,342),(37,266)).close().assemble().push([(851,665)]).circle(651).finalize().extrude(261).union(w0.sketch().push([(201,536)]).rect(610,900).reset().face(w0.sketch().arc((441,560),(517,201),(491,566)).segment((490,675)).segment((440,676)).close().assemble()).finalize().extrude(904))
\ No newline at end of file
diff --git a/test/extrude/288/288.stl b/test/extrude/288/288.stl
index 337fffb4f977c1383a4d9f7e9547e5d6548966a8..ea908ffe49619eaa437e576eac5f036ddbd1e841 100644
Binary files a/test/extrude/288/288.stl and b/test/extrude/288/288.stl differ
diff --git a/test/extrude/289/289.py b/test/extrude/289/289.py
index 4597b8b8abfe31624688e9082b84d92ec2bbbb70..847cdafef059bfd4bd18d21bc3b782a1ba5f2ef8 100644
--- a/test/extrude/289/289.py
+++ b/test/extrude/289/289.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(401,401,518))
-r=w0.workplane(offset=101).moveTo(788,1).cylinder(1000,589).union(w0.workplane(offset=577).moveTo(166,647).cylinder(753,741)).translate((175,188,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,725))
+r=w0.sketch().segment((26,685),(407,1)).segment((975,315)).segment((596,1000)).close().assemble().finalize().extrude(51)
\ No newline at end of file
diff --git a/test/extrude/289/289.stl b/test/extrude/289/289.stl
index 146810cb10b0c5c51337517b1c2fbc3536313972..917261a0d5643678832f4321b2a84645d2ebdd37 100644
Binary files a/test/extrude/289/289.stl and b/test/extrude/289/289.stl differ
diff --git a/test/extrude/29/29.py b/test/extrude/29/29.py
index c0fad3f587d99b066321244d237bc39787aea91a..85fcef38ac4fa9e29787effecce50dc87c1fa2da 100644
--- a/test/extrude/29/29.py
+++ b/test/extrude/29/29.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(573,480,480))
-r=w0.sketch().push([(1,204)]).rect(563,761).push([(1,199)]).rect(563,563,mode='s').finalize().extrude(84).union(w0.sketch().segment((865,886),(917,532)).segment((1000,542)).segment((948,896)).close().assemble().finalize().extrude(136)).union(w0.sketch().segment((147,313),(199,334)).segment((292,334)).segment((292,521)).segment((209,521)).segment((188,553)).arc((344,407),(147,313)).assemble().finalize().extrude(688))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(17,55,14))
+r=w0.sketch().segment((136,447),(920,447)).segment((920,199)).segment((137,199)).close().assemble().push([(373,346)]).circle(72,mode='s').push([(728,308)]).rect(108,100,mode='s').push([(622,358)]).circle(48,mode='s').push([(770,316)]).rect(54,104,mode='s').finalize().extrude(74)
diff --git a/test/extrude/29/29.stl b/test/extrude/29/29.stl
index fb250c77b0acd59062eb5eb07ab2756cbe3b421f..dabf8e085f85e9551b5861f9bbfc86558419f22c 100644
Binary files a/test/extrude/29/29.stl and b/test/extrude/29/29.stl differ
diff --git a/test/extrude/290/290.py b/test/extrude/290/290.py
index 44caa2a79ce6ba1f5aba838ffc94ac1a03697b08..cb84d42d0ef0c409dc5ff6255e6161246bcb3ba0 100644
--- a/test/extrude/290/290.py
+++ b/test/extrude/290/290.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(178,449,449))
-r=w0.sketch().push([(1,795)]).circle(468).push([(734,323)]).rect(813,925).reset().face(w0.sketch().segment((580,477),(673,113)).segment((888,169)).segment((804,533)).close().assemble(),mode='s').finalize().extrude(1000).translate((1,19,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(595,500,500))
+r=w0.sketch().segment((170,544),(219,2)).segment((644,42)).segment((595,580)).close().assemble().reset().face(w0.sketch().segment((815,854),(824,907)).segment((828,909)).arc((638,919),(814,853)).assemble()).finalize().extrude(310)
\ No newline at end of file
diff --git a/test/extrude/290/290.stl b/test/extrude/290/290.stl
index 72e4af29468e186744b1c99a4a6d79ca14b99c32..26b30cacb262c3293af198ec57535595fefbc62f 100644
Binary files a/test/extrude/290/290.stl and b/test/extrude/290/290.stl differ
diff --git a/test/extrude/291/291.py b/test/extrude/291/291.py
index e96c6e9c701bb1fbd1511c094955d31676dcba87..783c8b1efca286dd13d15f382c489270f2f51d99 100644
--- a/test/extrude/291/291.py
+++ b/test/extrude/291/291.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(645,869,645))
-w1=cq.Workplane('YZ',origin=(823,645,645))
-r=w0.workplane(offset=585).moveTo(636,935).box(869,1000,767).union(w1.sketch().segment((449,533),(524,533)).segment((524,468)).arc((757,776),(449,533)).assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(251,237,251))
+r=w0.sketch().push([(262,160)]).rect(494,461).push([(354,429)]).circle(324).finalize().extrude(45).union(w0.workplane(offset=295).moveTo(368,44).cylinder(339,295)).union(w0.workplane(offset=372).moveTo(183,286).cylinder(491,356))
\ No newline at end of file
diff --git a/test/extrude/291/291.stl b/test/extrude/291/291.stl
index 056d2ab5f4d9b4900d2daf7668eddcc36cbb5012..e330ce1b50e11a7499773cc9ca7ad65a0c6daab5 100644
Binary files a/test/extrude/291/291.stl and b/test/extrude/291/291.stl differ
diff --git a/test/extrude/292/292.py b/test/extrude/292/292.py
index 3befb0096350090b513107a37063219012a1bd00..d8501efc5ff83884e886431a98edc21075273e8f 100644
--- a/test/extrude/292/292.py
+++ b/test/extrude/292/292.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,570,500))
-r=w0.sketch().arc((151,151),(510,1),(850,151)).segment((650,151)).segment((650,850)).segment((850,850)).arc((510,1000),(151,850)).segment((351,850)).segment((351,151)).close().assemble().push([(505,500)]).rect(690,620,mode='s').finalize().extrude(351)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,499,755))
+w1=cq.Workplane('XY',origin=(501,500,760))
+r=w0.workplane(offset=458).moveTo(260,671).cylinder(585,759).union(w0.workplane(offset=477).moveTo(727,346).cylinder(544,774)).union(w1.sketch().arc((825,292),(836,345),(826,402)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/292/292.stl b/test/extrude/292/292.stl
index 23efe5cb5e94211a89e39b99112ef34b925d3faf..dafcce1c9438917a8146eac2a93798194054c457 100644
Binary files a/test/extrude/292/292.stl and b/test/extrude/292/292.stl differ
diff --git a/test/extrude/293/293.py b/test/extrude/293/293.py
index e98aa40103aa0951adb3add219229e45ced5b0f3..c6f53d0ecbcb92d92990e3a60222c5534fab234b 100644
--- a/test/extrude/293/293.py
+++ b/test/extrude/293/293.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(457,457,544))
-w1=cq.Workplane('YZ',origin=(370,457,457))
-r=w0.sketch().arc((381,870),(500,381),(457,881)).arc((424,859),(381,870)).assemble().finalize().extrude(218).union(w0.sketch().segment((424,131),(598,1)).segment((663,88)).segment((587,88)).segment((587,338)).close().assemble().reset().face(w0.sketch().segment((685,587),(707,587)).segment((707,446)).segment((1000,446)).segment((1000,913)).segment((685,913)).close().assemble()).reset().face(w0.sketch().segment((707,142),(815,283)).segment((707,370)).close().assemble()).finalize().extrude(620)).union(w1.sketch().push([(631,419)]).rect(913,881).push([(631,424)]).circle(598,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,381))
+r=w0.workplane(offset=554).moveTo(511,655).cylinder(609,709).union(w0.sketch().push([(445,734)]).circle(766).circle(555,mode='s').finalize().extrude(636)).union(w0.sketch().push([(446,735)]).circle(522).reset().face(w0.sketch().segment((510,1),(821,2)).segment((821,156)).arc((665,82),(510,156)).close().assemble()).reset().face(w0.sketch().arc((509,406),(666,481),(820,404)).segment((821,560)).segment((510,559)).close().assemble()).finalize().extrude(740))
\ No newline at end of file
diff --git a/test/extrude/293/293.stl b/test/extrude/293/293.stl
index bf8fb28b5a93becca75d5766705f6b013ba0bad8..b11b74b9fc52544a7620e8f91d46d64b785498c1 100644
Binary files a/test/extrude/293/293.stl and b/test/extrude/293/293.stl differ
diff --git a/test/extrude/294/294.py b/test/extrude/294/294.py
index a3d79e22c2225bef892cff3439c3b55a8083414b..ae1b36b98ee4bb3b1b71efd2e2b08ff457acfb1e 100644
--- a/test/extrude/294/294.py
+++ b/test/extrude/294/294.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(441,471,471))
-r=w0.sketch().segment((740,231),(760,221)).segment((850,560)).segment((830,570)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=735).moveTo(331,471).box(950,990,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(930,502,499))
+r=w0.sketch().segment((411,432),(411,566)).segment((466,565)).segment((466,540)).arc((461,531),(445,517)).segment((541,516)).segment((540,461)).arc((551,520),(501,555)).segment((500,566)).segment((592,565)).segment((589,430)).segment((541,431)).segment((541,359)).arc((639,521),(501,640)).segment((501,739)).segment((465,739)).segment((465,641)).arc((362,521),(425,375)).segment((426,431)).close().assemble().push([(484,213)]).rect(537,724).finalize().extrude(1).union(w0.sketch().segment((1,170),(225,171)).arc((501,71),(776,170)).segment((999,172)).segment((1000,824)).segment((775,824)).arc((501,929),(226,826)).segment((206,824)).segment((205,696)).segment((2,695)).close().assemble().finalize().extrude(410))
\ No newline at end of file
diff --git a/test/extrude/294/294.stl b/test/extrude/294/294.stl
index ec9d9128a8393a1e4eec8830fdb217311ef642d7..a548d549f5d308381bad5afce4c9c43061b154aa 100644
Binary files a/test/extrude/294/294.stl and b/test/extrude/294/294.stl differ
diff --git a/test/extrude/295/295.py b/test/extrude/295/295.py
index ca4588bd8f14de8f3784f414464a30cfbd144c96..669514567a9e0eb622ff6f02b27830b6ad504626 100644
--- a/test/extrude/295/295.py
+++ b/test/extrude/295/295.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(560,560,798))
-r=w0.sketch().push([(262,381)]).rect(881,899).push([(111,267)]).circle(569,mode='s').finalize().extrude(1).union(w0.workplane(offset=340).moveTo(817,707).cylinder(1000,762)).union(w0.sketch().push([(853,698)]).circle(716).push([(858,698)]).rect(643,762,mode='s').finalize().extrude(643))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,466))
+r=w0.sketch().push([(314,601)]).rect(605,621).push([(317,605)]).circle(515,mode='s').push([(512,231)]).circle(730).push([(461,913)]).rect(640,676).finalize().extrude(576)
\ No newline at end of file
diff --git a/test/extrude/295/295.stl b/test/extrude/295/295.stl
index 7698eee01c7ccc1ad14b5e08b5674dcf396ea98a..c6b74d8d2ebe9fc5f7a4914415c0485e140d40d2 100644
Binary files a/test/extrude/295/295.stl and b/test/extrude/295/295.stl differ
diff --git a/test/extrude/296/296.py b/test/extrude/296/296.py
index c1d4806025c8f45f3d0d7606a4414203026f52cf..98ca041f443713d43f0215a8667a194f621c1b6e 100644
--- a/test/extrude/296/296.py
+++ b/test/extrude/296/296.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).cylinder(1000,394).translate((61,61,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,759))
+w1=cq.Workplane('XY',origin=(500,502,900))
+r=w0.workplane(offset=121).moveTo(341,416).cylinder(1000,671).union(w0.workplane(offset=595).moveTo(499,748).box(1000,605,690)).union(w1.sketch().segment((326,202),(356,202)).segment((355,431)).arc((320,651),(326,425)).close().assemble().push([(294,512)]).rect(575,556,mode='s').finalize().extrude(599))
\ No newline at end of file
diff --git a/test/extrude/296/296.stl b/test/extrude/296/296.stl
index 1ced4e2c9678e774596d0b3f2e58e3f70c9f8e7a..fb52e0e255b8fd51dad6109bc10d18c586517d07 100644
Binary files a/test/extrude/296/296.stl and b/test/extrude/296/296.stl differ
diff --git a/test/extrude/297/297.py b/test/extrude/297/297.py
index 3e8602320b3a9e11663ed0e141d00b6daf067569..9ed801e73cf8860c545059398b37c00eb375125d 100644
--- a/test/extrude/297/297.py
+++ b/test/extrude/297/297.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(203,469,469))
-r=w0.sketch().push([(1,766)]).circle(532).push([(756,352)]).circle(713).finalize().extrude(1000).translate((1,63,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,137,500))
+r=w0.workplane(offset=733).moveTo(726,500).box(901,1000,964).union(w0.workplane(offset=865).moveTo(86,926).cylinder(1000,510))
\ No newline at end of file
diff --git a/test/extrude/297/297.stl b/test/extrude/297/297.stl
index ecf3f2c3a802a2daa0f70f1fe5755a2aad0325ec..90e7e88f234bbc63f8c11b0eb583ab73f7ae82fb 100644
Binary files a/test/extrude/297/297.stl and b/test/extrude/297/297.stl differ
diff --git a/test/extrude/298/298.py b/test/extrude/298/298.py
index 333e8d652ab9f5edcd2022cb3c9c5a04a582155f..832a5e22974e1942b58ff98626d5ae79ef2ea234 100644
--- a/test/extrude/298/298.py
+++ b/test/extrude/298/298.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(382,382,77))
-r=w0.workplane(offset=467).moveTo(196,399).cylinder(551,407).union(w0.workplane(offset=623).moveTo(196,399).cylinder(865,619)).union(w0.sketch().segment((52,314),(136,238)).arc((213,136),(323,69)).segment((407,1)).segment((458,52)).arc((678,162),(754,399)).segment((805,450)).segment((721,526)).arc((644,627),(534,695)).segment((450,763)).segment((399,712)).arc((179,602),(103,365)).close().assemble().finalize().extrude(1000)).translate((42,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,775))
+w1=cq.Workplane('ZX',origin=(500,540,500))
+r=w0.sketch().push([(396,467)]).circle(806).circle(646,mode='s').finalize().extrude(146).union(w0.sketch().push([(337,582)]).rect(655,1000).push([(357,530)]).circle(551,mode='s').finalize().extrude(726)).union(w1.workplane(offset=577).moveTo(330,631).box(1000,1000,657))
\ No newline at end of file
diff --git a/test/extrude/298/298.stl b/test/extrude/298/298.stl
index aea05f0f6f48f7c58de9041159b1970d26dd046a..b21a870786b915a32a936214e5af5bd252f1e5e4 100644
Binary files a/test/extrude/298/298.stl and b/test/extrude/298/298.stl differ
diff --git a/test/extrude/299/299.py b/test/extrude/299/299.py
index 291c157469df9df4800ad7f5755dc43bc0a63aaa..f92d19650f7476ddb09e8de454f325a262d8fcf1 100644
--- a/test/extrude/299/299.py
+++ b/test/extrude/299/299.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(591,591,886))
-r=w0.sketch().segment((125,705),(391,153)).segment((458,191)).segment((458,867)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((134,734),(1000,344),(258,933)).arc((391,715),(134,734)).assemble().finalize().extrude(30))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,329,500))
+r=w0.sketch().segment((180,120),(421,22)).segment((420,2)).segment((445,1)).segment((445,10)).segment((469,1)).segment((636,385)).segment((446,466)).segment((445,562)).segment((420,559)).segment((421,475)).segment((346,505)).close().assemble().finalize().extrude(261).union(w0.sketch().push([(614,896)]).rect(915,711).reset().face(w0.sketch().segment((535,879),(575,825)).segment((600,846)).arc((646,855),(666,889)).segment((692,911)).segment((651,966)).segment((626,946)).arc((582,936),(560,901)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/299/299.stl b/test/extrude/299/299.stl
index 5af3929ae770a69dc41892ed44799ec72135b393..15fd90667c2ca1f406efadfc5221e989890f4e31 100644
Binary files a/test/extrude/299/299.stl and b/test/extrude/299/299.stl differ
diff --git a/test/extrude/3/3.py b/test/extrude/3/3.py
index f3f767a46a5defed76add4ae5648c96a9cca6760..ea332a2d0bc0597e47629228df648bd5360fe30a 100644
--- a/test/extrude/3/3.py
+++ b/test/extrude/3/3.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(433,433,577))
-w1=cq.Workplane('YZ',origin=(467,433,433))
-r=w0.workplane(offset=149).moveTo(577,433).cylinder(1000,678).union(w0.workplane(offset=462).moveTo(577,433).box(738,856,492)).union(w1.sketch().push([(433,560)]).circle(729).push([(433,556)]).rect(500,661,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(64,9,29))
+r=w0.sketch().segment((219,606),(219,440)).segment((995,440)).segment((995,606)).close().assemble().reset().segment((543,586),(756,586)).segment((756,372)).segment((542,372)).close().assemble(mode='s').finalize().extrude(236).translate((1,228,1))
diff --git a/test/extrude/3/3.stl b/test/extrude/3/3.stl
index 0093c7e77fd2ff3767412bb1a04757ce695f7aaa..86a1468d4aa28f5c49176c16389c805bc023fa61 100644
Binary files a/test/extrude/3/3.stl and b/test/extrude/3/3.stl differ
diff --git a/test/extrude/30/30.py b/test/extrude/30/30.py
index 29f5f95ef9aa56408e71f995e2982046457596c5..d9ac2613acfae219ac3588835377bf6d3264b96f 100644
--- a/test/extrude/30/30.py
+++ b/test/extrude/30/30.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(464,537,464))
-w1=cq.Workplane('YZ',origin=(269,464,464))
-r=w0.sketch().segment((330,354),(403,366)).segment((415,220)).arc((915,659),(330,354)).assemble().finalize().extrude(1000).union(w1.sketch().push([(1,98)]).circle(610).circle(525,mode='s').finalize().extrude(622)).translate((1,147,50))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(44,57,44))
+r=w0.sketch().segment((706,315),(140,315)).segment((140,881)).segment((706,881)).close().assemble().finalize().extrude(391).union(w0.workplane(offset=47).sketch().segment((20,324),(490,324)).segment((490,198)).segment((20,198)).close().assemble().finalize().extrude(105)).translate((1,335,1))
diff --git a/test/extrude/30/30.stl b/test/extrude/30/30.stl
index c56a770cf3caffcf27e98f3512fad839c000e39e..75e5476d589eea72f6e158012d6402e566a96b50 100644
Binary files a/test/extrude/30/30.stl and b/test/extrude/30/30.stl differ
diff --git a/test/extrude/300/300.py b/test/extrude/300/300.py
index edec767ab3053238e399bd44cfe0a209c12494c2..0e76b8b6ec8c2cf3d20775f8bc096be79c3362a0 100644
--- a/test/extrude/300/300.py
+++ b/test/extrude/300/300.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,301,500))
-r=w0.sketch().segment((1,461),(121,461)).segment((121,211)).segment((880,211)).segment((880,461)).segment((1000,461)).segment((1000,540)).segment((880,540)).segment((880,790)).segment((121,790)).segment((121,540)).segment((1,540)).close().assemble().finalize().extrude(570).union(w0.sketch().arc((560,800),(411,211),(630,770)).arc((560,670),(560,800)).assemble().finalize().extrude(890))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,332))
+w1=cq.Workplane('ZX',origin=(502,415,500))
+r=w0.sketch().push([(214,750)]).rect(926,900).push([(136,181)]).circle(631).reset().face(w0.sketch().segment((456,57),(549,57)).arc((586,50),(626,56)).segment((716,56)).segment((720,211)).segment((625,210)).arc((590,220),(549,211)).segment((461,210)).close().assemble()).reset().face(w0.sketch().segment((711,366),(715,349)).segment((955,361)).segment((950,456)).segment((814,450)).segment((816,365)).close().assemble()).finalize().extrude(416).union(w0.workplane(offset=713).moveTo(892,768).box(716,764,925)).union(w1.workplane(offset=552).moveTo(436,511).cylinder(601,581))
\ No newline at end of file
diff --git a/test/extrude/300/300.stl b/test/extrude/300/300.stl
index 7f82e446c5ccaa176370daa7c9e89b2f8c742f08..0b23a4fbee3d034794af514676dab68a14cb388c 100644
Binary files a/test/extrude/300/300.stl and b/test/extrude/300/300.stl differ
diff --git a/test/extrude/301/301.py b/test/extrude/301/301.py
index 03556c8391f16b27c90512fc36a73a654c0eced4..9536df5968e49c1cb002c07bc9911ff37b88e3ba 100644
--- a/test/extrude/301/301.py
+++ b/test/extrude/301/301.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,361))
-r=w0.sketch().segment((251,251),(381,221)).segment((421,451)).segment((481,451)).segment((481,281)).segment((510,281)).segment((510,241)).segment((510,221)).segment((510,191)).segment((481,191)).segment((481,1)).segment((520,1)).segment((520,451)).segment((700,451)).segment((700,1000)).segment((321,1000)).segment((321,710)).close().assemble().finalize().extrude(351).union(w0.sketch().segment((141,111),(361,111)).segment((381,71)).segment((481,111)).segment((860,111)).segment((860,471)).segment((640,471)).segment((620,510)).segment((520,471)).segment((141,471)).close().assemble().finalize().extrude(930))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(706,500,500))
+r=w0.workplane(offset=293).moveTo(225,115).cylinder(914,614).union(w0.workplane(offset=334).moveTo(866,980).cylinder(836,519))
\ No newline at end of file
diff --git a/test/extrude/301/301.stl b/test/extrude/301/301.stl
index 8c2a10350cd97fb550e1481cc1884f2640dca7f5..b5236fe66bf042ef925ff5289ab697c325f55656 100644
Binary files a/test/extrude/301/301.stl and b/test/extrude/301/301.stl differ
diff --git a/test/extrude/302/302.py b/test/extrude/302/302.py
index 163844a6b6484dccf722f94bfe56ca6ed0c9a76a..210afa5a5c6c65eaec569385a1136fe9df381d5d 100644
--- a/test/extrude/302/302.py
+++ b/test/extrude/302/302.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(533,804,533))
-r=w0.sketch().segment((505,543),(543,543)).arc((664,477),(804,477)).arc((869,449),(888,515)).arc((907,533),(925,543)).segment((963,543)).segment((963,599)).arc((1000,729),(963,869)).segment((963,916)).segment((925,916)).arc((729,1000),(543,916)).segment((505,916)).segment((505,869)).arc((468,729),(505,599)).close().assemble().reset().face(w0.sketch().segment((599,505),(804,505)).arc((832,533),(869,533)).segment((869,953)).segment((599,953)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().arc((132,300),(160,76),(300,253)).arc((216,262),(132,300)).assemble().finalize().extrude(85))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(250,500,501))
+r=w0.workplane(offset=624).moveTo(316,103).box(1000,535,746).union(w0.workplane(offset=751).moveTo(781,695).cylinder(1000,721))
\ No newline at end of file
diff --git a/test/extrude/302/302.stl b/test/extrude/302/302.stl
index 928cc08b989085f927ad7fa20622b9ddf916d86c..e04daec9c0f26cbe18ec384744a9aff80d6e8b2f 100644
Binary files a/test/extrude/302/302.stl and b/test/extrude/302/302.stl differ
diff --git a/test/extrude/303/303.py b/test/extrude/303/303.py
index d5f6c78a711b1e38c06110b700a06bd60e428d39..b1b193e4c56c19f5fdca51ea347f7308509b026e 100644
--- a/test/extrude/303/303.py
+++ b/test/extrude/303/303.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(441,471,471))
-r=w0.sketch().arc((151,670),(391,481),(321,181)).arc((451,171),(580,211)).segment((710,121)).segment((790,231)).segment((680,311)).arc((730,550),(590,760)).arc((540,800),(471,810)).arc((291,790),(151,670)).assemble().finalize().extrude(1).union(w0.workplane(offset=735).moveTo(496,685).box(620,740,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,257))
+r=w0.workplane(offset=606).moveTo(62,451).cylinder(710,525).union(w0.sketch().arc((1,515),(46,625),(1,740)).segment((1,666)).arc((6,625),(1,591)).close().assemble().finalize().extrude(831)).union(w0.sketch().segment((572,385),(615,260)).segment((1000,396)).segment((955,521)).close().assemble().finalize().extrude(990))
\ No newline at end of file
diff --git a/test/extrude/303/303.stl b/test/extrude/303/303.stl
index 95496fc2357840c31ce58be747bc69e2830e622f..e9d7d1461ca69e4c513072b0b9639120889d79d1 100644
Binary files a/test/extrude/303/303.stl and b/test/extrude/303/303.stl differ
diff --git a/test/extrude/304/304.py b/test/extrude/304/304.py
index ef2a7ed634b85d0705aaeea1979c70f9b0f062f5..1ce2627ae86efe4106b20a205a3f3198cd0ee32b 100644
--- a/test/extrude/304/304.py
+++ b/test/extrude/304/304.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,704))
-w1=cq.Workplane('YZ',origin=(286,495,495))
-r=w0.sketch().arc((528,385),(890,210),(1000,594)).segment((978,583)).segment((978,605)).segment((1000,605)).arc((824,715),(616,660)).arc((199,649),(528,385)).assemble().finalize().extrude(199).union(w0.sketch().arc((1,506),(297,583),(506,363)).arc((352,791),(1,506)).assemble().finalize().extrude(221)).union(w1.sketch().segment((758,286),(769,286)).segment((769,550)).arc((780,561),(769,583)).segment((769,671)).segment((758,671)).segment((758,583)).arc((748,561),(758,550)).close().assemble().finalize().extrude(155))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,10,501))
+r=w0.sketch().segment((2,781),(970,171)).segment((999,221)).segment((30,831)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/304/304.stl b/test/extrude/304/304.stl
index 730abb0137fe27e8d6ddf91c722e1c181226c785..1196f01f2572b662452beb26b3ccfbda3d04f7ea 100644
Binary files a/test/extrude/304/304.stl and b/test/extrude/304/304.stl differ
diff --git a/test/extrude/305/305.py b/test/extrude/305/305.py
index 5d72838e7a7d8f916bb18712fcebcd0b69960591..621d2316ffabc5e14c54e008c43fb98dc8d5cef2 100644
--- a/test/extrude/305/305.py
+++ b/test/extrude/305/305.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(658,658,921))
-r=w0.sketch().segment((698,1),(947,1)).segment((947,159)).arc((829,93),(698,67)).close().assemble().finalize().extrude(119).union(w0.workplane(offset=566).moveTo(658,974).cylinder(842,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,869))
+r=w0.sketch().arc((175,140),(986,466),(231,901)).arc((456,505),(176,142)).assemble().finalize().extrude(1).union(w0.sketch().segment((326,22),(355,22)).arc((500,2),(645,22)).segment((674,21)).segment((675,31)).arc((999,500),(676,970)).segment((675,981)).segment((646,980)).arc((501,1000),(356,979)).segment((326,980)).segment((325,971)).arc((1,501),(326,30)).close().assemble().push([(170,502)]).rect(810,689,mode='s').push([(389,159)]).rect(545,715,mode='s').push([(606,835)]).circle(635,mode='s').push([(831,501)]).rect(810,690,mode='s').finalize().extrude(431)).union(w0.sketch().arc((166,511),(770,300),(391,821)).arc((341,621),(166,510)).assemble().finalize().extrude(585))
\ No newline at end of file
diff --git a/test/extrude/305/305.stl b/test/extrude/305/305.stl
index 8345203ae9eb433b21583bab630d224b5ddd79fd..37d55bca8742d235f3cc9eb82037b072a36170cd 100644
Binary files a/test/extrude/305/305.stl and b/test/extrude/305/305.stl differ
diff --git a/test/extrude/306/306.py b/test/extrude/306/306.py
index 75ec5da29a26cd86ce02e2055a81e38f3d02ee71..d672a41f7eb93c29f77eb853767e4d4ca09181aa 100644
--- a/test/extrude/306/306.py
+++ b/test/extrude/306/306.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(585,585,698))
-w1=cq.Workplane('XY',origin=(585,585,1000))
-r=w0.sketch().segment((255,840),(632,359)).segment((755,576)).close().assemble().finalize().extrude(1).union(w1.sketch().arc((435,632),(830,387),(651,821)).arc((491,793),(435,632)).assemble().finalize().extrude(642))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,90,499))
+r=w0.sketch().segment((2,422),(385,6)).segment((1000,579)).segment((616,994)).close().assemble().reset().face(w0.sketch().segment((217,426),(391,427)).arc((499,365),(609,426)).segment((785,426)).segment((786,576)).segment((612,576)).arc((500,636),(390,575)).segment((215,575)).close().assemble(),mode='s').finalize().extrude(1000).union(w0.sketch().segment((485,126),(515,125)).segment((515,216)).arc((784,500),(516,785)).segment((515,874)).segment((486,874)).segment((485,784)).arc((216,499),(485,215)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/306/306.stl b/test/extrude/306/306.stl
index 16d1eacaf9e11426bd9e78b6896c35c04811dd73..525ecdf44d6c6d525b35d9fc6ec926660d9b77ed 100644
Binary files a/test/extrude/306/306.stl and b/test/extrude/306/306.stl differ
diff --git a/test/extrude/307/307.py b/test/extrude/307/307.py
index 3e80279cba33c4e9b020427cafe76b0a7f170af0..b8c5d953196d0f725777fc849535a2378766264f 100644
--- a/test/extrude/307/307.py
+++ b/test/extrude/307/307.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(463,270,463))
-w1=cq.Workplane('ZX',origin=(463,484,463))
-r=w0.sketch().push([(71,296)]).rect(753,731).reset().face(w0.sketch().segment((1,216),(44,216)).segment((44,205)).segment((98,205)).segment((98,216)).segment((141,216)).segment((141,377)).segment((98,377)).segment((98,398)).segment((44,398)).segment((44,377)).segment((1,377)).close().assemble(),mode='s').finalize().extrude(205).union(w1.sketch().segment((377,130),(989,130)).segment((989,366)).segment((1000,366)).segment((1000,560)).segment((989,560)).segment((989,796)).segment((377,796)).segment((377,560)).segment((377,366)).close().assemble().push([(957,683)]).rect(506,474,mode='s').push([(957,715)]).rect(506,495,mode='s').finalize().extrude(893))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(341,501,500))
+w1=cq.Workplane('XY',origin=(502,500,615))
+r=w0.sketch().segment((185,410),(367,1)).segment((515,66)).arc((595,87),(666,132)).segment((815,195)).segment((634,611)).segment((486,544)).arc((406,527),(336,476)).close().assemble().finalize().extrude(884).union(w1.workplane(offset=692).moveTo(284,358).box(514,654,885))
\ No newline at end of file
diff --git a/test/extrude/307/307.stl b/test/extrude/307/307.stl
index c7e714c977e338b59b0e493a296615021460ed08..180e7986a75720e10f27ee78859ed42fb5ff6ee9 100644
Binary files a/test/extrude/307/307.stl and b/test/extrude/307/307.stl differ
diff --git a/test/extrude/308/308.py b/test/extrude/308/308.py
index 7e15279438f5a20df70e18e9a4068ceb2a412083..e12edf6a1767b14a7746e6864367c0332602a142 100644
--- a/test/extrude/308/308.py
+++ b/test/extrude/308/308.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,690))
-r=w0.sketch().segment((1,401),(281,401)).segment((431,321)).segment((461,381)).segment((411,401)).segment((1000,401)).segment((1000,680)).segment((191,680)).arc((111,530),(1,401)).assemble().finalize().extrude(111)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,646,499))
+w1=cq.Workplane('YZ',origin=(465,500,501))
+r=w0.sketch().segment((686,524),(700,516)).segment((705,530)).arc((621,500),(706,536)).segment((691,541)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((27,101),(462,100)).segment((460,300)).arc((911,420),(765,871)).arc((675,814),(611,901)).arc((441,839),(330,701)).segment((26,700)).close().assemble().finalize().extrude(155)).union(w1.workplane(offset=597).moveTo(651,626).cylinder(696,850))
\ No newline at end of file
diff --git a/test/extrude/308/308.stl b/test/extrude/308/308.stl
index f88325adf8ffe243f463ddf79421e44ad930075b..15a504fe91b77b4f2dfca4e4107bf1031f0427e3 100644
Binary files a/test/extrude/308/308.stl and b/test/extrude/308/308.stl differ
diff --git a/test/extrude/309/309.py b/test/extrude/309/309.py
index 79d9763cb475e9ed423f1269427011c313a9d31d..28820ac1c352c6597c32bb5a40529311820ede87 100644
--- a/test/extrude/309/309.py
+++ b/test/extrude/309/309.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().segment((341,720),(361,534)).segment((520,554)).segment((520,640)).segment((827,640)).segment((827,594)).segment((993,614)).segment((973,800)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,56))
+r=w0.workplane(offset=949).box(970,1000,1000)
\ No newline at end of file
diff --git a/test/extrude/309/309.stl b/test/extrude/309/309.stl
index 17035af556fa5448fde15ddee2e9e84404a0c2b6..ec0c5808d7c78a36dde68169b80c1b807ae7912a 100644
Binary files a/test/extrude/309/309.stl and b/test/extrude/309/309.stl differ
diff --git a/test/extrude/31/31.py b/test/extrude/31/31.py
index 855f90884abda7a7f3d4a6b1fb9adeabee49717f..30c261dab0155ed6be10ddedec3480568bf66599 100644
--- a/test/extrude/31/31.py
+++ b/test/extrude/31/31.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(781,521,521))
-w1=cq.Workplane('ZX',origin=(521,677,521))
-r=w0.sketch().segment((95,136),(875,43)).segment((917,386)).segment((136,490)).close().assemble().finalize().extrude(781).union(w1.sketch().segment((459,1),(1000,1)).segment((1000,344)).segment((459,344)).segment((459,209)).segment((500,209)).segment((500,199)).segment((459,199)).close().assemble().reset().face(w1.sketch().segment((605,74),(865,74)).segment((865,199)).segment((1000,199)).segment((1000,209)).segment((865,209)).segment((865,282)).segment((605,282)).segment((605,209)).segment((605,199)).close().assemble(),mode='s').finalize().extrude(792))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(10,70,4))
+r=w0.sketch().segment((436,210),(464,210)).arc((561,485),(610,771)).arc((635,853),(648,938)).segment((436,938)).close().assemble().finalize().extrude(85).union(w0.workplane(offset=359).sketch().segment((744,460),(392,460)).segment((636,786)).segment((744,786)).close().assemble().finalize().extrude(104))
diff --git a/test/extrude/31/31.stl b/test/extrude/31/31.stl
index 1fa738676695c448ec70d8f64234be4dbb745061..6cda1d43f1184e938eb2aaa480a2dbdb1f54cd02 100644
Binary files a/test/extrude/31/31.stl and b/test/extrude/31/31.stl differ
diff --git a/test/extrude/310/310.py b/test/extrude/310/310.py
index d92324d2e3a6a2ebf08c5237f1fdc68bfb638415..48fd0f497d159fe1740e37c5652cbaba046f65d3 100644
--- a/test/extrude/310/310.py
+++ b/test/extrude/310/310.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(903,573,573))
-w1=cq.Workplane('ZX',origin=(573,234,573))
-r=w0.sketch().push([(699,864)]).rect(1000,961).circle(583,mode='s').finalize().extrude(1).union(w0.sketch().arc((593,156),(583,88),(602,156)).arc((593,146),(593,156)).assemble().finalize().extrude(253)).union(w1.sketch().segment((457,243),(505,243)).segment((505,350)).segment((467,350)).segment((467,360)).segment((505,360)).segment((505,690)).segment((457,690)).close().assemble().push([(471,559)]).rect(602,602,mode='s').finalize().extrude(874))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(375,500,501))
+r=w0.sketch().segment((256,66),(480,1)).segment((565,295)).segment((569,296)).segment((565,300)).segment((570,316)).arc((691,445),(655,620)).segment((744,936)).segment((520,1000)).segment((436,706)).segment((431,705)).segment((434,701)).segment((432,685)).arc((310,557),(346,380)).close().assemble().finalize().extrude(746)
\ No newline at end of file
diff --git a/test/extrude/310/310.stl b/test/extrude/310/310.stl
index 7abc8405a0de12ce466604e24e63acfb83b9fb98..6b85aa8712771d55e38ae8930edfffef587f7fd1 100644
Binary files a/test/extrude/310/310.stl and b/test/extrude/310/310.stl differ
diff --git a/test/extrude/311/311.py b/test/extrude/311/311.py
index a201e1feeab88f85ad32a770bfa84d7a4c54e880..c887c94cae217f49a9db4a0a80cbe6fe412e3952 100644
--- a/test/extrude/311/311.py
+++ b/test/extrude/311/311.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(516,516,464))
-w1=cq.Workplane('YZ',origin=(434,516,516))
-r=w0.sketch().segment((1,423),(83,52)).segment((526,155)).segment((464,444)).segment((670,444)).segment((670,712)).segment((403,722)).segment((403,516)).close().assemble().push([(537,578)]).circle(609,mode='s').finalize().extrude(341).union(w0.sketch().segment((485,506),(495,506)).arc((537,495),(567,506)).segment((609,506)).segment((609,526)).arc((619,547),(619,557)).arc((1000,846),(547,712)).segment((485,712)).segment((485,650)).arc((444,578),(485,506)).assemble().finalize().extrude(547)).union(w1.sketch().arc((609,743),(506,300),(701,701)).arc((650,722),(609,743)).assemble().finalize().extrude(753))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,226))
+r=w0.sketch().segment((140,225),(705,1)).segment((859,389)).segment((729,440)).segment((728,909)).segment((265,909)).segment((266,550)).close().assemble().push([(448,678)]).circle(595,mode='s').finalize().extrude(829).union(w0.sketch().arc((220,849),(669,371),(465,997)).segment((465,849)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/311/311.stl b/test/extrude/311/311.stl
index 689a19a307a6199f3a58b07189a1f7d3f01b0645..364c4b4aac8117a424662cdc3dfd29edd5e70210 100644
Binary files a/test/extrude/311/311.stl and b/test/extrude/311/311.stl differ
diff --git a/test/extrude/312/312.py b/test/extrude/312/312.py
index 097a9af3f6e5dd1717365ff07839bebb026e48a7..c97ffb77f70a08aa7015c6ab9b4d75d92e43a210 100644
--- a/test/extrude/312/312.py
+++ b/test/extrude/312/312.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(221,221,81))
-r=w0.workplane(offset=241).moveTo(1,101).cylinder(261,1000).union(w0.workplane(offset=361).moveTo(1000,900).cylinder(500,441)).translate((779,679,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,540,500))
+r=w0.sketch().push([(500,889)]).circle(610).reset().face(w0.sketch().segment((446,6),(481,1)).segment((530,591)).segment((496,596)).close().assemble()).finalize().extrude(421)
\ No newline at end of file
diff --git a/test/extrude/312/312.stl b/test/extrude/312/312.stl
index a1369c7edfc962709946739cf289eec984937e57..a611f8017b99fa79434bd9b73bfae70b87b85792 100644
Binary files a/test/extrude/312/312.stl and b/test/extrude/312/312.stl differ
diff --git a/test/extrude/313/313.py b/test/extrude/313/313.py
index f6dd34be650b9fa62022226bc02eeeb53d8d63ae..8121f2d9f800b0357634004216430dd51af73ed7 100644
--- a/test/extrude/313/313.py
+++ b/test/extrude/313/313.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(357,71,357))
-w1=cq.Workplane('YZ',origin=(241,357,357))
-r=w0.sketch().arc((288,218),(303,241),(319,272)).arc((319,288),(334,295)).segment((334,311)).segment((349,311)).arc((388,342),(419,365)).segment((288,365)).close().assemble().finalize().extrude(535).union(w0.sketch().arc((55,288),(47,210),(117,171)).arc((667,202),(164,427)).arc((218,280),(55,288)).assemble().finalize().extrude(1000)).union(w1.sketch().segment((1,388),(102,388)).segment((102,334)).segment((311,334)).segment((311,388)).segment((404,388)).segment((404,396)).segment((311,396)).segment((311,442)).segment((102,442)).segment((102,396)).segment((1,396)).close().assemble().push([(202,388)]).rect(388,466,mode='s').finalize().extrude(861))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,521,501))
+r=w0.sketch().push([(171,276)]).rect(789,1000).push([(685,709)]).circle(791).reset().face(w0.sketch().segment((570,904),(800,517)).segment((805,521)).segment((574,905)).close().assemble(),mode='s').finalize().extrude(455)
\ No newline at end of file
diff --git a/test/extrude/313/313.stl b/test/extrude/313/313.stl
index 5c091fdfc57319fcd2816aa148df7df3997d6be4..08d257ff0bf3ce7afb32298ac840ab02f6d8e286 100644
Binary files a/test/extrude/313/313.stl and b/test/extrude/313/313.stl differ
diff --git a/test/extrude/314/314.py b/test/extrude/314/314.py
index 27eebbc47af03b91467f7f152fb1344fbe87d348..ed679ab39087c45618891608b7cac4abe38cf99f 100644
--- a/test/extrude/314/314.py
+++ b/test/extrude/314/314.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(404,404,106))
-r=w0.sketch().segment((388,1),(420,1)).segment((420,291)).arc((517,404),(420,517)).segment((420,807)).segment((388,807)).segment((388,517)).arc((291,404),(388,291)).close().assemble().push([(380,404)]).rect(420,468,mode='s').push([(428,404)]).rect(420,468,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(785,500,500))
+w1=cq.Workplane('XY',origin=(501,501,835))
+r=w0.workplane(offset=247).moveTo(51,267).box(601,705,1000).union(w1.workplane(offset=206).moveTo(359,844).box(785,816,1000))
\ No newline at end of file
diff --git a/test/extrude/314/314.stl b/test/extrude/314/314.stl
index 7d1e711015ca77b6e264fb88af712e2816e7a938..24dcacdfcbe1376339d15daf9d601472e5570fcc 100644
Binary files a/test/extrude/314/314.stl and b/test/extrude/314/314.stl differ
diff --git a/test/extrude/315/315.py b/test/extrude/315/315.py
index 829555f1ad1fd32822eb5ef4458f0c7966b768eb..a5e6ef5d3c7a53fc808bb4162af67ca75fd5ffd3 100644
--- a/test/extrude/315/315.py
+++ b/test/extrude/315/315.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,201,201))
-r=w0.workplane(offset=405).box(1000,345,608).translate((1,300,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(711,501,500))
+r=w0.sketch().segment((241,126),(450,2)).segment((695,410)).segment((485,541)).close().assemble().finalize().extrude(80).union(w0.sketch().segment((142,510),(332,391)).segment((405,511)).segment((215,629)).close().assemble().push([(472,444)]).circle(560).circle(514,mode='s').push([(477,555)]).circle(530).push([(781,865)]).rect(660,769).finalize().extrude(220))
\ No newline at end of file
diff --git a/test/extrude/315/315.stl b/test/extrude/315/315.stl
index 511a65f6769dae329789496e34cdba09377c0dcf..fbf1134ea1c09aa221c0b73ac8f637d7ff44bc6e 100644
Binary files a/test/extrude/315/315.stl and b/test/extrude/315/315.stl differ
diff --git a/test/extrude/316/316.py b/test/extrude/316/316.py
index c707deac02f5334df810521f8d5e5b76e323e331..ab5aba22a05fef4da5a3d225309c81eb71f8e2a8 100644
--- a/test/extrude/316/316.py
+++ b/test/extrude/316/316.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(485,485,818))
-w1=cq.Workplane('ZX',origin=(485,263,485))
-r=w0.workplane(offset=228).moveTo(1,495).cylinder(1000,506).union(w1.workplane(offset=707).moveTo(379,919).box(939,627,929)).translate((21,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(805,501,500))
+r=w0.sketch().segment((51,142),(551,2)).segment((676,435)).segment((175,574)).close().assemble().push([(762,846)]).rect(875,811).push([(759,845)]).rect(790,580,mode='s').finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/316/316.stl b/test/extrude/316/316.stl
index 66f201df1375df989fe33e1d3c8f70919cc0335d..40e6c2b7c1df577a68a105d773df73318580b443 100644
Binary files a/test/extrude/316/316.stl and b/test/extrude/316/316.stl differ
diff --git a/test/extrude/317/317.py b/test/extrude/317/317.py
index df51764229a7931816cccf308933cdd32bceb0bc..9177d03215c04a11313fc11081e033305509171e 100644
--- a/test/extrude/317/317.py
+++ b/test/extrude/317/317.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(348,348,174))
-w1=cq.Workplane('ZX',origin=(348,215,348))
-r=w0.sketch().push([(276,715)]).circle(490).push([(383,694)]).rect(358,368,mode='s').finalize().extrude(42).union(w0.workplane(offset=674).moveTo(490,42).cylinder(1000,551)).union(w1.sketch().segment((62,1),(592,1)).segment((592,470)).segment((297,470)).segment((297,653)).segment((266,653)).segment((266,470)).segment((184,470)).arc((144,602),(103,470)).segment((62,470)).close().assemble().finalize().extrude(623)).translate((1,162,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,230,500))
+r=w0.sketch().push([(287,718)]).rect(1000,885).push([(855,237)]).circle(645).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/317/317.stl b/test/extrude/317/317.stl
index d741a92ecb548730ec7a29d1e7d81800ccb30d97..a2032e3e156438d24788acf8c614ae1575a8c748 100644
Binary files a/test/extrude/317/317.stl and b/test/extrude/317/317.stl differ
diff --git a/test/extrude/318/318.py b/test/extrude/318/318.py
index f709ad689481acc315755da0f5cb16e762bd10f4..6a2f58a8ac5c34e16a4b8b6f7d673346b8769418 100644
--- a/test/extrude/318/318.py
+++ b/test/extrude/318/318.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(527,614,527))
-w1=cq.Workplane('YZ',origin=(509,527,527))
-r=w0.sketch().push([(781,474)]).rect(544,1000).push([(785,474)]).rect(536,544,mode='s').finalize().extrude(1).union(w0.workplane(offset=413).moveTo(273,750).box(790,658,755)).union(w0.sketch().segment((746,273),(912,273)).segment((912,597)).segment((834,597)).arc((562,702),(746,474)).close().assemble().finalize().extrude(877)).union(w1.sketch().segment((299,387),(430,387)).segment((430,527)).arc((492,606),(395,606)).segment((369,606)).arc((404,649),(457,658)).arc((500,685),(544,693)).segment((544,904)).segment((562,904)).arc((343,834),(308,606)).segment((299,606)).close().assemble().finalize().extrude(658))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(400,501,500))
+w1=cq.Workplane('XY',origin=(500,501,470))
+r=w0.sketch().arc((411,595),(435,605),(460,606)).arc((440,620),(420,620)).arc((156,696),(411,596)).assemble().finalize().extrude(604).union(w0.sketch().segment((1,685),(120,377)).segment((152,386)).arc((241,266),(384,250)).arc((641,250),(660,505)).segment((1000,505)).segment((1000,764)).segment((627,764)).segment((625,534)).arc((539,576),(445,561)).arc((305,605),(180,530)).segment((107,727)).close().assemble().finalize().extrude(706)).union(w1.workplane(offset=646).moveTo(457,488).box(625,664,791))
\ No newline at end of file
diff --git a/test/extrude/318/318.stl b/test/extrude/318/318.stl
index 9fe14c7207f11491d1bd280e8d66b899acd65c7b..6e4bb369099388e380a28fe81e912d6289681a13 100644
Binary files a/test/extrude/318/318.stl and b/test/extrude/318/318.stl differ
diff --git a/test/extrude/319/319.py b/test/extrude/319/319.py
index f808c8c5d89a502e417cbd0756c66d72ba66a7f5..a7c8aeebbb73bc786a6ca4d61b9d4622c8434b2a 100644
--- a/test/extrude/319/319.py
+++ b/test/extrude/319/319.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(550,550,429))
-r=w0.sketch().segment((100,330),(232,1)).segment((352,45)).segment((385,45)).segment((385,67)).segment((550,133)).segment((418,451)).segment((297,407)).segment((264,407)).segment((264,396)).close().assemble().finalize().extrude(660).union(w0.workplane(offset=671).moveTo(912,1000).box(726,748,791))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,616))
+r=w0.sketch().segment((56,666),(376,666)).arc((580,660),(455,821)).segment((456,999)).segment((56,999)).close().assemble().reset().face(w0.sketch().arc((455,681),(476,701),(456,721)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=279).moveTo(740,311).cylinder(946,704)).union(w0.sketch().push([(732,240)]).rect(665,980).push([(734,240)]).circle(546,mode='s').finalize().extrude(870))
\ No newline at end of file
diff --git a/test/extrude/319/319.stl b/test/extrude/319/319.stl
index e952393be14676d057e5f27032f12e8d7f80b7e0..07d07e9cd89485305ec9897bf8c4557713d921f8 100644
Binary files a/test/extrude/319/319.stl and b/test/extrude/319/319.stl differ
diff --git a/test/extrude/32/32.py b/test/extrude/32/32.py
index 79200b004babcc2c013c3d734c29ea6f003cface..1ed792e0aefa3129429507990023e7be6ccea8ef 100644
--- a/test/extrude/32/32.py
+++ b/test/extrude/32/32.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(349,349,117))
-w1=cq.Workplane('ZX',origin=(349,454,349))
-r=w0.sketch().push([(106,582)]).circle(652).circle(605,mode='s').finalize().extrude(1).union(w1.workplane(offset=24).moveTo(895,861).cylinder(1000,384)).translate((198,23,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(8,69,19))
+r=w0.sketch().segment((203,762),(934,762)).segment((933,214)).segment((202,214)).close().assemble().push([(406,403)]).circle(61,mode='s').push([(576,320)]).rect(92,77,mode='s').push([(701,655)]).circle(56,mode='s').finalize().extrude(246)
diff --git a/test/extrude/32/32.stl b/test/extrude/32/32.stl
index bb996f4fd4306cf594e474434614a72962de4145..b8599a9fa3805043accf8bf953aec15a4db540da 100644
Binary files a/test/extrude/32/32.stl and b/test/extrude/32/32.stl differ
diff --git a/test/extrude/320/320.py b/test/extrude/320/320.py
index 951a25ceae973fcee89770701f63f52ae43b458e..5dce72d24e8371fa190bf88ea1a39e277805c7bb 100644
--- a/test/extrude/320/320.py
+++ b/test/extrude/320/320.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,586,506))
-r=w0.workplane(offset=384).moveTo(606,617).box(748,869,748).union(w0.sketch().push([(606,617)]).circle(546).reset().face(w0.sketch().segment((758,909),(889,919)).segment((879,1000)).segment((758,990)).close().assemble()).finalize().extrude(273)).union(w0.sketch().push([(173,223)]).circle(556).reset().face(w0.sketch().segment((213,82),(273,1)).segment((314,31)).segment((294,31)).segment((294,51)).segment((324,51)).segment((324,31)).segment((617,243)).segment((566,324)).close().assemble()).push([(657,884)]).rect(748,758).finalize().extrude(586))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,685,500))
+r=w0.workplane(offset=316).moveTo(112,631).cylinder(871,610).union(w0.workplane(offset=403).moveTo(921,340).cylinder(696,579))
\ No newline at end of file
diff --git a/test/extrude/320/320.stl b/test/extrude/320/320.stl
index e369586d5f1efc23bc0d374a0835c15f7a20f797..cc3e463cf4dd782d731619728400a008b70b5b39 100644
Binary files a/test/extrude/320/320.stl and b/test/extrude/320/320.stl differ
diff --git a/test/extrude/321/321.py b/test/extrude/321/321.py
index 078e34d6b4340b7642d51d28dcef806b3b502a94..109bcf1eb57f7897bfebf64e4985c921b5b94b09 100644
--- a/test/extrude/321/321.py
+++ b/test/extrude/321/321.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().segment((48,141),(68,108)).segment((221,227)).arc((427,207),(467,414)).segment((620,527)).segment((600,560)).segment((447,441)).arc((241,461),(201,254)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,417))
+r=w0.workplane(offset=446).moveTo(167,616).cylinder(612,625).union(w0.sketch().segment((376,530),(400,529)).segment((401,512)).segment((960,511)).segment((960,805)).segment((825,805)).segment((825,1000)).segment((375,999)).close().assemble().push([(600,764)]).circle(676,mode='s').push([(715,245)]).circle(745).circle(611,mode='s').push([(682,52)]).rect(555,550,mode='s').finalize().extrude(780))
\ No newline at end of file
diff --git a/test/extrude/321/321.stl b/test/extrude/321/321.stl
index aa89c341a7254e805f3b0375ddc02dfa7da0f601..70206f8bb2bd481e7b3b1bbcc5231e25ad80c34a 100644
Binary files a/test/extrude/321/321.stl and b/test/extrude/321/321.stl differ
diff --git a/test/extrude/322/322.py b/test/extrude/322/322.py
index 42a6ba05aacbd10c35ce0286f0623bd1e74bad14..3dc5f1b27e1458afd9eeb8abe154e4f5e5a76f46 100644
--- a/test/extrude/322/322.py
+++ b/test/extrude/322/322.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(637,506,506))
-r=w0.sketch().segment((425,1),(485,1)).segment((485,415)).arc((576,1000),(425,425)).close().assemble().finalize().extrude(243)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,291,502))
+r=w0.sketch().segment((116,320),(290,1)).segment((680,215)).segment((566,427)).segment((565,455)).segment((546,455)).segment((506,536)).close().assemble().push([(700,815)]).circle(684).finalize().extrude(926)
\ No newline at end of file
diff --git a/test/extrude/322/322.stl b/test/extrude/322/322.stl
index 74579943f87c10d059a500623a8bd302b3822ffb..48729c78b89f474113e47060fc07578873381c59 100644
Binary files a/test/extrude/322/322.stl and b/test/extrude/322/322.stl differ
diff --git a/test/extrude/323/323.py b/test/extrude/323/323.py
index 707c10fa491ddca81604705a5ce36ea2adc9a73e..e0b2fe83ace06816697eecaf19762b35e4fc01b0 100644
--- a/test/extrude/323/323.py
+++ b/test/extrude/323/323.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(401,500,500))
-r=w0.sketch().segment((1,131),(700,131)).segment((700,191)).segment((1000,221)).segment((980,411)).segment((1000,500)).segment((970,510)).segment((940,870)).segment((650,840)).segment((640,840)).segment((291,800)).segment((311,610)).segment((291,520)).segment((321,510)).segment((331,401)).segment((1,401)).close().assemble().push([(650,510)]).circle(710,mode='s').finalize().extrude(710)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,560))
+r=w0.workplane(offset=378).moveTo(149,659).box(796,589,746).union(w0.sketch().segment((411,754),(635,605)).segment((635,795)).segment((734,795)).segment((526,929)).close().assemble().reset().face(w0.sketch().segment((675,580),(885,446)).segment((999,621)).segment((775,771)).segment((774,579)).close().assemble()).push([(835,205)]).rect(591,770).finalize().extrude(626))
\ No newline at end of file
diff --git a/test/extrude/323/323.stl b/test/extrude/323/323.stl
index 015e65ca885a385c277ee878d474fd9ac867fa2c..457951b2300cb54e0a142138efddde6196e5988a 100644
Binary files a/test/extrude/323/323.stl and b/test/extrude/323/323.stl differ
diff --git a/test/extrude/324/324.py b/test/extrude/324/324.py
index 83e02e0e40473710074987bb28007703890eabc4..4d4612dc356fc7a19fe29cec8e403c2f5f1b0481 100644
--- a/test/extrude/324/324.py
+++ b/test/extrude/324/324.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,301,500))
-r=w0.workplane(offset=580).moveTo(785,221).box(550,820,660).union(w0.sketch().arc((191,1),(261,101),(191,201)).close().assemble().finalize().extrude(740)).union(w0.sketch().segment((441,900),(481,830)).segment((640,920)).segment((590,1000)).close().assemble().finalize().extrude(910))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(479,500,499))
+w1=cq.Workplane('XY',origin=(500,500,326))
+r=w0.sketch().push([(171,698)]).circle(559).reset().face(w0.sketch().segment((134,670),(185,654)).segment((205,733)).segment((160,748)).close().assemble(),mode='s').finalize().extrude(106).union(w0.workplane(offset=328).moveTo(196,353).box(888,586,845)).union(w0.workplane(offset=699).moveTo(508,612).box(903,934,899)).union(w1.sketch().segment((670,394),(789,396)).segment((788,600)).arc((680,998),(669,585)).close().assemble().push([(729,418)]).rect(509,514,mode='s').finalize().extrude(344))
\ No newline at end of file
diff --git a/test/extrude/324/324.stl b/test/extrude/324/324.stl
index 10d980d1bc8854df9cdea431a976bac7c57657d9..97deb2cb240dbb3e87ea6b79672ab5f3845e795d 100644
Binary files a/test/extrude/324/324.stl and b/test/extrude/324/324.stl differ
diff --git a/test/extrude/325/325.py b/test/extrude/325/325.py
index 14d48fd81a6a75dbce7479aa2a03d88e99173c75..0ce1811fa876f279ae82b38353e87cf642ce7df0 100644
--- a/test/extrude/325/325.py
+++ b/test/extrude/325/325.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,547).translate((1,214,214))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(335,501,501))
+w1=cq.Workplane('XY',origin=(500,501,175))
+r=w0.sketch().segment((2,337),(212,335)).segment((211,141)).segment((485,140)).segment((485,335)).segment((696,335)).segment((695,381)).segment((486,380)).segment((485,576)).segment((211,575)).segment((211,380)).segment((1,380)).close().assemble().finalize().extrude(271).union(w0.workplane(offset=768).moveTo(855,715).cylinder(1000,645)).union(w0.sketch().segment((291,215),(337,206)).segment((405,496)).segment((361,511)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=752).moveTo(281,347).cylinder(1000,724))
\ No newline at end of file
diff --git a/test/extrude/325/325.stl b/test/extrude/325/325.stl
index 5646eb714ffe36e31820d9bc62d81e685b26024e..f45d5448ee8faa02320de2f6cc64d6cee0b59c55 100644
Binary files a/test/extrude/325/325.stl and b/test/extrude/325/325.stl differ
diff --git a/test/extrude/326/326.py b/test/extrude/326/326.py
index d3ed95dff6e89acb78e0a32be6715b4e3e4cd003..659e8e1a711d1b6f9eab71cd693724c58cc1a3f8 100644
--- a/test/extrude/326/326.py
+++ b/test/extrude/326/326.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,630,500))
-r=w0.sketch().segment((51,830),(241,1)).segment((950,171)).segment((760,1000)).close().assemble().circle(850,mode='s').finalize().extrude(231)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,222,501))
+r=w0.sketch().segment((1,719),(814,56)).segment((1000,282)).segment((186,945)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/326/326.stl b/test/extrude/326/326.stl
index af45fd4dcada7495780eec5c63392cb2693121c6..e2f6e6971b6c88b38492798031aeb07583db7f03 100644
Binary files a/test/extrude/326/326.stl and b/test/extrude/326/326.stl differ
diff --git a/test/extrude/327/327.py b/test/extrude/327/327.py
index bdbfb28c689f3e58f80d11c3936c05d8b7a9e4f9..23144e6a20f32ede0428b860052e8d8c2ac0dcdb 100644
--- a/test/extrude/327/327.py
+++ b/test/extrude/327/327.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(750,520,520))
-r=w0.sketch().segment((155,673),(472,289)).segment((433,289)).segment((433,39)).segment((837,39)).segment((837,289)).segment((491,289)).segment((885,597)).segment((558,1000)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=549).moveTo(683,318).cylinder(577,616))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,454,501))
+r=w0.sketch().segment((601,1),(766,1)).segment((764,217)).arc((950,471),(764,724)).segment((766,940)).segment((600,940)).segment((601,724)).arc((415,472),(600,215)).close().assemble().finalize().extrude(356).union(w0.sketch().push([(276,775)]).circle(725).push([(279,774)]).rect(656,529,mode='s').finalize().extrude(739))
\ No newline at end of file
diff --git a/test/extrude/327/327.stl b/test/extrude/327/327.stl
index ebd8aef97640b32e533298d1605b479e562f29af..4ea6060da172c7f45a6a4f3a05d0880d9c90be89 100644
Binary files a/test/extrude/327/327.stl and b/test/extrude/327/327.stl differ
diff --git a/test/extrude/328/328.py b/test/extrude/328/328.py
index 19047bb55b472e763e1e20f15f7a9e36e0faf59d..6dd60f59800b6ebe8913792ba98c4daadbe8ff9e 100644
--- a/test/extrude/328/328.py
+++ b/test/extrude/328/328.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,539))
-w1=cq.Workplane('YZ',origin=(550,495,495))
-r=w0.sketch().push([(232,934)]).rect(824,605).push([(248,616)]).rect(682,912).finalize().extrude(791).union(w0.sketch().segment((243,177),(418,67)).segment((594,352)).segment((561,374)).arc((583,374),(616,385)).arc((835,188),(791,484)).arc((791,704),(583,780)).arc((330,682),(385,407)).close().assemble().finalize().extrude(1000)).union(w1.sketch().arc((275,133),(671,12),(583,407)).segment((583,330)).segment((528,330)).arc((440,275),(341,330)).segment((319,330)).arc((308,319),(297,297)).arc((1,253),(275,133)).assemble().push([(155,232)]).circle(583,mode='s').finalize().extrude(758))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,461))
+w1=cq.Workplane('XY',origin=(502,500,295))
+r=w0.sketch().arc((250,295),(225,206),(277,127)).segment((275,1)).segment((414,1)).segment((414,127)).arc((449,160),(465,212)).segment((481,212)).segment((480,330)).segment((416,331)).segment((416,441)).segment((275,440)).segment((275,331)).segment((250,332)).close().assemble().finalize().extrude(746).union(w1.sketch().segment((396,526),(774,524)).segment((774,856)).segment((631,856)).segment((631,1000)).segment((474,999)).segment((477,855)).segment((395,855)).close().assemble().finalize().extrude(740))
\ No newline at end of file
diff --git a/test/extrude/328/328.stl b/test/extrude/328/328.stl
index c6775b7fa1b0914852e2300ba251fe5bc3f56adf..924a7d8c0f90d2f8186ac5e79a3f5af4b9305e14 100644
Binary files a/test/extrude/328/328.stl and b/test/extrude/328/328.stl differ
diff --git a/test/extrude/329/329.py b/test/extrude/329/329.py
index 32401f3e2a76afbc57f3d177e67ba2315f864e77..bc8c5db68e143badc7835ba60955a45a02ed9268 100644
--- a/test/extrude/329/329.py
+++ b/test/extrude/329/329.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(308,155,308))
-r=w0.sketch().segment((1,9),(32,1)).segment((155,608)).segment((116,616)).close().assemble().finalize().extrude(78).union(w0.workplane(offset=577).moveTo(308,132).box(1000,385,846))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,565))
+r=w0.sketch().push([(124,542)]).rect(746,834).push([(824,466)]).circle(677).finalize().extrude(216).union(w0.sketch().segment((431,356),(456,356)).arc((497,341),(536,355)).segment((561,356)).segment((560,426)).segment((535,425)).arc((495,445),(455,426)).segment((432,425)).close().assemble().finalize().extrude(650))
\ No newline at end of file
diff --git a/test/extrude/329/329.stl b/test/extrude/329/329.stl
index 1b70ee733ea21b8cb3edcdfbe38c1a035289dd63..363efc1f954d3ba29e77998354c2a34ca9938378 100644
Binary files a/test/extrude/329/329.stl and b/test/extrude/329/329.stl differ
diff --git a/test/extrude/33/33.py b/test/extrude/33/33.py
index 8481733dd7b7627d2d28028b9dff7ee4b3947aea..2006fa427babb7d69f3fbf3d72921e473a20e14d 100644
--- a/test/extrude/33/33.py
+++ b/test/extrude/33/33.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(486,234,486))
-r=w0.sketch().segment((205,903),(622,903)).arc((408,971),(205,903)).assemble().reset().face(w0.sketch().segment((224,1),(515,30)).segment((496,156)).segment((224,137)).close().assemble()).reset().face(w0.sketch().arc((631,350),(767,612),(631,893)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(47,46,16))
+r=w0.sketch().segment((32,432),(604,432)).segment((604,390)).segment((32,390)).close().assemble().finalize().extrude(117).union(w0.workplane(offset=215).sketch().segment((810,362),(428,362)).segment((428,136)).segment((810,136)).close().assemble().finalize().extrude(112))
diff --git a/test/extrude/33/33.stl b/test/extrude/33/33.stl
index c523f79e854fce0f24b7cb03fc3a811b3cfc3b87..62e788e87f0ab2f20e69f361f60ae0db090df512 100644
Binary files a/test/extrude/33/33.stl and b/test/extrude/33/33.stl differ
diff --git a/test/extrude/330/330.py b/test/extrude/330/330.py
index 879d599b0f17f86ff71ad4b604d4a49bf6ab87ae..436b1e7dbd8215981bf870cdfc60ba43c2af83fc 100644
--- a/test/extrude/330/330.py
+++ b/test/extrude/330/330.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(531,531,554))
-w1=cq.Workplane('ZX',origin=(531,866,531))
-r=w0.sketch().push([(163,643)]).circle(710).push([(883,274)]).rect(944,687).finalize().extrude(7).union(w0.workplane(offset=766).moveTo(587,788).cylinder(1000,542)).union(w1.sketch().push([(799,202)]).rect(955,989).push([(799,207)]).circle(643,mode='s').push([(799,1)]).rect(576,587,mode='s').finalize().extrude(174)).translate((18,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,411,502))
+r=w0.sketch().arc((322,685),(327,690),(330,686)).arc((345,771),(323,684)).assemble().finalize().extrude(233).union(w0.sketch().segment((62,277),(221,275)).arc((321,228),(416,276)).segment((530,276)).segment((537,253)).segment((1000,342)).segment((961,552)).segment((582,475)).arc((312,356),(97,562)).arc((3,461),(61,342)).close().assemble().finalize().extrude(949))
\ No newline at end of file
diff --git a/test/extrude/330/330.stl b/test/extrude/330/330.stl
index e0553103e5524f2282a812a3715148514107d6dc..ec90daaf48ad4188752ce1ddee6637867bc40864 100644
Binary files a/test/extrude/330/330.stl and b/test/extrude/330/330.stl differ
diff --git a/test/extrude/331/331.py b/test/extrude/331/331.py
index 5d3b7deb0cdb9b0252fcce38d503811806f07277..cba83afaec04090363196cc51cf488456f14d07b 100644
--- a/test/extrude/331/331.py
+++ b/test/extrude/331/331.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(461,500,500))
-w1=cq.Workplane('XY',origin=(500,500,600))
-r=w0.sketch().segment((1,441),(441,441)).segment((441,111)).segment((1000,111)).segment((1000,590)).segment((560,590)).segment((560,890)).segment((1,890)).close().assemble().finalize().extrude(900).union(w1.workplane(offset=575).moveTo(241,790).cylinder(650,590))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,351))
+r=w0.sketch().push([(839,515)]).rect(596,549).push([(838,976)]).rect(595,551).reset().face(w0.sketch().segment((796,964),(801,961)).segment((816,976)).segment((809,979)).close().assemble(),mode='s').finalize().extrude(237).union(w0.sketch().segment((116,111),(351,1)).segment((427,161)).segment((421,161)).segment((420,171)).segment((431,170)).segment((440,196)).segment((296,195)).segment((296,241)).segment((175,241)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/331/331.stl b/test/extrude/331/331.stl
index 1b723cc869ba0b9ac03aa22af1ad29fe471dd1f6..1ce8e9c7df0d4e033c4315d9bb8b6e4299177d10 100644
Binary files a/test/extrude/331/331.stl and b/test/extrude/331/331.stl differ
diff --git a/test/extrude/332/332.py b/test/extrude/332/332.py
index ba78f7f87a68dd755afbec26b7343c4a2ab685bb..b51cb13dd47edf085ecf6cf385fb8eaddda6e92a 100644
--- a/test/extrude/332/332.py
+++ b/test/extrude/332/332.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().segment((334,614),(560,347)).segment((614,394)).arc((847,454),(947,680)).segment((1000,720)).segment((774,987)).segment((720,940)).arc((487,880),(387,654)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((381,654),(394,654)).arc((667,394),(940,654)).segment((953,654)).segment((953,680)).segment((940,680)).arc((667,940),(394,680)).segment((381,680)).close().assemble().finalize().extrude(181))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,503,623))
+r=w0.sketch().segment((1,111),(516,112)).arc((993,396),(662,843)).segment((662,909)).segment((1,908)).close().assemble().finalize().extrude(256)
\ No newline at end of file
diff --git a/test/extrude/332/332.stl b/test/extrude/332/332.stl
index 910d2bb1473f311d5ca2814ed65f0288441bf836..7f93ab25c10f58f1b1dfc220e767da1be17fc8e7 100644
Binary files a/test/extrude/332/332.stl and b/test/extrude/332/332.stl differ
diff --git a/test/extrude/333/333.py b/test/extrude/333/333.py
index e81a572456bf7e3b22d16f8898d80a6af6ab9b65..ede20bcdd4e0c9d3783818d3bd0c58ae43bc11cb 100644
--- a/test/extrude/333/333.py
+++ b/test/extrude/333/333.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(906,607,607))
-r=w0.sketch().circle(1000).push([(540,819)]).rect(772,701,mode='s').finalize().extrude(1).translate((1,395,395))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,790,500))
+r=w0.sketch().segment((191,1),(449,1)).segment((449,127)).segment((470,150)).segment((551,151)).segment((551,271)).segment((546,272)).segment((670,466)).segment((810,466)).segment((809,1000)).segment((379,999)).segment((380,620)).segment((655,619)).segment((656,516)).segment((380,515)).segment((381,465)).segment((452,465)).segment((420,419)).segment((245,421)).segment((246,11)).segment((191,11)).close().assemble().push([(311,120)]).circle(531,mode='s').finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/333/333.stl b/test/extrude/333/333.stl
index 0ec43930ee9710c492439f42dc3aa8b49d9aef95..28ed39c75680b5d720fa884c30438fc4019c9fd9 100644
Binary files a/test/extrude/333/333.stl and b/test/extrude/333/333.stl differ
diff --git a/test/extrude/334/334.py b/test/extrude/334/334.py
index 576a4f5fe364f6c61c146c228c607d844e47a38f..cf1342ad816aeb3d0776b2eebbda20f968b3cf49 100644
--- a/test/extrude/334/334.py
+++ b/test/extrude/334/334.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(303,423,423))
-r=w0.sketch().segment((1,65),(28,65)).arc((93,10),(157,65)).segment((175,65)).segment((175,83)).segment((157,83)).arc((93,138),(28,83)).segment((1,83)).close().assemble().finalize().extrude(83).union(w0.sketch().segment((331,129),(468,129)).segment((468,313)).segment((698,239)).segment((734,358)).arc((808,478),(808,615)).segment((844,734)).segment((505,835)).segment((468,734)).segment((468,771)).segment((331,771)).close().assemble().finalize().extrude(138)).union(w0.workplane(offset=711).moveTo(597,542).cylinder(1000,670))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,400))
+r=w0.sketch().segment((55,130),(87,131)).arc((325,2),(568,130)).segment((599,129)).segment((598,187)).arc((619,295),(600,404)).segment((599,449)).arc((855,943),(455,555)).arc((251,580),(85,459)).segment((56,460)).segment((56,404)).arc((37,295),(57,184)).close().assemble().finalize().extrude(703)
\ No newline at end of file
diff --git a/test/extrude/334/334.stl b/test/extrude/334/334.stl
index 239183100bfd60c59959746d4d2f6813d991ec0c..5050aeb2591b0f00ab56e14b8f0a9ae21a6b9f6d 100644
Binary files a/test/extrude/334/334.stl and b/test/extrude/334/334.stl differ
diff --git a/test/extrude/335/335.py b/test/extrude/335/335.py
index a4af88f9ea250836d6e13d964db7593f5781bcfa..69d62b0923670733e7fd555f262a2ba8c0c12e06 100644
--- a/test/extrude/335/335.py
+++ b/test/extrude/335/335.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(573,334,334))
-r=w0.workplane(offset=1).moveTo(291,334).cylinder(1000,436).union(w0.workplane(offset=103).moveTo(402,334).box(488,522,795)).union(w0.workplane(offset=428).moveTo(214,334).box(351,419,522))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(366,500,502))
+r=w0.sketch().segment((190,87),(410,85)).segment((410,1)).segment((555,1)).segment((556,86)).segment((774,85)).segment((774,312)).segment((556,310)).segment((556,395)).segment((411,397)).segment((411,310)).segment((191,311)).close().assemble().push([(506,786)]).rect(1000,931).finalize().extrude(775)
\ No newline at end of file
diff --git a/test/extrude/335/335.stl b/test/extrude/335/335.stl
index d7d7e5d7c4690c83d9d6958530ba4a2cbaed78e3..edfa1bceaa004b7813d4c7898124a384fe22ae34 100644
Binary files a/test/extrude/335/335.stl and b/test/extrude/335/335.stl differ
diff --git a/test/extrude/336/336.py b/test/extrude/336/336.py
index cad83ccb228aece0ffe07144a6ff4225ee38439d..13fdc9d5582a78ae376c3f10510e0470af0f81d4 100644
--- a/test/extrude/336/336.py
+++ b/test/extrude/336/336.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(453,566,453))
-r=w0.sketch().push([(1,406)]).circle(472).rect(472,472,mode='s').push([(661,453)]).rect(981,1000).circle(510,mode='s').finalize().extrude(227).translate((1,1,19))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,332,501))
+r=w0.sketch().segment((2,125),(480,126)).segment((480,337)).segment((501,335)).segment((501,380)).segment((481,381)).segment((481,496)).segment((2,496)).close().assemble().push([(776,650)]).circle(726).finalize().extrude(839)
\ No newline at end of file
diff --git a/test/extrude/336/336.stl b/test/extrude/336/336.stl
index 99ff1f598626cef31ccb19f0296186a797237b71..af8e979a557eed3c736080fc3818391d154905a0 100644
Binary files a/test/extrude/336/336.stl and b/test/extrude/336/336.stl differ
diff --git a/test/extrude/337/337.py b/test/extrude/337/337.py
index bf2233909379fae637d52e153b7ee72b8215f90c..d82e083dc64bffe0e038384770aad15b4539d2c8 100644
--- a/test/extrude/337/337.py
+++ b/test/extrude/337/337.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(490,490,490))
-w1=cq.Workplane('ZX',origin=(490,562,490))
-r=w0.sketch().push([(42,450)]).circle(551).circle(541,mode='s').finalize().extrude(1).union(w0.sketch().segment((450,195),(623,195)).segment((776,144)).segment((786,195)).segment((959,195)).segment((959,348)).segment((776,348)).segment((623,388)).segment((613,348)).segment((450,348)).close().assemble().finalize().extrude(980)).union(w1.sketch().segment((460,735),(694,735)).arc((725,715),(766,735)).segment((1000,735)).segment((1000,817)).segment((766,817)).arc((725,837),(694,817)).segment((460,817)).close().assemble().finalize().extrude(715)).translate((1,1,20))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,442,500))
+r=w0.sketch().segment((1,232),(111,106)).segment((1000,871)).segment((890,996)).close().assemble().push([(375,145)]).circle(641).finalize().extrude(626)
\ No newline at end of file
diff --git a/test/extrude/337/337.stl b/test/extrude/337/337.stl
index 22e3471e1279d3c345be4650021061d5e76bbf76..89c5983266bb19bbcc53ba0f90442aa5677b0c74 100644
Binary files a/test/extrude/337/337.stl and b/test/extrude/337/337.stl differ
diff --git a/test/extrude/338/338.py b/test/extrude/338/338.py
index 4ccbe5b46e4e7f8470c040e240ad719c84b138b3..877a4bbb1bc0d5e5125e0e171b867980b4d99701 100644
--- a/test/extrude/338/338.py
+++ b/test/extrude/338/338.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(300,426,426))
-r=w0.workplane(offset=345).moveTo(495,271).box(472,621,587).union(w0.sketch().segment((81,943),(185,564)).segment((391,621)).segment((300,1000)).close().assemble().push([(236,782)]).rect(437,610,mode='s').push([(368,7)]).rect(724,736).finalize().extrude(449)).union(w0.sketch().segment((116,437),(277,437)).arc((541,1),(633,506)).segment((633,667)).segment((116,667)).close().assemble().finalize().extrude(851))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(561,501,501))
+w1=cq.Workplane('YZ',origin=(555,502,499))
+r=w0.sketch().push([(169,478)]).rect(834,835).push([(899,509)]).rect(700,866).reset().face(w0.sketch().segment((856,551),(900,570)).arc((876,564),(856,550)).assemble(),mode='s').reset().face(w0.sketch().arc((900,446),(926,451),(945,466)).close().assemble(),mode='s').finalize().extrude(465).union(w1.workplane(offset=441).moveTo(539,461).cylinder(621,586))
\ No newline at end of file
diff --git a/test/extrude/338/338.stl b/test/extrude/338/338.stl
index 194fdb54bba148986913372e9d1079c5d103f433..213ecd47c8b428d1c6a506fcfd9b4bbd6f86d650 100644
Binary files a/test/extrude/338/338.stl and b/test/extrude/338/338.stl differ
diff --git a/test/extrude/339/339.py b/test/extrude/339/339.py
index a5a49b2dee32514211a89f9a62991e49eb3d1e09..dc55dcc1e8d7a204dd5041795a8c750018083825 100644
--- a/test/extrude/339/339.py
+++ b/test/extrude/339/339.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((640,427),(694,427)).segment((694,574)).arc((680,580),(694,587)).segment((694,907)).segment((640,907)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,425,502))
+r=w0.sketch().arc((922,25),(920,66),(950,35)).arc((866,202),(922,27)).assemble().push([(977,100)]).rect(520,532,mode='s').finalize().extrude(531).union(w0.workplane(offset=579).moveTo(346,632).cylinder(655,846))
\ No newline at end of file
diff --git a/test/extrude/339/339.stl b/test/extrude/339/339.stl
index bcdd99681498685c16c23e1650b42ad6c0161fa7..0fde63f328958a1f536ddb04f0fa06f0d1704fc3 100644
Binary files a/test/extrude/339/339.stl and b/test/extrude/339/339.stl differ
diff --git a/test/extrude/34/34.py b/test/extrude/34/34.py
index 4ef0863894b9ec55a6015a5044dbd28a90ed99e1..2d1c81d3b42d732629e5b8e820f0da087caa20da 100644
--- a/test/extrude/34/34.py
+++ b/test/extrude/34/34.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,500))
-r=w0.sketch().push([(331,386)]).rect(560,830).push([(336,336)]).rect(510,510,mode='s').finalize().extrude(381).union(w0.sketch().segment((161,281),(341,261)).segment((331,261)).segment((331,1)).segment((690,1)).segment((690,261)).segment((461,261)).segment((491,491)).segment((201,530)).close().assemble().reset().face(w0.sketch().segment((331,830),(421,620)).segment((840,790)).segment((750,1000)).close().assemble()).finalize().extrude(620))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(11,4,19))
+r=w0.sketch().segment((118,711),(816,711)).segment((816,267)).segment((118,267)).close().assemble().finalize().extrude(338).union(w0.sketch().segment((694,497),(694,401)).segment((362,401)).segment((362,659)).segment((694,659)).segment((694,573)).segment((619,573)).segment((619,497)).close().assemble().finalize().extrude(159)).union(w0.workplane(offset=64).sketch().segment((634,577),(635,577)).segment((634,577)).segment((634,921)).segment((644,921)).segment((644,577)).segment((644,569)).segment((634,569)).close().assemble().finalize().extrude(116)).translate((1,335,1))
diff --git a/test/extrude/34/34.stl b/test/extrude/34/34.stl
index 0c4f6122b2623beb968150ff2b4cbc6aebef035b..11c7ee690c89fb5c10fc185c91754e04d0a7c514 100644
Binary files a/test/extrude/34/34.stl and b/test/extrude/34/34.stl differ
diff --git a/test/extrude/340/340.py b/test/extrude/340/340.py
index 0644123d23a5fc8a595a9a177a05bd767ea7d5ab..ac403fafd912d575a039658ee30f79e0a8d27788 100644
--- a/test/extrude/340/340.py
+++ b/test/extrude/340/340.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(271,500,500))
-w1=cq.Workplane('XY',origin=(500,500,241))
-r=w0.sketch().arc((740,680),(101,451),(780,411)).segment((1000,411)).segment((1000,680)).close().assemble().finalize().extrude(241).union(w1.sketch().segment((261,31),(530,31)).segment((530,1)).segment((850,1)).segment((850,191)).arc((860,201),(870,221)).segment((990,221)).segment((990,411)).segment((870,411)).arc((860,421),(850,441)).segment((850,630)).segment((600,630)).segment((600,700)).segment((261,700)).close().assemble().reset().face(w1.sketch().segment((471,221),(510,221)).arc((491,311),(510,401)).segment((471,401)).close().assemble(),mode='s').reset().face(w1.sketch().segment((880,221),(910,221)).segment((910,401)).segment((880,401)).arc((900,311),(880,221)).assemble(),mode='s').finalize().extrude(890))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(226,502,502))
+r=w0.sketch().push([(227,508)]).circle(726).reset().face(w0.sketch().segment((717,271),(762,272)).segment((762,291)).arc((942,337),(997,507)).arc((936,557),(913,631)).arc((651,571),(716,312)).close().assemble()).reset().face(w0.sketch().segment((717,320),(716,431)).arc((682,377),(718,320)).assemble(),mode='s').reset().face(w0.sketch().arc((761,320),(801,377),(762,433)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/340/340.stl b/test/extrude/340/340.stl
index 79f0fedfdd4698be691af1e6b46ac8e5ff388c3b..30197db85ea7310f67c8e57ea5db887fbaae9eea 100644
Binary files a/test/extrude/340/340.stl and b/test/extrude/340/340.stl differ
diff --git a/test/extrude/341/341.py b/test/extrude/341/341.py
index 17c44d4e0a0f515d1fdc2ac38f25d9a700e2c528..f6da8180c30ab3144b1435694dc0938b3ec0be26 100644
--- a/test/extrude/341/341.py
+++ b/test/extrude/341/341.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(391,500,500))
-w1=cq.Workplane('ZX',origin=(500,910,500))
-r=w0.sketch().segment((910,331),(1000,331)).segment((1000,500)).arc((990,500),(980,491)).close().assemble().reset().face(w0.sketch().segment((940,950),(1000,930)).segment((1000,950)).close().assemble()).finalize().extrude(251).union(w0.sketch().segment((31,71),(161,71)).segment((161,61)).segment((191,61)).arc((291,51),(391,71)).segment((451,71)).segment((451,101)).arc((491,520),(81,520)).segment((31,520)).segment((31,451)).arc((1,331),(31,211)).close().assemble().finalize().extrude(980)).union(w1.workplane(offset=351).moveTo(640,381).cylinder(800,750))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(142,252,251))
+r=w0.sketch().push([(167,394)]).circle(358).push([(184,228)]).rect(419,314).push([(254,244)]).circle(260,mode='s').finalize().extrude(406).union(w0.workplane(offset=362).moveTo(429,16).cylinder(472,266))
\ No newline at end of file
diff --git a/test/extrude/341/341.stl b/test/extrude/341/341.stl
index 651af96009e8707a44abdac1e42b51e7c6ae7a0b..3c78580ed2e8eb35bcd7df9dec695fd74495c620 100644
Binary files a/test/extrude/341/341.stl and b/test/extrude/341/341.stl differ
diff --git a/test/extrude/342/342.py b/test/extrude/342/342.py
index 5954c7ec0f1b79f6f1d7d644bb909ba1c14f136a..0e54b6b8e1f33d8ae580438ecd2e68da23de8b28 100644
--- a/test/extrude/342/342.py
+++ b/test/extrude/342/342.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,746))
-r=w0.sketch().segment((680,435),(849,435)).segment((849,623)).arc((877,708),(849,783)).segment((849,972)).segment((680,972)).segment((680,783)).arc((642,708),(680,623)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(293,279)]).rect(840,1000).push([(208,58)]).circle(519,mode='s').finalize().extrude(265))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,801,501))
+r=w0.sketch().push([(547,858)]).rect(830,736).push([(753,204)]).rect(994,856).finalize().extrude(1).union(w0.sketch().push([(51,865)]).circle(551).push([(42,895)]).circle(520,mode='s').finalize().extrude(20))
\ No newline at end of file
diff --git a/test/extrude/342/342.stl b/test/extrude/342/342.stl
index c67883d2623061331259c8ba265df6f6369b701e..cd51ee6e0ec86ec02a645f8cce418fade65cc001 100644
Binary files a/test/extrude/342/342.stl and b/test/extrude/342/342.stl differ
diff --git a/test/extrude/343/343.py b/test/extrude/343/343.py
index 77e98d74385ba1d4b4406c9a4dbde6a0ccc2a6c2..5d0efec7fc712b9baafcf4e2020b0d3be8d94856 100644
--- a/test/extrude/343/343.py
+++ b/test/extrude/343/343.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(620,560,560))
-r=w0.sketch().arc((540,800),(580,750),(610,710)).segment((760,670)).arc((700,780),(600,870)).segment((600,800)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((361,371),(381,371)).segment((381,221)).segment((451,221)).segment((451,371)).segment((461,371)).segment((461,750)).segment((451,750)).segment((451,900)).segment((381,900)).segment((381,750)).segment((361,750)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,317,501))
+r=w0.sketch().segment((1,270),(46,152)).segment((170,196)).arc((207,196),(241,220)).segment((240,255)).segment((312,255)).segment((310,196)).arc((486,342),(257,367)).segment((196,341)).arc((156,335),(125,317)).close().assemble().finalize().extrude(569).union(w0.sketch().segment((430,550),(506,551)).arc((547,542),(586,550)).segment((660,550)).segment((660,726)).segment((585,726)).arc((545,735),(507,725)).segment((430,725)).close().assemble().push([(830,295)]).circle(670).finalize().extrude(841)).union(w0.sketch().segment((272,790),(345,791)).arc((430,705),(516,791)).segment((590,789)).segment((590,796)).segment((515,796)).arc((432,876),(345,796)).segment((271,795)).close().assemble().finalize().extrude(870))
\ No newline at end of file
diff --git a/test/extrude/343/343.stl b/test/extrude/343/343.stl
index 629a3ca86f9bd79870697707b633f66772b08090..8598a4a4236baeb65359018c7daa85333024b233 100644
Binary files a/test/extrude/343/343.stl and b/test/extrude/343/343.stl differ
diff --git a/test/extrude/344/344.py b/test/extrude/344/344.py
index 518f8e53eabfc8d473005ecdb8df3d1cd62e62f5..897797a7e249e672327456743193f48af72028b4 100644
--- a/test/extrude/344/344.py
+++ b/test/extrude/344/344.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(428,374,428))
-r=w0.sketch().segment((514,266),(557,266)).segment((557,514)).arc((698,957),(514,536)).close().assemble().finalize().extrude(395).union(w0.sketch().push([(271,1)]).rect(1000,654).reset().face(w0.sketch().segment((147,287),(266,190)).segment((395,341)).arc((546,730),(266,428)).close().assemble()).push([(428,546)]).circle(460,mode='s').finalize().extrude(557))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,570))
+w1=cq.Workplane('ZX',origin=(500,616,501))
+r=w0.workplane(offset=480).moveTo(425,626).cylinder(541,532).union(w0.workplane(offset=534).moveTo(427,624).cylinder(566,740)).union(w0.workplane(offset=636).moveTo(885,272).box(731,774,771)).union(w1.workplane(offset=536).moveTo(400,241).cylinder(571,739))
\ No newline at end of file
diff --git a/test/extrude/344/344.stl b/test/extrude/344/344.stl
index fcee312ed498a6078c716537eefb58e9830e5afd..f0bef4930fe5fe99562df891f53cc353529c0ac4 100644
Binary files a/test/extrude/344/344.stl and b/test/extrude/344/344.stl differ
diff --git a/test/extrude/345/345.py b/test/extrude/345/345.py
index b4103ba8df17cf23e8d279248c9e9e6d2987c559..ad6d19a89c8b2a8d62fa619ff4fd7c4f9366fa8e 100644
--- a/test/extrude/345/345.py
+++ b/test/extrude/345/345.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(248,355,355))
-w1=cq.Workplane('XY',origin=(355,355,291))
-r=w0.workplane(offset=141).moveTo(608,603).box(388,635,785).union(w0.workplane(offset=678).moveTo(259,1).cylinder(1000,388)).union(w1.workplane(offset=543).moveTo(130,264).box(613,710,731)).translate((5,1,33))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,665))
+r=w0.sketch().segment((132,499),(356,1)).segment((869,230)).segment((779,425)).arc((840,597),(677,669)).segment((660,696)).segment((666,696)).segment((665,1000)).segment((495,999)).segment((496,695)).segment((566,695)).close().assemble().finalize().extrude(167)
\ No newline at end of file
diff --git a/test/extrude/345/345.stl b/test/extrude/345/345.stl
index cd48135a4c8422d45c0108ff3af019b0e43a9176..2b404c47e09a2206a3b9723d593cab6e5abe3d4a 100644
Binary files a/test/extrude/345/345.stl and b/test/extrude/345/345.stl differ
diff --git a/test/extrude/346/346.py b/test/extrude/346/346.py
index 3a78cb84a73fadd1e94d41b790ae561b1994cb7e..529a6a517c26d781dc48e482d24bf265c07a3807 100644
--- a/test/extrude/346/346.py
+++ b/test/extrude/346/346.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(412,597,412))
-w1=cq.Workplane('ZX',origin=(412,412,412))
-r=w0.workplane(offset=118).moveTo(799,766).cylinder(1000,428).union(w0.sketch().segment((9,82),(65,41)).arc((130,74),(194,98)).segment((275,90)).segment((275,98)).segment((202,106)).segment((388,364)).segment((275,452)).segment((219,380)).segment((219,372)).close().assemble().finalize().extrude(1)).union(w1.workplane(offset=613).moveTo(448,311).box(726,710,815))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,521))
+r=w0.sketch().arc((859,80),(869,80),(875,76)).arc((881,97),(859,81)).assemble().finalize().extrude(1).union(w0.sketch().segment((116,132),(171,96)).segment((330,335)).arc((746,841),(276,385)).close().assemble().finalize().extrude(980))
\ No newline at end of file
diff --git a/test/extrude/346/346.stl b/test/extrude/346/346.stl
index b8454eea45cfd9693041a312074345c5ed83d48c..9618c5e18fb012e4025f8e24b71a801e093299e8 100644
Binary files a/test/extrude/346/346.stl and b/test/extrude/346/346.stl differ
diff --git a/test/extrude/347/347.py b/test/extrude/347/347.py
index ece2ec9490f681c2fc236b5323c0f5fe91e44036..8e9cb426a07e219d1093f393ddf753878958f5fc 100644
--- a/test/extrude/347/347.py
+++ b/test/extrude/347/347.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(480,480,573))
-r=w0.sketch().segment((136,199),(136,240)).arc((1,11),(199,199)).close().assemble().reset().face(w0.sketch().segment((251,625),(740,625)).segment((740,261)).segment((1000,261)).segment((1000,990)).segment((251,990)).close().assemble()).finalize().extrude(292)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,595,501))
+r=w0.sketch().segment((2,534),(75,460)).segment((71,455)).segment((206,247)).segment((255,281)).segment((406,131)).segment((675,406)).arc((785,402),(870,472)).segment((1000,470)).segment((999,630)).segment((870,630)).arc((740,706),(606,639)).segment((530,756)).segment((481,720)).segment((331,869)).close().assemble().finalize().extrude(27).union(w0.workplane(offset=640).moveTo(371,501).cylinder(780,560))
\ No newline at end of file
diff --git a/test/extrude/347/347.stl b/test/extrude/347/347.stl
index fbda6f6de97e1cda2a8dec7f14d56813b75ec1d9..17c10087631605879bdbe1f2da043ea9e2493f5b 100644
Binary files a/test/extrude/347/347.stl and b/test/extrude/347/347.stl differ
diff --git a/test/extrude/348/348.py b/test/extrude/348/348.py
index f4f7f34ce865ff9558bece4dd7a941412d3936c2..507f4de9bdc639bd2a77fb2a3a899120b0b00cbf 100644
--- a/test/extrude/348/348.py
+++ b/test/extrude/348/348.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(556,556,711))
-r=w0.sketch().segment((1,778),(445,767)).segment((445,900)).segment((1,911)).close().assemble().push([(933,423)]).rect(911,1000).finalize().extrude(234)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,325))
+r=w0.sketch().segment((300,126),(650,1)).segment((804,431)).segment((452,556)).close().assemble().finalize().extrude(550).union(w0.workplane(offset=678).moveTo(223,821).box(556,861,855))
\ No newline at end of file
diff --git a/test/extrude/348/348.stl b/test/extrude/348/348.stl
index 0c8ba7f333c443e56e8a130303bfda83113e6b52..6f0cd34efe48a7390dc56341706babfc22a4e4b4 100644
Binary files a/test/extrude/348/348.stl and b/test/extrude/348/348.stl differ
diff --git a/test/extrude/349/349.py b/test/extrude/349/349.py
index d9c644098c2795e584591f8ccf54b9c8d9a45564..a2b5714efe54551f6159fc4aa2de2809d192c28d 100644
--- a/test/extrude/349/349.py
+++ b/test/extrude/349/349.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(771,519,519))
-r=w0.sketch().push([(218,97)]).circle(699).push([(880,1000)]).circle(639).push([(807,964)]).circle(555,mode='s').finalize().extrude(1).translate((1,1,84))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,382,501))
+w1=cq.Workplane('XY',origin=(501,501,456))
+r=w0.workplane(offset=459).moveTo(726,218).box(999,726,586).union(w0.sketch().push([(192,836)]).circle(664).push([(181,855)]).rect(690,600,mode='s').finalize().extrude(430)).union(w1.sketch().segment((1,600),(485,601)).arc((736,240),(540,631)).segment((541,796)).segment((1,795)).close().assemble().push([(540,351)]).circle(580,mode='s').finalize().extrude(929))
\ No newline at end of file
diff --git a/test/extrude/349/349.stl b/test/extrude/349/349.stl
index eb339a23cdb542ee9532943c0c76cb3d26dd9c5a..112cc0360e041c09a81759b62182e0945bd07340 100644
Binary files a/test/extrude/349/349.stl and b/test/extrude/349/349.stl differ
diff --git a/test/extrude/35/35.py b/test/extrude/35/35.py
index 2bd5f09b6ee0a1a1f6d0f429d703769f5e789ed1..77d84237302c555e2515e9cfae20c7f48aa1daa8 100644
--- a/test/extrude/35/35.py
+++ b/test/extrude/35/35.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,368))
-r=w0.workplane(offset=552).moveTo(706,545).cylinder(603,574).union(w0.sketch().push([(207,1000)]).circle(736).circle(633,mode='s').push([(794,1)]).circle(736).finalize().extrude(780)).translate((31,236,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(52,1,71))
+r=w0.sketch().segment((461,876),(717,876)).segment((717,110)).segment((461,110)).close().assemble().push([(533,442)]).rect(191,217,mode='s').finalize().extrude(90).translate((1,90,1))
diff --git a/test/extrude/35/35.stl b/test/extrude/35/35.stl
index e7123b174e3c653533993c93942aedae691d0977..f8a2af7fd15c5cf1dda6ec0791c7cdca9257b9a5 100644
Binary files a/test/extrude/35/35.stl and b/test/extrude/35/35.stl differ
diff --git a/test/extrude/350/350.py b/test/extrude/350/350.py
index 229675ae91e2217049996ff5f9182ede2ef994cf..e2f30e096d2f77c2d66abbfcd802594dcf35818b 100644
--- a/test/extrude/350/350.py
+++ b/test/extrude/350/350.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(394,192,394))
-w1=cq.Workplane('ZX',origin=(394,1,394))
-r=w0.workplane(offset=362).moveTo(591,139).box(511,947,458).union(w0.workplane(offset=697).moveTo(267,798).cylinder(1000,522)).union(w1.sketch().push([(607,538)]).rect(415,426).rect(415,405,mode='s').finalize().extrude(787))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,741))
+r=w0.sketch().arc((232,402),(126,62),(471,172)).segment((495,171)).arc((482,301),(565,405)).arc((400,550),(232,402)).assemble().finalize().extrude(18).union(w0.sketch().segment((607,797),(766,666)).segment((936,871)).segment((776,1000)).close().assemble().finalize().extrude(198))
\ No newline at end of file
diff --git a/test/extrude/350/350.stl b/test/extrude/350/350.stl
index 96a96067e1311a89dcd9e3741ae82d593b1fc3e7..7f26fee6192784bfc100f7826b10ff7be070f41f 100644
Binary files a/test/extrude/350/350.stl and b/test/extrude/350/350.stl differ
diff --git a/test/extrude/351/351.py b/test/extrude/351/351.py
index 54b921832968d0a3eef62ba82938475cb0f46c33..692aa5f36b4887a8cc0fc216cd32e1fcaa9f7d65 100644
--- a/test/extrude/351/351.py
+++ b/test/extrude/351/351.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,710,500))
-r=w0.workplane(offset=291).moveTo(171,211).box(520,680,920).union(w0.sketch().segment((101,241),(231,241)).segment((231,351)).arc((331,510),(231,660)).segment((231,770)).segment((101,770)).segment((101,660)).arc((1,510),(101,351)).close().assemble().reset().face(w0.sketch().segment((101,371),(101,640)).arc((21,510),(101,371)).assemble(),mode='s').reset().face(w0.sketch().arc((231,371),(311,510),(231,640)).close().assemble(),mode='s').reset().face(w0.sketch().segment((940,770),(1000,830)).segment((940,880)).arc((950,830),(940,770)).assemble()).finalize().extrude(411))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(711,499,501))
+r=w0.sketch().push([(171,765)]).circle(670).reset().face(w0.sketch().segment((355,101),(465,101)).segment((467,67)).segment((896,67)).segment((896,101)).segment((999,101)).segment((1000,210)).segment((895,210)).segment((894,245)).segment((465,246)).segment((467,210)).segment((355,212)).close().assemble()).finalize().extrude(82)
\ No newline at end of file
diff --git a/test/extrude/351/351.stl b/test/extrude/351/351.stl
index f748312cafb8d13bec311b7cd98655467fec38b2..054190c06df71004b14c85e839759c9dcaeb5e74 100644
Binary files a/test/extrude/351/351.stl and b/test/extrude/351/351.stl differ
diff --git a/test/extrude/352/352.py b/test/extrude/352/352.py
index 9c6feb7af994af0981fc2aa573be36f2f2c0a53f..bf93f726c6cd6bdf3bd6e21307d802da7d45b037 100644
--- a/test/extrude/352/352.py
+++ b/test/extrude/352/352.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(451,451,451))
-r=w0.workplane(offset=303).moveTo(737,1).cylinder(748,550).union(w0.sketch().push([(210,528)]).circle(583).push([(210,522)]).rect(627,528,mode='s').finalize().extrude(297)).union(w0.sketch().arc((253,945),(253,462),(495,890)).arc((396,1000),(253,945)).assemble().finalize().extrude(737)).translate((1,1,99))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,421))
+r=w0.sketch().segment((2,397),(420,210)).segment((596,605)).segment((177,792)).close().assemble().reset().face(w0.sketch().arc((842,530),(991,487),(847,551)).segment((856,551)).segment((857,531)).close().assemble()).finalize().extrude(526).union(w0.workplane(offset=583).moveTo(832,529).box(590,586,666))
\ No newline at end of file
diff --git a/test/extrude/352/352.stl b/test/extrude/352/352.stl
index 230745d189cc70df388626c0867ca94c6de4e936..0990228a79f66bd9e5c8cb322507417674b18a3e 100644
Binary files a/test/extrude/352/352.stl and b/test/extrude/352/352.stl differ
diff --git a/test/extrude/353/353.py b/test/extrude/353/353.py
index dfe6ce3a599359ea9ee1abf1e14fe2a313197185..2f714801fb5574df62dd12879b43ca2d0649f996 100644
--- a/test/extrude/353/353.py
+++ b/test/extrude/353/353.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,341))
-r=w0.sketch().segment((1,321),(31,321)).segment((21,311)).segment((131,261)).arc((201,211),(281,191)).segment((391,141)).segment((421,211)).arc((500,261),(550,321)).segment((630,321)).segment((630,590)).segment((600,590)).segment((610,610)).segment((500,660)).arc((481,680),(451,690)).segment((1000,730)).segment((990,860)).segment((401,820)).segment((411,710)).arc((381,720),(341,730)).segment((241,780)).segment((201,710)).arc((131,660),(81,590)).segment((1,590)).close().assemble().reset().face(w0.sketch().segment((291,471),(301,441)).segment((341,451)).segment((331,481)).close().assemble(),mode='s').finalize().extrude(820)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,624,501))
+r=w0.sketch().segment((41,96),(71,7)).segment((332,96)).arc((566,11),(701,221)).segment((959,311)).segment((929,402)).segment((670,312)).arc((436,397),(300,187)).close().assemble().reset().face(w0.sketch().segment((386,216),(585,282)).arc((466,312),(386,217)).assemble(),mode='s').reset().face(w0.sketch().arc((416,126),(536,98),(614,191)).close().assemble(),mode='s').finalize().extrude(245).union(w0.workplane(offset=489).moveTo(553,950).box(616,600,525))
\ No newline at end of file
diff --git a/test/extrude/353/353.stl b/test/extrude/353/353.stl
index 005809fa962ad6cd1a032e5b67b8e3206c30e354..b248f0f022663865cce20beafac0b8e35da7a52d 100644
Binary files a/test/extrude/353/353.stl and b/test/extrude/353/353.stl differ
diff --git a/test/extrude/354/354.py b/test/extrude/354/354.py
index 7243a0dc56186869aad4f63a712daf947e8cd2a7..8aeafc0fa152b07c46d6b21feb5d1669d80561b3 100644
--- a/test/extrude/354/354.py
+++ b/test/extrude/354/354.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(557,557,681))
-r=w0.sketch().push([(897,866)]).circle(609).push([(897,897)]).circle(578,mode='s').finalize().extrude(1).union(w0.sketch().segment((42,969),(52,712)).segment((506,722)).segment((495,979)).close().assemble().reset().face(w0.sketch().segment((63,403),(506,403)).arc((1000,228),(763,701)).segment((763,681)).segment((784,681)).segment((784,516)).segment((959,495)).segment((938,300)).segment((619,341)).segment((640,526)).segment((712,516)).segment((712,567)).segment((547,567)).arc((516,516),(506,454)).segment((63,454)).close().assemble()).finalize().extrude(856))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(651,501,499))
+r=w0.sketch().push([(287,492)]).rect(1000,814).reset().face(w0.sketch().segment((7,586),(57,586)).segment((60,626)).segment((6,625)).close().assemble(),mode='s').push([(283,529)]).rect(755,705,mode='s').reset().face(w0.sketch().segment((481,430),(499,432)).segment((501,480)).arc((515,506),(500,525)).segment((501,575)).segment((480,576)).segment((480,525)).arc((466,507),(480,481)).close().assemble(),mode='s').finalize().extrude(195).union(w0.sketch().segment((810,195),(826,196)).segment((826,231)).arc((1000,499),(825,776)).segment((825,804)).segment((811,806)).segment((811,786)).arc((395,501),(810,222)).close().assemble().finalize().extrude(461))
\ No newline at end of file
diff --git a/test/extrude/354/354.stl b/test/extrude/354/354.stl
index fcdfabb8d1f6ff4d35bb3b1d36fd55b2b315298f..ce219bf1a83158f0310b99937d257e83063bd780 100644
Binary files a/test/extrude/354/354.stl and b/test/extrude/354/354.stl differ
diff --git a/test/extrude/355/355.py b/test/extrude/355/355.py
index 4ce4a014124723f7c9eb47fbfcb61ab9dbab29f2..4526a7b85d2ba7d7755f71fefc59f55f14d244ef 100644
--- a/test/extrude/355/355.py
+++ b/test/extrude/355/355.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(516,516,444))
-r=w0.sketch().segment((1,434),(382,434)).segment((434,392)).segment((464,434)).segment((588,434)).arc((1000,238),(619,485)).segment((619,876)).segment((238,876)).segment((186,918)).segment((155,876)).segment((1,876)).close().assemble().finalize().extrude(650)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(421,500,500))
+r=w0.sketch().arc((590,337),(998,465),(605,640)).arc((1,516),(591,335)).assemble().reset().face(w0.sketch().arc((591,337),(994,466),(611,635)).arc((636,484),(591,335)).assemble(),mode='s').finalize().extrude(661)
\ No newline at end of file
diff --git a/test/extrude/355/355.stl b/test/extrude/355/355.stl
index 464c5e07f7be48b5550f00e9b2a6a0f907971467..620bf55b8580219aeca46050b523eacba16eeb74 100644
Binary files a/test/extrude/355/355.stl and b/test/extrude/355/355.stl differ
diff --git a/test/extrude/356/356.py b/test/extrude/356/356.py
index 6dd1db01b0dfbbea68e74c467e13d453783ed985..15390774d1ecace4a4fccc7a2de0002aab066d23 100644
--- a/test/extrude/356/356.py
+++ b/test/extrude/356/356.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().arc((707,920),(574,434),(827,867)).arc((667,654),(707,920)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,297,501))
+r=w0.sketch().segment((92,700),(251,540)).segment((400,690)).segment((242,851)).close().assemble().push([(834,31)]).circle(514).reset().face(w0.sketch().segment((826,31),(836,25)).segment((840,36)).segment((835,42)).close().assemble(),mode='s').finalize().extrude(666).union(w0.sketch().segment((121,365),(730,190)).segment((911,824)).segment((302,1000)).close().assemble().push([(836,31)]).circle(530).finalize().extrude(909))
\ No newline at end of file
diff --git a/test/extrude/356/356.stl b/test/extrude/356/356.stl
index 188c601efdfbe711a3210d1fc37cdd0ce36ab9ae..69274d3ec5a92346f90637c4b657cfeba62ff517 100644
Binary files a/test/extrude/356/356.stl and b/test/extrude/356/356.stl differ
diff --git a/test/extrude/357/357.py b/test/extrude/357/357.py
index 34ca30ac8922bd573a5fe9914caa9702a4d5c385..ae7a8e18ee254ee8105c238495870a3dcb2559dd 100644
--- a/test/extrude/357/357.py
+++ b/test/extrude/357/357.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,471,500))
-r=w0.sketch().segment((331,690),(391,630)).segment((471,710)).segment((461,710)).segment((461,830)).close().assemble().finalize().extrude(101).union(w0.sketch().segment((301,91),(461,1)).segment((640,321)).arc((760,530),(670,750)).segment((670,1000)).segment((351,1000)).segment((351,770)).arc((241,510),(411,301)).close().assemble().finalize().extrude(960))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,842))
+r=w0.sketch().segment((132,462),(377,272)).segment((376,1)).segment((631,1)).segment((630,75)).segment((653,57)).segment((877,342)).segment((632,536)).segment((630,805)).segment((377,806)).segment((376,730)).segment((357,753)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((210,281),(521,85)).segment((796,521)).segment((751,550)).arc((347,982),(286,402)).close().assemble().finalize().extrude(146))
\ No newline at end of file
diff --git a/test/extrude/357/357.stl b/test/extrude/357/357.stl
index 412cc704859c9f0326e1deb42f49b8e0e1169943..9cc10b9042f0f9e116292811ed004f1802d31c28 100644
Binary files a/test/extrude/357/357.stl and b/test/extrude/357/357.stl differ
diff --git a/test/extrude/358/358.py b/test/extrude/358/358.py
index b5401975cd408ceb6cc39adb7b1bf205a3f8acdb..30e1d8da10345430423e7688f494145ef7ba4e08 100644
--- a/test/extrude/358/358.py
+++ b/test/extrude/358/358.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(403,232,403))
-r=w0.sketch().push([(7,245)]).rect(829,744).push([(1,245)]).circle(415,mode='s').push([(988,708)]).circle(427).reset().face(w0.sketch().segment((988,695),(1000,695)).segment((1000,720)).segment((1000,732)).segment((988,732)).segment((988,720)).arc((976,708),(988,695)).assemble(),mode='s').finalize().extrude(756).translate((1,1,6))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,176))
+r=w0.sketch().segment((456,649),(486,641)).segment((485,631)).segment((510,630)).segment((516,629)).arc((476,819),(540,640)).segment((560,706)).segment((540,711)).segment((541,750)).segment((487,750)).segment((485,729)).segment((480,731)).close().assemble().finalize().extrude(741).union(w0.sketch().segment((201,456),(400,456)).arc((425,1),(445,454)).segment((805,457)).segment((804,564)).arc((766,630),(804,689)).segment((806,1000)).segment((202,1000)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/358/358.stl b/test/extrude/358/358.stl
index 1bff15f2649a3ac45b7679a75d365cb3ecfac378..def074abfe55354ffa619056b1d1a9a6b0a9c540 100644
Binary files a/test/extrude/358/358.stl and b/test/extrude/358/358.stl differ
diff --git a/test/extrude/359/359.py b/test/extrude/359/359.py
index 4d6027f7ba4e7b5e90a025c5345c5659c765467f..275922b1f62669384f45bf99c55e7cd022a26d90 100644
--- a/test/extrude/359/359.py
+++ b/test/extrude/359/359.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(503,334,334))
-w1=cq.Workplane('XY',origin=(334,334,205))
-r=w0.workplane(offset=1).cylinder(1000,513).union(w0.sketch().arc((344,354),(314,324),(354,334)).arc((344,344),(344,354)).assemble().finalize().extrude(533)).union(w1.sketch().arc((553,85),(543,394),(821,254)).arc((443,543),(553,85)).assemble().finalize().extrude(453)).translate((1,181,181))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,321))
+r=w0.workplane(offset=613).moveTo(446,754).cylinder(725,744).union(w0.workplane(offset=681).moveTo(516,286).cylinder(861,784))
\ No newline at end of file
diff --git a/test/extrude/359/359.stl b/test/extrude/359/359.stl
index d443e494ebf8f0ea07bba123aa6336823ace8f24..b0a45d7462977ff99c18f70e26f33e2f1469d805 100644
Binary files a/test/extrude/359/359.stl and b/test/extrude/359/359.stl differ
diff --git a/test/extrude/36/36.py b/test/extrude/36/36.py
index 0e569b12ad9196371eefc7bac5610f4d25b0206c..0bca64c2cb45861f7e1c3874aed81eb8025b6c0e 100644
--- a/test/extrude/36/36.py
+++ b/test/extrude/36/36.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(611,474,474))
-w1=cq.Workplane('ZX',origin=(474,506,474))
-r=w0.sketch().arc((937,506),(1000,663),(937,821)).close().assemble().finalize().extrude(12).union(w0.sketch().segment((663,148),(737,127)).segment((758,211)).arc((716,232),(685,253)).segment((674,201)).arc((685,180),(674,180)).close().assemble().finalize().extrude(169)).union(w0.sketch().segment((159,464),(159,474)).arc((1,274),(169,464)).close().assemble().finalize().extrude(674)).union(w1.sketch().push([(290,332)]).rect(611,632).push([(301,390)]).rect(527,516,mode='s').finalize().extrude(422))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(45,30,21))
+r=w0.sketch().segment((505,330),(575,324)).segment((575,868)).segment((505,868)).close().assemble().push([(527,580)]).circle(68,mode='s').finalize().extrude(135)
diff --git a/test/extrude/36/36.stl b/test/extrude/36/36.stl
index 5f74d8f04da7e66fbc18cfaf0d8dae3e1717be97..2fb7131706a93bf5d53f67358527aa1046f86eb2 100644
Binary files a/test/extrude/36/36.stl and b/test/extrude/36/36.stl differ
diff --git a/test/extrude/360/360.py b/test/extrude/360/360.py
index 767507d6888fd37930077b2c87009151bc498f2d..99d0b6a6a79d6ff7f04a54d812f1045d1c838b0f 100644
--- a/test/extrude/360/360.py
+++ b/test/extrude/360/360.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(323,506,506))
-r=w0.sketch().push([(506,946)]).rect(828,699).reset().face(w0.sketch().segment((452,914),(506,882)).segment((560,979)).segment((506,1000)).close().assemble(),mode='s').push([(613,1)]).circle(538).finalize().extrude(882).translate((1,1,32))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,415,500))
+w1=cq.Workplane('YZ',origin=(771,500,500))
+r=w0.sketch().push([(346,235)]).circle(734).reset().face(w0.sketch().segment((216,292),(315,97)).segment((481,185)).segment((380,376)).close().assemble(),mode='s').finalize().extrude(371).union(w1.workplane(offset=616).moveTo(501,640).cylinder(730,750))
\ No newline at end of file
diff --git a/test/extrude/360/360.stl b/test/extrude/360/360.stl
index 1400518e2c5812665c6cc76ee5a9ae8982d301dd..4f4727e54a4610774b4aa0c10c6fbf35688d7640 100644
Binary files a/test/extrude/360/360.stl and b/test/extrude/360/360.stl differ
diff --git a/test/extrude/361/361.py b/test/extrude/361/361.py
index e2f428f44ab2a28068bb20afe5c24dae1382a2e2..efe06f1443d0f4c990052b4ab434d3886355a237 100644
--- a/test/extrude/361/361.py
+++ b/test/extrude/361/361.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(558,841,558))
-r=w0.sketch().arc((213,973),(390,655),(257,991)).arc((266,973),(266,956)).arc((372,691),(240,947)).arc((222,956),(213,973)).assemble().finalize().extrude(1).union(w0.sketch().segment((160,408),(195,408)).segment((195,160)).segment((417,160)).arc((593,116),(779,160)).segment((1000,160)).segment((1000,850)).segment((779,850)).arc((593,894),(417,850)).segment((195,850)).segment((195,646)).segment((160,646)).close().assemble().reset().face(w0.sketch().arc((249,408),(496,257),(735,408)).segment((602,408)).arc((505,593),(417,408)).close().assemble(),mode='s').reset().face(w0.sketch().segment((249,646),(735,646)).arc((496,806),(249,646)).assemble(),mode='s').finalize().extrude(266))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,305,502))
+r=w0.sketch().segment((390,1),(615,1)).segment((614,391)).segment((391,391)).segment((390,371)).arc((191,220),(390,71)).close().assemble().reset().face(w0.sketch().segment((346,710),(566,461)).segment((685,566)).segment((466,814)).close().assemble()).push([(825,208)]).rect(510,535).finalize().extrude(764).union(w0.workplane(offset=696).moveTo(301,870).cylinder(889,629))
\ No newline at end of file
diff --git a/test/extrude/361/361.stl b/test/extrude/361/361.stl
index 988a14e19779aab0ba5259fe7c27971cfa49bd12..f07369813b45e2220acc5ba16449c047c8107cd3 100644
Binary files a/test/extrude/361/361.stl and b/test/extrude/361/361.stl differ
diff --git a/test/extrude/362/362.py b/test/extrude/362/362.py
index e3552461c8e823d2640bc579bb2c13fb5e6794de..89e4d8aaf549df094e698f005272ef09394ff660 100644
--- a/test/extrude/362/362.py
+++ b/test/extrude/362/362.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(542,808,542))
-r=w0.sketch().segment((615,808),(872,423)).segment((1000,505)).segment((743,890)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((83,193),(129,203),(166,230)).close().assemble().reset().face(w0.sketch().segment((166,313),(175,276)).arc((175,294),(166,313)).assemble()).finalize().extrude(28))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(601,501,499))
+r=w0.sketch().segment((7,235),(166,237)).arc((295,205),(426,236)).segment((585,235)).segment((585,385)).segment((669,386)).segment((815,281)).segment((990,524)).segment((681,746)).segment((585,615)).segment((585,764)).segment((425,765)).arc((296,796),(165,765)).segment((7,766)).segment((7,551)).arc((1,501),(7,452)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((495,686),(859,231)).segment((1000,340)).segment((635,795)).close().assemble().finalize().extrude(879))
\ No newline at end of file
diff --git a/test/extrude/362/362.stl b/test/extrude/362/362.stl
index a6087139b4d1b70fd0e27472aa7867858a7bc0e3..5377afea370e06ef635004ce03b0aa805199d548 100644
Binary files a/test/extrude/362/362.stl and b/test/extrude/362/362.stl differ
diff --git a/test/extrude/363/363.py b/test/extrude/363/363.py
index e31e65ce2865612f89edf4883c632d58860a2ef0..f769d4cba6bdea049624d2f2477f6992ef118084 100644
--- a/test/extrude/363/363.py
+++ b/test/extrude/363/363.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(447,447,176))
-w1=cq.Workplane('XY',origin=(447,447,331))
-r=w0.workplane(offset=583).moveTo(166,1).cylinder(719,486).union(w0.sketch().segment((243,515),(399,544)).segment((399,476)).arc((631,156),(612,554)).segment((612,932)).segment((243,932)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=384).moveTo(602,505).box(505,583,573)).translate((1,40,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,500,500))
+r=w0.workplane(offset=846).moveTo(386,199).box(1000,816,1000).union(w0.sketch().segment((217,360),(866,360)).segment((824,455)).arc((481,591),(497,960)).segment((215,959)).close().assemble().push([(422,416)]).circle(550,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/363/363.stl b/test/extrude/363/363.stl
index cc6fb5b5c5ef06724fed50f1ef17df72a7deae37..2f747bc0a854eaa77057b12d35da2576c6713b50 100644
Binary files a/test/extrude/363/363.stl and b/test/extrude/363/363.stl differ
diff --git a/test/extrude/364/364.py b/test/extrude/364/364.py
index eca246f1c4523e2a59fb8ad30808309da7c6bc64..8d07e3d3362f9629e9dc02dd63447d163d378660 100644
--- a/test/extrude/364/364.py
+++ b/test/extrude/364/364.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(470,470,206))
-r=w0.sketch().push([(1,904)]).circle(603).push([(531,470)]).circle(519).push([(856,121)]).circle(687).push([(850,121)]).rect(603,711,mode='s').finalize().extrude(1000).translate((133,97,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(511,502,500))
+r=w0.sketch().push([(451,247)]).circle(745).push([(565,136)]).circle(531,mode='s').finalize().extrude(41).union(w0.sketch().segment((569,570),(616,570)).segment((616,510)).segment((750,509)).segment((749,570)).segment((796,570)).segment((794,839)).segment((750,841)).segment((749,910)).segment((615,910)).segment((614,841)).segment((570,841)).close().assemble().finalize().extrude(530)).union(w0.workplane(offset=718).moveTo(682,707).box(626,1000,936))
\ No newline at end of file
diff --git a/test/extrude/364/364.stl b/test/extrude/364/364.stl
index ffe56e42578def1ee3ee009b453320a6869aa71d..836b9da4756c8a207f0bef69f6ba3941d9cfa2fd 100644
Binary files a/test/extrude/364/364.stl and b/test/extrude/364/364.stl differ
diff --git a/test/extrude/365/365.py b/test/extrude/365/365.py
index 2fe44106ca5431cccfe07663c745090ca21555c9..43c60a1098ccefd16e1fd68c4fcecf3aa051e525 100644
--- a/test/extrude/365/365.py
+++ b/test/extrude/365/365.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().arc((274,8),(394,334),(274,660)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,331))
+r=w0.workplane(offset=484).moveTo(530,444).cylinder(531,645).union(w0.sketch().segment((435,629),(464,680)).arc((445,878),(641,924)).arc((658,949),(679,970)).arc((401,914),(436,630)).assemble().finalize().extrude(670)).union(w0.sketch().push([(433,812)]).rect(726,874).push([(602,179)]).rect(653,855).finalize().extrude(875))
\ No newline at end of file
diff --git a/test/extrude/365/365.stl b/test/extrude/365/365.stl
index 43c79fc4cc3680786955aa89e6af842ef3f19eb5..64f5e42412c3fe55080b255bfbf22312807f1be3 100644
Binary files a/test/extrude/365/365.stl and b/test/extrude/365/365.stl differ
diff --git a/test/extrude/366/366.py b/test/extrude/366/366.py
index 025abd590bbad922b549ada6ba7d146d7aa218aa..132762fa491a869200e98e530b3469df7b8a1294 100644
--- a/test/extrude/366/366.py
+++ b/test/extrude/366/366.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.workplane(offset=667).box(614,507,1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,476,502))
+w1=cq.Workplane('ZX',origin=(500,515,499))
+r=w0.sketch().push([(23,384)]).rect(545,615).reset().face(w0.sketch().segment((620,406),(984,406)).segment((985,526)).arc((1000,604),(984,685)).segment((984,805)).segment((620,804)).segment((620,685)).arc((601,604),(620,526)).close().assemble()).reset().face(w0.sketch().segment((715,721),(845,469)).segment((890,490)).segment((754,741)).close().assemble(),mode='s').finalize().extrude(406).union(w1.workplane(offset=553).moveTo(726,255).cylinder(604,560))
\ No newline at end of file
diff --git a/test/extrude/366/366.stl b/test/extrude/366/366.stl
index a1af7467f32dad691cbf60b91a68dfaccda0d7a1..87376e78a1fd1a8bff00ab255f2993278c00fd27 100644
Binary files a/test/extrude/366/366.stl and b/test/extrude/366/366.stl differ
diff --git a/test/extrude/367/367.py b/test/extrude/367/367.py
index dd3667d8149c9520e6c25c02070b7306cf5355b5..237f34388eb61e5f8a7e2c55eb2e8e8e4f1c0e8b 100644
--- a/test/extrude/367/367.py
+++ b/test/extrude/367/367.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(432,294,432))
-w1=cq.Workplane('YZ',origin=(440,432,432))
-r=w0.sketch().segment((397,147),(785,122)).segment((802,302)).arc((845,406),(819,518)).segment((828,681)).segment((440,707)).close().assemble().finalize().extrude(793).union(w0.workplane(offset=716).moveTo(414,561).cylinder(1000,612)).union(w1.sketch().segment((130,18),(208,18)).segment((208,104)).arc((337,268),(208,423)).segment((208,509)).segment((130,509)).segment((130,423)).arc((1,268),(130,104)).close().assemble().finalize().extrude(182))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,461,500))
+r=w0.workplane(offset=480).moveTo(161,510).box(819,900,540).union(w0.sketch().arc((830,294),(999,446),(864,625)).arc((610,484),(829,295)).assemble().finalize().extrude(625))
\ No newline at end of file
diff --git a/test/extrude/367/367.stl b/test/extrude/367/367.stl
index f41196b4c87c8548e5a39af337b0acd8c0b4f1d3..154b9cc36042d599fb3950a1aaf43c1c527c0aa1 100644
Binary files a/test/extrude/367/367.stl and b/test/extrude/367/367.stl differ
diff --git a/test/extrude/368/368.py b/test/extrude/368/368.py
index 26ec9a15d32169237f75c26e3345ec4f353669b2..e442b7061df705319643a213f4904ca70843b82d 100644
--- a/test/extrude/368/368.py
+++ b/test/extrude/368/368.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).box(680,987,1000).translate((7,161,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,336,500))
+r=w0.sketch().push([(581,416)]).circle(531).push([(579,421)]).rect(536,511,mode='s').finalize().extrude(360).union(w0.sketch().push([(301,286)]).circle(567).circle(545,mode='s').finalize().extrude(626)).union(w0.sketch().push([(400,115)]).circle(616).reset().face(w0.sketch().arc((286,886),(426,736),(316,556)).arc((762,772),(286,886)).assemble()).finalize().extrude(965))
\ No newline at end of file
diff --git a/test/extrude/368/368.stl b/test/extrude/368/368.stl
index 411f70f68c63341b71add1fc3a284ae2eb1778b7..0442d7977af41c4513f19bcbe74729118e828cae 100644
Binary files a/test/extrude/368/368.stl and b/test/extrude/368/368.stl differ
diff --git a/test/extrude/369/369.py b/test/extrude/369/369.py
index 154bc3ddeb8f2a02941ca4d3d7b1632107eae17e..d9a4cc9bbf1edec0e2180cec2c1de0b3cc406d47 100644
--- a/test/extrude/369/369.py
+++ b/test/extrude/369/369.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(236,161,161))
-r=w0.sketch().rect(832,1000).push([(278,278)]).circle(253,mode='s').finalize().extrude(1).translate((1,256,340))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,984))
+w1=cq.Workplane('XY',origin=(501,500,639))
+r=w0.workplane(offset=13).moveTo(265,699).cylinder(1000,580).union(w0.sketch().segment((526,20),(631,20)).segment((631,2)).segment((709,1)).segment((710,22)).segment((815,21)).segment((816,454)).arc((774,390),(710,350)).segment((710,650)).arc((775,611),(814,544)).segment((814,981)).segment((710,979)).segment((710,1000)).segment((630,1000)).segment((629,981)).segment((526,980)).segment((525,545)).arc((565,610),(631,650)).segment((630,350)).arc((564,390),(526,455)).close().assemble().finalize().extrude(136)).union(w1.sketch().arc((751,460),(745,470),(756,480)).arc((585,532),(749,461)).assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/369/369.stl b/test/extrude/369/369.stl
index e7998c18e6fc077d7a2a0a024b61bc642957d250..c74067d13a68f8f01f4741122da62c1a23458f50 100644
Binary files a/test/extrude/369/369.stl and b/test/extrude/369/369.stl differ
diff --git a/test/extrude/37/37.py b/test/extrude/37/37.py
index 0fc09a0b0e942c6058c1835986a37d4dc136448f..c76544829c89e7774afa948ef535ab2450177d81 100644
--- a/test/extrude/37/37.py
+++ b/test/extrude/37/37.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(569,854,569))
-r=w0.sketch().segment((139,328),(302,328)).arc((208,569),(302,811)).segment((139,811)).close().assemble().reset().face(w0.sketch().segment((836,328),(1000,328)).segment((1000,811)).segment((836,811)).arc((931,569),(836,328)).assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(70,65,49))
+r=w0.sketch().segment((659,810),(656,810)).arc((641,804),(635,789)).segment((635,27)).segment((659,38)).close().assemble().finalize().extrude(270).union(w0.workplane(offset=265).sketch().segment((522,771),(348,771)).segment((522,189)).close().assemble().finalize().extrude(71)).translate((1,272,1))
diff --git a/test/extrude/37/37.stl b/test/extrude/37/37.stl
index 01669edec997f11b487117f40dc9a7319b19d17e..bfc816c8a41dbf8667ea15bd74e4a5148b808b26 100644
Binary files a/test/extrude/37/37.stl and b/test/extrude/37/37.stl differ
diff --git a/test/extrude/370/370.py b/test/extrude/370/370.py
index 4bbc80ae4c57c62df138499cb5951b32624ee144..bfc56d08c65c6991cb51146080fe10460d948275 100644
--- a/test/extrude/370/370.py
+++ b/test/extrude/370/370.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(420,538,538))
-w1=cq.Workplane('XY',origin=(538,538,613))
-r=w0.sketch().segment((388,1),(484,1)).segment((484,345)).segment((753,345)).segment((753,517)).arc((731,549),(753,581)).segment((603,581)).segment((603,731)).segment((753,731)).segment((753,764)).segment((452,764)).segment((452,613)).segment((388,613)).close().assemble().finalize().extrude(581).union(w1.workplane(offset=769).moveTo(581,393).box(688,678,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(685,501,500))
+r=w0.sketch().segment((155,579),(290,1)).segment((715,101)).segment((586,650)).segment((846,652)).segment((846,1000)).segment((382,999)).segment((379,651)).segment((461,652)).close().assemble().finalize().extrude(125)
\ No newline at end of file
diff --git a/test/extrude/370/370.stl b/test/extrude/370/370.stl
index 71a3f7c8123cb408b06a91380e36b4268d16d456..91e2953edc3a77cd5de545bcf2c2dc28992146dd 100644
Binary files a/test/extrude/370/370.stl and b/test/extrude/370/370.stl differ
diff --git a/test/extrude/371/371.py b/test/extrude/371/371.py
index 702a75da6ed42cd27158680c0b6f326c148bbc45..2c51ea370e1d19b6bc4d8799e6cb099d1f944b18 100644
--- a/test/extrude/371/371.py
+++ b/test/extrude/371/371.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(147,427,427))
-r=w0.sketch().push([(1,236)]).rect(847,936).push([(847,656)]).circle(644).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,325,499))
+r=w0.sketch().segment((120,441),(355,440)).arc((561,316),(766,441)).segment((999,441)).segment((1000,639)).segment((765,642)).arc((561,765),(355,641)).segment((121,641)).close().assemble().finalize().extrude(235).union(w0.workplane(offset=807).moveTo(245,501).box(990,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/371/371.stl b/test/extrude/371/371.stl
index bce11ab3483c981a726bb7344144169eff0bf09b..b01b354056e8a939248219e1de54290965ec795b 100644
Binary files a/test/extrude/371/371.stl and b/test/extrude/371/371.stl differ
diff --git a/test/extrude/372/372.py b/test/extrude/372/372.py
index 24338690c041d809c63180637f6090b03512136e..88569fbf4d60a856805d30027ee19e45a42f7cd9 100644
--- a/test/extrude/372/372.py
+++ b/test/extrude/372/372.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(572,572,893))
-w1=cq.Workplane('YZ',origin=(483,572,572))
-r=w0.sketch().segment((304,135),(304,340)).segment((527,340)).segment((527,278)).segment((795,242)).arc((411,804),(304,135)).assemble().push([(1000,991)]).circle(590).finalize().extrude(1).union(w1.workplane(offset=438).moveTo(567,349).box(670,768,839))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,635,501))
+r=w0.sketch().segment((231,544),(526,524)).segment((541,791)).segment((250,810)).close().assemble().push([(398,725)]).rect(546,560,mode='s').reset().face(w0.sketch().arc((406,2),(415,47),(407,92)).close().assemble()).finalize().extrude(1).union(w0.workplane(offset=561).moveTo(761,989).cylinder(619,509)).union(w0.workplane(offset=624).moveTo(418,543).box(526,826,746))
\ No newline at end of file
diff --git a/test/extrude/372/372.stl b/test/extrude/372/372.stl
index 5f92aadd1a3f39782017845bdf21b9ca352d790d..e1a3134099dd5df03482d2a459e3bd39f45aff03 100644
Binary files a/test/extrude/372/372.stl and b/test/extrude/372/372.stl differ
diff --git a/test/extrude/373/373.py b/test/extrude/373/373.py
index 32ee7d89e73dbc088ab62b9f52e8d3654ccac23b..417be5d46c44af04d549eb145e2bed14bd7bfa40 100644
--- a/test/extrude/373/373.py
+++ b/test/extrude/373/373.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(550,550,802))
-r=w0.sketch().push([(945,967)]).circle(682).push([(923,912)]).rect(616,616,mode='s').push([(967,1000)]).circle(572,mode='s').finalize().extrude(34).union(w0.sketch().segment((23,210),(133,210)).arc((396,1),(638,210)).segment((660,210)).segment((748,210)).segment((748,319)).segment((638,319)).arc((396,528),(133,319)).segment((23,319)).close().assemble().finalize().extrude(221))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,580,500))
+r=w0.sketch().push([(672,859)]).rect(587,666).push([(673,854)]).rect(536,560,mode='s').finalize().extrude(1).union(w0.sketch().segment((285,85),(345,62)).segment((415,241)).close().assemble().finalize().extrude(919))
\ No newline at end of file
diff --git a/test/extrude/373/373.stl b/test/extrude/373/373.stl
index f6eafe5e5a609e83e39fa5cdc1e00b15d88199e7..313f75ed39deba1ac2326315c4aa9a5f9bd48759 100644
Binary files a/test/extrude/373/373.stl and b/test/extrude/373/373.stl differ
diff --git a/test/extrude/374/374.py b/test/extrude/374/374.py
index 1b1590640b51545f2d14e5ae06bf4672419eef1c..5292602b436ac2c85a9b8865074b0f6f83928ae5 100644
--- a/test/extrude/374/374.py
+++ b/test/extrude/374/374.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,391,500))
-r=w0.sketch().segment((31,101),(560,101)).segment((560,1)).segment((970,1)).segment((970,431)).segment((790,431)).segment((790,1000)).segment((31,1000)).close().assemble().finalize().extrude(720)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,520,499))
+w1=cq.Workplane('XY',origin=(500,499,47))
+r=w0.sketch().segment((95,5),(186,7)).arc((212,2),(235,7)).segment((326,5)).segment((325,185)).segment((236,186)).arc((210,192),(186,185)).segment((95,187)).close().assemble().finalize().extrude(241).union(w0.sketch().segment((626,765),(746,655)).segment((956,891)).segment((836,1000)).close().assemble().finalize().extrude(476)).union(w1.workplane(offset=784).moveTo(446,719).cylinder(1000,517))
\ No newline at end of file
diff --git a/test/extrude/374/374.stl b/test/extrude/374/374.stl
index e28181ccfed6cc0be58307108b3faea8a9b89369..b37e88da936dafc81fec5703aaf8470bed2ac1d1 100644
Binary files a/test/extrude/374/374.stl and b/test/extrude/374/374.stl differ
diff --git a/test/extrude/375/375.py b/test/extrude/375/375.py
index cd0fe3b717c00259b6623d0b8783e6a9832f4a9b..d0f5d08daa6f6937c08c7df794d133baffdb00f7 100644
--- a/test/extrude/375/375.py
+++ b/test/extrude/375/375.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,728,506))
-r=w0.sketch().segment((1,304),(273,41)).segment((566,344)).segment((294,606)).close().assemble().reset().face(w0.sketch().segment((405,637),(606,637)).arc((1000,697),(687,939)).segment((687,950)).segment((405,950)).close().assemble()).reset().face(w0.sketch().segment((425,667),(596,667)).arc((586,808),(657,919)).segment((425,919)).close().assemble(),mode='s').finalize().extrude(72).union(w0.workplane(offset=450).moveTo(122,531).box(546,536,617))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(686,501,501))
+r=w0.sketch().push([(499,760)]).circle(741).push([(526,97)]).circle(597).circle(544,mode='s').finalize().extrude(130)
\ No newline at end of file
diff --git a/test/extrude/375/375.stl b/test/extrude/375/375.stl
index 791edf262c3b55d99b920e86cfacbb71d942bef4..8627a43b917a3a2a2aea2a744f12a70a2c4c3dc9 100644
Binary files a/test/extrude/375/375.stl and b/test/extrude/375/375.stl differ
diff --git a/test/extrude/376/376.py b/test/extrude/376/376.py
index 22bd193b009141965847f8e93e9439386cc42eda..9c5ca7cd694874977b4bb4523e3917ac2deb8172 100644
--- a/test/extrude/376/376.py
+++ b/test/extrude/376/376.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(550,500,500))
-r=w0.sketch().arc((11,1),(111,241),(11,510)).close().assemble().finalize().extrude(91).union(w0.sketch().segment((281,730),(461,730)).arc((640,610),(810,730)).segment((990,730)).segment((990,900)).segment((810,900)).arc((640,1000),(461,900)).segment((281,900)).close().assemble().finalize().extrude(810))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(380,500,500))
+r=w0.sketch().push([(146,25)]).rect(530,550).reset().face(w0.sketch().arc((310,231),(361,186),(421,207)).arc((471,216),(515,240)).arc((601,180),(704,170)).segment((695,177)).segment((784,350)).segment((810,342)).segment((724,177)).arc((844,466),(534,526)).arc((261,506),(312,232)).assemble()).finalize().extrude(681).union(w0.sketch().arc((516,661),(560,709),(621,740)).segment((609,750)).segment((689,840)).segment((731,805)).segment((681,749)).arc((719,751),(765,740)).arc((756,869),(655,960)).segment((655,1000)).segment((556,1000)).segment((556,960)).arc((440,820),(515,662)).assemble().finalize().extrude(741))
\ No newline at end of file
diff --git a/test/extrude/376/376.stl b/test/extrude/376/376.stl
index e4e9509ade3b6398f41cefd8277339c883281565..19bad88267cd7b9a732f38165c7adb794b8d8a7f 100644
Binary files a/test/extrude/376/376.stl and b/test/extrude/376/376.stl differ
diff --git a/test/extrude/377/377.py b/test/extrude/377/377.py
index 67e97099366a1608f38372adf2f08c6897fb5561..26c1f3fcd6117a67cd454382cf3d9b0d03ce65e2 100644
--- a/test/extrude/377/377.py
+++ b/test/extrude/377/377.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,590,500))
-r=w0.sketch().segment((1,61),(990,61)).segment((990,800)).segment((1000,800)).segment((990,810)).segment((990,830)).segment((980,840)).segment((960,830)).segment((810,830)).arc((610,940),(411,830)).segment((1,830)).close().assemble().push([(540,845)]).rect(540,530,mode='s').finalize().extrude(321)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,495))
+w1=cq.Workplane('ZX',origin=(500,471,500))
+r=w0.sketch().arc((600,456),(707,630),(599,801)).close().assemble().finalize().extrude(6).union(w1.sketch().arc((889,301),(945,296),(1000,320)).arc((945,301),(891,301)).assemble().finalize().extrude(231))
\ No newline at end of file
diff --git a/test/extrude/377/377.stl b/test/extrude/377/377.stl
index fec5d45e69a8720ebf3c4dce27cac663114d56bf..f869558ab72b04558a64a2e77c52cc76fe48b74f 100644
Binary files a/test/extrude/377/377.stl and b/test/extrude/377/377.stl differ
diff --git a/test/extrude/378/378.py b/test/extrude/378/378.py
index ab09b6d107658df1dd2f39edce4493a818741de8..82c04e4a0669ce5b726ae80399e26b6e3cc15a68 100644
--- a/test/extrude/378/378.py
+++ b/test/extrude/378/378.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(226,226,442))
-r=w0.workplane(offset=1).cylinder(675,1000).translate((775,775,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,426,499))
+r=w0.sketch().segment((2,131),(494,130)).segment((495,170)).segment((226,171)).segment((227,556)).segment((1,556)).close().assemble().reset().face(w0.sketch().segment((427,691),(650,691)).segment((650,275)).arc((960,722),(424,691)).assemble()).finalize().extrude(647)
\ No newline at end of file
diff --git a/test/extrude/378/378.stl b/test/extrude/378/378.stl
index 96156233676366a23ecf772632fb8ab355495492..903614a1365719ca06917a9c8a19d78b85ce80b4 100644
Binary files a/test/extrude/378/378.stl and b/test/extrude/378/378.stl differ
diff --git a/test/extrude/379/379.py b/test/extrude/379/379.py
index a690b8c8afe479a46e785b57cb3ce5d7aebb6e3c..8ee41263f7a2275af9327252957124e00007f2cd 100644
--- a/test/extrude/379/379.py
+++ b/test/extrude/379/379.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(722,485,485))
-r=w0.sketch().segment((876,856),(1000,856)).segment((1000,959)).segment((876,959)).segment((876,918)).segment((887,918)).segment((887,907)).segment((876,907)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(83,125)]).circle(598).push([(125,145)]).circle(537,mode='s').finalize().extrude(248)).translate((1,31,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,491))
+w1=cq.Workplane('XY',origin=(502,502,71))
+r=w0.workplane(offset=721).moveTo(502,530).box(1000,1000,940).union(w1.sketch().arc((487,42),(661,233),(541,7)).segment((596,7)).segment((596,102)).segment((487,103)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/379/379.stl b/test/extrude/379/379.stl
index 2408fd0ecae281171e679eea76e6517eff9463b2..203bf274c9bc563f5dd5da9a697c84c6cd466235 100644
Binary files a/test/extrude/379/379.stl and b/test/extrude/379/379.stl differ
diff --git a/test/extrude/38/38.py b/test/extrude/38/38.py
index d0d9731ca37b75805051b6c03c549a6e58392ea3..88e1442f0fd350a459553bcf377e0d971b1ff473 100644
--- a/test/extrude/38/38.py
+++ b/test/extrude/38/38.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(63,371,371))
-r=w0.sketch().push([(371,1)]).circle(618).circle(581,mode='s').reset().face(w0.sketch().segment((124,951),(149,901)).segment((223,926)).segment((223,988)).close().assemble()).push([(180,951)]).rect(408,420,mode='s').finalize().extrude(1000).translate((1,1,247))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(62,76,25))
+r=w0.sketch().segment((1,982),(527,982)).arc((651,931),(703,807)).segment((703,106)).segment((1,106)).close().assemble().push([(336,652)]).rect(253,144,mode='s').finalize().extrude(330)
diff --git a/test/extrude/38/38.stl b/test/extrude/38/38.stl
index be8f1aeaf6ed3b8ed6d69f64cba1d9c3400512bb..1c5d2a1f0461886b51c228bb8fb7d239e69a2e9b 100644
Binary files a/test/extrude/38/38.stl and b/test/extrude/38/38.stl differ
diff --git a/test/extrude/380/380.py b/test/extrude/380/380.py
index e734c7c31a29183f722e0e2238c281186d616280..0f17ab7cb11d00697e1848107001cbc4abdf8649 100644
--- a/test/extrude/380/380.py
+++ b/test/extrude/380/380.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(527,667,527))
-r=w0.sketch().segment((151,495),(474,495)).segment((474,506)).arc((463,517),(474,517)).segment((474,678)).segment((334,678)).arc((119,1000),(151,624)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=656).moveTo(839,270).cylinder(785,753))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,554,501))
+r=w0.workplane(offset=233).moveTo(876,491).cylinder(1000,624).union(w0.sketch().push([(208,501)]).rect(916,1000).reset().face(w0.sketch().segment((42,260),(95,261)).arc((111,255),(125,260)).segment((180,261)).segment((182,307)).segment((127,306)).arc((110,310),(96,305)).segment((42,307)).close().assemble(),mode='s').push([(152,553)]).rect(715,516,mode='s').finalize().extrude(926))
\ No newline at end of file
diff --git a/test/extrude/380/380.stl b/test/extrude/380/380.stl
index c33fe2c9d64d31e0ca71f07852905889c2600e2b..37937ccaaf682638a3a4973fd2b7ab3e90b21a39 100644
Binary files a/test/extrude/380/380.stl and b/test/extrude/380/380.stl differ
diff --git a/test/extrude/381/381.py b/test/extrude/381/381.py
index 6c3a6f81db17655ee626f8a5340c3422c4a1e2d6..d0b9f8f52ebf58734a292f55f35f19b56283a8c3 100644
--- a/test/extrude/381/381.py
+++ b/test/extrude/381/381.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(421,132,421))
-r=w0.sketch().push([(993,490)]).rect(656,862).push([(986,490)]).circle(504,mode='s').finalize().extrude(711).union(w0.workplane(offset=711).moveTo(1,407).box(959,972,1000)).translate((1,1,59))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,341))
+r=w0.sketch().segment((450,1),(550,1)).segment((550,271)).arc((736,501),(551,731)).segment((552,999)).segment((451,1000)).segment((451,730)).arc((266,502),(450,272)).close().assemble().finalize().extrude(820)
\ No newline at end of file
diff --git a/test/extrude/381/381.stl b/test/extrude/381/381.stl
index 6d53a8b3a83ee435c1eefc4d1b974351819c181a..4f0cf2567c543596733a3f412908bff13f660c03 100644
Binary files a/test/extrude/381/381.stl and b/test/extrude/381/381.stl differ
diff --git a/test/extrude/382/382.py b/test/extrude/382/382.py
index 027104a75f346a5c977d8047d10e725d121bcc36..e2811fecd4d7e5554081e090690ac87cc4ce2437 100644
--- a/test/extrude/382/382.py
+++ b/test/extrude/382/382.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(519,667,519))
-r=w0.sketch().push([(630,470)]).circle(605).push([(901,624)]).rect(642,901).finalize().extrude(186).union(w0.sketch().arc((112,507),(137,1),(211,507)).segment((470,507)).segment((470,605)).arc((420,729),(297,679)).segment((112,679)).close().assemble().push([(895,870)]).rect(1000,877).finalize().extrude(235)).union(w0.workplane(offset=538).moveTo(877,445).cylinder(556,778))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,828,498))
+r=w0.sketch().segment((85,300),(354,1)).segment((505,135)).segment((479,135)).arc((461,130),(445,135)).segment((335,136)).segment((334,170)).arc((241,286),(236,434)).close().assemble().reset().face(w0.sketch().arc((415,598),(431,604),(444,604)).arc((519,531),(624,490)).segment((664,489)).segment((699,354)).arc((723,359),(748,354)).segment((839,439)).segment((769,515)).arc((733,987),(434,620)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/382/382.stl b/test/extrude/382/382.stl
index d825633f5cd748b172d23bc672d07b87f1592500..cd3bc4953c7be9bd12eb4df6da03cdfaa1cbb43f 100644
Binary files a/test/extrude/382/382.stl and b/test/extrude/382/382.stl differ
diff --git a/test/extrude/383/383.py b/test/extrude/383/383.py
index 0767d43cf371576204c1e0180dae27534e40f5c4..83c8082afb065bab2eafe827c3144736e4af608c 100644
--- a/test/extrude/383/383.py
+++ b/test/extrude/383/383.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(521,230,521))
-w1=cq.Workplane('YZ',origin=(709,521,521))
-r=w0.sketch().push([(1000,376)]).circle(563).push([(990,355)]).circle(532,mode='s').finalize().extrude(886).union(w1.sketch().segment((532,11),(553,11)).segment((553,1)).segment((792,1)).segment((792,11)).segment((823,11)).segment((823,407)).segment((792,407)).segment((792,417)).segment((740,417)).arc((303,646),(532,209)).close().assemble().finalize().extrude(324))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(309,245,309))
+r=w0.sketch().push([(255,131)]).circle(439).reset().face(w0.sketch().arc((460,583),(207,436),(493,376)).arc((429,473),(460,583)).assemble()).finalize().extrude(436)
\ No newline at end of file
diff --git a/test/extrude/383/383.stl b/test/extrude/383/383.stl
index 5630eedd6e0f79c748eabbf205cb030540f7fd3f..bc58dd73b811f2eba9d7acba9e7bb000656da390 100644
Binary files a/test/extrude/383/383.stl and b/test/extrude/383/383.stl differ
diff --git a/test/extrude/384/384.py b/test/extrude/384/384.py
index 6e52e8f68c4ba1c274a24c4f2c70e8676bcf1ee6..a63552ad5dbd15c1f82bde9d8fb8996028f412eb 100644
--- a/test/extrude/384/384.py
+++ b/test/extrude/384/384.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(575,828,575))
-r=w0.sketch().segment((1,667),(150,506)).arc((254,460),(288,345)).segment((541,70)).segment((839,70)).segment((839,24)).arc((920,1000),(1,667)).assemble().finalize().extrude(58)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,520))
+r=w0.sketch().push([(180,777)]).rect(861,706).push([(570,275)]).rect(570,810).finalize().extrude(277).union(w0.sketch().push([(568,279)]).rect(725,576).push([(543,249)]).rect(515,515,mode='s').push([(625,290)]).circle(514,mode='s').finalize().extrude(366)).union(w0.workplane(offset=591).moveTo(854,440).box(789,509,681))
\ No newline at end of file
diff --git a/test/extrude/384/384.stl b/test/extrude/384/384.stl
index 320da60cd90be4fd1ec19e8aac0a551c321a82d2..40475795ee22fa45fbbde50f7f45e4439b58464c 100644
Binary files a/test/extrude/384/384.stl and b/test/extrude/384/384.stl differ
diff --git a/test/extrude/385/385.py b/test/extrude/385/385.py
index 2ab4de78aa47cba59a46342f46fbc2e5d1f9d488..a41769d42c6cc2fa4c2b7d10821df42c3817118a 100644
--- a/test/extrude/385/385.py
+++ b/test/extrude/385/385.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(303,448,448))
-w1=cq.Workplane('ZX',origin=(448,157,448))
-r=w0.sketch().arc((22,771),(1,459),(303,417)).arc((74,521),(22,771)).assemble().finalize().extrude(844).union(w0.sketch().segment((542,334),(802,126)).segment((969,344)).segment((709,542)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=334).moveTo(605,308).box(553,979,677))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,395))
+r=w0.workplane(offset=529).moveTo(581,524).box(820,810,555).union(w0.sketch().segment((260,32),(332,1)).segment((426,206)).segment((355,236)).close().assemble().reset().face(w0.sketch().segment((372,864),(720,866)).segment((720,1000)).segment((371,1000)).segment((371,974)).segment((490,974)).segment((490,891)).segment((370,891)).close().assemble()).finalize().extrude(715))
\ No newline at end of file
diff --git a/test/extrude/385/385.stl b/test/extrude/385/385.stl
index 46745285af7d679de67dfe08a58f8dae3e2669f0..775fb58b3f4d4b6999ee0aa4005cd228148813b8 100644
Binary files a/test/extrude/385/385.stl and b/test/extrude/385/385.stl differ
diff --git a/test/extrude/386/386.py b/test/extrude/386/386.py
index 4cfecda9e9f452e680bbf1acf107d6013fbac167..1a06ea7823767132eaf5404981cff8d6132f7ec0 100644
--- a/test/extrude/386/386.py
+++ b/test/extrude/386/386.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(37,358,358))
-r=w0.sketch().segment((1,144),(308,144)).segment((308,101)).segment((543,101)).segment((543,144)).segment((715,144)).segment((715,236)).segment((543,236)).segment((543,615)).segment((308,615)).segment((308,236)).segment((1,236)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,736,502))
+w1=cq.Workplane('XY',origin=(501,500,890))
+r=w0.sketch().push([(330,221)]).circle(720).push([(315,95)]).circle(576,mode='s').finalize().extrude(1).union(w1.sketch().segment((574,465),(1000,465)).segment((999,921)).segment((885,921)).arc((865,905),(841,894)).segment((840,749)).segment((726,750)).segment((725,895)).arc((699,905),(679,919)).segment((575,921)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/386/386.stl b/test/extrude/386/386.stl
index f218f4b72446b9e2442016c2e2b3e725e4180fcc..98ea4b229e93c9cd3a524ebd76061ce8f1ffb81e 100644
Binary files a/test/extrude/386/386.stl and b/test/extrude/386/386.stl differ
diff --git a/test/extrude/387/387.py b/test/extrude/387/387.py
index 483e41ae299578068766aba68b38d6a982d70ad3..641806600be3425f09397e23c31e0104a75894ce 100644
--- a/test/extrude/387/387.py
+++ b/test/extrude/387/387.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(281,281,1))
-r=w0.workplane(offset=565).box(1000,296,849).translate((220,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,575,501))
+r=w0.sketch().push([(330,748)]).rect(901,1000).push([(726,509)]).rect(590,735).reset().face(w0.sketch().segment((705,516),(719,484)).segment((740,494)).segment((726,525)).close().assemble(),mode='s').finalize().extrude(346).union(w0.sketch().push([(486,335)]).circle(575).circle(565,mode='s').reset().face(w0.sketch().segment((635,1),(846,1)).segment((844,170)).arc((870,250),(845,331)).segment((845,500)).segment((636,499)).segment((635,330)).arc((605,250),(635,170)).close().assemble()).finalize().extrude(461))
\ No newline at end of file
diff --git a/test/extrude/387/387.stl b/test/extrude/387/387.stl
index 0930d1222e815b8f1bade65f914f4f4272f663cb..5a39e8354684157f9cfc712d5220e86443c21c98 100644
Binary files a/test/extrude/387/387.stl and b/test/extrude/387/387.stl differ
diff --git a/test/extrude/388/388.py b/test/extrude/388/388.py
index c98c98b41faab31d03492f747f61253ab279ee0c..9fb23a84ab2e3cea4818598cd8347fbfbc6f90c7 100644
--- a/test/extrude/388/388.py
+++ b/test/extrude/388/388.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(544,716,544))
-r=w0.workplane(offset=316).moveTo(1,322).cylinder(1000,618).union(w0.workplane(offset=396).moveTo(581,420).cylinder(840,618)).union(w0.workplane(offset=605).moveTo(1000,692).cylinder(667,692)).translate((1,1,74))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,650))
+r=w0.sketch().segment((1,640),(101,481)).segment((101,266)).segment((207,265)).segment((206,377)).segment((306,436)).segment((207,601)).segment((205,814)).segment((101,816)).segment((100,766)).segment((165,765)).segment((166,619)).segment((101,620)).segment((102,701)).close().assemble().reset().face(w0.sketch().segment((466,380),(940,186)).segment((999,336)).segment((526,530)).close().assemble()).finalize().extrude(195)
\ No newline at end of file
diff --git a/test/extrude/388/388.stl b/test/extrude/388/388.stl
index 5a07e4e49c5476ba2a0b1c539741c5a5d1005f86..bad3635923edc887071e46c955368ea38d6f7e19 100644
Binary files a/test/extrude/388/388.stl and b/test/extrude/388/388.stl differ
diff --git a/test/extrude/389/389.py b/test/extrude/389/389.py
index 866b69fbca0d8db88b1174fc683d26d6488f69dc..6b99e905e6e18589a630431d30e3757410e57ba2 100644
--- a/test/extrude/389/389.py
+++ b/test/extrude/389/389.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(146,257,146))
-r=w0.workplane(offset=1).box(795,1000,436).union(w0.workplane(offset=176).cylinder(206,556)).translate((411,1,411))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,501,500))
+r=w0.sketch().segment((260,445),(317,341)).segment((421,395)).arc((561,381),(630,500)).segment((741,556)).segment((685,659)).segment((579,605)).arc((442,620),(370,500)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/389/389.stl b/test/extrude/389/389.stl
index ea7e0c75a271e46b3d69d9642600ac30558d7325..50313c4509cccb2f5fb31d48b3feaf3ba5f2d595 100644
Binary files a/test/extrude/389/389.stl and b/test/extrude/389/389.stl differ
diff --git a/test/extrude/39/39.py b/test/extrude/39/39.py
index b61ec847d2de601b707d62edb46cd0d311d771ac..aa1ae6b28227b001661fe31bfe2aea703e5e622d 100644
--- a/test/extrude/39/39.py
+++ b/test/extrude/39/39.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,260,260))
-r=w0.sketch().segment((20,356),(500,356)).arc((260,500),(20,356)).assemble().finalize().extrude(39).union(w0.sketch().push([(260,227)]).rect(894,673).push([(107,404)]).circle(280,mode='s').reset().face(w0.sketch().segment((135,126),(135,328)).arc((97,222),(135,126)).assemble(),mode='s').reset().face(w0.sketch().arc((212,78),(260,68),(308,78)).close().assemble(),mode='s').reset().face(w0.sketch().segment((212,376),(308,376)).arc((260,385),(212,376)).assemble(),mode='s').reset().face(w0.sketch().arc((385,126),(424,222),(385,328)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(52,21,43))
+r=w0.sketch().segment((39,280),(635,280)).segment((635,728)).segment((39,728)).close().assemble().push([(359,536)]).circle(125,mode='s').finalize().extrude(279).translate((1,259,1))
diff --git a/test/extrude/39/39.stl b/test/extrude/39/39.stl
index 66b3446f0396ca8d7309620dec063a0023b8cbb5..345685df211cb07ece92099a66224efb3ab75b95 100644
Binary files a/test/extrude/39/39.stl and b/test/extrude/39/39.stl differ
diff --git a/test/extrude/390/390.py b/test/extrude/390/390.py
index 1b60178a823ff75ac0bc9c1c716b1ff9a248686f..10692f429616b91db97b1e93348c9d53a5c32c12 100644
--- a/test/extrude/390/390.py
+++ b/test/extrude/390/390.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(75,1,75))
-r=w0.workplane(offset=149).box(1000,796,223).translate((324,1,426))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,615,500))
+r=w0.sketch().segment((1,301),(157,300)).segment((157,180)).segment((350,182)).segment((350,301)).segment((396,300)).segment((397,496)).segment((352,496)).segment((351,559)).segment((156,562)).segment((155,494)).segment((1,495)).close().assemble().finalize().extrude(272).union(w0.sketch().segment((985,626),(1000,627)).segment((1000,734)).segment((985,736)).arc((725,671),(984,625)).assemble().push([(859,675)]).circle(565,mode='s').finalize().extrude(335))
\ No newline at end of file
diff --git a/test/extrude/390/390.stl b/test/extrude/390/390.stl
index ab630edd5de103586779e05a4857de28807b3be1..385855fde3302817b5010a4cbecdd4fd3ef79f0a 100644
Binary files a/test/extrude/390/390.stl and b/test/extrude/390/390.stl differ
diff --git a/test/extrude/391/391.py b/test/extrude/391/391.py
index 017bcdead61fd6c0f9942320dd2d37313255788d..ff0a5d48d79d5566a3e9140abb9635b6cb81b7d8 100644
--- a/test/extrude/391/391.py
+++ b/test/extrude/391/391.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(500,500,500))
-r=w0.sketch().segment((71,21),(530,1)).segment((550,481)).segment((91,500)).close().assemble().push([(855,476)]).rect(570,670).finalize().extrude(121).union(w0.sketch().push([(321,301)]).circle(620).reset().face(w0.sketch().arc((630,590),(481,421),(660,560)).segment((660,700)).arc((930,820),(660,940)).segment((660,1000)).segment((630,1000)).segment((630,910)).arc((610,820),(630,740)).close().assemble()).finalize().extrude(870))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,746))
+w1=cq.Workplane('ZX',origin=(501,985,500))
+r=w0.sketch().push([(831,340)]).rect(841,1000).push([(857,244)]).rect(725,735,mode='s').finalize().extrude(735).union(w1.sketch().arc((287,97),(567,33),(631,312)).arc((645,421),(617,536)).arc((550,541),(576,600)).arc((525,650),(467,685)).segment((466,596)).arc((470,577),(466,555)).segment((466,466)).segment((390,465)).segment((391,555)).arc((385,575),(391,595)).segment((392,710)).arc((26,455),(287,96)).assemble().push([(456,205)]).circle(580,mode='s').finalize().extrude(281))
\ No newline at end of file
diff --git a/test/extrude/391/391.stl b/test/extrude/391/391.stl
index 2fffaac447c0d628c21ab4b2152e34f81760ee40..037f1c4939c2e7d27a8da3542a84387e68e1fc38 100644
Binary files a/test/extrude/391/391.stl and b/test/extrude/391/391.stl differ
diff --git a/test/extrude/392/392.py b/test/extrude/392/392.py
index b4b4482214960b88a6389b31b05f2c5badfa86c3..e3f75d60ab332589c134bff6bbf988bda0e1834b 100644
--- a/test/extrude/392/392.py
+++ b/test/extrude/392/392.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(454,498,454))
-r=w0.sketch().segment((443,50),(989,39)).segment((1000,672)).segment((803,672)).segment((803,869)).segment((640,869)).segment((640,672)).segment((443,683)).close().assemble().finalize().extrude(367).union(w0.sketch().push([(6,236)]).rect(651,672).push([(1,230)]).rect(487,552,mode='s').finalize().extrude(389))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(705,501,502))
+r=w0.sketch().segment((170,355),(207,355)).segment((207,366)).arc((376,549),(205,736)).segment((205,746)).segment((171,745)).segment((171,736)).arc((1,552),(170,367)).close().assemble().finalize().extrude(92).union(w0.sketch().segment((516,256),(660,256)).segment((660,296)).segment((999,325)).segment((999,340)).segment((660,306)).segment((659,406)).segment((516,405)).close().assemble().finalize().extrude(236)).union(w0.workplane(offset=415).moveTo(568,481).box(886,581,670))
\ No newline at end of file
diff --git a/test/extrude/392/392.stl b/test/extrude/392/392.stl
index 38f309e1e029148a501a9f32e060b51f151ab26c..69865a1bb995fb47b2b4d3d86889742754413f93 100644
Binary files a/test/extrude/392/392.stl and b/test/extrude/392/392.stl differ
diff --git a/test/extrude/393/393.py b/test/extrude/393/393.py
index 831788e0523c045b67023e9be757db3809aa4325..fb5544d6a968abec9a974d3dfab678b9da975e09 100644
--- a/test/extrude/393/393.py
+++ b/test/extrude/393/393.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(422,422,597))
-w1=cq.Workplane('YZ',origin=(404,422,422))
-r=w0.sketch().segment((124,755),(369,755)).arc((474,685),(597,755)).segment((720,755)).segment((720,1000)).segment((124,1000)).close().assemble().push([(562,763)]).rect(492,439,mode='s').finalize().extrude(439).union(w0.workplane(offset=614).moveTo(422,877).cylinder(807,842)).union(w1.workplane(offset=588).moveTo(1,316).cylinder(755,877)).translate((1,456,141))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,164,500))
+r=w0.sketch().segment((2,630),(220,631)).segment((222,648)).segment((147,651)).arc((142,634),(135,649)).segment((1,650)).close().assemble().finalize().extrude(1000).union(w0.sketch().arc((541,539),(854,230),(844,676)).arc((620,774),(540,541)).assemble().push([(570,485)]).rect(561,579,mode='s').finalize().extrude(1000)).union(w0.workplane(offset=832).moveTo(760,449).cylinder(1000,614))
\ No newline at end of file
diff --git a/test/extrude/393/393.stl b/test/extrude/393/393.stl
index 3e93408308203d5c183c4b7a491c5d2483a8349b..db27621ff277af9ed0b5a5b36d5e6d40a152294f 100644
Binary files a/test/extrude/393/393.stl and b/test/extrude/393/393.stl differ
diff --git a/test/extrude/394/394.py b/test/extrude/394/394.py
index d5c7cc12bc55e4c82ebc7094fa39f18f0e8fadc4..ca5825020828db64c3c9a0565fed8b4c4705fd0d 100644
--- a/test/extrude/394/394.py
+++ b/test/extrude/394/394.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,291))
-r=w0.sketch().segment((1,600),(461,560)).segment((491,950)).segment((31,990)).close().assemble().finalize().extrude(491).union(w0.sketch().segment((700,11),(760,11)).segment((760,51)).segment((1000,51)).segment((1000,161)).segment((760,161)).segment((760,431)).segment((700,431)).close().assemble().finalize().extrude(920))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(440,501,500))
+r=w0.sketch().push([(292,535)]).circle(606).push([(655,840)]).circle(661).circle(516,mode='s').push([(616,96)]).circle(596).finalize().extrude(620)
\ No newline at end of file
diff --git a/test/extrude/394/394.stl b/test/extrude/394/394.stl
index 2672202e0fa042cf590ce32cc081918c9e5c9158..07e72055f9ebcc5061c5d713c0689de11bfa85b1 100644
Binary files a/test/extrude/394/394.stl and b/test/extrude/394/394.stl differ
diff --git a/test/extrude/395/395.py b/test/extrude/395/395.py
index f3674142db5bfaf9db8c1d11654c7191bfc43d66..f3e43f37a5b70f495037a33bcd57806ecd94782b 100644
--- a/test/extrude/395/395.py
+++ b/test/extrude/395/395.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(406,406,108))
-r=w0.sketch().arc((1,257),(174,117),(18,290)).segment((42,290)).segment((42,257)).close().assemble().finalize().extrude(769).union(w0.sketch().segment((125,348),(406,348)).segment((406,191)).segment((529,191)).segment((529,348)).segment((818,348)).segment((818,562)).segment((529,562)).segment((529,711)).segment((406,711)).segment((406,562)).segment((125,562)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(315,499,500))
+r=w0.workplane(offset=604).moveTo(316,745).cylinder(706,756).union(w0.sketch().push([(721,221)]).circle(721).reset().face(w0.sketch().segment((515,205),(526,157)).segment((919,230)).segment((915,282)).close().assemble(),mode='s').finalize().extrude(875))
\ No newline at end of file
diff --git a/test/extrude/395/395.stl b/test/extrude/395/395.stl
index 20e7ad444157e49b66bfbc40e46862df75690889..5f1c2f50757636a57ac07d1a09051298fe4f9774 100644
Binary files a/test/extrude/395/395.stl and b/test/extrude/395/395.stl differ
diff --git a/test/extrude/396/396.py b/test/extrude/396/396.py
index b8656bcd52c44c014fe89b9e3ba652796a190e85..72ab4fe8202265cb0665c1d8462f6474ba322568 100644
--- a/test/extrude/396/396.py
+++ b/test/extrude/396/396.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(354,495,495))
-r=w0.workplane(offset=395).moveTo(849,485).cylinder(697,556).union(w0.sketch().segment((21,1),(475,1)).segment((475,62)).segment((364,314)).segment((445,344)).arc((445,193),(546,72)).segment((506,41)).arc((788,11),(970,253)).segment((929,223)).arc((909,395),(808,495)).segment((849,526)).arc((758,576),(637,576)).arc((334,1000),(62,556)).segment((21,556)).close().assemble().reset().face(w0.sketch().segment((92,405),(233,405)).arc((152,435),(92,495)).close().assemble(),mode='s').finalize().extrude(980))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,317,502))
+r=w0.sketch().arc((177,492),(123,273),(257,93)).arc((283,4),(351,64)).arc((442,68),(527,108)).arc((592,54),(556,127)).arc((625,239),(642,366)).arc((652,670),(352,635)).segment((177,635)).close().assemble().finalize().extrude(437).union(w0.sketch().segment((396,946),(522,825)).segment((521,706)).segment((886,707)).segment((884,1000)).segment((520,1000)).segment((522,931)).segment((447,1000)).close().assemble().finalize().extrude(941))
\ No newline at end of file
diff --git a/test/extrude/396/396.stl b/test/extrude/396/396.stl
index 0f406382a7cdad37861eefcfe650af4fa1bf3d77..5f378f8a1ebe582490e53883e9633fff70584e80 100644
Binary files a/test/extrude/396/396.stl and b/test/extrude/396/396.stl differ
diff --git a/test/extrude/397/397.py b/test/extrude/397/397.py
index 94d30225b8f575f235b40baf6c19144d3136e136..666ba77931d1dc99187605be75630c6f03dcc3d7 100644
--- a/test/extrude/397/397.py
+++ b/test/extrude/397/397.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((587,620),(747,714)).arc((660,674),(587,620)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,480,501))
+w1=cq.Workplane('XY',origin=(501,500,570))
+r=w0.workplane(offset=616).moveTo(577,198).box(526,896,731).union(w0.sketch().push([(415,879)]).circle(620).push([(461,681)]).circle(530).finalize().extrude(825)).union(w1.sketch().segment((436,196),(606,197)).segment((606,341)).arc((825,619),(501,471)).segment((435,471)).segment((436,427)).segment((471,426)).segment((470,245)).segment((435,247)).close().assemble().finalize().extrude(636))
\ No newline at end of file
diff --git a/test/extrude/397/397.stl b/test/extrude/397/397.stl
index 3a95f772ff7d15c9a548be23e9ee310d7f0c1072..423cf7e6a4deb4facb89758103b4c778cc818606 100644
Binary files a/test/extrude/397/397.stl and b/test/extrude/397/397.stl differ
diff --git a/test/extrude/398/398.py b/test/extrude/398/398.py
index 3c946bb2f2ea97ab6c8ccfc0521416771565d7ad..ce5e6bb4734a9287bd4b625b107df63c3e63d1e6 100644
--- a/test/extrude/398/398.py
+++ b/test/extrude/398/398.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,630))
-r=w0.workplane(offset=371).moveTo(560,550).cylinder(760,750).union(w0.sketch().segment((31,161),(141,161)).arc((500,1),(860,161)).segment((970,161)).segment((970,321)).arc((1000,500),(970,680)).segment((970,840)).segment((860,840)).arc((500,1000),(141,840)).segment((31,840)).segment((31,680)).arc((1,500),(31,321)).close().assemble().circle(960,mode='s').finalize().extrude(391))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,794,500))
+r=w0.sketch().segment((1,326),(515,326)).arc((804,280),(1000,502)).segment((441,501)).segment((442,351)).segment((100,351)).segment((100,735)).segment((1,736)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=311).moveTo(297,530).box(986,701,880))
\ No newline at end of file
diff --git a/test/extrude/398/398.stl b/test/extrude/398/398.stl
index 999de558a17fec92155c8921430265bb49151082..bf71a8475c94d77fab5aad0d5331a9283b3bd79d 100644
Binary files a/test/extrude/398/398.stl and b/test/extrude/398/398.stl differ
diff --git a/test/extrude/399/399.py b/test/extrude/399/399.py
index c836fd314e6fecd5ca7f4d2e7ef788f23c03c3a4..b83916789448e723487f41dcad930ecdf380b589 100644
--- a/test/extrude/399/399.py
+++ b/test/extrude/399/399.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(518,518,644))
-r=w0.workplane(offset=334).moveTo(277,856).box(816,989,885).union(w0.sketch().segment((70,506),(139,345)).arc((12,1),(345,150)).segment((391,162)).arc((621,357),(334,460)).segment((277,587)).close().assemble().push([(1000,35)]).circle(610).finalize().extrude(633)).translate((1,58,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,419,501))
+w1=cq.Workplane('YZ',origin=(501,499,499))
+r=w0.sketch().push([(557,383)]).rect(754,523).push([(555,382)]).rect(519,504,mode='s').finalize().extrude(155).union(w0.workplane(offset=461).moveTo(40,360).cylinder(581,539)).union(w1.sketch().segment((360,411),(524,410)).segment((525,675)).segment((884,674)).arc((805,978),(514,858)).segment((361,859)).close().assemble().push([(824,792)]).rect(531,585,mode='s').finalize().extrude(683))
\ No newline at end of file
diff --git a/test/extrude/399/399.stl b/test/extrude/399/399.stl
index 7029ca3c06ee26ba724c339487ddc96a2162582c..5200effbc00badc35dc62ee8a6f76f86c8ee7aba 100644
Binary files a/test/extrude/399/399.stl and b/test/extrude/399/399.stl differ
diff --git a/test/extrude/4/4.py b/test/extrude/4/4.py
index 633895dbfe3cfb5f10397183b5bc9a4278c13ef5..8e3494852f561d5f9e6547c73a526b80490e705c 100644
--- a/test/extrude/4/4.py
+++ b/test/extrude/4/4.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,261))
-r=w0.sketch().segment((1,161),(381,161)).segment((750,31)).segment((1000,760)).segment((740,850)).segment((740,970)).segment((1,970)).close().assemble().finalize().extrude(990)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(15,44,22))
+r=w0.sketch().segment((670,676),(316,321)).segment((670,1)).segment((1000,321)).close().assemble().push([(683,272)]).rect(200,180,mode='s').finalize().extrude(120)
diff --git a/test/extrude/4/4.stl b/test/extrude/4/4.stl
index ee41260dc7aa65766b31d138c45b6e5a6a67a913..bd328bd9f76d5c31df8b2cf33ed69f278ef554c7 100644
Binary files a/test/extrude/4/4.stl and b/test/extrude/4/4.stl differ
diff --git a/test/extrude/40/40.py b/test/extrude/40/40.py
index 77df4ff7bc24a6bdc648cfedd02b9e873f1c1415..513ce04eb81ff003ebec7687813771eca9d47391 100644
--- a/test/extrude/40/40.py
+++ b/test/extrude/40/40.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(522,522,320))
-r=w0.sketch().push([(330,203)]).circle(734).reset().face(w0.sketch().arc((426,299),(235,107),(447,277)).segment((447,373)).segment((426,373)).close().assemble(),mode='s').finalize().extrude(713).union(w0.sketch().segment((1,224),(192,224)).arc((522,65),(883,182)).arc((809,373),(1000,352)).arc((862,947),(235,947)).segment((1,947)).segment((1,639)).arc((352,607),(1,564)).close().assemble().finalize().extrude(926)).translate((1,10,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(50,67,54))
+r=w0.sketch().segment((42,201),(640,201)).segment((640,651)).segment((41,651)).close().assemble().push([(346,412)]).rect(93,132,mode='s').finalize().extrude(116).translate((1,50,1))
diff --git a/test/extrude/40/40.stl b/test/extrude/40/40.stl
index d4213b623d9b1fe8de0dd9fb73b09008fc4c328b..15fd6b5da9941207e488a4d6ffcb9a1b988bf42d 100644
Binary files a/test/extrude/40/40.stl and b/test/extrude/40/40.stl differ
diff --git a/test/extrude/400/400.py b/test/extrude/400/400.py
index f3fe8885f19cec3ff1b41b8f867fdd2847526e5d..134c937682f96082cd826bedb103138ab0386e48 100644
--- a/test/extrude/400/400.py
+++ b/test/extrude/400/400.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(575,575,690))
-r=w0.sketch().push([(885,713)]).circle(839).push([(879,707)]).rect(977,701,mode='s').finalize().extrude(219).union(w0.sketch().segment((1,173),(541,173)).segment((541,701)).segment((483,701)).segment((483,736)).segment((1,736)).close().assemble().finalize().extrude(621)).union(w0.sketch().segment((736,564),(782,564)).segment((782,541)).arc((1000,874),(736,564)).assemble().finalize().extrude(690))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,380,500))
+w1=cq.Workplane('XY',origin=(501,500,575))
+r=w0.sketch().push([(538,501)]).rect(1000,841).push([(724,499)]).circle(530,mode='s').finalize().extrude(122).union(w0.sketch().segment((500,536),(584,410)).segment((776,539)).segment((689,666)).close().assemble().finalize().extrude(635)).union(w0.workplane(offset=809).moveTo(634,535).cylinder(1000,520)).union(w1.sketch().push([(536,235)]).circle(636).circle(521,mode='s').finalize().extrude(110))
\ No newline at end of file
diff --git a/test/extrude/400/400.stl b/test/extrude/400/400.stl
index a35105256d671c74d3173d6dcf5d9b2fa1b0ee92..12e34401515cd7f6f914bb378a01f0b1f0f4c2b3 100644
Binary files a/test/extrude/400/400.stl and b/test/extrude/400/400.stl differ
diff --git a/test/extrude/401/401.py b/test/extrude/401/401.py
index 7ad50ce7d89fc9cb9c95cead1dbf4296c4fb0cf6..c841ecdaa00007c3f49b3439e89016ce6d295182 100644
--- a/test/extrude/401/401.py
+++ b/test/extrude/401/401.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(575,391,575))
-r=w0.sketch().push([(277,937)]).rect(828,1000).push([(432,753)]).rect(610,793).push([(989,334)]).circle(587).finalize().extrude(839).union(w0.sketch().segment((254,58),(472,58)).segment((472,1)).segment((644,1)).segment((644,334)).segment((587,334)).segment((587,506)).segment((254,506)).close().assemble().finalize().extrude(954))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(706,500,501))
+r=w0.sketch().arc((206,641),(45,320),(391,414)).segment((404,414)).segment((406,836)).segment((206,836)).close().assemble().reset().face(w0.sketch().segment((146,591),(205,501)).segment((205,636)).close().assemble(),mode='s').reset().face(w0.sketch().segment((449,165),(999,165)).arc((726,391),(451,166)).assemble()).finalize().extrude(96)
\ No newline at end of file
diff --git a/test/extrude/401/401.stl b/test/extrude/401/401.stl
index 5f02fa947f6cb0937edf549f89af3f0619afd54b..41eae524bcccbffcaf3705cad57a23547fd8ca9e 100644
Binary files a/test/extrude/401/401.stl and b/test/extrude/401/401.stl differ
diff --git a/test/extrude/402/402.py b/test/extrude/402/402.py
index a06643aac40f950f42b0fdc492bae0182617450a..1c8e46dcf3955f44de7a0958165d44908eb19025 100644
--- a/test/extrude/402/402.py
+++ b/test/extrude/402/402.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(432,294,432))
-r=w0.sketch().segment((285,199),(337,199)).segment((337,1)).segment((526,1)).segment((526,199)).segment((578,199)).segment((578,259)).segment((526,259)).segment((526,440)).segment((337,440)).segment((337,259)).segment((285,259)).close().assemble().finalize().extrude(139).union(w0.workplane(offset=716).moveTo(367,789).box(457,578,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,499,1))
+r=w0.sketch().arc((477,531),(500,507),(500,471)).segment((524,485)).segment((502,531)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/402/402.stl b/test/extrude/402/402.stl
index fc9616f314a1370e1dc92a8b2eecb8e74f0565e0..22f53729c8bfdb4eead077a469884d6983861e96 100644
Binary files a/test/extrude/402/402.stl and b/test/extrude/402/402.stl differ
diff --git a/test/extrude/403/403.py b/test/extrude/403/403.py
index f89b68594df08ac2de4ddbe7c72549300ee1a541..e9edba5bc3314b528b11dd34d32b72ae72a22086 100644
--- a/test/extrude/403/403.py
+++ b/test/extrude/403/403.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(510,736,510))
-w1=cq.Workplane('ZX',origin=(510,647,510))
-r=w0.sketch().arc((403,265),(452,197),(530,236)).arc((794,452),(647,755)).arc((579,1000),(452,785)).arc((246,540),(403,265)).assemble().push([(520,510)]).rect(785,726,mode='s').reset().face(w0.sketch().arc((432,246),(461,226),(500,236)).arc((461,236),(432,246)).assemble(),mode='s').finalize().extrude(608).union(w0.sketch().push([(471,265)]).circle(755).push([(432,481)]).circle(530,mode='s').finalize().extrude(657)).union(w1.sketch().arc((354,177),(442,119),(549,138)).segment((549,236)).arc((383,265),(549,305)).segment((549,393)).arc((442,422),(354,363)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,60,500))
+r=w0.sketch().segment((2,195),(122,195)).segment((121,595)).arc((57,635),(1,685)).close().assemble().push([(62,499)]).circle(554,mode='s').reset().face(w0.sketch().arc((429,550),(756,476),(760,810)).arc((631,640),(431,550)).assemble()).finalize().extrude(601).union(w0.sketch().segment((301,190),(950,190)).segment((951,534)).segment((984,530)).segment((1000,586)).segment((956,597)).arc((640,310),(301,566)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/403/403.stl b/test/extrude/403/403.stl
index 23cecc48e92bf453d14f25fe41581bd9057a8818..8bcf382c4e06478c4d1eb62e562de36d184d1ab9 100644
Binary files a/test/extrude/403/403.stl and b/test/extrude/403/403.stl differ
diff --git a/test/extrude/404/404.py b/test/extrude/404/404.py
index 3b382a9f4710eeb6e6165154c35188135db7dc34..1b07d191573650c10b38500a941a7695449c2eb2 100644
--- a/test/extrude/404/404.py
+++ b/test/extrude/404/404.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(367,496,367))
-r=w0.workplane(offset=233).moveTo(555,649).box(525,792,634).union(w0.workplane(offset=313).moveTo(367,1).box(1000,624,476))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,550,502))
+r=w0.workplane(offset=412).moveTo(212,850).cylinder(674,531).union(w0.sketch().arc((150,786),(511,1),(830,804)).arc((825,985),(664,915)).arc((477,941),(290,895)).arc((275,916),(252,929)).segment((250,870)).arc((211,845),(172,810)).segment((172,930)).arc((127,865),(151,785)).assemble().push([(498,473)]).rect(1000,826,mode='s').push([(765,889)]).circle(525,mode='s').finalize().extrude(571))
\ No newline at end of file
diff --git a/test/extrude/404/404.stl b/test/extrude/404/404.stl
index be3c90f1d1155c119fd1955007562d3c5635f114..24068b7c7ed61e01444e00fab6f5dd416fcdb711 100644
Binary files a/test/extrude/404/404.stl and b/test/extrude/404/404.stl differ
diff --git a/test/extrude/405/405.py b/test/extrude/405/405.py
index 76346bfc85641681d8eb6bbef034714707a23e35..030fcd788cfdcf331db14d56a4e0a5930d6ab092 100644
--- a/test/extrude/405/405.py
+++ b/test/extrude/405/405.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(923,616,616))
-w1=cq.Workplane('ZX',origin=(616,531,616))
-r=w0.sketch().arc((316,600),(516,500),(716,600)).close().assemble().reset().face(w0.sketch().segment((316,900),(716,900)).arc((516,1000),(316,900)).assemble()).reset().face(w0.sketch().arc((762,708),(769,746),(762,793)).close().assemble()).finalize().extrude(1).union(w0.sketch().segment((493,232),(593,232)).segment((593,447)).segment((677,447)).segment((677,547)).arc((639,524),(593,500)).segment((593,516)).segment((570,516)).segment((570,362)).segment((493,362)).close().assemble().finalize().extrude(331)).union(w1.sketch().arc((723,808),(731,808),(731,800)).arc((769,854),(723,808)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,126,500))
+r=w0.sketch().segment((1,262),(201,261)).segment((201,151)).segment((491,151)).segment((475,177)).segment((696,281)).segment((696,866)).segment((1,865)).close().assemble().reset().face(w0.sketch().segment((220,307),(476,306)).segment((475,705)).segment((386,706)).arc((101,760),(222,499)).close().assemble(),mode='s').push([(866,271)]).circle(636).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/405/405.stl b/test/extrude/405/405.stl
index 9440d25b64e3858b9778c38cd71f08d0ed114469..2669295794f0c12e591d2d96041bab921f20c044 100644
Binary files a/test/extrude/405/405.stl and b/test/extrude/405/405.stl differ
diff --git a/test/extrude/406/406.py b/test/extrude/406/406.py
index b3f93ff453be9e3822a68b90d33adb5d07899f73..ddbd0703e08712a36beac8a0add9ada1f36463e8 100644
--- a/test/extrude/406/406.py
+++ b/test/extrude/406/406.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(506,506,485))
-r=w0.workplane(offset=339).moveTo(970,132).cylinder(839,546).union(w0.sketch().segment((1,939),(72,425)).segment((344,465)).arc((647,485),(506,758)).segment((475,1000)).close().assemble().push([(344,980)]).circle(516,mode='s').push([(183,198)]).rect(667,879).finalize().extrude(889))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,526))
+w1=cq.Workplane('YZ',origin=(541,501,500))
+r=w0.workplane(offset=372).moveTo(896,646).cylinder(754,606).union(w0.workplane(offset=603).moveTo(166,459).box(831,876,706)).union(w1.sketch().arc((250,345),(275,330),(256,351)).arc((255,345),(251,346)).assemble().finalize().extrude(132))
\ No newline at end of file
diff --git a/test/extrude/406/406.stl b/test/extrude/406/406.stl
index b8471a43decace5d061751a162d60518f6a5d596..28a0644036263c878a5ce0893f13ab272caf8f3d 100644
Binary files a/test/extrude/406/406.stl and b/test/extrude/406/406.stl differ
diff --git a/test/extrude/407/407.py b/test/extrude/407/407.py
index 64b43740c0381cc29f6bc39ee0a78297886c6942..199dced23c0ebc32c70a0f59b06196a542ea9e2e 100644
--- a/test/extrude/407/407.py
+++ b/test/extrude/407/407.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(527,527,388))
-r=w0.sketch().segment((119,1),(441,1)).arc((613,216),(334,162)).segment((119,162)).close().assemble().push([(705,828)]).rect(989,1000).finalize().extrude(807)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,649,502))
+w1=cq.Workplane('ZX',origin=(502,901,500))
+r=w0.sketch().arc((576,367),(480,180),(584,1)).close().assemble().push([(770,736)]).circle(592).reset().face(w0.sketch().segment((799,371),(810,5)).arc((910,190),(799,371)).assemble()).finalize().extrude(734).union(w1.workplane(offset=98).moveTo(166,920).cylinder(1000,580))
\ No newline at end of file
diff --git a/test/extrude/407/407.stl b/test/extrude/407/407.stl
index 3ffcec6aa3b2a07f6678e201ed48aac9019cd1d5..a952b427c510388fc951c98781a18cd96ec79df6 100644
Binary files a/test/extrude/407/407.stl and b/test/extrude/407/407.stl differ
diff --git a/test/extrude/408/408.py b/test/extrude/408/408.py
index 8f54f6f8c6f02557b0d17a35fbb2acb626601bda..f6c44c3ce63619322935581a0de3cef9882673ec 100644
--- a/test/extrude/408/408.py
+++ b/test/extrude/408/408.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(419,419,512))
-w1=cq.Workplane('XY',origin=(419,419,222))
-r=w0.sketch().push([(466,71)]).rect(628,884).reset().face(w0.sketch().segment((373,24),(535,1)).segment((559,117)).segment((396,152)).close().assemble(),mode='s').finalize().extrude(686).union(w0.sketch().segment((175,826),(257,559)).segment((466,628)).segment((466,605)).segment((779,605)).segment((779,733)).segment((803,733)).segment((779,826)).segment((779,837)).segment((768,837)).segment((721,1000)).close().assemble().finalize().extrude(872)).union(w1.workplane(offset=245).moveTo(100,262).box(547,500,768))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(999,500,502))
+r=w0.sketch().segment((500,311),(645,311)).segment((647,411)).segment((740,410)).segment((740,681)).segment((535,681)).segment((535,581)).segment((502,579)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=482).moveTo(351,601).cylinder(541,590))
\ No newline at end of file
diff --git a/test/extrude/408/408.stl b/test/extrude/408/408.stl
index b15c71e6c811efedc1bdc4ea26fa18b4a5b3a136..c3a5d01ea8c1726843a06833ab78669a16de89ce 100644
Binary files a/test/extrude/408/408.stl and b/test/extrude/408/408.stl differ
diff --git a/test/extrude/409/409.py b/test/extrude/409/409.py
index 8c344cbb25839623fa6ccbd55e4b407930c35f82..56018e0dd48fecb4be27165b37035f4735af4c7a 100644
--- a/test/extrude/409/409.py
+++ b/test/extrude/409/409.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(648,972,648))
-r=w0.sketch().segment((296,458),(388,458)).segment((388,388)).segment((909,388)).segment((909,458)).segment((1000,458)).segment((1000,838)).segment((909,838)).segment((909,909)).segment((388,909)).segment((388,838)).segment((296,838)).close().assemble().push([(652,437)]).rect(697,719,mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,840))
+r=w0.sketch().segment((117,860),(452,686)).segment((130,764)).segment((130,756)).segment((490,666)).segment((681,567)).segment((756,705)).segment((187,1000)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((630,95),(650,2)).segment((886,46)).segment((869,140)).close().assemble().finalize().extrude(331))
\ No newline at end of file
diff --git a/test/extrude/409/409.stl b/test/extrude/409/409.stl
index 2133a9e3ce27eacc931536d89633b19deca78482..2c8cd47ffe31d8f4f09144ae1a4a412e2137029f 100644
Binary files a/test/extrude/409/409.stl and b/test/extrude/409/409.stl differ
diff --git a/test/extrude/41/41.py b/test/extrude/41/41.py
index 2370797c910efff7d11903bfc322815a8bc53be6..3fb78e7798726d203f846d1c1c965629921fc087 100644
--- a/test/extrude/41/41.py
+++ b/test/extrude/41/41.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,293,293))
-r=w0.workplane(offset=394).moveTo(360,85).box(742,1000,495).union(w0.sketch().segment((1,832),(46,91)).segment((461,113)).segment((416,854)).close().assemble().reset().face(w0.sketch().segment((80,371),(371,371)).segment((371,573)).segment((214,573)).arc((80,719),(80,517)).close().assemble(),mode='s').finalize().extrude(888)).translate((1,1,123))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(45,8,37))
+r=w0.sketch().segment((233,977),(913,977)).segment((913,297)).segment((645,297)).arc((354,418),(233,709)).close().assemble().push([(594,644)]).circle(98,mode='s').finalize().extrude(318).translate((1,311,1))
diff --git a/test/extrude/41/41.stl b/test/extrude/41/41.stl
index 7c8553792be0958a6c7ab148cd384f9fcc862d5e..3ced107a4da95262c43dd6e3a81955f97a3b34f3 100644
Binary files a/test/extrude/41/41.stl and b/test/extrude/41/41.stl differ
diff --git a/test/extrude/410/410.py b/test/extrude/410/410.py
index 09957ab75d40ec917ac3e38afe8f1149d2d5f6f0..ac95d93911908f4400e36fc49123cf4a042e6844 100644
--- a/test/extrude/410/410.py
+++ b/test/extrude/410/410.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(480,480,480))
-r=w0.sketch().arc((605,1),(906,147),(605,292)).close().assemble().finalize().extrude(407).union(w0.sketch().segment((84,386),(136,386)).segment((136,646)).arc((147,688),(136,729)).segment((136,813)).arc((105,823),(136,834)).segment((136,1000)).segment((84,1000)).segment((84,729)).arc((53,688),(84,646)).close().assemble().finalize().extrude(553))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,589))
+w1=cq.Workplane('YZ',origin=(601,501,500))
+r=w0.sketch().push([(122,529)]).circle(621).reset().face(w0.sketch().segment((102,592),(146,590)).arc((121,595),(102,591)).assemble(),mode='s').finalize().extrude(121).union(w1.sketch().arc((347,331),(665,246),(550,549)).segment((550,741)).segment((451,741)).arc((305,785),(386,656)).segment((385,545)).arc((305,445),(346,332)).assemble().finalize().extrude(901))
\ No newline at end of file
diff --git a/test/extrude/410/410.stl b/test/extrude/410/410.stl
index add1289c52c41083fd62ca997fe40acfd12bafc9..cc2e434ae3352c0608c9e166262ad040d36bd931 100644
Binary files a/test/extrude/410/410.stl and b/test/extrude/410/410.stl differ
diff --git a/test/extrude/411/411.py b/test/extrude/411/411.py
index 4f2690d112f6ce9cf2eca61fa50172b2cfa64918..561e106385e899f5ff60cac9362b3aef930cd767 100644
--- a/test/extrude/411/411.py
+++ b/test/extrude/411/411.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,291,500))
-r=w0.sketch().segment((1,251),(530,251)).segment((530,181)).segment((1000,181)).segment((1000,341)).segment((560,341)).segment((560,820)).segment((1,820)).close().assemble().push([(461,645)]).rect(700,650,mode='s').push([(451,471)]).circle(550,mode='s').finalize().extrude(790).union(w0.workplane(offset=715).moveTo(281,530).cylinder(930,590))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,410,500))
+r=w0.sketch().push([(230,671)]).circle(686).push([(347,634)]).circle(541,mode='s').finalize().extrude(285).union(w0.workplane(offset=619).moveTo(132,495).box(765,619,735)).union(w0.sketch().segment((500,192),(621,191)).segment((619,145)).segment((880,146)).segment((880,192)).segment((1000,190)).segment((999,501)).segment((880,501)).segment((879,545)).segment((621,547)).segment((619,501)).segment((501,500)).close().assemble().reset().face(w0.sketch().segment((531,352),(621,330)).segment((620,429)).segment((555,445)).close().assemble(),mode='s').reset().face(w0.sketch().segment((881,261),(946,240)).segment((969,335)).segment((881,360)).close().assemble(),mode='s').finalize().extrude(895))
\ No newline at end of file
diff --git a/test/extrude/411/411.stl b/test/extrude/411/411.stl
index cf354861a528bd1dfce982c234ed701ccc696c7a..162eec119832a8e23205a08be084c19eb8ae4434 100644
Binary files a/test/extrude/411/411.stl and b/test/extrude/411/411.stl differ
diff --git a/test/extrude/412/412.py b/test/extrude/412/412.py
index 38eacb2adc4c773c41a302137396bba182175b7d..3a033cd5ef55ef1312b648855930d37250c5bc82 100644
--- a/test/extrude/412/412.py
+++ b/test/extrude/412/412.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(600,445,445))
-r=w0.sketch().segment((423,245),(467,223)).arc((589,34),(811,23)).segment((856,1)).segment((1000,256)).segment((967,267)).arc((944,223),(911,179)).arc((556,112),(667,456)).arc((700,478),(722,489)).arc((667,489),(612,478)).segment((556,500)).close().assemble().finalize().extrude(123).union(w0.workplane(offset=317).moveTo(12,767).cylinder(700,567)).translate((1,111,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,969))
+w1=cq.Workplane('YZ',origin=(637,499,501))
+r=w0.sketch().push([(502,337)]).rect(1000,1000).reset().face(w0.sketch().segment((240,246),(540,66)).segment((761,426)).segment((460,611)).close().assemble(),mode='s').finalize().extrude(1).union(w1.sketch().push([(840,473)]).rect(821,1000).push([(715,595)]).rect(571,569,mode='s').finalize().extrude(436))
\ No newline at end of file
diff --git a/test/extrude/412/412.stl b/test/extrude/412/412.stl
index ec0133b2a7d5cef65fab42615efbef9c498df9cd..56dc1ee5908b017c5fde14ea9e7109a0a0eb9f05 100644
Binary files a/test/extrude/412/412.stl and b/test/extrude/412/412.stl differ
diff --git a/test/extrude/413/413.py b/test/extrude/413/413.py
index c2f8d58d022e0cd12e03dff939aa9fe623471247..55ba464e4e1379a34db856278a7d24eb9c06dd32 100644
--- a/test/extrude/413/413.py
+++ b/test/extrude/413/413.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,314,314))
-r=w0.sketch().rect(717,940).circle(366,mode='s').finalize().extrude(254).union(w0.workplane(offset=575).cylinder(836,336)).union(w0.workplane(offset=657).cylinder(1000,553)).translate((1,240,240))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,560,501))
+r=w0.sketch().push([(308,512)]).rect(1000,716).push([(931,450)]).circle(569).finalize().extrude(376)
\ No newline at end of file
diff --git a/test/extrude/413/413.stl b/test/extrude/413/413.stl
index fc9cd344670109107536256679be8d9f588339d5..69fd5cc571bca0bf2c3779662e1672ab0fe4a231 100644
Binary files a/test/extrude/413/413.stl and b/test/extrude/413/413.stl differ
diff --git a/test/extrude/414/414.py b/test/extrude/414/414.py
index 67ff1e9d82a4fd7cc05a42a291b9e1c20615f366..ef89a91108d4c05e46ef6a90ac134cb3448ab524 100644
--- a/test/extrude/414/414.py
+++ b/test/extrude/414/414.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(382,382,72))
-r=w0.sketch().segment((120,310),(493,310)).segment((493,770)).arc((453,1),(120,691)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,865))
+r=w0.sketch().segment((125,626),(600,591)).segment((609,745)).segment((136,780)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((6,421),(230,420)).segment((230,370)).segment((434,372)).arc((541,56),(870,51)).arc((799,199),(960,150)).arc((961,421),(730,570)).segment((729,945)).segment((506,946)).segment((506,1000)).segment((230,999)).segment((231,944)).segment((7,945)).close().assemble().push([(709,285)]).rect(595,641,mode='s').finalize().extrude(439))
\ No newline at end of file
diff --git a/test/extrude/414/414.stl b/test/extrude/414/414.stl
index 92049d391d69e159e8284faf1edf07a6aa095063..789978a517656a32dfaddea7d3cfa907ab2b4569 100644
Binary files a/test/extrude/414/414.stl and b/test/extrude/414/414.stl differ
diff --git a/test/extrude/415/415.py b/test/extrude/415/415.py
index e32b46042b7df7240b1c228b0f36a1c4ef39e514..4e05e1831ee68efc9c6dfd2cdd7491401796ce81 100644
--- a/test/extrude/415/415.py
+++ b/test/extrude/415/415.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().segment((594,674),(620,574)).segment((740,694)).segment((680,760)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,500,502))
+r=w0.sketch().segment((371,310),(631,310)).segment((632,689)).arc((500,666),(371,691)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/415/415.stl b/test/extrude/415/415.stl
index b151bf813a79bfd520fdd949149eda4840d30537..740c33f2866659fde26925f8715c97f3a348c549 100644
Binary files a/test/extrude/415/415.stl and b/test/extrude/415/415.stl differ
diff --git a/test/extrude/416/416.py b/test/extrude/416/416.py
index 18bcdf5c9711e0bab8f09bb0060330971e78db08..f18c2437f9e3da73309d08006e57c1be1d61b4b1 100644
--- a/test/extrude/416/416.py
+++ b/test/extrude/416/416.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(325,325,1))
-r=w0.sketch().rect(1000,474).push([(38,301)]).rect(386,426,mode='s').finalize().extrude(980).translate((176,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(222,500,502))
+r=w0.sketch().push([(376,491)]).circle(621).reset().face(w0.sketch().segment((556,717),(595,717)).segment((595,650)).segment((670,651)).segment((671,716)).segment((712,716)).segment((710,784)).segment((670,785)).segment((670,844)).segment((595,845)).segment((596,786)).segment((556,787)).close().assemble()).finalize().extrude(375).union(w0.sketch().arc((6,705),(90,536),(275,536)).segment((277,307)).segment((645,305)).segment((744,142)).segment((894,230)).segment((850,307)).segment((1000,306)).segment((1000,660)).segment((630,662)).segment((531,831)).segment((380,736)).segment((426,661)).segment((356,660)).arc((222,856),(18,741)).arc((2,726),(8,705)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/416/416.stl b/test/extrude/416/416.stl
index 3bf170e609a7fd4bb5d90cb0d75bb72914812ab2..9bcf2fe6939b48c258e3335f8f4532788ca252f2 100644
Binary files a/test/extrude/416/416.stl and b/test/extrude/416/416.stl differ
diff --git a/test/extrude/417/417.py b/test/extrude/417/417.py
index 7ba29fdc72dfcfe864fde7dfadcc119d4058900c..afe393efd243b499e0084cadd6ca40064cc8f754 100644
--- a/test/extrude/417/417.py
+++ b/test/extrude/417/417.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.workplane(offset=667).cylinder(1000,434).translate((1,101,101))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,346,501))
+r=w0.workplane(offset=584).moveTo(40,548).box(579,764,666).union(w0.sketch().arc((436,411),(521,352),(625,321)).segment((695,322)).segment((1000,625)).segment((841,626)).segment((841,480)).segment((481,481)).segment((480,624)).segment((434,625)).close().assemble().finalize().extrude(809))
\ No newline at end of file
diff --git a/test/extrude/417/417.stl b/test/extrude/417/417.stl
index 5698b68b1309eae66e81539230e9f776b31a2cec..2c6caa07ba7cd1a7d4e92132a3b4c8cb84130df7 100644
Binary files a/test/extrude/417/417.stl and b/test/extrude/417/417.stl differ
diff --git a/test/extrude/418/418.py b/test/extrude/418/418.py
index 8be592c4ef72cc499f69fe943836e37e2fc014d9..4835404b7e012291f8cdb6969712eb28ea71cd86 100644
--- a/test/extrude/418/418.py
+++ b/test/extrude/418/418.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,650,500))
-w1=cq.Workplane('ZX',origin=(500,441,500))
-r=w0.sketch().segment((41,301),(131,301)).arc((221,281),(311,301)).segment((391,301)).segment((391,371)).arc((441,500),(391,630)).segment((391,690)).segment((311,690)).arc((221,710),(131,690)).segment((41,690)).segment((41,630)).arc((1,500),(41,371)).close().assemble().reset().face(w0.sketch().segment((530,530),(790,261)).segment((1000,471)).segment((740,740)).close().assemble()).finalize().extrude(451).union(w1.workplane(offset=456).moveTo(565,505).box(850,870,590))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,441,501))
+r=w0.sketch().segment((1,222),(16,222)).segment((16,215)).segment((32,216)).segment((32,491)).segment((16,490)).segment((15,480)).segment((1,480)).close().assemble().finalize().extrude(450).union(w0.workplane(offset=589).moveTo(989,775).cylinder(676,509))
\ No newline at end of file
diff --git a/test/extrude/418/418.stl b/test/extrude/418/418.stl
index 80a660020e18d1efd38ac8ef6c4cadaff5e9cfc9..3e8665b2f8e527567ce08c9d5f27f81a5b44c702 100644
Binary files a/test/extrude/418/418.stl and b/test/extrude/418/418.stl differ
diff --git a/test/extrude/419/419.py b/test/extrude/419/419.py
index c6b72a2e34a93f3ad2ca274bdec49d81d7e1fb1c..9d297a584409361a0eac4f4076def008193b9425 100644
--- a/test/extrude/419/419.py
+++ b/test/extrude/419/419.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(635,635,949))
-r=w0.sketch().arc((271,497),(424,453),(570,380)).segment((1000,380)).segment((1000,891)).segment((271,891)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,175,501))
+r=w0.workplane(offset=470).moveTo(636,400).cylinder(560,529).union(w0.sketch().arc((286,999),(310,505),(810,561)).arc((412,620),(286,1000)).assemble().finalize().extrude(705)).union(w0.workplane(offset=857).moveTo(575,398).box(890,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/419/419.stl b/test/extrude/419/419.stl
index 62e3bab13c48257dd6efa4126537627edac75be9..0b62cabaa62324018bbc964ef326cd7db1da78be 100644
Binary files a/test/extrude/419/419.stl and b/test/extrude/419/419.stl differ
diff --git a/test/extrude/42/42.py b/test/extrude/42/42.py
index 4db8bad04e4882514e995fac6f014a92616cd6a7..9d1a2ffe0645f7dcd211cfcbbcdd585933a5fe60 100644
--- a/test/extrude/42/42.py
+++ b/test/extrude/42/42.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(475,619,475))
-r=w0.sketch().push([(83,336)]).rect(722,1000).push([(176,310)]).circle(506,mode='s').finalize().extrude(1).union(w0.sketch().segment((310,454),(660,454)).arc((856,464),(825,660)).segment((825,712)).segment((310,712)).close().assemble().finalize().extrude(351)).union(w0.sketch().segment((155,32),(434,32)).segment((434,186)).arc((464,258),(464,331)).segment((773,331)).segment((773,815)).segment((990,815)).segment((990,918)).segment((495,918)).segment((495,835)).segment((361,835)).segment((207,516)).segment((155,516)).segment((155,444)).arc((83,289),(155,145)).close().assemble().reset().face(w0.sketch().segment((310,516),(361,516)).segment((361,537)).arc((341,526),(310,516)).assemble(),mode='s').finalize().extrude(660))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(30,55,42))
+r=w0.sketch().segment((535,99),(482,99)).arc((473,103),(469,112)).segment((469,735)).segment((537,735)).segment((537,417)).close().assemble().reset().segment((356,198),(596,198)).segment((596,438)).segment((356,438)).close().assemble(mode='s').finalize().extrude(67).translate((1,13,1))
diff --git a/test/extrude/42/42.stl b/test/extrude/42/42.stl
index 9267bd718fa5a012193b155ac309d95ec59791bb..cf60e2279726b7f912cc9aa036786b4a254a6b9b 100644
Binary files a/test/extrude/42/42.stl and b/test/extrude/42/42.stl differ
diff --git a/test/extrude/420/420.py b/test/extrude/420/420.py
index 2851da4da1aa149bf4966ae25014a26058e70dca..35daa93f0520b187e76b8817bdd0fe0f3d85c08b 100644
--- a/test/extrude/420/420.py
+++ b/test/extrude/420/420.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().segment((154,48),(227,14)).segment((514,620)).segment((441,654)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,180))
+r=w0.sketch().segment((2,402),(616,401)).segment((615,511)).arc((979,696),(595,565)).segment((1,566)).close().assemble().reset().face(w0.sketch().segment((740,601),(805,570)).segment((839,635)).segment((776,660)).close().assemble(),mode='s').reset().face(w0.sketch().segment((65,251),(354,191)).segment((381,305)).segment((317,320)).arc((276,327),(240,336)).segment((91,366)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/420/420.stl b/test/extrude/420/420.stl
index b4239518bf2fd65764cf937b130c383ffaaa505e..4c13d38771e988995041a8889140875bf956bfc3 100644
Binary files a/test/extrude/420/420.stl and b/test/extrude/420/420.stl differ
diff --git a/test/extrude/421/421.py b/test/extrude/421/421.py
index 39585f86f9bf9d023bafcc9b4167ae54183bf942..fa6c89148bb51eb20b4423e789da955e4e5ce4c0 100644
--- a/test/extrude/421/421.py
+++ b/test/extrude/421/421.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(556,556,578))
-w1=cq.Workplane('ZX',origin=(556,523,556))
-r=w0.sketch().segment((789,822),(911,667)).arc((867,756),(789,822)).assemble().finalize().extrude(467).union(w1.sketch().arc((367,179),(390,179),(401,168)).segment((401,134)).segment((889,134)).segment((889,634)).arc((1000,967),(822,667)).segment((401,667)).segment((401,589)).arc((1,412),(367,179)).assemble().reset().face(w1.sketch().segment((911,711),(944,711)).segment((944,734)).arc((1000,800),(944,878)).segment((944,900)).segment((911,900)).segment((911,878)).arc((856,800),(911,734)).close().assemble(),mode='s').finalize().extrude(323))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,321))
+r=w0.sketch().segment((1,290),(22,87)).segment((141,101)).segment((110,115)).arc((115,196),(95,116)).segment((56,116)).segment((55,141)).segment((20,155)).segment((55,230)).segment((56,281)).segment((76,280)).segment((81,297)).close().assemble().finalize().extrude(235).union(w0.sketch().push([(801,715)]).circle(701).push([(821,671)]).circle(540,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/421/421.stl b/test/extrude/421/421.stl
index e2a3ada4c6022d9c3655dbff6ad558a6c7af90f5..826fc33bf714886f81703b2bf065be99d4eb89c3 100644
Binary files a/test/extrude/421/421.stl and b/test/extrude/421/421.stl differ
diff --git a/test/extrude/422/422.py b/test/extrude/422/422.py
index fa5a91c199d3ffb2e17aef1f57903d476c1e5bec..6edbf4bc54a5d49bb3fd0eb2eb8bb059815ec15f 100644
--- a/test/extrude/422/422.py
+++ b/test/extrude/422/422.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(550,496,496))
-r=w0.workplane(offset=244).moveTo(618,788).box(829,541,1000).union(w0.sketch().arc((496,919),(532,505),(739,865)).segment((739,928)).segment((649,928)).arc((577,937),(514,928)).segment((496,928)).close().assemble().finalize().extrude(1)).union(w0.sketch().arc((271,469),(298,100),(658,208)).segment((487,208)).segment((487,298)).arc((343,343),(271,469)).assemble().finalize().extrude(892))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,675,502))
+w1=cq.Workplane('YZ',origin=(496,501,501))
+r=w0.sketch().segment((245,366),(426,365)).segment((426,341)).segment((577,340)).segment((576,367)).segment((751,367)).segment((749,511)).arc((755,540),(749,565)).segment((750,870)).segment((576,869)).segment((576,895)).segment((447,895)).segment((465,975)).segment((379,1000)).segment((341,870)).segment((246,870)).close().assemble().reset().face(w0.sketch().arc((576,681),(645,679),(710,645)).arc((666,749),(576,814)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().segment((285,870),(439,871)).segment((441,950)).arc((360,936),(285,951)).close().assemble().finalize().extrude(544)).union(w1.sketch().arc((546,362),(791,340),(856,575)).arc((745,400),(546,361)).assemble().finalize().extrude(6))
\ No newline at end of file
diff --git a/test/extrude/422/422.stl b/test/extrude/422/422.stl
index 80a860b41e29f6a66d24681544d6f9108dc07096..a28f478f01c44866e727c55c9bdbb743fb85d5dc 100644
Binary files a/test/extrude/422/422.stl and b/test/extrude/422/422.stl differ
diff --git a/test/extrude/423/423.py b/test/extrude/423/423.py
index c1d2d8489e6097fad2af8bdb704d19a54cdcd9da..c727787528af3ce848f09d9c08bdab783e233a55 100644
--- a/test/extrude/423/423.py
+++ b/test/extrude/423/423.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,224,224))
-w1=cq.Workplane('YZ',origin=(303,224,224))
-r=w0.workplane(offset=8).moveTo(514,40).cylinder(658,264).union(w0.workplane(offset=612).moveTo(172,224).cylinder(1000,500)).union(w1.sketch().arc((500,54),(514,27),(514,54)).arc((514,40),(500,54)).assemble().finalize().extrude(803)).translate((321,105,53))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,1000))
+r=w0.workplane(offset=2).moveTo(522,329).box(835,826,1000).union(w0.sketch().push([(355,796)]).rect(591,581).reset().face(w0.sketch().segment((326,819),(331,770)).segment((386,771)).segment((380,819)).close().assemble(),mode='s').finalize().extrude(57))
\ No newline at end of file
diff --git a/test/extrude/423/423.stl b/test/extrude/423/423.stl
index 855cc156523479b644317c904e9fa0bff3dc40d6..ac060ff14ba84bebc18aa26bc8fb1078ac488eb5 100644
Binary files a/test/extrude/423/423.stl and b/test/extrude/423/423.stl differ
diff --git a/test/extrude/424/424.py b/test/extrude/424/424.py
index d29bf37ba54af1b1999c6b28711ae8885ba622ef..0c2bb813d4d64a78104da034dbae36c3cb80fb0b 100644
--- a/test/extrude/424/424.py
+++ b/test/extrude/424/424.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.workplane(offset=667).box(654,534,1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,185))
+r=w0.sketch().segment((31,426),(390,427)).segment((391,500)).segment((670,165)).segment((1000,442)).segment((670,835)).segment((391,605)).segment((391,726)).segment((30,724)).close().assemble().reset().face(w0.sketch().segment((571,435),(706,391)).segment((770,566)).segment((630,610)).close().assemble(),mode='s').finalize().extrude(1000).union(w0.sketch().segment((1,600),(20,602)).segment((20,669)).arc((5,635),(2,599)).assemble().reset().face(w0.sketch().segment((340,600),(421,600)).arc((395,681),(341,744)).segment((341,675)).segment((355,670)).close().assemble()).finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/424/424.stl b/test/extrude/424/424.stl
index 292015b37f076ddbc2f5c7381b19a62628e346b2..a2ebe05fd6a3569061f1d6d920a06b3367ed277d 100644
Binary files a/test/extrude/424/424.stl and b/test/extrude/424/424.stl differ
diff --git a/test/extrude/425/425.py b/test/extrude/425/425.py
index 8219874d76502e45fbb3f07c5d60f938cd593a78..616c76a844e3d2461c2982eaa3aef7fb775f4c32 100644
--- a/test/extrude/425/425.py
+++ b/test/extrude/425/425.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(260,464,464))
-r=w0.workplane(offset=394).cylinder(602,574).union(w0.sketch().segment((1,214),(306,214)).segment((306,103)).segment((621,103)).segment((621,214)).segment((926,214)).segment((926,713)).segment((621,713)).segment((621,824)).segment((306,824)).segment((306,713)).segment((1,713)).close().assemble().finalize().extrude(1000)).translate((1,111,111))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,491,500))
+r=w0.sketch().segment((102,575),(137,539)).segment((195,605)).segment((287,546)).segment((386,690)).segment((162,739)).segment((110,666)).segment((161,636)).close().assemble().push([(171,950)]).circle(551).reset().face(w0.sketch().segment((132,935),(155,931)).segment((156,946)).segment((135,949)).close().assemble(),mode='s').finalize().extrude(10).union(w0.sketch().push([(540,566)]).circle(615).push([(619,145)]).circle(645).finalize().extrude(944)).union(w0.sketch().segment((531,72),(696,71)).arc((716,67),(736,70)).segment((899,71)).segment((900,201)).segment((735,201)).arc((714,207),(695,200)).segment((529,200)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/425/425.stl b/test/extrude/425/425.stl
index 294bdd4fdeba45dc862c5ec012b58a3309bcb6cf..cdd4017dbd85db87a06ef7c1979b4bab49d88d70 100644
Binary files a/test/extrude/425/425.stl and b/test/extrude/425/425.stl differ
diff --git a/test/extrude/426/426.py b/test/extrude/426/426.py
index c8c77e0c46045b9c83a60638e8a13f358cc490f7..60ba641ebb7f4ed8cbca8509d73b555ac441eb6a 100644
--- a/test/extrude/426/426.py
+++ b/test/extrude/426/426.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(349,315,349))
-w1=cq.Workplane('XY',origin=(349,349,233))
-r=w0.sketch().push([(117,13)]).circle(593).rect(466,605,mode='s').finalize().extrude(1).union(w0.workplane(offset=559).moveTo(408,634).box(1000,942,768)).union(w1.workplane(offset=646).moveTo(123,158).box(454,733,942)).translate((232,1,128))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,426,500))
+w1=cq.Workplane('YZ',origin=(251,500,501))
+r=w0.workplane(offset=288).moveTo(741,651).box(801,580,924).union(w0.sketch().segment((146,361),(160,325)).arc((180,302),(180,270)).segment((195,235)).arc((206,246),(211,260)).segment((230,261)).segment((230,310)).segment((210,312)).arc((185,347),(147,360)).assemble().finalize().extrude(1000)).union(w1.workplane(offset=757).moveTo(456,165).cylinder(1000,556))
\ No newline at end of file
diff --git a/test/extrude/426/426.stl b/test/extrude/426/426.stl
index 8fb335f476918c5d1bb77c6a63aac0faac9e1fb5..61cfec657cbc98ed095af2fe9c02688ce7f7da2e 100644
Binary files a/test/extrude/426/426.stl and b/test/extrude/426/426.stl differ
diff --git a/test/extrude/427/427.py b/test/extrude/427/427.py
index beb2ab67852217942d168be0d5b7c9826c6317fb..46968c4204d15626c1d0971894cfca76acead843 100644
--- a/test/extrude/427/427.py
+++ b/test/extrude/427/427.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((401,381),(933,381)).segment((933,700)).arc((614,674),(447,953)).segment((401,953)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,182,501))
+r=w0.workplane(offset=824).box(1000,1000,1000)
\ No newline at end of file
diff --git a/test/extrude/427/427.stl b/test/extrude/427/427.stl
index f222070ae83f93672c7deaa4071b7858ed8bcc4e..3cb8bbc50376df81236bb0cb56bab9ccd70527c2 100644
Binary files a/test/extrude/427/427.stl and b/test/extrude/427/427.stl differ
diff --git a/test/extrude/428/428.py b/test/extrude/428/428.py
index c02321c49b641852804b58bea3ae442453d2636d..4851119ce001a088f20ce061c1d45cdf04aec10b 100644
--- a/test/extrude/428/428.py
+++ b/test/extrude/428/428.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,291))
-r=w0.sketch().segment((1,91),(261,91)).arc((500,21),(740,91)).segment((1000,91)).segment((1000,910)).segment((740,910)).arc((500,980),(261,910)).segment((1,910)).close().assemble().finalize().extrude(920)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,276,502))
+r=w0.sketch().segment((587,101),(725,101)).arc((972,61),(867,287)).segment((867,741)).segment((586,742)).close().assemble().push([(759,151)]).rect(747,571,mode='s').finalize().extrude(525).union(w0.sketch().push([(216,781)]).circle(717).reset().face(w0.sketch().segment((31,733),(97,730)).segment((96,717)).segment((337,717)).segment((337,730)).segment((401,731)).segment((402,837)).segment((337,837)).segment((335,852)).segment((97,851)).segment((96,836)).segment((31,835)).close().assemble(),mode='s').finalize().extrude(946))
\ No newline at end of file
diff --git a/test/extrude/428/428.stl b/test/extrude/428/428.stl
index 7ed364ac264e4e8b2ced3614b478ae57d617a087..4fc83dc13101c2cf7b7cc4da2820605f58f621d5 100644
Binary files a/test/extrude/428/428.stl and b/test/extrude/428/428.stl differ
diff --git a/test/extrude/429/429.py b/test/extrude/429/429.py
index 1f177bce151a1b87695e0e65be2b14ea90851f3d..c9629a92e4e9becd5af3883bbb76c77684f4d561 100644
--- a/test/extrude/429/429.py
+++ b/test/extrude/429/429.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(639,422,422))
-w1=cq.Workplane('YZ',origin=(507,422,422))
-r=w0.workplane(offset=200).moveTo(410,1).cylinder(868,603).union(w1.workplane(offset=314).moveTo(591,1000).cylinder(639,446)).translate((1,1,181))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(830,500,500))
+r=w0.sketch().segment((1,377),(365,376)).segment((366,381)).segment((495,381)).arc((482,312),(495,235)).segment((381,237)).segment((382,127)).segment((591,125)).arc((690,101),(790,126)).segment((999,127)).segment((1000,235)).segment((885,236)).arc((900,310),(884,381)).segment((999,381)).segment((1000,490)).segment((790,491)).arc((690,509),(591,491)).segment((405,492)).segment((407,976)).segment((1,976)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=560).moveTo(450,456).cylinder(621,931))
\ No newline at end of file
diff --git a/test/extrude/429/429.stl b/test/extrude/429/429.stl
index 52ee9de7e3dffe75ddc5a61cf0a2a89948261bbc..3fb5bf817fae1cc39d06b519e66f3070c4c4033f 100644
Binary files a/test/extrude/429/429.stl and b/test/extrude/429/429.stl differ
diff --git a/test/extrude/43/43.py b/test/extrude/43/43.py
index be5386adc78d07273897d30a2a2b30a274552712..c2a2026448e05aadea50a53dc30cf76acb54002a 100644
--- a/test/extrude/43/43.py
+++ b/test/extrude/43/43.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(453,222,453))
-r=w0.sketch().push([(537,695)]).circle(737).push([(537,700)]).rect(937,695,mode='s').finalize().extrude(369).union(w0.sketch().push([(190,33)]).circle(558).reset().face(w0.sketch().segment((138,1),(232,1)).segment((243,43)).segment((159,64)).close().assemble(),mode='s').finalize().extrude(1000)).translate((73,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(1,19,75))
+r=w0.sketch().segment((288,432),(960,432)).segment((960,946)).segment((288,946)).close().assemble().push([(620,659)]).rect(178,113,mode='s').finalize().extrude(236)
diff --git a/test/extrude/43/43.stl b/test/extrude/43/43.stl
index 8de9cc3375e4a1c0782539ad6b534c0a575efaf9..f47f7262a7f566df0ec1f46050b51d632e62fac3 100644
Binary files a/test/extrude/43/43.stl and b/test/extrude/43/43.stl differ
diff --git a/test/extrude/430/430.py b/test/extrude/430/430.py
index 8d8e27fcf5e2e389a26a7e04a4e9c5ff2b91f243..553dc582d4796a28f64a6c74ffce9cee147ea6f4 100644
--- a/test/extrude/430/430.py
+++ b/test/extrude/430/430.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,500,500))
-r=w0.sketch().arc((281,750),(331,720),(361,670)).segment((371,680)).segment((411,610)).segment((391,600)).arc((371,520),(331,451)).arc((461,620),(281,750)).assemble().finalize().extrude(371).union(w0.sketch().arc((261,720),(211,530),(401,510)).arc((301,590),(261,720)).assemble().reset().face(w0.sketch().arc((461,970),(710,860),(690,580)).segment((820,580)).segment((810,1000)).segment((461,990)).close().assemble()).reset().face(w0.sketch().segment((670,21),(690,1)).segment((690,11)).segment((680,21)).close().assemble()).finalize().extrude(630))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,237,502))
+r=w0.sketch().segment((587,936),(586,947)).segment((592,940)).segment((591,931)).arc((647,985),(587,935)).assemble().finalize().extrude(856).union(w0.workplane(offset=721).moveTo(391,273).box(592,1000,940)).union(w0.sketch().segment((566,536),(587,512)).segment((622,547)).segment((596,571)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/430/430.stl b/test/extrude/430/430.stl
index 18d4f7172e5921633f55ba5b14bc1a940ac29128..1de50b086ed5f914a2deb2c42525f92ee8bd8d58 100644
Binary files a/test/extrude/430/430.stl and b/test/extrude/430/430.stl differ
diff --git a/test/extrude/431/431.py b/test/extrude/431/431.py
index 3572f1695f001f23ef1dae9a0d4858874527ece2..e74b94670345ee3c3139fea2457f6fef55484f27 100644
--- a/test/extrude/431/431.py
+++ b/test/extrude/431/431.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,261))
-w1=cq.Workplane('ZX',origin=(500,830,500))
-r=w0.sketch().segment((1,11),(431,11)).segment((431,500)).arc((720,930),(341,570)).segment((1,570)).close().assemble().finalize().extrude(700).union(w1.sketch().segment((471,540),(570,540)).segment((570,550)).arc((740,770),(570,990)).segment((570,1000)).segment((471,1000)).segment((471,990)).arc((301,770),(471,550)).close().assemble().finalize().extrude(600))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,1,502))
+r=w0.workplane(offset=997).moveTo(135,744).box(730,835,1000).union(w0.sketch().push([(921,152)]).circle(561).push([(917,148)]).rect(515,575,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/431/431.stl b/test/extrude/431/431.stl
index ce5f2d11818dc2b837265a3f6a392b76fb380dd5..1b5e58d85bd4c0fb9adc4a439c9608ad708a0c8e 100644
Binary files a/test/extrude/431/431.stl and b/test/extrude/431/431.stl differ
diff --git a/test/extrude/432/432.py b/test/extrude/432/432.py
index 17819d1451c97255210866af921a63b83c77d444..b0fbb7e594f0e9f76eb374f571d1205eb7414401 100644
--- a/test/extrude/432/432.py
+++ b/test/extrude/432/432.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(325,649,325))
-r=w0.workplane(offset=1).cylinder(973,1000).translate((676,1,676))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,677))
+r=w0.sketch().push([(481,259)]).rect(1000,1000).push([(480,260)]).rect(891,861,mode='s').push([(674,880)]).circle(619).finalize().extrude(152).union(w0.sketch().segment((640,716),(716,655)).segment((755,700)).segment((675,761)).close().assemble().finalize().extrude(240))
\ No newline at end of file
diff --git a/test/extrude/432/432.stl b/test/extrude/432/432.stl
index 3daff726e9f76442abd78dac7b10be8863416d81..59c13edc874808a1ad434f5045a663f075c327a6 100644
Binary files a/test/extrude/432/432.stl and b/test/extrude/432/432.stl differ
diff --git a/test/extrude/433/433.py b/test/extrude/433/433.py
index 7196adc78e0e0ac2da42495a0276b02d3e5586bd..a116e0c2b1218587e48c1a14eb1c2f2897e3a1ab 100644
--- a/test/extrude/433/433.py
+++ b/test/extrude/433/433.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(439,465,439))
-r=w0.workplane(offset=395).box(842,1000,527).union(w0.sketch().segment((1,448),(755,132)).segment((877,430)).segment((124,746)).close().assemble().finalize().extrude(474)).translate((62,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,322))
+r=w0.sketch().push([(954,966)]).circle(537).circle(516,mode='s').finalize().extrude(442).union(w0.sketch().arc((178,506),(68,108),(482,98)).segment((790,96)).segment((789,611)).segment((407,610)).arc((372,651),(331,611)).segment((177,611)).close().assemble().push([(484,606)]).rect(507,512,mode='s').finalize().extrude(752)).union(w0.workplane(offset=713).moveTo(621,705).cylinder(925,765))
\ No newline at end of file
diff --git a/test/extrude/433/433.stl b/test/extrude/433/433.stl
index 3e83a4a84fc2bd420dbd3f623e949152ef064516..114a1786bccad6bd8887f3b7dd25d81d19ab0cf4 100644
Binary files a/test/extrude/433/433.stl and b/test/extrude/433/433.stl differ
diff --git a/test/extrude/434/434.py b/test/extrude/434/434.py
index 36f8ec381691fde4ecec81c9a88f40bf5107adba..051cbe3e27fab199dbdad8f4b44ba64813999921 100644
--- a/test/extrude/434/434.py
+++ b/test/extrude/434/434.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(452,388,452))
-w1=cq.Workplane('XY',origin=(452,452,484))
-r=w0.workplane(offset=726).moveTo(248,893).cylinder(1000,549).union(w1.workplane(offset=586).moveTo(146,1).box(914,517,721))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,994))
+r=w0.workplane(offset=2).moveTo(536,495).cylinder(1000,966).union(w0.sketch().push([(300,671)]).circle(801).push([(297,671)]).rect(964,760,mode='s').finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/434/434.stl b/test/extrude/434/434.stl
index 3615bb26ea02a02c5e58bf00dc9f2feb8830deb2..5674a535ff339767bb3f62a1071b14e35f972f47 100644
Binary files a/test/extrude/434/434.stl and b/test/extrude/434/434.stl differ
diff --git a/test/extrude/435/435.py b/test/extrude/435/435.py
index 21a0d23d5b3965b4fa97c8be1cd3d09c94b7b978..d5baab038dabca7b5c4c0bcb7175a4577a35af50 100644
--- a/test/extrude/435/435.py
+++ b/test/extrude/435/435.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(736,1000,736))
-r=w0.sketch().segment((576,764),(642,859)).segment((576,868)).close().assemble().finalize().extrude(1).union(w0.sketch().circle(981).reset().face(w0.sketch().arc((783,604),(953,680),(783,755)).arc((877,680),(783,604)).assemble(),mode='s').finalize().extrude(943)).translate((246,1,246))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,471,501))
+r=w0.sketch().segment((560,711),(617,661)).arc((790,176),(764,692)).segment((791,720)).segment((660,829)).close().assemble().finalize().extrude(205).union(w0.sketch().segment((1,372),(286,372)).segment((190,426)).segment((306,626)).segment((1,624)).close().assemble().finalize().extrude(851))
\ No newline at end of file
diff --git a/test/extrude/435/435.stl b/test/extrude/435/435.stl
index 3177b6ff6925101f0217adc09a40b9bd8ead1fb4..4639c178c143dd29507a1acf717522eba31ef43c 100644
Binary files a/test/extrude/435/435.stl and b/test/extrude/435/435.stl differ
diff --git a/test/extrude/436/436.py b/test/extrude/436/436.py
index 7db45e136e8e430d5a45399e21842d593f30f89e..13ac563974a4570d76c60850cd6ecee3b7219ec9 100644
--- a/test/extrude/436/436.py
+++ b/test/extrude/436/436.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(371,60,371))
-r=w0.workplane(offset=593).moveTo(423,253).cylinder(815,401).union(w0.sketch().segment((201,1),(541,1)).segment((541,297)).arc((556,371),(541,445)).segment((541,741)).segment((201,741)).segment((201,445)).arc((186,371),(201,297)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(205,501,501))
+r=w0.sketch().segment((260,1),(739,1)).segment((740,141)).arc((934,499),(741,860)).segment((740,1000)).segment((260,999)).segment((260,860)).arc((65,501),(260,141)).close().assemble().push([(242,620)]).circle(611,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/436/436.stl b/test/extrude/436/436.stl
index 8858b7afe50024d9160d64c91ab33fb0c46902d1..583119ecbebc2f5baeb17d5b6ee4355eedb0d9cf 100644
Binary files a/test/extrude/436/436.stl and b/test/extrude/436/436.stl differ
diff --git a/test/extrude/437/437.py b/test/extrude/437/437.py
index 5396fc3586ec6fdea53da499e37808f3b0aaf9d2..a1e15158d5073cb17770dffb133baaf0843a2cd1 100644
--- a/test/extrude/437/437.py
+++ b/test/extrude/437/437.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(511,725,511))
-r=w0.sketch().segment((796,755),(796,817)).segment((908,817)).arc((725,1000),(796,755)).assemble().finalize().extrude(83).union(w0.workplane(offset=429).moveTo(307,215).cylinder(674,725)).union(w0.sketch().segment((235,32),(674,1)).segment((704,378)).segment((847,378)).segment((847,490)).segment((929,490)).segment((929,776)).segment((847,776)).segment((847,796)).segment((541,796)).segment((541,776)).segment((521,776)).segment((521,490)).segment((541,490)).segment((541,460)).segment((266,480)).close().assemble().finalize().extrude(460))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,146,502))
+r=w0.sketch().segment((1,461),(261,61)).segment((392,146)).arc((774,161),(944,504)).segment((999,540)).segment((995,550)).segment((785,550)).segment((786,754)).segment((860,755)).segment((741,941)).segment((594,846)).arc((370,786),(226,604)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/437/437.stl b/test/extrude/437/437.stl
index 7fdfb75b4198ed9d0af6c05848a8970dfb7c8c8d..58f285d19b0778176c07dd72429b49ce520dd85a 100644
Binary files a/test/extrude/437/437.stl and b/test/extrude/437/437.stl differ
diff --git a/test/extrude/438/438.py b/test/extrude/438/438.py
index 8ea28ce74ec14c4a87d96d2656120816f72efdc8..f1e60d02c78fb36713f596c696c2731cd228a76d 100644
--- a/test/extrude/438/438.py
+++ b/test/extrude/438/438.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(546,818,546))
-r=w0.sketch().segment((537,155),(555,155)).segment((555,264)).segment((537,255)).close().assemble().reset().face(w0.sketch().segment((537,292),(555,283)).segment((555,918)).segment((537,918)).close().assemble()).finalize().extrude(1).union(w0.sketch().segment((174,419),(255,419)).segment((255,92)).segment((837,92)).segment((837,419)).segment((918,419)).segment((918,664)).segment((837,664)).segment((837,1000)).segment((255,1000)).segment((255,664)).segment((174,664)).close().assemble().push([(414,124)]).rect(573,609,mode='s').finalize().extrude(55))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,836,500))
+r=w0.workplane(offset=164).moveTo(796,670).cylinder(1000,706).union(w0.sketch().segment((142,125),(142,437)).segment((395,435)).segment((395,451)).segment((460,451)).segment((461,435)).segment((600,436)).arc((589,475),(570,510)).segment((471,510)).segment((470,625)).arc((450,635),(436,645)).segment((435,657)).segment((406,656)).arc((300,676),(200,656)).segment((171,656)).segment((171,646)).arc((1,396),(142,126)).assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/438/438.stl b/test/extrude/438/438.stl
index 9cdb8bc004a2a32f694381ea95252c6cc2f3e352..c3e8cf38a76931fdab8b57e7981c93343801cb57 100644
Binary files a/test/extrude/438/438.stl and b/test/extrude/438/438.stl differ
diff --git a/test/extrude/439/439.py b/test/extrude/439/439.py
index c7172bc58efa983318881d90f3907202e1c4d2ab..41e9cd678cfc9ca0a0b4fc12857f5e9e2011266f 100644
--- a/test/extrude/439/439.py
+++ b/test/extrude/439/439.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().arc((587,714),(634,520),(767,660)).arc((707,814),(587,714)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,396,501))
+r=w0.workplane(offset=597).moveTo(440,870).box(520,761,694).union(w0.sketch().segment((266,71),(317,72)).segment((325,1)).segment((695,55)).segment((695,72)).segment((700,72)).segment((701,265)).segment((734,266)).segment((735,681)).segment((500,681)).segment((500,427)).segment((271,396)).segment((272,375)).segment((265,375)).close().assemble().finalize().extrude(711))
\ No newline at end of file
diff --git a/test/extrude/439/439.stl b/test/extrude/439/439.stl
index 0f94b167d6336cb9ca56ea58a2340b7cad1eac2a..aaf44a87a78691a33416ce313bac32bbe09b83fc 100644
Binary files a/test/extrude/439/439.stl and b/test/extrude/439/439.stl differ
diff --git a/test/extrude/44/44.py b/test/extrude/44/44.py
index 7aa56548e675ede15a79f70e2e94a3905a0fccae..87f8d84bdb24552ac2e436443c2752477d43c263 100644
--- a/test/extrude/44/44.py
+++ b/test/extrude/44/44.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(473,348,348))
-w1=cq.Workplane('YZ',origin=(625,348,348))
-r=w0.sketch().push([(154,1)]).circle(695).circle(681,mode='s').finalize().extrude(56).union(w0.sketch().arc((237,820),(154,487),(431,278)).arc((778,112),(806,500)).arc((709,1000),(237,820)).assemble().finalize().extrude(528)).union(w1.workplane(offset=63).moveTo(154,1).cylinder(917,362)).translate((1,194,348))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(42,34,78))
+r=w0.sketch().segment((237,707),(623,707)).segment((623,59)).segment((237,59)).close().assemble().push([(465,421)]).circle(92,mode='s').finalize().extrude(243)
diff --git a/test/extrude/44/44.stl b/test/extrude/44/44.stl
index 315ee713486029a4b78f9f117416b0b79bfce111..d3f6c6c2794feaf3370ae191b97b4df436922696 100644
--- a/test/extrude/44/44.stl
+++ b/test/extrude/44/44.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:09a1bf725d3a97166959b9f1430450fd28087e798225eeeed84dfa9779b5c35f
-size 104484
+oid sha256:47f8872f1875c73128661460aa30a6e6e4736b68fe1620bc38d0525a14207268
+size 26084
diff --git a/test/extrude/440/440.py b/test/extrude/440/440.py
index 62b993dc81dd145b2acc1e49b38885bc300d0f90..f6a3a4667fc0f412d37595d72fd0f93b8d45a315 100644
--- a/test/extrude/440/440.py
+++ b/test/extrude/440/440.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(744,582,582))
-r=w0.workplane(offset=419).moveTo(994,692).box(756,942,907).union(w0.workplane(offset=466).moveTo(1000,698).cylinder(814,744)).union(w0.sketch().arc((1,872),(24,733),(106,617)).arc((361,663),(570,512)).arc((652,524),(593,466)).arc((617,315),(570,175)).segment((895,175)).segment((895,837)).segment((640,837)).arc((640,919),(617,988)).arc((349,698),(1,872)).assemble().finalize().extrude(524))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,426,501))
+w1=cq.Workplane('XY',origin=(500,500,632))
+r=w0.sketch().push([(145,615)]).circle(645).reset().face(w0.sketch().segment((816,446),(830,445)).arc((880,436),(934,446)).segment((944,447)).segment((945,455)).arc((999,550),(945,649)).segment((944,656)).segment((936,656)).arc((879,672),(830,656)).segment((814,656)).segment((816,651)).arc((765,550),(816,454)).close().assemble()).finalize().extrude(859).union(w1.sketch().push([(454,437)]).circle(716).circle(619,mode='s').finalize().extrude(796))
\ No newline at end of file
diff --git a/test/extrude/440/440.stl b/test/extrude/440/440.stl
index 589339e3cf77c268b894e9f5faccb465b06d8266..95546dfdab5e040a331678a708acbe0fda08e1a5 100644
Binary files a/test/extrude/440/440.stl and b/test/extrude/440/440.stl differ
diff --git a/test/extrude/441/441.py b/test/extrude/441/441.py
index 0f861c1d0545770e9293c9fe6082120e0677159b..fbf263575eab96e72afda07f890269b7d1dfaabe 100644
--- a/test/extrude/441/441.py
+++ b/test/extrude/441/441.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(214,378,378))
-w1=cq.Workplane('ZX',origin=(378,378,378))
-r=w0.workplane(offset=236).moveTo(159,803).cylinder(662,498).union(w0.sketch().push([(405,449)]).rect(1000,563).push([(181,378)]).circle(400,mode='s').push([(274,1)]).rect(520,716).finalize().extrude(159)).union(w1.workplane(offset=465).moveTo(329,672).box(913,683,552))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(503,501,201))
+r=w0.workplane(offset=708).moveTo(446,276).cylinder(911,587).union(w0.sketch().segment((160,67),(431,67)).segment((752,1)).segment((822,358)).segment((728,372)).segment((726,460)).arc((671,967),(232,718)).arc((471,417),(161,190)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/441/441.stl b/test/extrude/441/441.stl
index ffa9881147f34303e51f27cb7504b341fc39e21a..bf2b4f4ade62c90c568abcacf9dc6f4d01397b04 100644
Binary files a/test/extrude/441/441.stl and b/test/extrude/441/441.stl differ
diff --git a/test/extrude/442/442.py b/test/extrude/442/442.py
index 9a09fd1fb306e926a6ba38812d8f8cd1f627cca9..bfcdce1dddd76dc696811ea28adc44e7769f1563 100644
--- a/test/extrude/442/442.py
+++ b/test/extrude/442/442.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,321,500))
-r=w0.sketch().push([(451,421)]).circle(650).reset().face(w0.sketch().segment((730,670),(810,630)).segment((830,680)).segment((950,650)).segment((1000,860)).segment((920,880)).segment((920,890)).segment((780,960)).segment((890,860)).close().assemble()).finalize().extrude(371).union(w0.sketch().segment((1,81),(51,41)).segment((331,41)).segment((331,351)).segment((1,351)).close().assemble().finalize().extrude(710)).union(w0.workplane(offset=750).moveTo(451,421).cylinder(1000,540))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,1000,500))
+r=w0.workplane(offset=2).box(1000,520,1000)
\ No newline at end of file
diff --git a/test/extrude/442/442.stl b/test/extrude/442/442.stl
index 1b989abfeffe7d4244085f6414e6018a8ed72286..6ff326cf5a1c1459c1efa8512425b957fea2b9fe 100644
Binary files a/test/extrude/442/442.stl and b/test/extrude/442/442.stl differ
diff --git a/test/extrude/443/443.py b/test/extrude/443/443.py
index 9ff78a4bcfe11a1f63beeb18d7840e524edcb9b1..ca24b69aa55d998ca636cf0c9834d5a49fb59b3b 100644
--- a/test/extrude/443/443.py
+++ b/test/extrude/443/443.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,263))
-r=w0.sketch().segment((294,455),(526,102)).segment((748,243)).segment((748,253)).segment((1000,425)).segment((677,889)).segment((465,748)).segment((455,748)).segment((354,677)).arc((1,667),(294,455)).assemble().finalize().extrude(970)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,226))
+r=w0.sketch().segment((1,660),(90,191)).segment((331,240)).segment((330,52)).segment((485,50)).arc((671,540),(999,951)).segment((331,950)).segment((332,525)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/443/443.stl b/test/extrude/443/443.stl
index f15a63d96620fd5b5bc814a0c950f7d302f24038..b75fa97937c8d934ba899b510f9f4bdd97cae57d 100644
Binary files a/test/extrude/443/443.stl and b/test/extrude/443/443.stl differ
diff --git a/test/extrude/444/444.py b/test/extrude/444/444.py
index 3bb2cc3662129d4b047f9d8017f55f8301cd0a9f..a16165df705ba9ab1f819a654a539903abced85e 100644
--- a/test/extrude/444/444.py
+++ b/test/extrude/444/444.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).moveTo(221,201).cylinder(1000,487).union(w0.sketch().segment((154,401),(281,401)).segment((281,287)).segment((187,287)).arc((594,441),(154,401)).assemble().push([(377,384)]).rect(367,474,mode='s').finalize().extrude(108))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,566,501))
+w1=cq.Workplane('ZX',origin=(500,507,502))
+r=w0.sketch().arc((605,941),(500,689),(765,716)).arc((649,799),(605,940)).assemble().finalize().extrude(1).union(w0.sketch().segment((195,135),(220,135)).segment((221,1)).segment((781,1)).segment((780,135)).segment((806,135)).segment((806,265)).segment((780,266)).segment((781,401)).segment((221,400)).segment((220,266)).segment((197,265)).close().assemble().push([(628,785)]).rect(576,930).finalize().extrude(871)).union(w1.workplane(offset=552).moveTo(376,784).box(571,600,602))
\ No newline at end of file
diff --git a/test/extrude/444/444.stl b/test/extrude/444/444.stl
index ec67c28a94c02e6d731063f1b656896a1c593ec9..e9463cf21b9e9151ed4a06ee5be8ff6049b6f385 100644
Binary files a/test/extrude/444/444.stl and b/test/extrude/444/444.stl differ
diff --git a/test/extrude/445/445.py b/test/extrude/445/445.py
index f68b123d98155ccc33e1ae22eafb48c23b1eb081..60e3ac53794ad24fbd95ac263266d8b7a97bbbe1 100644
--- a/test/extrude/445/445.py
+++ b/test/extrude/445/445.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(429,401,429))
-r=w0.workplane(offset=294).moveTo(215,1).box(800,1000,700).union(w0.workplane(offset=600).moveTo(515,829).cylinder(772,743)).translate((71,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,217))
+r=w0.workplane(offset=515).moveTo(527,500).cylinder(531,976).union(w0.sketch().arc((252,560),(2,455),(265,396)).arc((462,226),(707,285)).arc((570,422),(661,595)).segment((660,620)).segment((671,621)).segment((670,601)).arc((727,614),(784,604)).arc((500,781),(252,559)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/445/445.stl b/test/extrude/445/445.stl
index 126d4e615b41d3184ba040f0940fe6bf1f3163e0..8b106597b1672efe2ff6c19fb2ec0790bfd3f513 100644
Binary files a/test/extrude/445/445.stl and b/test/extrude/445/445.stl differ
diff --git a/test/extrude/446/446.py b/test/extrude/446/446.py
index 9d5b3f1607885cb1003ed64b3e9fbcdfcf75ac7f..076727ad4781f2355d408380956095a184ac80bb 100644
--- a/test/extrude/446/446.py
+++ b/test/extrude/446/446.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(331,161,331))
-w1=cq.Workplane('YZ',origin=(321,331,331))
-r=w0.sketch().segment((151,151),(361,151)).arc((231,361),(361,580)).segment((151,580)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((151,451),(311,451)).segment((311,421)).segment((401,500)).segment((311,600)).close().assemble().finalize().extrude(1000)).union(w1.sketch().segment((131,461),(141,461)).segment((151,461)).segment((151,451)).segment((141,451)).arc((191,500),(131,461)).assemble().finalize().extrude(71))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(710,501,499))
+r=w0.sketch().push([(157,331)]).circle(656).push([(825,429)]).circle(675).finalize().extrude(81).union(w0.sketch().segment((361,630),(450,630)).segment((416,659)).segment((461,720)).segment((510,686)).segment((475,630)).segment((916,630)).segment((916,800)).segment((756,800)).segment((755,826)).segment((502,826)).segment((502,801)).segment((362,801)).close().assemble().finalize().extrude(146))
\ No newline at end of file
diff --git a/test/extrude/446/446.stl b/test/extrude/446/446.stl
index 0c4b06f60d98f31f628fc8240d9148b1b365c0e6..20f9e4bc441026d7e36c104f0dc72640b9bf0460 100644
Binary files a/test/extrude/446/446.stl and b/test/extrude/446/446.stl differ
diff --git a/test/extrude/447/447.py b/test/extrude/447/447.py
index 510a26719417345383c9799ceac918268bbbf138..dbcec7a00d57c8759439750c7c3c008ff0284025 100644
--- a/test/extrude/447/447.py
+++ b/test/extrude/447/447.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,336,336))
-r=w0.workplane(offset=618).moveTo(397,531).cylinder(899,477).union(w0.sketch().segment((350,108),(350,122)).segment((356,122)).arc((135,88),(356,108)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(296,253,253))
+w1=cq.Workplane('ZX',origin=(253,200,253))
+r=w0.workplane(offset=139).moveTo(157,312).box(471,321,482).union(w0.sketch().segment((92,416),(140,435)).arc((115,427),(93,416)).assemble().reset().face(w0.sketch().arc((178,193),(201,198),(223,208)).close().assemble()).finalize().extrude(83)).union(w0.sketch().push([(159,312)]).rect(372,356).push([(389,110)]).circle(362).finalize().extrude(155)).union(w1.sketch().segment((200,245),(281,245)).segment((281,195)).segment((359,195)).segment((359,245)).segment((439,246)).segment((439,271)).arc((494,384),(369,389)).segment((359,389)).segment((359,440)).segment((280,439)).segment((281,388)).segment((200,389)).close().assemble().push([(430,343)]).rect(371,258,mode='s').finalize().extrude(62))
\ No newline at end of file
diff --git a/test/extrude/447/447.stl b/test/extrude/447/447.stl
index e0482343bdb969438bbf94041f0259f0fe517da9..fad8b1a752a20cb681d7555a18b7a9bdee634532 100644
Binary files a/test/extrude/447/447.stl and b/test/extrude/447/447.stl differ
diff --git a/test/extrude/448/448.py b/test/extrude/448/448.py
index 6b844570cc2c73dbf2c37196400bdbd21aebfd87..04378cb42c12548ebe9dcf6711295bac45a6393c 100644
--- a/test/extrude/448/448.py
+++ b/test/extrude/448/448.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(544,544,479))
-r=w0.sketch().segment((327,55),(359,1)).segment((457,66)).segment((424,120)).segment((414,77)).segment((392,88)).arc((359,66),(327,55)).assemble().finalize().extrude(631).union(w0.workplane(offset=609).moveTo(674,1000).cylinder(674,631))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,545,499))
+r=w0.sketch().segment((389,741),(416,605)).arc((76,136),(584,411)).segment((641,426)).arc((966,825),(449,751)).close().assemble().finalize().extrude(415)
\ No newline at end of file
diff --git a/test/extrude/448/448.stl b/test/extrude/448/448.stl
index 34717f446ce42d6ef418b846fafaeeab40cfbb5b..40137b5d2da5da3c08f68da57ce4b8a549b205b2 100644
Binary files a/test/extrude/448/448.stl and b/test/extrude/448/448.stl differ
diff --git a/test/extrude/449/449.py b/test/extrude/449/449.py
index 4d70ff557005bc9dc2b92aba82a0a301a66aad34..2dcbced62ce010c7c661a2a5b7c5a81f345efb25 100644
--- a/test/extrude/449/449.py
+++ b/test/extrude/449/449.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(383,520,383))
-w1=cq.Workplane('ZX',origin=(383,442,383))
-r=w0.sketch().push([(212,1)]).rect(1000,598).reset().face(w0.sketch().segment((363,500),(452,500)).segment((500,500)).arc((647,442),(785,500)).segment((834,500)).segment((843,500)).segment((843,569)).arc((863,657),(843,745)).segment((843,775)).segment((834,775)).segment((834,814)).segment((785,814)).arc((647,873),(500,814)).segment((452,814)).segment((452,775)).segment((363,775)).close().assemble()).finalize().extrude(246).union(w1.sketch().segment((119,422),(187,422)).segment((187,628)).arc((158,726),(265,736)).segment((628,736)).segment((628,824)).segment((119,824)).close().assemble().finalize().extrude(187))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(494,501,501))
+r=w0.sketch().segment((127,311),(570,1)).segment((874,441)).segment((694,565)).segment((694,666)).segment((547,665)).segment((430,750)).segment((371,665)).segment((325,665)).segment((326,596)).close().assemble().finalize().extrude(195).union(w0.workplane(offset=658).moveTo(296,931).cylinder(815,570))
\ No newline at end of file
diff --git a/test/extrude/449/449.stl b/test/extrude/449/449.stl
index faf6e1f7361a7e87416dc52562c6131bf08e5e75..4031629ad544a57e640ba788c8262c248b0c703f 100644
Binary files a/test/extrude/449/449.stl and b/test/extrude/449/449.stl differ
diff --git a/test/extrude/45/45.py b/test/extrude/45/45.py
index 5bc06f433a3a5a11f4c0d2c922061145a617657a..52ccc6c784739fabca9548e6100c109cadbfbbcc 100644
--- a/test/extrude/45/45.py
+++ b/test/extrude/45/45.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,416,416))
-w1=cq.Workplane('ZX',origin=(416,70,416))
-r=w0.sketch().push([(41,802)]).circle(525).push([(36,802)]).rect(426,555,mode='s').finalize().extrude(792).union(w0.sketch().push([(36,802)]).rect(624,496).push([(624,199)]).circle(693).circle(535,mode='s').finalize().extrude(1000)).union(w1.sketch().arc((278,832),(248,693),(377,624)).segment((565,624)).segment((565,664)).arc((367,664),(278,832)).assemble().finalize().extrude(832)).translate((1,69,79))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(76,36,67))
+r=w0.sketch().segment((879,165),(239,165)).segment((239,747)).segment((239,456)).segment((530,456)).segment((530,747)).segment((239,747)).segment((879,747)).close().assemble().push([(652,370)]).rect(72,94,mode='s').push([(394,430)]).rect(68,58,mode='s').finalize().extrude(175)
diff --git a/test/extrude/45/45.stl b/test/extrude/45/45.stl
index 47cd3dd441221832792bc1863236f80b8727c344..e31abba0ecc164dd648fbfa2623a1355f1ca4402 100644
Binary files a/test/extrude/45/45.stl and b/test/extrude/45/45.stl differ
diff --git a/test/extrude/450/450.py b/test/extrude/450/450.py
index 34376a848cce5d24c56c949f3ac14acad0223198..09b1d7e6a62caf48661d7db4dfbeec3d339131ad 100644
--- a/test/extrude/450/450.py
+++ b/test/extrude/450/450.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(792,505,505))
-w1=cq.Workplane('YZ',origin=(574,505,505))
-r=w0.sketch().push([(309,244)]).rect(792,783).push([(283,153)]).rect(531,514,mode='s').finalize().extrude(279).union(w0.sketch().push([(596,770)]).rect(1000,774).reset().face(w0.sketch().segment((731,731),(748,731)).segment((765,800)).segment((748,800)).close().assemble(),mode='s').finalize().extrude(653)).union(w1.sketch().arc((288,566),(505,522),(566,314)).arc((696,739),(288,566)).assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,646))
+r=w0.sketch().push([(774,708)]).rect(955,555).reset().face(w0.sketch().segment((745,701),(771,700)).arc((776,694),(780,700)).segment((799,701)).segment((801,714)).segment((779,716)).arc((775,721),(770,715)).segment((745,714)).close().assemble(),mode='s').finalize().extrude(205).union(w0.sketch().segment((1,410),(80,190)).segment((352,291)).segment((271,512)).close().assemble().push([(622,395)]).rect(745,941).reset().face(w0.sketch().segment((576,715),(617,716)).segment((616,725)).arc((594,725),(579,731)).close().assemble()).reset().face(w0.sketch().arc((584,814),(606,816),(626,810)).segment((626,820)).segment((590,824)).close().assemble()).finalize().extrude(422))
\ No newline at end of file
diff --git a/test/extrude/450/450.stl b/test/extrude/450/450.stl
index 1b8194827d3aec1e922cc71081aa579ebec19b76..7a4b734e1b966d930ff68fe00c4d191be3cd11a3 100644
Binary files a/test/extrude/450/450.stl and b/test/extrude/450/450.stl differ
diff --git a/test/extrude/451/451.py b/test/extrude/451/451.py
index fb7d08d608e429a639737cbcf422fe4742904b9c..bc1d7e176dfdc1a5752c8c0350185cec11cbd782 100644
--- a/test/extrude/451/451.py
+++ b/test/extrude/451/451.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(688,463,463))
-r=w0.sketch().segment((753,151),(828,151)).segment((828,173)).arc((1000,377),(828,581)).segment((828,603)).segment((753,603)).segment((753,581)).arc((592,377),(753,173)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(76,511)]).rect(764,989).push([(76,506)]).circle(592,mode='s').reset().face(w0.sketch().segment((484,194),(764,194)).segment((764,355)).arc((774,398),(764,441)).segment((764,592)).segment((484,592)).segment((484,441)).arc((474,398),(484,355)).close().assemble()).finalize().extrude(474))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,734,501))
+r=w0.workplane(offset=264).box(1000,750,974)
\ No newline at end of file
diff --git a/test/extrude/451/451.stl b/test/extrude/451/451.stl
index 2b1619498087da1848fa74f4d49ee3eefed58a71..056a1004670365585cb3191a6708c261caed9227 100644
Binary files a/test/extrude/451/451.stl and b/test/extrude/451/451.stl differ
diff --git a/test/extrude/452/452.py b/test/extrude/452/452.py
index 87a7cfa2d607b19173e32e3c198abf7622e6063d..e33b9720bea3ab6916d4f0068ddf278e02b04063 100644
--- a/test/extrude/452/452.py
+++ b/test/extrude/452/452.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,608))
-w1=cq.Workplane('YZ',origin=(393,500,500))
-r=w0.sketch().push([(393,236)]).circle(726).push([(422,745)]).circle(589).push([(412,745)]).circle(520,mode='s').finalize().extrude(1).union(w0.sketch().segment((696,598),(765,530)).segment((834,589)).segment((755,657)).close().assemble().finalize().extrude(638)).union(w1.sketch().push([(740,726)]).rect(1000,834).push([(726,814)]).circle(559,mode='s').finalize().extrude(530))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(498,499,654))
+r=w0.sketch().arc((46,494),(733,60),(718,879)).arc((235,948),(45,495)).assemble().finalize().extrude(190)
\ No newline at end of file
diff --git a/test/extrude/452/452.stl b/test/extrude/452/452.stl
index b504431c1f35bcb4c0b22372311c783a293a3a3d..48be5c5030cc012c3d69790be05831bd25ab537b 100644
Binary files a/test/extrude/452/452.stl and b/test/extrude/452/452.stl differ
diff --git a/test/extrude/453/453.py b/test/extrude/453/453.py
index 81607c7cf2818aa15c7933183302d01d7fa1c159..65d140ef9098023ee652ca36322ca428910fb4f9 100644
--- a/test/extrude/453/453.py
+++ b/test/extrude/453/453.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(490,480,490))
-w1=cq.Workplane('ZX',origin=(490,450,490))
-r=w0.workplane(offset=317).moveTo(429,32).cylinder(837,541).union(w0.sketch().arc((460,93),(592,235),(460,388)).close().assemble().finalize().extrude(817)).union(w1.sketch().segment((195,439),(225,439)).segment((225,419)).segment((286,419)).arc((439,1),(602,419)).segment((755,419)).segment((755,439)).segment((786,439)).segment((786,980)).segment((755,980)).segment((755,1000)).segment((225,1000)).segment((225,980)).segment((195,980)).close().assemble().push([(551,205)]).circle(521,mode='s').finalize().extrude(888)).translate((20,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(171,501,500))
+r=w0.workplane(offset=831).box(1000,1000,1000)
\ No newline at end of file
diff --git a/test/extrude/453/453.stl b/test/extrude/453/453.stl
index 39f906f0a4fed14cf2cf0b9f1caef8d68e20b202..44fdb253cf94bb8a9079ac3827bb1173cd2f7280 100644
Binary files a/test/extrude/453/453.stl and b/test/extrude/453/453.stl differ
diff --git a/test/extrude/454/454.py b/test/extrude/454/454.py
index d7af6575fb07549636499f3e6540b7b1dee659d3..63cb9a1f162875f2966a600fc4580a748d577e7c 100644
--- a/test/extrude/454/454.py
+++ b/test/extrude/454/454.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(611,916,611))
-r=w0.sketch().segment((85,138),(222,138)).segment((148,211)).arc((127,211),(106,222)).arc((96,190),(85,138)).assemble().finalize().extrude(1).union(w0.workplane(offset=416).moveTo(800,748).cylinder(1000,947))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(450,500,499))
+r=w0.sketch().push([(825,181)]).circle(675).circle(576,mode='s').finalize().extrude(152).union(w0.sketch().segment((1,405),(859,405)).segment((861,995)).segment((826,995)).arc((456,730),(90,996)).segment((1,996)).close().assemble().finalize().extrude(955))
\ No newline at end of file
diff --git a/test/extrude/454/454.stl b/test/extrude/454/454.stl
index 7a8c9286c752f45a2cfbd28cec114e6d8ba6deca..4393bfeed8672240835e18cecc77d9b23370a79f 100644
Binary files a/test/extrude/454/454.stl and b/test/extrude/454/454.stl differ
diff --git a/test/extrude/455/455.py b/test/extrude/455/455.py
index dba63a665383ccb01f3b242a3706eb01ae61dc7c..5560a4742ddbf14083b218a93f62e9028cdf5ae3 100644
--- a/test/extrude/455/455.py
+++ b/test/extrude/455/455.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().circle(461).reset().face(w0.sketch().segment((307,334),(327,307)).segment((361,334)).segment((341,361)).close().assemble(),mode='s').finalize().extrude(1000).translate((128,128,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,203,501))
+r=w0.workplane(offset=564).moveTo(465,179).cylinder(629,611).union(w0.sketch().segment((834,834),(833,872)).arc((173,124),(873,833)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/455/455.stl b/test/extrude/455/455.stl
index 34a165d5fe1d5ad89b09b5c7c89c318ca8a807ef..487f1db42a6e394a6748577543018386f87329bc 100644
Binary files a/test/extrude/455/455.stl and b/test/extrude/455/455.stl differ
diff --git a/test/extrude/456/456.py b/test/extrude/456/456.py
index 2f1ccde50c4aa0a1387c155b6915c8caf056d8ab..10655ff574d80a0b730e20dc0e4bbfca279ba501 100644
--- a/test/extrude/456/456.py
+++ b/test/extrude/456/456.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,568,334))
-r=w0.workplane(offset=1).cylinder(1000,429).union(w0.sketch().segment((291,14),(377,14)).segment((377,118)).arc((550,334),(377,550)).segment((377,654)).segment((291,654)).segment((291,550)).arc((118,334),(291,118)).close().assemble().push([(230,334)]).rect(455,490,mode='s').push([(438,334)]).rect(455,490,mode='s').finalize().extrude(533)).translate((96,1,96))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,522))
+r=w0.sketch().segment((351,1),(452,2)).arc((382,147),(453,285)).segment((351,287)).close().assemble().finalize().extrude(263).union(w0.sketch().arc((757,658),(771,687),(767,726)).arc((231,777),(757,656)).assemble().finalize().extrude(703))
\ No newline at end of file
diff --git a/test/extrude/456/456.stl b/test/extrude/456/456.stl
index 6bfad9ae5eb8a06dbd3bd1b9480cf15964b84f62..45b0ff196a46430e7ed82b495c93aaec0940a371 100644
Binary files a/test/extrude/456/456.stl and b/test/extrude/456/456.stl differ
diff --git a/test/extrude/457/457.py b/test/extrude/457/457.py
index d9566ad43a422e99da59315ab520784901a3e484..f28ee370f69f299d4f64f06ed9a085138fa6cd92 100644
--- a/test/extrude/457/457.py
+++ b/test/extrude/457/457.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(344,506,506))
-r=w0.sketch().segment((384,193),(384,818)).segment((939,818)).segment((939,919)).segment((445,919)).segment((445,828)).arc((1,506),(445,183)).segment((445,92)).segment((939,92)).segment((939,193)).close().assemble().reset().face(w0.sketch().segment((62,455),(334,455)).arc((294,506),(334,556)).segment((62,556)).close().assemble(),mode='s').push([(1000,506)]).rect(526,808).finalize().extrude(828)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,501,501))
+r=w0.sketch().segment((382,415),(595,391)).segment((619,586)).arc((510,585),(406,611)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/457/457.stl b/test/extrude/457/457.stl
index 25169a8041e133a4078a7aee468b306a5754ab3a..bfde0c2c9be6b5cee4bc687c861d0bf21bceddab 100644
Binary files a/test/extrude/457/457.stl and b/test/extrude/457/457.stl differ
diff --git a/test/extrude/458/458.py b/test/extrude/458/458.py
index 3bd41e3b6602b2a45a41d0d122a42d1cc082af40..d3a8002060eeb488c0492209e4856906d99a89b2 100644
--- a/test/extrude/458/458.py
+++ b/test/extrude/458/458.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(405,112,405))
-r=w0.sketch().segment((1,778),(102,596)).arc((193,728),(354,728)).segment((263,909)).close().assemble().reset().face(w0.sketch().segment((203,395),(294,213)).segment((546,344)).segment((445,526)).arc((364,395),(203,395)).assemble()).reset().face(w0.sketch().segment((748,576),(859,576)).segment((859,818)).segment((768,778)).segment((748,839)).close().assemble()).finalize().extrude(526).union(w0.workplane(offset=702).moveTo(82,31).cylinder(1000,536)).translate((101,1,50))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(279,280,344))
+r=w0.sketch().push([(149,296)]).circle(427).reset().face(w0.sketch().segment((443,124),(460,115)).segment((557,327)).segment((541,335)).close().assemble()).finalize().extrude(153)
\ No newline at end of file
diff --git a/test/extrude/458/458.stl b/test/extrude/458/458.stl
index 2429a66573eb4c63388fb137e23d2468bb43f80e..f66eee46e817cad72749da1d3626a10af9b6dff7 100644
Binary files a/test/extrude/458/458.stl and b/test/extrude/458/458.stl differ
diff --git a/test/extrude/459/459.py b/test/extrude/459/459.py
index 84177b979a2f3816b4bfbf873f9e264bd0006184..0248b2967843f8a6979d0a9822572c990b41ea99 100644
--- a/test/extrude/459/459.py
+++ b/test/extrude/459/459.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(474,558,474))
-r=w0.sketch().segment((64,727),(348,727)).segment((443,642)).segment((453,642)).segment((453,632)).segment((621,453)).segment((884,716)).segment((611,1000)).segment((348,748)).segment((348,916)).segment((64,916)).close().assemble().push([(211,821)]).circle(506,mode='s').push([(474,1)]).circle(527).finalize().extrude(306).translate((53,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,849,502))
+r=w0.sketch().arc((656,435),(724,635),(655,834)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((606,265),(680,265)).segment((681,75)).segment((920,75)).segment((919,267)).segment((1000,266)).segment((999,437)).segment((921,435)).segment((919,625)).segment((680,625)).segment((681,436)).segment((606,435)).close().assemble().finalize().extrude(15)).union(w0.sketch().segment((2,580),(116,581)).arc((402,347),(690,580)).segment((805,580)).segment((805,691)).segment((691,691)).arc((402,925),(116,691)).segment((1,692)).close().assemble().finalize().extrude(591))
\ No newline at end of file
diff --git a/test/extrude/459/459.stl b/test/extrude/459/459.stl
index 7c73717d138c4479e9c58aa17d67f1753f988fea..c39fe689cc10300876dfd932e50ad63975274087 100644
Binary files a/test/extrude/459/459.stl and b/test/extrude/459/459.stl differ
diff --git a/test/extrude/46/46.py b/test/extrude/46/46.py
index 7e44ba4e0b8d7699c1d4ee7703109ed88acb3ff5..11f14d2a7ae1f90b34516305f8ff95f49dd306b9 100644
--- a/test/extrude/46/46.py
+++ b/test/extrude/46/46.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(444,444,444))
-w1=cq.Workplane('YZ',origin=(478,444,444))
-r=w0.sketch().arc((376,671),(444,523),(580,603)).arc((603,1000),(376,671)).assemble().finalize().extrude(852).union(w1.workplane(offset=217).moveTo(262,1).cylinder(898,569)).translate((1,1,125))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(37,31,10))
+r=w0.sketch().segment((492,522),(492,344)).segment((492,522)).segment((136,522)).segment((136,344)).segment((492,344)).segment((848,344)).segment((848,522)).close().assemble().push([(507,385)]).rect(161,136,mode='s').finalize().extrude(204)
diff --git a/test/extrude/46/46.stl b/test/extrude/46/46.stl
index 3d8075f711ce8dc9a5ccf79388e1eaed5725ba82..80ae576ec3fe04136e77307a389baaebff8374fb 100644
Binary files a/test/extrude/46/46.stl and b/test/extrude/46/46.stl differ
diff --git a/test/extrude/460/460.py b/test/extrude/460/460.py
index c04568e1f38294872da41451adc3814e8562adf4..d59581b726cd954a85fb5e37b48c22d14cc1b65e 100644
--- a/test/extrude/460/460.py
+++ b/test/extrude/460/460.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((381,574),(474,434)).segment((953,760)).segment((860,900)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=657).box(1000,973,687))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(370,501,500))
+r=w0.sketch().arc((1,316),(526,91),(391,645)).segment((391,951)).segment((372,951)).segment((371,316)).close().assemble().finalize().extrude(266).union(w0.workplane(offset=750).moveTo(549,959).box(1000,555,1000))
\ No newline at end of file
diff --git a/test/extrude/460/460.stl b/test/extrude/460/460.stl
index 77e93d88e5c588476d53b00143c65198f52e0812..de74193734280f27aed63fa5fcaeee275d8d81a6 100644
Binary files a/test/extrude/460/460.stl and b/test/extrude/460/460.stl differ
diff --git a/test/extrude/461/461.py b/test/extrude/461/461.py
index 7ff77210be12bad1fb5ded0dcdfbfd43df8a4283..7222963bd82fc557d48ed3925b968a6157a9c5d0 100644
--- a/test/extrude/461/461.py
+++ b/test/extrude/461/461.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(684,376,376))
-r=w0.workplane(offset=63).moveTo(575,118).cylinder(1000,534).union(w0.sketch().push([(242,359)]).circle(600).push([(438,704)]).rect(401,550).finalize().extrude(1)).translate((1,1,41))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(421,500,501))
+w1=cq.Workplane('YZ',origin=(540,501,501))
+r=w0.sketch().segment((90,789),(137,721)).arc((160,705),(180,684)).segment((181,834)).arc((146,800),(92,789)).assemble().finalize().extrude(371).union(w0.workplane(offset=644).moveTo(239,795).box(975,740,791)).union(w1.workplane(offset=549).moveTo(735,350).cylinder(595,764))
\ No newline at end of file
diff --git a/test/extrude/461/461.stl b/test/extrude/461/461.stl
index 1cad6e4b066a9856ea306c77fbcfa1208a6bc7f9..d2b3df864de90e1068f5f8d1ef8d66411b1eceb3 100644
Binary files a/test/extrude/461/461.stl and b/test/extrude/461/461.stl differ
diff --git a/test/extrude/462/462.py b/test/extrude/462/462.py
index af27a751bb9e56afc9b5fe511bfebd20e02c3211..3dc4f0571eb28f9fb02a5967670ba7faffae2ccf 100644
--- a/test/extrude/462/462.py
+++ b/test/extrude/462/462.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(299,424,424))
-w1=cq.Workplane('XY',origin=(424,424,145))
-r=w0.workplane(offset=260).moveTo(659,755).box(817,452,750).union(w0.sketch().push([(721,260)]).circle(606).circle(529,mode='s').finalize().extrude(1000)).union(w1.workplane(offset=558).moveTo(817,1).cylinder(693,481)).translate((1,58,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,654))
+r=w0.sketch().segment((600,795),(710,796)).arc((731,815),(754,796)).segment((755,732)).segment((806,731)).segment((806,796)).segment((964,796)).segment((965,935)).segment((806,934)).segment((806,999)).segment((756,1000)).segment((756,936)).segment((600,934)).close().assemble().finalize().extrude(185).union(w0.sketch().push([(118,315)]).rect(666,1000).push([(98,350)]).rect(626,589,mode='s').push([(141,466)]).circle(521,mode='s').push([(160,616)]).circle(511,mode='s').finalize().extrude(322))
\ No newline at end of file
diff --git a/test/extrude/462/462.stl b/test/extrude/462/462.stl
index 370d15aa3fa39fd310f50eec25949c25c500d301..0915e1a3d051857d97fcc3b25c56ada9f180e42e 100644
Binary files a/test/extrude/462/462.stl and b/test/extrude/462/462.stl differ
diff --git a/test/extrude/463/463.py b/test/extrude/463/463.py
index f4738615bb016eadeee3756856145e385d10b3b7..450d21fbbf4324ed278a9e298e232a1d41114c97 100644
--- a/test/extrude/463/463.py
+++ b/test/extrude/463/463.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.workplane(offset=667).cylinder(1000,361).translate((1,28,28))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,427,501))
+w1=cq.Workplane('YZ',origin=(786,500,500))
+r=w0.sketch().arc((701,489),(876,411),(870,216)).segment((999,296)).segment((830,571)).close().assemble().finalize().extrude(444).union(w1.workplane(offset=229).moveTo(615,17).cylinder(1000,517))
\ No newline at end of file
diff --git a/test/extrude/463/463.stl b/test/extrude/463/463.stl
index a78e936bef84cd331323663b83fb7cd1fc76e93e..07bd268ae3bc1997c5b2f1a41fc832a3b3cc7b0b 100644
Binary files a/test/extrude/463/463.stl and b/test/extrude/463/463.stl differ
diff --git a/test/extrude/464/464.py b/test/extrude/464/464.py
index f6af90fca8d84f84e54fda17adce895e88288808..67908a6e2f1ef2d1fdb49e9c0e49347c57202ad3 100644
--- a/test/extrude/464/464.py
+++ b/test/extrude/464/464.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(600,600,700))
-r=w0.sketch().segment((590,580),(590,590)).segment((600,580)).arc((610,620),(590,580)).assemble().reset().face(w0.sketch().segment((580,590),(620,600)).segment((620,610)).segment((580,600)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().segment((411,391),(530,391)).segment((530,381)).segment((670,381)).segment((670,391)).segment((790,391)).segment((790,510)).arc((810,600),(790,690)).segment((790,810)).segment((670,810)).segment((670,820)).segment((530,820)).segment((530,810)).segment((411,810)).segment((411,690)).arc((391,600),(411,510)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,585))
+r=w0.workplane(offset=208).moveTo(697,575).box(555,601,1000).union(w0.sketch().segment((639,295),(761,296)).segment((759,854)).segment((640,855)).segment((641,841)).arc((180,650),(639,466)).close().assemble().push([(440,201)]).circle(621).finalize().extrude(401)).union(w0.workplane(offset=708).moveTo(699,575).cylinder(915,619))
\ No newline at end of file
diff --git a/test/extrude/464/464.stl b/test/extrude/464/464.stl
index f8e817bd356f66fed6f3e34f05c51c110214c103..1641a883fbe5f2cf71762020e22185d96f2236a5 100644
Binary files a/test/extrude/464/464.stl and b/test/extrude/464/464.stl differ
diff --git a/test/extrude/465/465.py b/test/extrude/465/465.py
index 8b60671f02130e3ae60810416c09de556fe7653c..729ee53745f9e626b05029dde8cc8de7119d6edb 100644
--- a/test/extrude/465/465.py
+++ b/test/extrude/465/465.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(226,1,226))
-r=w0.sketch().rect(1000,365).circle(295,mode='s').finalize().extrude(682).translate((1,1,275))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,310))
+r=w0.workplane(offset=427).moveTo(416,360).cylinder(644,861).union(w0.sketch().arc((826,994),(684,709),(899,950)).arc((821,909),(825,995)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/465/465.stl b/test/extrude/465/465.stl
index b812983833228393a04603a22e03c6dc7f846fcb..eb922479de91ee8e33e1ae7e593386247a1c9cf2 100644
Binary files a/test/extrude/465/465.stl and b/test/extrude/465/465.stl differ
diff --git a/test/extrude/466/466.py b/test/extrude/466/466.py
index ba2d1e110fe5f623fcf449d46d6452e2baf9fce1..3eed96a87e2e43c9a24f03f109d0ff72aaed6702 100644
--- a/test/extrude/466/466.py
+++ b/test/extrude/466/466.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(635,635,949))
-r=w0.sketch().segment((271,504),(745,504)).segment((745,548)).segment((898,548)).segment((898,657)).arc((1000,716),(883,723)).segment((665,723)).segment((665,643)).segment((271,643)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(316,500,502))
+r=w0.workplane(offset=403).moveTo(243,660).box(984,741,696).union(w0.workplane(offset=689).moveTo(806,533).box(891,776,880)).union(w0.sketch().arc((145,301),(212,281),(230,220)).arc((291,360),(145,301)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/466/466.stl b/test/extrude/466/466.stl
index ea65ff80244d1ba3920f566ccbb7dc4c48d2ac2a..1a476050dca8c9e6658c64be52c54fe4444088dc 100644
Binary files a/test/extrude/466/466.stl and b/test/extrude/466/466.stl differ
diff --git a/test/extrude/467/467.py b/test/extrude/467/467.py
index 96f97ee646d620381c059e3edcf35ca68bcc3033..dc81d755b35ccaae55a0349bcaee5bae084baaf5 100644
--- a/test/extrude/467/467.py
+++ b/test/extrude/467/467.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.workplane(offset=667).cylinder(1000,810).translate((477,1,477))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,581))
+r=w0.sketch().segment((1,385),(1000,387)).segment((1000,614)).segment((741,615)).segment((740,401)).segment((262,401)).segment((260,615)).segment((2,616)).close().assemble().finalize().extrude(341)
\ No newline at end of file
diff --git a/test/extrude/467/467.stl b/test/extrude/467/467.stl
index 9561771e24c40e7feb9f8fd6b9e6e3f7cc3e54f7..56058d12bbfe31ac51334762b51751c455c18fde 100644
Binary files a/test/extrude/467/467.stl and b/test/extrude/467/467.stl differ
diff --git a/test/extrude/468/468.py b/test/extrude/468/468.py
index 19f10b5657b4d3bae8424fb7b11e1f4d24c2fe00..fe3e467834bbda1a84b0e89cb452c9633aceffad 100644
--- a/test/extrude/468/468.py
+++ b/test/extrude/468/468.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(793,529,529))
-r=w0.sketch().segment((199,689),(416,435)).segment((500,435)).segment((548,500)).segment((548,510)).segment((538,510)).segment((538,623)).segment((548,623)).segment((548,698)).segment((614,698)).segment((623,548)).segment((859,557)).segment((849,821)).segment((717,802)).segment((548,1000)).close().assemble().reset().face(w0.sketch().segment((717,58),(821,58)).segment((821,199)).arc((859,274),(821,369)).segment((821,435)).segment((717,435)).segment((717,369)).arc((661,274),(717,199)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(652,501,502))
+r=w0.sketch().arc((410,1),(475,530),(731,1000)).arc((301,585),(411,2)).assemble().finalize().extrude(195)
\ No newline at end of file
diff --git a/test/extrude/468/468.stl b/test/extrude/468/468.stl
index d4a79a88ed8428f46e498eb3a6b1ca0952b4c1cb..d5a852ecbfdd450062d664820cfee4e56e264c5a 100644
Binary files a/test/extrude/468/468.stl and b/test/extrude/468/468.stl differ
diff --git a/test/extrude/469/469.py b/test/extrude/469/469.py
index 18656d816aadbdac372ea2e79e512d3243201116..26ef5c7dadc760b9a5bcd7713f981a8943d200f8 100644
--- a/test/extrude/469/469.py
+++ b/test/extrude/469/469.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(437,437,345))
-r=w0.sketch().push([(529,231)]).circle(575).reset().face(w0.sketch().arc((495,70),(1000,58),(610,368)).arc((678,173),(495,70)).assemble()).finalize().extrude(472).union(w0.sketch().push([(1,851)]).circle(575).push([(162,368)]).circle(449).finalize().extrude(633)).translate((139,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,612))
+r=w0.workplane(offset=389).moveTo(75,995).box(646,510,720).union(w0.sketch().segment((550,596),(896,1)).segment((1000,67)).segment((656,656)).close().assemble().finalize().extrude(371))
\ No newline at end of file
diff --git a/test/extrude/469/469.stl b/test/extrude/469/469.stl
index e9667c742a9a6bd0ac7ec824df6ef249a373c4d0..e9f594eaa41764b2bbddd5f55b22874478ce26db 100644
Binary files a/test/extrude/469/469.stl and b/test/extrude/469/469.stl differ
diff --git a/test/extrude/47/47.py b/test/extrude/47/47.py
index dbdb3e4aec33ee005e0aad09f3c06fe8c1216073..f64fc5c138791f37a9adf5ee15c68f5c1ea03a26 100644
--- a/test/extrude/47/47.py
+++ b/test/extrude/47/47.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(507,266,507))
-r=w0.workplane(offset=567).moveTo(182,868).cylinder(627,723).union(w0.sketch().push([(188,862)]).rect(759,1000).reset().face(w0.sketch().arc((591,25),(1000,1),(868,386)).arc((470,410),(591,25)).assemble()).push([(621,651)]).rect(759,579).finalize().extrude(988)).translate((1,1,35))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(79,6,9))
+r=w0.sketch().segment((1,593),(1,248)).segment((132,248)).segment((684,139)).segment((684,194)).close().assemble().push([(128,274)]).circle(37,mode='s').push([(453,334)]).circle(62,mode='s').push([(93,419)]).circle(43,mode='s').finalize().extrude(340)
diff --git a/test/extrude/47/47.stl b/test/extrude/47/47.stl
index 39b6cc7d00dc4dfbd4d7a037a10b45945c1a0d84..677fb65664c6239f5b7d679f03a98762f4cf7e4d 100644
Binary files a/test/extrude/47/47.stl and b/test/extrude/47/47.stl differ
diff --git a/test/extrude/470/470.py b/test/extrude/470/470.py
index a701fbbbb359c5f840fbbf1d3735ff8c95cb05bf..a62ac86c82029945d67d3fe0ddb1b83bc35c2903 100644
--- a/test/extrude/470/470.py
+++ b/test/extrude/470/470.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(570,500,500))
-w1=cq.Workplane('YZ',origin=(680,500,500))
-r=w0.sketch().push([(590,860)]).circle(570).circle(550,mode='s').finalize().extrude(111).union(w0.sketch().segment((950,321),(1000,331)).segment((950,500)).close().assemble().finalize().extrude(740)).union(w1.sketch().segment((1,201),(31,201)).segment((31,171)).segment((241,171)).segment((241,71)).segment((570,71)).segment((570,371)).segment((241,371)).segment((241,311)).segment((31,311)).segment((31,271)).segment((1,271)).close().assemble().finalize().extrude(321))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,502,501))
+r=w0.sketch().segment((380,574),(619,406)).arc((556,565),(381,576)).assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/470/470.stl b/test/extrude/470/470.stl
index 462414a5814f4c10fd5a0f1632ce550e8717abd1..83e817686b0563e61c389ba577e200bc0556a866 100644
Binary files a/test/extrude/470/470.stl and b/test/extrude/470/470.stl differ
diff --git a/test/extrude/471/471.py b/test/extrude/471/471.py
index ade008a77453a27cb997275a41b9764ffad066fe..c29d429027d1c552256139aa27bd6b1a5705feee 100644
--- a/test/extrude/471/471.py
+++ b/test/extrude/471/471.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).cylinder(1000,614).translate((281,281,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,639,499))
+w1=cq.Workplane('YZ',origin=(375,501,501))
+r=w0.sketch().push([(432,420)]).circle(634).push([(346,464)]).circle(539,mode='s').circle(534).circle(522,mode='s').finalize().extrude(121).union(w0.sketch().push([(230,485)]).circle(606).push([(428,421)]).rect(565,531).push([(803,839)]).rect(646,820).finalize().extrude(595)).union(w1.sketch().segment((501,292),(720,292)).segment((720,416)).segment((730,417)).segment((731,659)).segment((526,660)).segment((526,535)).segment((500,535)).close().assemble().push([(595,330)]).rect(510,509,mode='s').finalize().extrude(127))
\ No newline at end of file
diff --git a/test/extrude/471/471.stl b/test/extrude/471/471.stl
index 838ec02cb64ad7631b2b473794f5aa3f5d33fc6d..2a739d2e2cca06426910b0c7693cc92585362f61 100644
Binary files a/test/extrude/471/471.stl and b/test/extrude/471/471.stl differ
diff --git a/test/extrude/472/472.py b/test/extrude/472/472.py
index 55eace399dd5bdcf509af4f8ccb6c562e2aac471..c221ef005d1604ee5a719e8c766f45125a5ef7b3 100644
--- a/test/extrude/472/472.py
+++ b/test/extrude/472/472.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(490,511,490))
-w1=cq.Workplane('YZ',origin=(729,490,490))
-r=w0.workplane(offset=272).moveTo(141,204).box(834,750,927).union(w0.sketch().segment((261,386),(584,386)).segment((584,615)).segment((261,573)).close().assemble().finalize().extrude(729)).union(w0.sketch().segment((553,1),(761,1)).arc((1000,220),(688,282)).segment((553,282)).close().assemble().finalize().extrude(886)).union(w1.sketch().arc((542,407),(553,428),(542,438)).close().assemble().finalize().extrude(750))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(655,501,501))
+w1=cq.Workplane('YZ',origin=(586,500,500))
+r=w0.sketch().segment((531,630),(945,321)).segment((1000,395)).segment((584,707)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=612).moveTo(333,501).box(1000,1000,726)).union(w1.sketch().arc((246,226),(325,210),(405,221)).segment((375,220)).segment((377,275)).arc((317,240),(246,225)).assemble().finalize().extrude(745))
\ No newline at end of file
diff --git a/test/extrude/472/472.stl b/test/extrude/472/472.stl
index 61b877e1ff3cabf155cc9f0357a19a7779762523..61c4b02b64e2a466ea8470f58d353cb9bcfbbda7 100644
Binary files a/test/extrude/472/472.stl and b/test/extrude/472/472.stl differ
diff --git a/test/extrude/473/473.py b/test/extrude/473/473.py
index c170d21236f49ae421c3d40cfad3f749fc4c5580..787fa764cf6ac629b7a660d0d227c251a180fc8c 100644
--- a/test/extrude/473/473.py
+++ b/test/extrude/473/473.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(556,556,512))
-w1=cq.Workplane('XY',origin=(556,556,423))
-r=w0.sketch().segment((423,534),(500,534)).segment((545,722)).segment((423,722)).close().assemble().finalize().extrude(345).union(w0.workplane(offset=495).moveTo(623,1000).cylinder(678,667)).union(w1.sketch().arc((478,401),(578,1),(589,412)).arc((534,489),(478,401)).assemble().finalize().extrude(944))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,510))
+r=w0.sketch().segment((32,946),(181,357)).segment((242,356)).arc((709,135),(572,631)).segment((569,416)).segment((407,415)).arc((525,761),(247,1000)).close().assemble().finalize().extrude(340).union(w0.workplane(offset=544).moveTo(723,60).box(966,620,586)).union(w0.sketch().arc((880,312),(920,337),(970,355)).segment((880,356)).close().assemble().finalize().extrude(645))
\ No newline at end of file
diff --git a/test/extrude/473/473.stl b/test/extrude/473/473.stl
index 829e4614c7ebaafaf33976437fa54da6d495e426..2a2d8976d85bb729dfa1d753121cbe1449c53b3e 100644
Binary files a/test/extrude/473/473.stl and b/test/extrude/473/473.stl differ
diff --git a/test/extrude/474/474.py b/test/extrude/474/474.py
index 7cc84bfc7da246472707fee0861bdf85a60afc60..bdd2e2b44806329b76333e9c42f4e2dbb8a5af78 100644
--- a/test/extrude/474/474.py
+++ b/test/extrude/474/474.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(419,327,419))
-w1=cq.Workplane('ZX',origin=(419,450,419))
-r=w0.workplane(offset=225).moveTo(154,653).box(562,969,806).union(w0.sketch().segment((93,256),(297,164)).segment((297,32)).segment((541,32)).segment((541,52)).segment((664,1)).segment((755,225)).segment((541,317)).segment((541,439)).segment((297,439)).segment((297,419)).segment((184,470)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=628).moveTo(271,159).box(755,918,837))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,505,502))
+r=w0.workplane(offset=251).moveTo(771,470).cylinder(1000,531).union(w0.sketch().segment((221,520),(240,520)).arc((380,446),(542,450)).arc((542,432),(550,411)).segment((329,410)).segment((331,1)).segment((765,1)).segment((764,300)).arc((795,311),(820,326)).segment((821,52)).segment((844,51)).segment((845,340)).segment((720,671)).arc((715,785),(666,894)).segment((664,916)).segment((644,916)).arc((444,1000),(242,916)).segment((221,915)).segment((222,896)).arc((161,721),(222,542)).close().assemble().finalize().extrude(989))
\ No newline at end of file
diff --git a/test/extrude/474/474.stl b/test/extrude/474/474.stl
index efd9eacba6f7e5c7a69d24d162b083aaeab76f11..20ea5154f64fce3d031c6cc6cb65b1a4670e0361 100644
Binary files a/test/extrude/474/474.stl and b/test/extrude/474/474.stl differ
diff --git a/test/extrude/475/475.py b/test/extrude/475/475.py
index 543573ab004d32264db4bbeeb6a2f6ca596e769e..4421e4970e8cdcfa319e9dbd6c134ece818f310f 100644
--- a/test/extrude/475/475.py
+++ b/test/extrude/475/475.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(419,419,466))
-r=w0.sketch().push([(129,593)]).circle(663).push([(442,117)]).circle(698).reset().face(w0.sketch().segment((326,129),(559,59)).segment((570,117)).segment((338,187)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().segment((408,919),(489,919)).arc((605,396),(733,919)).segment((954,919)).segment((954,954)).segment((652,954)).arc((582,1000),(524,954)).segment((408,954)).close().assemble().finalize().extrude(733)).translate((116,164,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,275,501))
+r=w0.sketch().segment((2,485),(56,525)).arc((77,630),(121,736)).segment((120,256)).segment((870,255)).arc((635,81),(340,85)).segment((287,55)).arc((770,81),(1000,515)).segment((945,476)).arc((924,372),(881,265)).segment((880,746)).segment((130,746)).arc((367,921),(660,916)).segment((716,946)).arc((230,919),(1,486)).assemble().finalize().extrude(955)
\ No newline at end of file
diff --git a/test/extrude/475/475.stl b/test/extrude/475/475.stl
index 473285bbd53fe7a4f068cb6bc7955bed90c4eab2..f05bb9f7a39ddbeb310ca30e90ceadb76dba3c31 100644
Binary files a/test/extrude/475/475.stl and b/test/extrude/475/475.stl differ
diff --git a/test/extrude/476/476.py b/test/extrude/476/476.py
index f1698c744b44d0db2206a091017b5713f3ff2151..08bd04619f787ddeede845810c87e3f69443155f 100644
--- a/test/extrude/476/476.py
+++ b/test/extrude/476/476.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(360,360,44))
-w1=cq.Workplane('XY',origin=(360,360,87))
-r=w0.sketch().segment((677,1),(677,145)).segment((684,1)).close().assemble().finalize().extrude(1000).union(w1.sketch().push([(288,594)]).rect(863,612).push([(296,605)]).circle(411,mode='s').finalize().extrude(569))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,382))
+r=w0.workplane(offset=545).moveTo(655,550).cylinder(591,661).union(w0.workplane(offset=550).moveTo(302,457).cylinder(600,801)).union(w0.sketch().segment((420,551),(1000,550)).segment((1000,620)).segment((996,611)).segment((655,709)).segment((696,846)).segment((420,846)).close().assemble().push([(541,701)]).circle(545,mode='s').reset().face(w0.sketch().segment((990,844),(1000,839)).segment((999,846)).close().assemble()).finalize().extrude(745))
\ No newline at end of file
diff --git a/test/extrude/476/476.stl b/test/extrude/476/476.stl
index 25b3ece9d4cbfcf209091e6de96abeab3c8a779b..08be3137762e5dc1e4ac3e4eb0aac19f1b7b5098 100644
Binary files a/test/extrude/476/476.stl and b/test/extrude/476/476.stl differ
diff --git a/test/extrude/477/477.py b/test/extrude/477/477.py
index 67337942f0e38ccea255d83868f3c7c2f1f2450c..31481eef151787ece6a25fdf55f1a2232f85c97f 100644
--- a/test/extrude/477/477.py
+++ b/test/extrude/477/477.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(50,220,220))
-r=w0.workplane(offset=1).cylinder(659,257).union(w0.workplane(offset=610).cylinder(1000,756)).translate((280,537,537))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(521,500,501))
+w1=cq.Workplane('YZ',origin=(646,501,501))
+r=w0.workplane(offset=414).moveTo(814,261).box(700,1000,669).union(w1.sketch().segment((85,810),(242,811)).arc((240,711),(320,655)).arc((551,770),(306,866)).arc((297,861),(280,851)).segment((281,1000)).segment((87,1000)).close().assemble().finalize().extrude(211))
\ No newline at end of file
diff --git a/test/extrude/477/477.stl b/test/extrude/477/477.stl
index 211fd31934fd5661803612acfa9a76a3ff272ba8..ad44394baf925dd72d416b006caf139e5ce8f72a 100644
Binary files a/test/extrude/477/477.stl and b/test/extrude/477/477.stl differ
diff --git a/test/extrude/478/478.py b/test/extrude/478/478.py
index 97b9f91b98b590b7fd8538b9d3484ff637aa34d6..768449c15d9cdc9f61b1c8c4be464a87eed07424 100644
--- a/test/extrude/478/478.py
+++ b/test/extrude/478/478.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(49,282,282))
-r=w0.sketch().segment((1,399),(20,389)).arc((98,253),(253,224)).segment((263,214)).segment((282,234)).arc((292,234),(302,243)).arc((564,331),(360,515)).arc((273,583),(156,593)).segment((146,602)).segment((127,583)).arc((49,515),(20,418)).close().assemble().finalize().extrude(30).union(w0.workplane(offset=641).moveTo(292,40).cylinder(1000,360)).translate((1,1,39))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,450,501))
+r=w0.sketch().arc((561,260),(966,185),(722,515)).arc((54,751),(560,260)).assemble().finalize().extrude(601)
\ No newline at end of file
diff --git a/test/extrude/478/478.stl b/test/extrude/478/478.stl
index 1964db371e8f0e25a5b52bf0cb09849ee8235ef2..ef0a807702289e76228440dd6bf74ea9eed0d7ef 100644
Binary files a/test/extrude/478/478.stl and b/test/extrude/478/478.stl differ
diff --git a/test/extrude/479/479.py b/test/extrude/479/479.py
index 66acbe2de63c040ade063784b2b35c4bdfd6bed7..4e2c713a185e43f7839acc0af243f3c1f9c25019 100644
--- a/test/extrude/479/479.py
+++ b/test/extrude/479/479.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(40,360,360))
-r=w0.workplane(offset=500).moveTo(156,549).box(922,738,641).union(w0.workplane(offset=680).moveTo(825,1).cylinder(1000,379)).translate((1,1,19))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,316))
+w1=cq.Workplane('XY',origin=(500,500,506))
+r=w0.sketch().push([(455,945)]).rect(961,611).push([(621,517)]).circle(611).finalize().extrude(376).union(w0.sketch().push([(619,516)]).circle(559).circle(511,mode='s').finalize().extrude(531)).union(w0.workplane(offset=751).moveTo(624,512).box(805,995,1000)).union(w1.workplane(offset=650).moveTo(486,296).box(620,1000,801))
\ No newline at end of file
diff --git a/test/extrude/479/479.stl b/test/extrude/479/479.stl
index dc53f94147d1cd74918faaf9828d6ebcc52d551a..b72abbefff6e49067f529c510b743f1863a726fa 100644
Binary files a/test/extrude/479/479.stl and b/test/extrude/479/479.stl differ
diff --git a/test/extrude/48/48.py b/test/extrude/48/48.py
index 32c6f1d9a96a7a7914278f36d2f4a8ca917250a5..0fc3ace5997aa48876fb532efdf3efcbe3b114b6 100644
--- a/test/extrude/48/48.py
+++ b/test/extrude/48/48.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(362,140,362))
-w1=cq.Workplane('XY',origin=(362,362,408))
-r=w0.workplane(offset=533).moveTo(380,1).cylinder(704,464).union(w0.sketch().segment((20,482),(38,334)).segment((704,417)).segment((686,574)).close().assemble().push([(362,454)]).rect(454,491,mode='s').finalize().extrude(1000)).union(w1.sketch().arc((538,232),(297,56),(584,10)).arc((815,186),(538,232)).assemble().finalize().extrude(547)).translate((103,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(51,69,53))
+r=w0.sketch().segment((928,223),(214,21)).segment((214,633)).segment((928,633)).close().assemble().finalize().extrude(226).union(w0.sketch().segment((372,515),(242,515)).segment((242,125)).segment((372,125)).close().assemble().finalize().extrude(54)).union(w0.sketch().segment((646,445),(792,445)).segment((792,719)).segment((646,719)).close().assemble().finalize().extrude(182))
diff --git a/test/extrude/48/48.stl b/test/extrude/48/48.stl
index 4a7df376a35b0b6ed3bfd0605be7660fc35cd0c1..d30fda36331c34665a286db18afc7a9105208eeb 100644
Binary files a/test/extrude/48/48.stl and b/test/extrude/48/48.stl differ
diff --git a/test/extrude/480/480.py b/test/extrude/480/480.py
index a3b0c94dc63fd73b02643f0a185aae1dafe29cbb..5c51d55a6826f677fe6a1c9ff30e1aa75f044bff 100644
--- a/test/extrude/480/480.py
+++ b/test/extrude/480/480.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,420,495))
-r=w0.sketch().arc((441,259),(313,55),(560,1)).segment((839,1)).segment((839,549)).segment((667,549)).arc((313,1000),(441,452)).close().assemble().push([(436,82)]).rect(506,570,mode='s').finalize().extrude(646)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(251,500,501))
+r=w0.workplane(offset=395).moveTo(810,678).box(870,1000,711).union(w0.sketch().push([(206,202)]).circle(700).push([(142,216)]).circle(530,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/480/480.stl b/test/extrude/480/480.stl
index a5f9b0bc2d84d57c949b9c02a09842102fe7cf77..34690e66e22108f683bf0e78a1c2d346a8380074 100644
Binary files a/test/extrude/480/480.stl and b/test/extrude/480/480.stl differ
diff --git a/test/extrude/481/481.py b/test/extrude/481/481.py
index 34bd41508708f6d283299f65e3b346b925d1210b..aefa3d337ae814a3d949d204ba2ade146f1557d1 100644
--- a/test/extrude/481/481.py
+++ b/test/extrude/481/481.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(25,25,45))
-r=w0.workplane(offset=1).box(318,1000,74).translate((135,476,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,375,499))
+r=w0.sketch().segment((61,280),(281,281)).segment((280,227)).segment((375,227)).segment((375,281)).segment((397,280)).arc((446,355),(501,280)).segment((596,291)).segment((595,745)).segment((376,744)).segment((376,800)).segment((279,800)).segment((282,744)).segment((61,745)).close().assemble().push([(331,352)]).circle(561,mode='s').circle(521).finalize().extrude(375).union(w0.sketch().segment((101,941),(127,916)).arc((136,681),(371,639)).segment((390,616)).segment((457,671)).segment((436,697)).arc((420,935),(191,974)).segment((170,1000)).close().assemble().push([(329,513)]).rect(556,685).push([(826,94)]).rect(731,685).finalize().extrude(875))
\ No newline at end of file
diff --git a/test/extrude/481/481.stl b/test/extrude/481/481.stl
index d0c077fe6a7bfbdf4511144e5a2df96d40761373..ed5ab91fa73b67689401d7cddf311a967553321a 100644
Binary files a/test/extrude/481/481.stl and b/test/extrude/481/481.stl differ
diff --git a/test/extrude/482/482.py b/test/extrude/482/482.py
index 02c5880d57734d862afc152cd634e5e6f8479281..4e15ffddf49f5203a9d53a72f9a5742f2f3c6175 100644
--- a/test/extrude/482/482.py
+++ b/test/extrude/482/482.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,441))
-r=w0.sketch().segment((1,421),(161,421)).arc((660,11),(161,431)).segment((161,1000)).segment((1,1000)).close().assemble().push([(51,560)]).circle(530,mode='s').finalize().extrude(630)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(340,502,501))
+r=w0.workplane(offset=331).moveTo(415,354).cylinder(841,654).union(w0.sketch().arc((275,360),(300,285),(340,221)).segment((341,57)).segment((890,55)).segment((891,190)).arc((960,596),(606,805)).segment((556,739)).arc((62,836),(296,385)).close().assemble().reset().face(w0.sketch().segment((540,551),(839,550)).arc((724,660),(565,671)).arc((561,610),(540,552)).assemble(),mode='s').finalize().extrude(210)).union(w0.sketch().push([(336,801)]).circle(596).push([(629,446)]).circle(541).circle(526,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/482/482.stl b/test/extrude/482/482.stl
index 85fa3ef74389d9f48cead884c9b9c943d58ee4e3..69ca440e19fe09dd50bb06a0f7ad288054eb1f5c 100644
Binary files a/test/extrude/482/482.stl and b/test/extrude/482/482.stl differ
diff --git a/test/extrude/483/483.py b/test/extrude/483/483.py
index b66072b6006be9d616205d7f8049af4f2e464175..eb164bead1f45b8f6f0ef35c7ace8092332d4583 100644
--- a/test/extrude/483/483.py
+++ b/test/extrude/483/483.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(267,447,447))
-w1=cq.Workplane('ZX',origin=(447,532,447))
-r=w0.workplane(offset=623).moveTo(75,607).cylinder(798,586).union(w0.sketch().segment((235,373),(267,373)).segment((267,160)).segment((405,160)).arc((883,1),(681,469)).segment((681,564)).segment((724,564)).segment((724,979)).segment((500,979)).segment((500,617)).arc((479,649),(458,671)).segment((267,671)).segment((267,469)).segment((235,469)).close().assemble().push([(681,192)]).circle(490,mode='s').finalize().extrude(1000)).union(w1.sketch().push([(426,224)]).circle(596).push([(304,198)]).rect(458,500,mode='s').finalize().extrude(469)).translate((1,66,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(381,501,499))
+r=w0.sketch().arc((94,331),(194,321),(179,416)).arc((25,480),(96,330)).assemble().finalize().extrude(595).union(w0.sketch().push([(950,649)]).circle(551).rect(540,540,mode='s').finalize().extrude(736))
\ No newline at end of file
diff --git a/test/extrude/483/483.stl b/test/extrude/483/483.stl
index 2e0cf8a30d3b5b53f9d582cc415152b422ebb7a8..3edce38026e84071b2522db39f9421310278e66c 100644
Binary files a/test/extrude/483/483.stl and b/test/extrude/483/483.stl differ
diff --git a/test/extrude/484/484.py b/test/extrude/484/484.py
index 418c1842f30917a3c139ff739165021d831b3637..dc56ba2c0b71555b38b5bd0a8be67edd1223862c 100644
--- a/test/extrude/484/484.py
+++ b/test/extrude/484/484.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(547,547,929))
-w1=cq.Workplane('YZ',origin=(874,547,547))
-r=w0.sketch().segment((23,154),(67,154)).arc((339,1),(612,154)).segment((656,154)).segment((656,208)).arc((667,329),(656,470)).segment((656,525)).segment((612,525)).arc((339,678),(67,525)).segment((23,525)).segment((23,470)).arc((12,329),(23,208)).close().assemble().push([(853,1000)]).rect(634,733).finalize().extrude(481).union(w1.workplane(offset=651).moveTo(820,405).cylinder(754,787))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,694,501))
+r=w0.sketch().push([(261,500)]).circle(759).circle(716,mode='s').reset().face(w0.sketch().segment((726,255),(999,296)).segment((994,322)).segment((725,286)).close().assemble()).finalize().extrude(110)
\ No newline at end of file
diff --git a/test/extrude/484/484.stl b/test/extrude/484/484.stl
index f42fd47720d684fa8c92d7fb3634bf0567b68f8f..a8efee5a3cbb894e08da3c527998eb6620140f95 100644
Binary files a/test/extrude/484/484.stl and b/test/extrude/484/484.stl differ
diff --git a/test/extrude/485/485.py b/test/extrude/485/485.py
index 2b79a9166699fc189bb0af74fb603f2c12c5da2f..c96b7d95245fddf998dcc879d1993cd3fb032abd 100644
--- a/test/extrude/485/485.py
+++ b/test/extrude/485/485.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(515,515,767))
-r=w0.sketch().segment((30,69),(1000,69)).segment((1000,961)).arc((515,835),(30,961)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,502,1))
+r=w0.sketch().segment((256,127),(565,126)).segment((564,131)).segment((361,130)).segment((362,466)).segment((256,465)).close().assemble().reset().face(w0.sketch().segment((536,815),(606,814)).segment((604,866)).segment((670,865)).segment((671,816)).segment((746,816)).arc((640,876),(535,814)).assemble()).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/485/485.stl b/test/extrude/485/485.stl
index 6a4d3f83146ebc58bbeece0746a412d5b073761c..493b21803d8f9285d13b543cd7e8fc3db3312467 100644
Binary files a/test/extrude/485/485.stl and b/test/extrude/485/485.stl differ
diff --git a/test/extrude/486/486.py b/test/extrude/486/486.py
index 78f562da396e7ab3fb53749a7ab1b6558adce85b..ad4c28debc3df73aae4efd1e63fe7dcbe46fa12b 100644
--- a/test/extrude/486/486.py
+++ b/test/extrude/486/486.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().segment((254,221),(494,221)).segment((494,441)).segment((254,441)).segment((254,374)).arc((247,334),(254,294)).close().assemble().finalize().extrude(347).union(w0.workplane(offset=667).cylinder(1000,607)).translate((274,1,274))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,661,501))
+w1=cq.Workplane('ZX',origin=(500,491,500))
+r=w0.sketch().segment((26,746),(397,745)).segment((207,586)).segment((406,350)).segment((649,556)).segment((465,781)).segment((464,855)).segment((25,856)).close().assemble().finalize().extrude(630).union(w0.sketch().segment((430,360),(836,146)).segment((975,420)).segment((575,630)).close().assemble().finalize().extrude(840)).union(w1.sketch().segment((495,221),(691,221)).arc((739,211),(785,221)).segment((915,220)).segment((916,315)).arc((941,416),(915,510)).segment((915,559)).segment((889,560)).segment((889,236)).segment((585,235)).segment((585,561)).segment((496,559)).close().assemble().finalize().extrude(11))
\ No newline at end of file
diff --git a/test/extrude/486/486.stl b/test/extrude/486/486.stl
index de8caeb0706cd7c6e1e0f4aef3556f29a4b62aa0..006f1c169968a4c47aa132bb08a8c8ec8febd83d 100644
Binary files a/test/extrude/486/486.stl and b/test/extrude/486/486.stl differ
diff --git a/test/extrude/487/487.py b/test/extrude/487/487.py
index 9ad0161febc3e669ba55618665b3e271847588fc..e0de55cfcf3f9afd09fd9887e0333a9fd051870f 100644
--- a/test/extrude/487/487.py
+++ b/test/extrude/487/487.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(468,468,599))
-w1=cq.Workplane('XY',origin=(468,468,571))
-r=w0.sketch().segment((20,524),(141,384)).arc((160,449),(197,505)).segment((197,178)).segment((496,178)).arc((440,150),(374,132)).segment((496,1)).segment((683,178)).segment((916,178)).segment((916,608)).segment((356,608)).segment((253,729)).close().assemble().finalize().extrude(767).union(w1.workplane(offset=202).moveTo(655,879).cylinder(1000,524))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(80,501,500))
+r=w0.sketch().segment((30,315),(564,2)).segment((969,686)).segment((436,999)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/487/487.stl b/test/extrude/487/487.stl
index 8545824102d5c584666430940d355bcb29d2355e..98231a0b8b7ace664ad7079822442cbff2e9cdf9 100644
Binary files a/test/extrude/487/487.stl and b/test/extrude/487/487.stl differ
diff --git a/test/extrude/488/488.py b/test/extrude/488/488.py
index 30fdc1164e72a0796fba5a43bf457ff5f9df1a4d..e56ae91feab0053f0537d04ad41835d04c89d0b5 100644
--- a/test/extrude/488/488.py
+++ b/test/extrude/488/488.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().arc((214,354),(241,327),(221,294)).arc((454,347),(214,354)).assemble().rect(414,401,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,499,840))
+r=w0.sketch().segment((122,974),(145,185)).segment((226,190)).segment((225,1)).segment((235,1)).arc((276,5),(311,1)).segment((530,2)).segment((530,202)).segment((881,210)).segment((856,1000)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/488/488.stl b/test/extrude/488/488.stl
index bc7faa6c355e900c1599a1d9b4225cdd33f3effd..c2d39d7679df053a8c316017cabbca1c0ac1df98 100644
Binary files a/test/extrude/488/488.stl and b/test/extrude/488/488.stl differ
diff --git a/test/extrude/489/489.py b/test/extrude/489/489.py
index 0ac654b0f836da950b4b28341f9d92f470377d43..fe754763beba969ede3632e8dc358d031e67b0a4 100644
--- a/test/extrude/489/489.py
+++ b/test/extrude/489/489.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(576,319,319))
-r=w0.workplane(offset=20).moveTo(538,39).cylinder(917,417).union(w0.sketch().arc((311,46),(311,697),(342,46)).segment((342,531)).segment((311,531)).segment((311,334)).arc((168,311),(311,281)).close().assemble().finalize().extrude(39)).union(w0.sketch().push([(319,372)]).rect(1000,909).reset().face(w0.sketch().segment((417,266),(584,266)).segment((584,470)).segment((448,470)).arc((1,432),(417,266)).assemble(),mode='s').finalize().extrude(395)).translate((1,1,60))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(331,499,500))
+w1=cq.Workplane('YZ',origin=(427,499,501))
+r=w0.workplane(offset=426).moveTo(709,66).cylinder(652,564).union(w0.sketch().segment((131,496),(140,495)).arc((247,355),(420,342)).arc((415,476),(549,449)).arc((562,625),(441,751)).segment((440,806)).segment((395,805)).arc((330,999),(270,806)).segment((131,806)).close().assemble().finalize().extrude(476)).union(w1.workplane(offset=701).moveTo(648,460).box(945,710,900))
\ No newline at end of file
diff --git a/test/extrude/489/489.stl b/test/extrude/489/489.stl
index c5daed305fa46d37099bc6422b7d7fae0116c452..56f7e12ff3c0e00aedc25a6731cb485b2f1201bc 100644
Binary files a/test/extrude/489/489.stl and b/test/extrude/489/489.stl differ
diff --git a/test/extrude/49/49.py b/test/extrude/49/49.py
index 46aefd90608a2bb2a6ee78c9345fdc6142e57348..5a9d3bbc533a55e09c574ed9f78902da80546c70 100644
--- a/test/extrude/49/49.py
+++ b/test/extrude/49/49.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(464,195,464))
-r=w0.sketch().arc((297,686),(242,574),(343,510)).arc((824,722),(297,686)).assemble().push([(565,658)]).rect(612,796,mode='s').finalize().extrude(778).union(w0.sketch().segment((94,177),(121,177)).segment((121,1)).segment((140,1)).segment((140,177)).segment((168,177)).segment((168,306)).segment((140,306)).segment((140,482)).segment((121,482)).segment((121,306)).segment((94,306)).close().assemble().push([(140,255)]).rect(500,473,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(42,38,16))
+r=w0.sketch().segment((637,240),(637,490)).arc((539,770),(288,928)).segment((281,899)).arc((516,751),(607,490)).segment((607,240)).close().assemble().push([(491,282)]).circle(60,mode='s').push([(403,568)]).rect(78,82,mode='s').push([(429,352)]).rect(68,58,mode='s').finalize().extrude(124)
diff --git a/test/extrude/49/49.stl b/test/extrude/49/49.stl
index 99b554b56c7a743ead9246933ce04c07d14a4f95..fc8222f83b3da635afbc51d22a0c3357f7bb50c4 100644
Binary files a/test/extrude/49/49.stl and b/test/extrude/49/49.stl differ
diff --git a/test/extrude/490/490.py b/test/extrude/490/490.py
index 5eebe38e34d1bb3e3627a71bd01176834a276201..1a10ed3dcb9f67b1f2772454a76241cf26de59dd 100644
--- a/test/extrude/490/490.py
+++ b/test/extrude/490/490.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,534).translate((201,1,201))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,136,499))
+r=w0.sketch().segment((1,147),(252,145)).segment((251,280)).arc((231,381),(250,481)).segment((1,516)).close().assemble().reset().face(w0.sketch().arc((537,590),(630,521),(680,411)).segment((1000,409)).segment((1000,856)).segment((660,854)).arc((641,735),(535,670)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/490/490.stl b/test/extrude/490/490.stl
index 0b617e40495842b041225ea171ee9cccbda7ae78..2f56e68475a41bc4feef405f07fba637b87ae754 100644
Binary files a/test/extrude/490/490.stl and b/test/extrude/490/490.stl differ
diff --git a/test/extrude/491/491.py b/test/extrude/491/491.py
index 64b0efb40f76dc8188b38b2efd35da5cc6031774..78f456ea53698345ede6fc6ec3fe3037d5bbb6eb 100644
--- a/test/extrude/491/491.py
+++ b/test/extrude/491/491.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(670,500,500))
-r=w0.sketch().segment((1,181),(381,181)).segment((281,311)).segment((151,251)).segment((61,451)).segment((291,550)).segment((301,510)).segment((421,600)).segment((421,610)).segment((1,610)).close().assemble().reset().face(w0.sketch().segment((840,181),(1000,181)).segment((1000,291)).close().assemble()).finalize().extrude(161).union(w0.sketch().arc((341,510),(361,251),(620,231)).arc((850,740),(341,510)).assemble().finalize().extrude(261))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(601,499,501))
+r=w0.sketch().arc((240,322),(246,346),(241,372)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(736,608)]).rect(550,646).push([(748,604)]).rect(515,517,mode='s').finalize().extrude(900))
\ No newline at end of file
diff --git a/test/extrude/491/491.stl b/test/extrude/491/491.stl
index 5aa3135fe600c9e40a626c9d7fae4ceb9b3d116c..04fcca2abacfc7c883757d35425eaca84f023a54 100644
Binary files a/test/extrude/491/491.stl and b/test/extrude/491/491.stl differ
diff --git a/test/extrude/492/492.py b/test/extrude/492/492.py
index 184f6dc2ea70dde9ba0665522a624439cb45b508..4099a2bbfda34cfe9beb0abf3898c2e13035e85f 100644
--- a/test/extrude/492/492.py
+++ b/test/extrude/492/492.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(384,384,510))
-r=w0.workplane(offset=102).moveTo(1,133).box(874,485,950).union(w0.sketch().segment((812,623),(925,535)).segment((874,472)).arc((1000,623),(812,623)).assemble().finalize().extrude(711)).translate((53,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,591))
+r=w0.sketch().segment((306,252),(441,251)).segment((441,41)).segment((861,41)).segment((860,250)).segment((1000,252)).segment((1000,280)).segment((861,280)).segment((860,491)).segment((441,491)).segment((440,282)).segment((307,280)).close().assemble().finalize().extrude(317).union(w0.sketch().push([(81,794)]).circle(582).reset().face(w0.sketch().segment((261,501),(631,500)).segment((629,575)).segment((605,520)).segment((261,706)).close().assemble()).reset().face(w0.sketch().segment((262,890),(290,941)).segment((545,806)).segment((546,845)).segment((629,844)).segment((629,961)).segment((260,959)).close().assemble()).finalize().extrude(405))
\ No newline at end of file
diff --git a/test/extrude/492/492.stl b/test/extrude/492/492.stl
index b0bba0c8f78f3838255ab04e2c51bd22c2c2ca6b..107aa9702d029e9b4096d314ad6e1e91a41217e3 100644
Binary files a/test/extrude/492/492.stl and b/test/extrude/492/492.stl differ
diff --git a/test/extrude/493/493.py b/test/extrude/493/493.py
index 00a8d905444692ad784a94ce736d2d2bad272fe0..984c2a8125900a880ff01706e02212950b7a4fca 100644
--- a/test/extrude/493/493.py
+++ b/test/extrude/493/493.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,282))
-r=w0.workplane(offset=602).moveTo(787,1).cylinder(708,562).union(w0.sketch().push([(388,899)]).rect(1000,809).reset().face(w0.sketch().segment((708,439),(809,439)).segment((809,551)).segment((708,551)).segment((708,506)).close().assemble()).finalize().extrude(933)).translate((1,67,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(660,500,500))
+w1=cq.Workplane('YZ',origin=(685,501,499))
+r=w0.sketch().arc((241,673),(294,639),(335,595)).arc((749,680),(360,520)).arc((339,425),(271,350)).arc((590,155),(927,320)).segment((929,381)).segment((963,381)).arc((755,908),(240,675)).assemble().finalize().extrude(146).union(w0.sketch().segment((1,105),(31,105)).segment((31,65)).segment((604,65)).segment((603,106)).segment((633,107)).segment((635,559)).segment((604,559)).segment((603,605)).segment((32,605)).segment((32,559)).segment((1,559)).close().assemble().finalize().extrude(723)).union(w1.sketch().segment((261,250),(414,249)).arc((315,350),(260,485)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/493/493.stl b/test/extrude/493/493.stl
index c7a64efce5f36d60fa72d164703c3f5a6182e4c1..1f1977ce518b15138a7b27fa379be9de4faa6149 100644
Binary files a/test/extrude/493/493.stl and b/test/extrude/493/493.stl differ
diff --git a/test/extrude/494/494.py b/test/extrude/494/494.py
index b27b19213d2db771f71e60bc961b33a12e230bd0..0e0311289398a23cf74f351738f44ce575e7cde8 100644
--- a/test/extrude/494/494.py
+++ b/test/extrude/494/494.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(779,520,520))
-r=w0.sketch().segment((49,462),(59,491)).segment((404,328)).arc((462,376),(491,452)).arc((491,654),(308,750)).arc((107,683),(49,462)).assemble().push([(443,59)]).circle(529).reset().face(w0.sketch().segment((683,942),(875,443)).segment((1000,500)).segment((817,990)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,1))
+r=w0.sketch().rect(539,929).reset().face(w0.sketch().segment((486,346),(490,337)).segment((506,340)).segment((500,352)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/494/494.stl b/test/extrude/494/494.stl
index c6c261705d69d75fd643beeb48bf3bbbd2418645..83d7674a04e583068b4c7dbe9259aac6f3f1d0dd 100644
Binary files a/test/extrude/494/494.stl and b/test/extrude/494/494.stl differ
diff --git a/test/extrude/495/495.py b/test/extrude/495/495.py
index f3a4b3c27753970b113c241146e0401f2460635d..42ac2239bbb9f0260229d52f32be27a8a560863c 100644
--- a/test/extrude/495/495.py
+++ b/test/extrude/495/495.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(690,486,486))
-r=w0.sketch().arc((146,496),(282,1),(486,467)).arc((350,971),(146,496)).assemble().push([(307,268)]).rect(1000,496,mode='s').finalize().extrude(69).union(w0.workplane(offset=340).moveTo(932,573).cylinder(777,496))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,2,500))
+r=w0.sketch().segment((356,180),(645,180)).segment((644,811)).arc((500,795),(356,820)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/495/495.stl b/test/extrude/495/495.stl
index d2f540ddbb65f6a780ab9372d1895e2ffd69df07..cc1f25eb723769b1578f5299c751d648c2e84861 100644
Binary files a/test/extrude/495/495.stl and b/test/extrude/495/495.stl differ
diff --git a/test/extrude/496/496.py b/test/extrude/496/496.py
index 0fa16a7f725c0dd19b1d799315166829b596d225..1b1c106e98a722024d7db944e91d90b2a49543c8 100644
--- a/test/extrude/496/496.py
+++ b/test/extrude/496/496.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(88,394,394))
-r=w0.sketch().segment((1,331),(654,95)).segment((788,457)).segment((135,693)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,1,502))
+r=w0.workplane(offset=698).moveTo(501,515).cylinder(896,551).union(w0.sketch().segment((731,440),(730,466)).segment((745,465)).arc((262,580),(741,440)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/496/496.stl b/test/extrude/496/496.stl
index 1755cec3c3fc5fbf935fab46abefb734a82236a4..d3feeeb8a2538376d58af9e38aeb190c17c8e7c1 100644
Binary files a/test/extrude/496/496.stl and b/test/extrude/496/496.stl differ
diff --git a/test/extrude/497/497.py b/test/extrude/497/497.py
index 4e5ae0427420fb219a4046a28343aef772fe8a38..c375f9592f3c1314a71f190c18e002569ed4518b 100644
--- a/test/extrude/497/497.py
+++ b/test/extrude/497/497.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(86,388,388))
-r=w0.sketch().segment((1,272),(133,86)).segment((342,249)).arc((729,257),(621,636)).segment((582,690)).segment((535,644)).arc((388,605),(288,481)).close().assemble().reset().face(w0.sketch().segment((419,559),(481,605)).arc((458,605),(442,597)).close().assemble(),mode='s').reset().face(w0.sketch().segment((442,210),(621,210)).segment((621,272)).arc((698,528),(497,349)).segment((442,311)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(551,502,500))
+w1=cq.Workplane('ZX',origin=(500,756,500))
+r=w0.workplane(offset=530).moveTo(576,824).box(551,855,560).union(w0.sketch().segment((247,77),(541,76)).segment((541,2)).segment((597,1)).segment((594,435)).segment((540,436)).segment((540,380)).segment((246,380)).close().assemble().finalize().extrude(605)).union(w1.sketch().push([(437,500)]).rect(726,859).reset().face(w1.sketch().segment((366,450),(395,451)).arc((435,435),(482,450)).segment((506,451)).segment((507,551)).segment((480,549)).arc((434,566),(395,551)).segment((365,551)).close().assemble(),mode='s').finalize().extrude(151))
\ No newline at end of file
diff --git a/test/extrude/497/497.stl b/test/extrude/497/497.stl
index 59ad372d1538079df1132ca09c00bcfb59c5b101..4a4fd59c2c8b5f77bfd686a536c30d9c3b775f70 100644
Binary files a/test/extrude/497/497.stl and b/test/extrude/497/497.stl differ
diff --git a/test/extrude/498/498.py b/test/extrude/498/498.py
index 7856ce20a10c09d3762157271ab14748e4a54381..68c1c1d471444bd0826c14cda8488a79241242b5 100644
--- a/test/extrude/498/498.py
+++ b/test/extrude/498/498.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(405,293,405))
-r=w0.sketch().arc((136,596),(338,428),(327,686)).arc((315,764),(270,697)).arc((203,674),(147,618)).segment((158,630)).segment((181,596)).segment((147,573)).close().assemble().reset().face(w0.sketch().segment((293,719),(315,719)).segment((304,753)).segment((293,753)).close().assemble(),mode='s').finalize().extrude(46).union(w0.sketch().segment((102,46),(573,46)).segment((573,371)).segment((371,371)).segment((371,573)).segment((203,573)).segment((203,371)).segment((102,371)).close().assemble().push([(832,405)]).circle(540).finalize().extrude(248)).union(w0.workplane(offset=703).moveTo(1,405).cylinder(1000,562)).translate((1,1,157))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(297,501,501))
+w1=cq.Workplane('YZ',origin=(481,500,501))
+r=w0.sketch().segment((185,517),(206,485)).segment((426,634)).segment((511,635)).segment((510,670)).segment((475,670)).segment((656,796)).segment((636,821)).segment((416,670)).segment((331,671)).segment((331,634)).segment((365,635)).close().assemble().push([(721,181)]).circle(595).finalize().extrude(207).union(w0.sketch().arc((355,501),(370,470),(401,459)).arc((527,399),(540,540)).arc((385,814),(356,501)).assemble().push([(421,653)]).rect(640,664,mode='s').finalize().extrude(820)).union(w1.sketch().arc((325,411),(461,395),(586,450)).arc((500,651),(606,835)).arc((485,906),(344,905)).arc((495,650),(326,410)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/498/498.stl b/test/extrude/498/498.stl
index 3c69e953260c352842d1766ed737142912da044b..91ce6d691b93f05fd74e1a3ff430fd44727fa0dc 100644
Binary files a/test/extrude/498/498.stl and b/test/extrude/498/498.stl differ
diff --git a/test/extrude/499/499.py b/test/extrude/499/499.py
index c84433a848be29d886956e666c6de5533a240793..43dc1ec49fa7ccf20c36cdad3cc7a60f1518b210 100644
--- a/test/extrude/499/499.py
+++ b/test/extrude/499/499.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(527,527,727))
-r=w0.sketch().segment((1,464),(474,85)).segment((495,106)).segment((22,485)).close().assemble().push([(1000,916)]).circle(579).finalize().extrude(117)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,16,502))
+r=w0.sketch().segment((72,120),(640,1)).segment((765,595)).segment((931,596)).arc((860,796),(930,1000)).segment((735,1000)).segment((734,681)).segment((211,790)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/499/499.stl b/test/extrude/499/499.stl
index ef0444344e7f649ff28a1a2a89bb9392da170e10..caee1084393adc613bbf8e7adcb270b7f4f0ec7d 100644
Binary files a/test/extrude/499/499.stl and b/test/extrude/499/499.stl differ
diff --git a/test/extrude/5/5.py b/test/extrude/5/5.py
index 48c100a8b75c427329089aa72bfb61190093953b..f230e635ca7dc4d0005d0e791a882f8601d01534 100644
--- a/test/extrude/5/5.py
+++ b/test/extrude/5/5.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(560,560,760))
-r=w0.sketch().arc((534,814),(560,321),(614,814)).segment((614,920)).segment((534,920)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(1000,347)]).circle(787).push([(800,361)]).circle(574,mode='s').finalize().extrude(441)).union(w0.sketch().push([(41,720)]).circle(707).push([(574,800)]).circle(760).circle(720,mode='s').finalize().extrude(707)).translate((107,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(67,13,62))
+r=w0.sketch().segment((72,157),(574,157)).segment((574,535)).segment((72,535)).close().assemble().finalize().extrude(201).union(w0.sketch().segment((185,434),(269,434)).segment((269,684)).segment((185,684)).close().assemble().finalize().extrude(145)).union(w0.workplane(offset=46).sketch().segment((726,334),(688,334)).segment((688,85)).segment((726,84)).close().assemble().finalize().extrude(52))
diff --git a/test/extrude/5/5.stl b/test/extrude/5/5.stl
index be8935f9cab76320c16c0d052436d50186fb80d5..9b76a833bd2ab041f40409eea953aa40a6fad868 100644
--- a/test/extrude/5/5.stl
+++ b/test/extrude/5/5.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:485e8ba59ccf2ed36aef31f2ad2ab597445d34b81359d414936bce437fc6aeeb
-size 131084
+oid sha256:28c51473526d9d69880380f1c3263966ca9b25e13f3cd60b235b140c99456005
+size 2084
diff --git a/test/extrude/50/50.py b/test/extrude/50/50.py
index bd44c04257fd7819ebe8e9ea50cae7404184b60e..6bef2a0759b77f087cd7241ed96a5cc0f0dca369 100644
--- a/test/extrude/50/50.py
+++ b/test/extrude/50/50.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(641,957,641))
-r=w0.sketch().segment((296,720),(439,648)).arc((461,540),(533,468)).segment((511,303)).segment((669,281)).segment((691,447)).arc((727,461),(763,483)).segment((907,403)).segment((986,562)).segment((907,598)).arc((950,763),(849,899)).segment((849,856)).segment((892,842)).segment((849,720)).segment((849,648)).arc((677,533),(842,662)).arc((813,748),(748,813)).segment((770,978)).segment((612,1000)).segment((590,856)).arc((583,842),(576,835)).arc((547,820),(518,799)).segment((375,878)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(66,67,57))
+r=w0.sketch().segment((476,926),(788,926)).segment((788,356)).segment((476,356)).close().assemble().push([(627,627)]).rect(122,132,mode='s').finalize().extrude(139).union(w0.workplane(offset=143).sketch().segment((435,505),(66,505)).segment((66,874)).segment((435,873)).close().assemble().finalize().extrude(93)).translate((1,170,1))
diff --git a/test/extrude/50/50.stl b/test/extrude/50/50.stl
index 63f1343032967b391d7016684f227545a8161f8f..492b963766a47e906ff74e5414f86f5ef1778951 100644
Binary files a/test/extrude/50/50.stl and b/test/extrude/50/50.stl differ
diff --git a/test/extrude/500/500.py b/test/extrude/500/500.py
index 81e058a41a3c493fc94fa8face73811ec184088b..9bc9ec5d093216d75751ff3105e9268dffa1536d 100644
--- a/test/extrude/500/500.py
+++ b/test/extrude/500/500.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(606,671,606))
-r=w0.sketch().push([(1,224)]).circle(658).push([(1000,777)]).circle(869).finalize().extrude(474).union(w0.sketch().push([(435,777)]).circle(816).push([(487,632)]).circle(619,mode='s').push([(593,737)]).circle(658,mode='s').finalize().extrude(487)).translate((1,1,52))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(324,260,324))
+w1=cq.Workplane('XY',origin=(324,324,270))
+r=w0.workplane(offset=422).moveTo(291,12).cylinder(520,335).union(w0.sketch().segment((157,130),(311,130)).segment((311,366)).arc((347,633),(166,433)).segment((157,433)).close().assemble().finalize().extrude(543)).union(w1.sketch().push([(282,244)]).circle(398).push([(270,196)]).circle(337,mode='s').finalize().extrude(558))
\ No newline at end of file
diff --git a/test/extrude/500/500.stl b/test/extrude/500/500.stl
index 4e70c2307cf2a6a651df26cf8717102392b77d92..ad4e72a2d87dca174d6bd53c1a053805999c7392 100644
Binary files a/test/extrude/500/500.stl and b/test/extrude/500/500.stl differ
diff --git a/test/extrude/501/501.py b/test/extrude/501/501.py
index 5d98c36a6338e225be71e2cdcc0b68fb41b226da..51442d45d09f4a18c442215684f70e3dc5d6d56a 100644
--- a/test/extrude/501/501.py
+++ b/test/extrude/501/501.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(516,279,516))
-r=w0.sketch().push([(593,928)]).rect(547,722).push([(598,974)]).rect(537,526,mode='s').finalize().extrude(567).union(w0.sketch().arc((423,1),(588,135),(537,341)).segment((516,279)).arc((526,166),(444,73)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,596,499))
+r=w0.sketch().segment((2,406),(819,106)).segment((999,596)).segment((181,895)).close().assemble().finalize().extrude(310)
\ No newline at end of file
diff --git a/test/extrude/501/501.stl b/test/extrude/501/501.stl
index f3342895d22f56a411979fac0b9d26b5060aba80..d31420c0fc4c96f7304da08da4bdeec7092e12b5 100644
Binary files a/test/extrude/501/501.stl and b/test/extrude/501/501.stl differ
diff --git a/test/extrude/502/502.py b/test/extrude/502/502.py
index 8eca71c51e0ff26ca6a8bb23102d3f820d7f4523..1d063ad8cc41a412dcfe562920d132e5bd9056d2 100644
--- a/test/extrude/502/502.py
+++ b/test/extrude/502/502.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(932,624,624))
-r=w0.sketch().segment((527,414),(587,249)).segment((700,294)).segment((647,414)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((662,767),(685,760)).segment((722,992)).segment((662,1000)).close().assemble().finalize().extrude(519))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,270,500))
+r=w0.sketch().arc((924,754),(988,643),(935,754)).arc((930,749),(924,753)).assemble().push([(959,703)]).circle(519,mode='s').finalize().extrude(943).union(w0.sketch().arc((147,615),(104,265),(350,523)).arc((191,435),(145,614)).assemble().finalize().extrude(963))
\ No newline at end of file
diff --git a/test/extrude/502/502.stl b/test/extrude/502/502.stl
index 645af5177af167c6fafa24f5271a456fcc5f254d..f4019d69b5316e9d5063b113ff572294341d3da6 100644
Binary files a/test/extrude/502/502.stl and b/test/extrude/502/502.stl differ
diff --git a/test/extrude/503/503.py b/test/extrude/503/503.py
index 88e56a455400affa46618b19491cad5322e5ac15..99434d1f6d8d12a8fc9066354b97599ef81513ab 100644
--- a/test/extrude/503/503.py
+++ b/test/extrude/503/503.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).cylinder(1000,520).translate((187,187,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,755,501))
+w1=cq.Workplane('ZX',origin=(501,764,500))
+r=w0.workplane(offset=397).moveTo(500,660).cylinder(709,840).union(w1.workplane(offset=236).moveTo(207,228).box(571,955,1000))
\ No newline at end of file
diff --git a/test/extrude/503/503.stl b/test/extrude/503/503.stl
index d1a2de4197fd508883510893f11e8ff5618be0a6..9ea042b185b3d85a65cb1d49b2c28fea7f09be5c 100644
Binary files a/test/extrude/503/503.stl and b/test/extrude/503/503.stl differ
diff --git a/test/extrude/504/504.py b/test/extrude/504/504.py
index 3b9d06f4e14d6ba850a463995fa552655fd5de0c..164cd31da9a31d54629ed58fc6b6053fb14b9ca3 100644
--- a/test/extrude/504/504.py
+++ b/test/extrude/504/504.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(619,619,855))
-r=w0.sketch().segment((451,382),(977,382)).segment((977,908)).segment((695,908)).segment((695,1000)).segment((474,1000)).segment((474,908)).segment((451,908)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((260,260),(398,260)).segment((398,237)).segment((489,237)).segment((489,260)).segment((779,260)).segment((779,459)).segment((489,459)).segment((489,878)).segment((398,878)).segment((398,459)).segment((260,459)).close().assemble().push([(714,645)]).rect(855,931).push([(710,653)]).rect(695,657,mode='s').finalize().extrude(764))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(567,502,500))
+r=w0.sketch().segment((532,787),(545,801)).arc((542,806),(532,811)).close().assemble().finalize().extrude(67).union(w0.sketch().segment((1,561),(7,562)).arc((57,602),(107,562)).segment((222,560)).arc((266,631),(326,687)).arc((501,385),(847,435)).arc((742,175),(471,92)).arc((907,116),(927,551)).arc((771,957),(362,812)).segment((1,812)).close().assemble().finalize().extrude(811))
\ No newline at end of file
diff --git a/test/extrude/504/504.stl b/test/extrude/504/504.stl
index c3498ac4027867cceecfbc8c3ffc0784818ce55a..f05b43907bf05d6b1d683be19c8dc07ad6f0ae54 100644
Binary files a/test/extrude/504/504.stl and b/test/extrude/504/504.stl differ
diff --git a/test/extrude/505/505.py b/test/extrude/505/505.py
index 29b40fa7a537aaa90a868a62a34c2bafad944148..29fe2102d4216bb81f909dd117bcc408816de488 100644
--- a/test/extrude/505/505.py
+++ b/test/extrude/505/505.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((600,394),(640,434)).segment((700,367)).segment((674,334)).arc((574,987),(660,334)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(515,501,500))
+w1=cq.Workplane('ZX',origin=(500,456,501))
+r=w0.sketch().push([(690,836)]).circle(601).push([(689,837)]).rect(561,635,mode='s').finalize().extrude(62).union(w0.sketch().segment((810,945),(960,945)).arc((885,1000),(809,945)).assemble().finalize().extrude(819)).union(w0.sketch().segment((40,216),(485,216)).segment((487,250)).segment((851,251)).segment((851,325)).segment((829,325)).segment((829,470)).arc((831,840),(486,714)).segment((481,717)).segment((482,711)).arc((477,679),(475,651)).segment((42,651)).close().assemble().finalize().extrude(850)).union(w1.sketch().arc((1,849),(125,894),(240,819)).arc((132,925),(2,850)).assemble().finalize().extrude(831))
\ No newline at end of file
diff --git a/test/extrude/505/505.stl b/test/extrude/505/505.stl
index 128d6bacb5edb24dc8e70e856d9e9582030ef4fd..d87c4f5ddd71ebdc53a4cca617d29160056b1b99 100644
Binary files a/test/extrude/505/505.stl and b/test/extrude/505/505.stl differ
diff --git a/test/extrude/506/506.py b/test/extrude/506/506.py
index 8cba089210b9cdeb81fb3ed81a19ae8cb44bf567..509483d5aa508bd96211e7a0788bec65cecd3180 100644
--- a/test/extrude/506/506.py
+++ b/test/extrude/506/506.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,254,254))
-r=w0.workplane(offset=508).box(478,1000,761).translate((1,1,247))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,501,499))
+r=w0.sketch().arc((340,821),(272,570),(472,401)).segment((471,147)).segment((531,145)).segment((532,399)).arc((739,594),(611,855)).arc((485,755),(341,820)).assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/506/506.stl b/test/extrude/506/506.stl
index 4c15b968b299593d233cd3cce272e23ea8347c29..fca8119d15ab1e490cc492a9e48e5c43415ba7e9 100644
Binary files a/test/extrude/506/506.stl and b/test/extrude/506/506.stl differ
diff --git a/test/extrude/507/507.py b/test/extrude/507/507.py
index 31535e74cddddf123b85bbf63da527c47fbbd678..d437d53d42bd9c7623a8dfd3fff855dc7194866c 100644
--- a/test/extrude/507/507.py
+++ b/test/extrude/507/507.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(664,1000,664))
-r=w0.sketch().arc((486,891),(308,288),(822,664)).segment((654,664)).segment((654,852)).arc((614,871),(585,881)).segment((585,960)).segment((486,960)).close().assemble().push([(1000,941)]).circle(703).finalize().extrude(1).union(w0.sketch().push([(1000,941)]).circle(822).rect(683,782,mode='s').finalize().extrude(288))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,1))
+r=w0.sketch().segment((185,525),(201,525)).arc((515,71),(785,559)).segment((786,930)).segment((442,930)).segment((715,861)).segment((670,676)).arc((456,721),(260,621)).segment((341,931)).segment((186,931)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/507/507.stl b/test/extrude/507/507.stl
index 9a9f4e16db312d1232b7cd689a8bee17026a895a..fb01a89378601315f626f99061b57a6c29feff94 100644
Binary files a/test/extrude/507/507.stl and b/test/extrude/507/507.stl differ
diff --git a/test/extrude/508/508.py b/test/extrude/508/508.py
index b87b5789036b8e291f3a9b4f99d17f285879fa48..a29b74d9ea1f6bbf7d287466c724fb1b3b1f2bc0 100644
--- a/test/extrude/508/508.py
+++ b/test/extrude/508/508.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(607,562,562))
-r=w0.sketch().arc((674,416),(731,461),(787,472)).arc((944,585),(921,394)).arc((955,338),(944,270)).arc((1000,697),(674,416)).assemble().finalize().extrude(360).union(w0.sketch().segment((1,484),(91,484)).arc((136,472),(192,484)).arc((293,472),(394,506)).segment((68,506)).segment((68,854)).segment((1,854)).close().assemble().finalize().extrude(686))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,390))
+w1=cq.Workplane('ZX',origin=(501,1,501))
+r=w0.sketch().segment((91,929),(146,931)).segment((147,989)).arc((76,866),(137,996)).segment((90,995)).close().assemble().finalize().extrude(337).union(w1.workplane(offset=838).moveTo(699,835).box(650,759,1000))
\ No newline at end of file
diff --git a/test/extrude/508/508.stl b/test/extrude/508/508.stl
index 2a04549f892dd44f34e9f6322f6a494e5c5b744c..3d47beca66b603109f5ef4b99f1da930b795b8ec 100644
Binary files a/test/extrude/508/508.stl and b/test/extrude/508/508.stl differ
diff --git a/test/extrude/509/509.py b/test/extrude/509/509.py
index b1a7d28a2d6b6778baa4ffc8a55abb7f2dfafbab..000672e370858b600479e83e52bb242281f86fca 100644
--- a/test/extrude/509/509.py
+++ b/test/extrude/509/509.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,600,500))
-r=w0.sketch().segment((101,261),(471,1)).segment((830,510)).segment((451,770)).close().assemble().reset().face(w0.sketch().segment((111,950),(181,870)).segment((181,860)).segment((191,860)).segment((231,820)).segment((281,860)).segment((471,860)).segment((471,1000)).close().assemble()).finalize().extrude(31).union(w0.sketch().segment((810,590),(900,590)).arc((850,620),(810,670)).close().assemble().finalize().extrude(770))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,724))
+r=w0.sketch().push([(336,231)]).circle(695).reset().face(w0.sketch().segment((390,724),(582,726)).segment((582,560)).segment((595,559)).segment((595,1000)).segment((391,1000)).close().assemble()).push([(492,781)]).circle(531,mode='s').finalize().extrude(46).union(w0.workplane(offset=496).moveTo(850,10).cylinder(511,510))
\ No newline at end of file
diff --git a/test/extrude/509/509.stl b/test/extrude/509/509.stl
index 1456d6f6200619a7b203efc73d9ea1b3697451d5..438f234854562d9bb275b1f34aa1637f99abc0aa 100644
Binary files a/test/extrude/509/509.stl and b/test/extrude/509/509.stl differ
diff --git a/test/extrude/51/51.py b/test/extrude/51/51.py
index fab85d4dff3197aed0dac33e6ae229257cabeebc..8f633776246cecb097de8f6a6afb1f0d0f0cb552 100644
--- a/test/extrude/51/51.py
+++ b/test/extrude/51/51.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,500))
-r=w0.sketch().segment((71,201),(391,201)).segment((391,471)).segment((421,471)).segment((421,1)).segment((930,1)).segment((930,520)).segment((451,520)).segment((451,1000)).segment((241,1000)).segment((241,510)).segment((71,510)).close().assemble().push([(346,735)]).rect(570,890,mode='s').finalize().extrude(351).union(w0.workplane(offset=580).moveTo(670,261).cylinder(660,600))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(49,75,48))
+r=w0.sketch().segment((235,6),(847,6)).segment((847,700)).segment((235,700)).close().assemble().push([(504,360)]).circle(71,mode='s').finalize().extrude(146).union(w0.workplane(offset=271).sketch().segment((309,729),(847,729)).segment((847,783)).segment((309,783)).close().assemble().finalize().extrude(54))
diff --git a/test/extrude/51/51.stl b/test/extrude/51/51.stl
index 3322a5ffdbbaa8f303d36196f116379c01f8ef8e..464948dc5ccb887a7cde0869be7018b8ef27209e 100644
Binary files a/test/extrude/51/51.stl and b/test/extrude/51/51.stl differ
diff --git a/test/extrude/510/510.py b/test/extrude/510/510.py
index 2db89831a019eb182377d4713a6457c5d6c1420b..5fa6fecf8eed19497e67e1f849f4bdb0264a9ca2 100644
--- a/test/extrude/510/510.py
+++ b/test/extrude/510/510.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(457,500,457))
-w1=cq.Workplane('YZ',origin=(620,457,457))
-r=w0.sketch().segment((370,196),(805,196)).segment((805,696)).segment((522,696)).arc((207,696),(370,403)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=343).moveTo(587,164).cylinder(685,707)).union(w0.sketch().arc((609,978),(620,989),(609,1000)).close().assemble().finalize().extrude(511)).union(w1.sketch().push([(805,142)]).circle(522).reset().face(w1.sketch().segment((805,88),(815,88)).segment((815,120)).arc((826,142),(815,164)).segment((815,196)).segment((805,196)).segment((805,164)).arc((794,142),(805,120)).close().assemble(),mode='s').finalize().extrude(120)).translate((88,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(610,500,501))
+r=w0.sketch().segment((82,217),(241,217)).arc((205,255),(182,301)).segment((136,301)).segment((135,430)).segment((181,431)).arc((365,565),(556,430)).segment((596,431)).segment((596,300)).segment((555,300)).arc((531,255),(497,216)).segment((656,216)).segment((655,285)).segment((921,286)).segment((921,1000)).segment((710,1000)).arc((649,795),(460,690)).segment((460,726)).segment((292,729)).segment((292,720)).arc((225,769),(177,834)).segment((177,515)).segment((81,515)).close().assemble().reset().face(w0.sketch().segment((270,5),(445,1)).segment((451,186)).arc((361,171),(276,192)).close().assemble()).finalize().extrude(275)
\ No newline at end of file
diff --git a/test/extrude/510/510.stl b/test/extrude/510/510.stl
index 59cc92ade275d3b14610d31e014216e66f8e1286..9e249d44e77bacf0267da267734f718b9baef1aa 100644
Binary files a/test/extrude/510/510.stl and b/test/extrude/510/510.stl differ
diff --git a/test/extrude/511/511.py b/test/extrude/511/511.py
index d9be59408e0244e53457dfd19d32af5aa865ead3..2fce09d7e9bda158775d4120c99ec28979f8b0ad 100644
--- a/test/extrude/511/511.py
+++ b/test/extrude/511/511.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(552,552,565))
-w1=cq.Workplane('XY',origin=(552,552,539))
-r=w0.sketch().push([(552,1)]).circle(641).rect(680,577,mode='s').finalize().extrude(232).union(w1.sketch().push([(539,1000)]).rect(654,936).rect(603,603,mode='s').finalize().extrude(872)).translate((1,89,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,627))
+w1=cq.Workplane('ZX',origin=(500,277,501))
+r=w0.sketch().segment((170,576),(579,577)).segment((580,786)).arc((297,714),(230,1000)).segment((170,1000)).close().assemble().finalize().extrude(131).union(w1.workplane(offset=363).moveTo(521,798).box(941,564,775))
\ No newline at end of file
diff --git a/test/extrude/511/511.stl b/test/extrude/511/511.stl
index e7ce8bb6817633c27e033798173938ce3abd98f2..6dc1c7b1322d725f3fb05922b9bf4a54e7d76f20 100644
Binary files a/test/extrude/511/511.stl and b/test/extrude/511/511.stl differ
diff --git a/test/extrude/512/512.py b/test/extrude/512/512.py
index ff03ce51a4e4a8f6911b20643c6c8b7d8345da4d..ae44f741d41081a040dd41b1f73382dfb9208153 100644
--- a/test/extrude/512/512.py
+++ b/test/extrude/512/512.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(376,199,376))
-r=w0.workplane(offset=417).moveTo(194,584).box(573,1000,459).union(w0.workplane(offset=553).moveTo(511,1).cylinder(729,521)).translate((145,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,170))
+r=w0.sketch().segment((1,356),(795,356)).arc((830,26),(871,355)).segment((979,357)).segment((980,976)).segment((1,975)).close().assemble().push([(125,741)]).circle(561,mode='s').push([(906,297)]).circle(536,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/512/512.stl b/test/extrude/512/512.stl
index 5a18192edd99a861576e320386facb6383ef0a29..adf26d134553cdd8a000c88b375b2ca3b3d9f4bd 100644
Binary files a/test/extrude/512/512.stl and b/test/extrude/512/512.stl differ
diff --git a/test/extrude/513/513.py b/test/extrude/513/513.py
index a949beb14e056a0ced9acd414241cd4f30676d40..87f810cf06073ef8cbeb207e5697b5ce4e39e9ff 100644
--- a/test/extrude/513/513.py
+++ b/test/extrude/513/513.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(414,414,133))
-r=w0.sketch().segment((224,18),(447,18)).arc((521,1),(604,18)).segment((818,18)).segment((818,645)).segment((224,645)).close().assemble().finalize().extrude(389).union(w0.sketch().segment((9,744),(447,686)).segment((455,769)).segment((18,827)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(276,501,501))
+r=w0.workplane(offset=581).moveTo(41,270).cylinder(660,541).union(w0.workplane(offset=727).moveTo(730,608).box(1000,824,956))
\ No newline at end of file
diff --git a/test/extrude/513/513.stl b/test/extrude/513/513.stl
index 9d987463ecdf73a6daddaba9579705844eb3230d..f53777ee8e8b3c813da9381c792ef58bb877acce 100644
Binary files a/test/extrude/513/513.stl and b/test/extrude/513/513.stl differ
diff --git a/test/extrude/514/514.py b/test/extrude/514/514.py
index 99254a537e9beca29bdb2523c7c3663dfd2d6151..53ebd3fd642fc64bdbb5d766e70d91f5f1caebbd 100644
--- a/test/extrude/514/514.py
+++ b/test/extrude/514/514.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(477,477,524))
-r=w0.sketch().segment((315,125),(391,125)).arc((496,1),(600,125)).segment((638,125)).segment((638,258)).segment((315,258)).close().assemble().reset().face(w0.sketch().segment((486,115),(496,125)).segment((486,125)).close().assemble(),mode='s').push([(434,691)]).rect(486,1000).finalize().extrude(372)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(152,501,500))
+r=w0.sketch().segment((485,1),(620,1)).segment((621,1000)).segment((484,999)).segment((485,595)).arc((380,485),(485,376)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/514/514.stl b/test/extrude/514/514.stl
index daa3e665f3b10271215cc2005b91898aea01fb90..c12f791172152f66f1cbdb69fc33ca7cef8c6afd 100644
Binary files a/test/extrude/514/514.stl and b/test/extrude/514/514.stl differ
diff --git a/test/extrude/515/515.py b/test/extrude/515/515.py
index a4cc290a00456d3e2e57585428c5a9303026385b..b773206b58d0a36b81c3885c233a96afd8fbd4e9 100644
--- a/test/extrude/515/515.py
+++ b/test/extrude/515/515.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).moveTo(351,251).box(674,754,1000).union(w0.workplane(offset=81).moveTo(201,574).cylinder(840,387))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,360,502))
+w1=cq.Workplane('ZX',origin=(500,315,500))
+r=w0.sketch().segment((444,86),(470,87)).segment((470,1)).segment((591,2)).segment((590,86)).segment((675,85)).segment((675,436)).segment((590,436)).segment((591,597)).segment((469,597)).segment((470,436)).segment((446,435)).close().assemble().finalize().extrude(316).union(w0.sketch().push([(231,841)]).rect(619,819).push([(245,969)]).rect(551,530,mode='s').finalize().extrude(971)).union(w1.workplane(offset=506).moveTo(555,361).cylinder(511,774))
\ No newline at end of file
diff --git a/test/extrude/515/515.stl b/test/extrude/515/515.stl
index a30187d73c4ef8ece11e686d46d729db4c9bac65..b64f9a19c21e24f9e605d2da6ab6bd7b47e6f8a9 100644
Binary files a/test/extrude/515/515.stl and b/test/extrude/515/515.stl differ
diff --git a/test/extrude/516/516.py b/test/extrude/516/516.py
index e996eeb19f8a37c28632a75af7d094a91aa790d5..82264348b274cd011f8d880bc410dd15944ad820 100644
--- a/test/extrude/516/516.py
+++ b/test/extrude/516/516.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().segment((367,600),(427,474)).segment((967,734)).segment((907,860)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,465,501))
+r=w0.sketch().segment((1,285),(811,50)).segment((1000,714)).segment((681,810)).arc((536,625),(505,860)).segment((190,949)).close().assemble().finalize().extrude(570)
\ No newline at end of file
diff --git a/test/extrude/516/516.stl b/test/extrude/516/516.stl
index ebac266fb102a48faf58b664c84bbdcd9ab1d0c0..7fb3b8c673908f67e305fce986344dc39d5e6a7a 100644
Binary files a/test/extrude/516/516.stl and b/test/extrude/516/516.stl differ
diff --git a/test/extrude/517/517.py b/test/extrude/517/517.py
index 4e10fa372a7bf7869d00c689b2a306188a915a97..2668c5115793b191b8136129e620217166fe9c2e 100644
--- a/test/extrude/517/517.py
+++ b/test/extrude/517/517.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(284,444,444))
-w1=cq.Workplane('ZX',origin=(444,331,444))
-r=w0.workplane(offset=312).moveTo(694,826).box(736,623,708).union(w0.sketch().arc((105,274),(171,1),(435,76)).arc((576,246),(500,453)).arc((482,463),(472,482)).arc((218,482),(105,274)).assemble().finalize().extrude(1000)).union(w1.sketch().segment((491,321),(793,321)).segment((793,868)).segment((491,868)).segment((491,746)).segment((774,746)).segment((774,519)).segment((491,519)).close().assemble().finalize().extrude(161))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(335,501,500))
+r=w0.sketch().push([(198,293)]).rect(895,826).reset().face(w0.sketch().segment((655,535),(966,486)).segment((999,710)).segment((690,761)).close().assemble()).finalize().extrude(456).union(w0.sketch().segment((70,674),(275,675)).segment((275,729)).arc((227,859),(102,800)).segment((72,799)).close().assemble().finalize().extrude(875))
\ No newline at end of file
diff --git a/test/extrude/517/517.stl b/test/extrude/517/517.stl
index 821e599a8e78694d441a609266b4a864ad60fae1..5bb1d1565725d9b6af6ce7dbb9ef3b2b3a5a98d2 100644
Binary files a/test/extrude/517/517.stl and b/test/extrude/517/517.stl differ
diff --git a/test/extrude/518/518.py b/test/extrude/518/518.py
index 42ca3c265d0c4f2f450a625eac5293d1e0ed65fe..533ced567d2b577b49ee4c698cc28ddee03eaa9a 100644
--- a/test/extrude/518/518.py
+++ b/test/extrude/518/518.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(607,906,607))
-r=w0.sketch().segment((261,1000),(300,662)).segment((331,662)).segment((292,1000)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=567).moveTo(780,284).box(953,748,685))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(541,502,500))
+w1=cq.Workplane('XY',origin=(501,501,691))
+r=w0.workplane(offset=730).moveTo(236,352).cylinder(960,541).union(w1.workplane(offset=402).moveTo(224,653).box(945,805,695))
\ No newline at end of file
diff --git a/test/extrude/518/518.stl b/test/extrude/518/518.stl
index 270bd5ddb17cb31bde85efdd1328b6aa6e5ea11a..ee185c8e443a9cde42a42c768fb512081b815569 100644
Binary files a/test/extrude/518/518.stl and b/test/extrude/518/518.stl differ
diff --git a/test/extrude/519/519.py b/test/extrude/519/519.py
index e6a1af6779710148e920c844cdfb050e8ee4dd2a..985ba0851b51eeba23ac71d3b373360d2276280d 100644
--- a/test/extrude/519/519.py
+++ b/test/extrude/519/519.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(360,347,347))
-w1=cq.Workplane('XY',origin=(347,347,513))
-r=w0.workplane(offset=20).cylinder(1000,654).union(w0.sketch().segment((321,232),(334,193)).segment((436,232)).segment((424,270)).close().assemble().finalize().extrude(974)).union(w1.sketch().segment((283,1),(411,1)).segment((411,693)).segment((283,693)).segment((283,334)).arc((39,206),(283,65)).close().assemble().finalize().extrude(398)).translate((122,309,309))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(324,501,499))
+w1=cq.Workplane('ZX',origin=(500,669,500))
+r=w0.sketch().segment((534,435),(714,435)).segment((715,595)).segment((919,594)).segment((921,879)).segment((730,881)).segment((760,709)).segment((680,695)).segment((681,644)).segment((564,645)).segment((565,675)).segment((535,669)).close().assemble().push([(554,545)]).rect(530,590,mode='s').finalize().extrude(610).union(w0.sketch().arc((430,574),(8,319),(495,280)).arc((360,404),(429,576)).assemble().finalize().extrude(990)).union(w1.workplane(offset=666).moveTo(643,257).box(604,634,830))
\ No newline at end of file
diff --git a/test/extrude/519/519.stl b/test/extrude/519/519.stl
index 265226d31229c8bb54202f28a1cd890788e89fa6..8daf794dde5e288bdd72799ba4448cd0356ea0fb 100644
Binary files a/test/extrude/519/519.stl and b/test/extrude/519/519.stl differ
diff --git a/test/extrude/52/52.py b/test/extrude/52/52.py
index 147340d8a68c4ecd93e60d5129c62f25e080d54d..24a98d00bf1a2a31f941f3eb4554d794d41abe58 100644
--- a/test/extrude/52/52.py
+++ b/test/extrude/52/52.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(562,472,562))
-w1=cq.Workplane('XY',origin=(562,562,686))
-r=w0.sketch().push([(663,933)]).circle(630).push([(624,916)]).rect(573,573,mode='s').push([(674,899)]).circle(573,mode='s').finalize().extrude(315).union(w0.sketch().arc((1,630),(282,461),(270,124)).arc((495,573),(1,630)).assemble().finalize().extrude(1000)).union(w1.sketch().arc((742,484),(832,450),(921,472)).arc((899,472),(877,484)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(44,36,68))
+r=w0.sketch().segment((45,754),(676,754)).segment((676,122)).segment((45,122)).segment((45,753)).close().assemble().push([(413,534)]).rect(78,54,mode='s').push([(385,295)]).rect(70,89,mode='s').finalize().extrude(181)
diff --git a/test/extrude/52/52.stl b/test/extrude/52/52.stl
index ce8c474822ddae49e47f0a1ae9370595abb6e0e9..721dfa12a37f6721d7393048bce252611efd7111 100644
Binary files a/test/extrude/52/52.stl and b/test/extrude/52/52.stl differ
diff --git a/test/extrude/520/520.py b/test/extrude/520/520.py
index 6b8e9d44b8b66128738da64781bd2c975e123e72..d374a8fe908e318047a17eee8cb79e062093a6ae 100644
--- a/test/extrude/520/520.py
+++ b/test/extrude/520/520.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(459,459,612))
-w1=cq.Workplane('YZ',origin=(542,459,459))
-r=w0.sketch().push([(265,1)]).circle(695).reset().face(w0.sketch().arc((431,237),(514,306),(598,251)).arc((514,764),(431,237)).assemble()).finalize().extrude(292).union(w0.workplane(offset=577).moveTo(882,1000).box(473,764,695)).union(w1.sketch().arc((334,348),(348,320),(348,278)).arc((431,70),(570,251)).segment((653,251)).segment((653,764)).segment((334,764)).close().assemble().finalize().extrude(750)).translate((1,236,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(330,501,501))
+r=w0.workplane(offset=586).moveTo(921,916).cylinder(670,581).union(w0.sketch().segment((2,316),(20,146)).segment((45,151)).arc((300,6),(532,192)).segment((241,190)).segment((242,232)).segment((551,231)).segment((537,382)).segment((509,381)).arc((245,525),(20,315)).close().assemble().finalize().extrude(846))
\ No newline at end of file
diff --git a/test/extrude/520/520.stl b/test/extrude/520/520.stl
index 43cae0a6408f1569a56e4640241c789660b3081a..8a5f8cc216f026d1f6a58fc8cc67961a2574a832 100644
Binary files a/test/extrude/520/520.stl and b/test/extrude/520/520.stl differ
diff --git a/test/extrude/521/521.py b/test/extrude/521/521.py
index 665b43ed4f818d4a7407d237f1cd26d91101ce35..4415d1030916b2c3e1bfe3b1d1e0045f0e73a378 100644
--- a/test/extrude/521/521.py
+++ b/test/extrude/521/521.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(559,532,559))
-w1=cq.Workplane('YZ',origin=(667,559,559))
-r=w0.workplane(offset=726).moveTo(856,1000).cylinder(892,568).union(w1.sketch().segment((262,307),(424,307)).segment((424,253)).segment((577,253)).segment((577,307)).segment((739,307)).segment((739,343)).segment((577,343)).segment((577,397)).segment((424,397)).segment((424,343)).segment((262,343)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(602,500,502))
+r=w0.sketch().segment((91,226),(461,80)).segment((516,36)).segment((531,51)).segment((661,1)).segment((819,395)).segment((891,486)).segment((864,509)).segment((910,630)).segment((671,730)).segment((709,750)).segment((579,980)).segment((501,934)).segment((595,755)).segment((541,781)).segment((485,825)).segment((471,805)).segment((430,820)).segment((430,591)).segment((231,591)).segment((181,461)).segment((112,376)).segment((135,350)).close().assemble().push([(301,916)]).circle(586).circle(515,mode='s').finalize().extrude(296)
\ No newline at end of file
diff --git a/test/extrude/521/521.stl b/test/extrude/521/521.stl
index 5ec5bfeed934041f9f6d199832ef3456865c123e..201d9efbd6f5aff8ef6ea5c0eba9d18cc3c1c4a2 100644
Binary files a/test/extrude/521/521.stl and b/test/extrude/521/521.stl differ
diff --git a/test/extrude/522/522.py b/test/extrude/522/522.py
index 9c935f1741db186fde287293c955d7c96cb44513..01541c9bccc8529605544c78e3ea89a452d12c00 100644
--- a/test/extrude/522/522.py
+++ b/test/extrude/522/522.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,445))
-w1=cq.Workplane('XY',origin=(495,495,556))
-r=w0.sketch().segment((667,384),(717,384)).arc((758,334),(808,304)).segment((808,536)).arc((758,506),(717,455)).segment((667,455)).close().assemble().reset().face(w0.sketch().arc((859,304),(909,334),(950,384)).segment((1000,384)).segment((1000,455)).segment((950,455)).arc((909,506),(859,536)).close().assemble()).finalize().extrude(778).union(w0.sketch().arc((41,647),(122,677),(213,677)).segment((314,657)).arc((334,849),(183,950)).segment((183,960)).segment((162,960)).segment((162,950)).arc((1,839),(41,647)).assemble().finalize().extrude(818)).union(w1.sketch().push([(253,273)]).circle(738).circle(647,mode='s').finalize().extrude(162))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(631,502,501))
+w1=cq.Workplane('YZ',origin=(721,501,500))
+r=w0.sketch().segment((141,431),(431,1)).segment((547,80)).segment((255,509)).close().assemble().reset().face(w0.sketch().segment((260,356),(307,266)).arc((305,242),(331,222)).segment((376,132)).segment((425,160)).segment((380,247)).arc((376,277),(355,296)).segment((312,381)).close().assemble(),mode='s').finalize().extrude(1).union(w1.workplane(offset=578).moveTo(577,851).box(1000,801,656))
\ No newline at end of file
diff --git a/test/extrude/522/522.stl b/test/extrude/522/522.stl
index 1867a3dc0e64438ef8ea7a70fa8bffe5c0f76e1b..01d5cb2583394aa4dab0cfdf5668a01cd8cab4c7 100644
Binary files a/test/extrude/522/522.stl and b/test/extrude/522/522.stl differ
diff --git a/test/extrude/523/523.py b/test/extrude/523/523.py
index 402a4686e9fe89e484ef28f9315b4c0e0a21e64d..e4a8dc7476e4b8e19c8827c8acc50b59aa27fce4 100644
--- a/test/extrude/523/523.py
+++ b/test/extrude/523/523.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(457,685,457))
-r=w0.sketch().push([(739,12)]).circle(555).circle(533,mode='s').finalize().extrude(1).union(w0.sketch().segment((77,707),(88,729)).arc((88,653),(99,587)).segment((88,598)).arc((175,457),(327,392)).segment((316,403)).arc((381,392),(446,403)).segment((435,392)).arc((609,490),(685,674)).segment((674,663)).arc((674,729),(653,794)).segment((674,783)).arc((577,924),(435,1000)).segment((457,989)).arc((381,1000),(316,989)).segment((327,1000)).arc((153,902),(77,707)).assemble().finalize().extrude(55)).translate((87,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(421,501,501))
+w1=cq.Workplane('ZX',origin=(501,23,502))
+r=w0.sketch().arc((2,567),(266,312),(447,630)).segment((448,567)).close().assemble().finalize().extrude(1000).union(w1.sketch().arc((222,162),(766,326),(402,760)).arc((421,612),(392,465)).segment((392,162)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/523/523.stl b/test/extrude/523/523.stl
index e29489b63f42947fba76c706b9a449fd0e800160..805b2a1d4ba8b05e0be243cbe8feec75149184d5 100644
Binary files a/test/extrude/523/523.stl and b/test/extrude/523/523.stl differ
diff --git a/test/extrude/524/524.py b/test/extrude/524/524.py
index a795bbc807a90cf0dc3baa99ef6421ef3ece2cde..9fa751809801e26369f395f5836f33fa22bdd710 100644
--- a/test/extrude/524/524.py
+++ b/test/extrude/524/524.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(591,591,885))
-w1=cq.Workplane('XY',origin=(591,591,656))
-r=w0.sketch().segment((615,238),(902,238)).segment((902,378)).segment((959,304)).segment((1000,337)).segment((943,419)).arc((779,353),(615,394)).close().assemble().finalize().extrude(1).union(w1.sketch().segment((181,672),(460,672)).segment((460,238)).segment((779,238)).segment((779,672)).segment((869,672)).segment((869,754)).segment((779,754)).segment((779,943)).segment((460,943)).segment((460,754)).segment((181,754)).close().assemble().finalize().extrude(329))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,647,501))
+r=w0.sketch().arc((17,580),(81,355),(317,381)).arc((960,541),(301,451)).arc((131,456),(16,581)).assemble().finalize().extrude(60).union(w0.workplane(offset=575).moveTo(896,739).cylinder(650,606))
\ No newline at end of file
diff --git a/test/extrude/524/524.stl b/test/extrude/524/524.stl
index 08aaf693b0dc259ac773402f0bb843730a36013f..30822762f239fdcec6c11afe24b121cf2a4cc859 100644
Binary files a/test/extrude/524/524.stl and b/test/extrude/524/524.stl differ
diff --git a/test/extrude/525/525.py b/test/extrude/525/525.py
index a93716bdc4f2c6af45977ad15a6f729d9382d866..180b9d4ac39af40fdbf150ce2aa123597f31cca5 100644
--- a/test/extrude/525/525.py
+++ b/test/extrude/525/525.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(562,562,349))
-r=w0.workplane(offset=725).moveTo(978,966).cylinder(888,708).union(w0.sketch().segment((1,192),(371,192)).arc((877,203),(472,495)).segment((472,674)).segment((1,674)).close().assemble().reset().face(w0.sketch().segment((35,394),(214,225)).segment((428,472)).segment((259,630)).close().assemble(),mode='s').push([(624,276)]).rect(820,708,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,581,500))
+w1=cq.Workplane('YZ',origin=(424,500,501))
+r=w0.sketch().arc((350,666),(290,481),(446,366)).arc((371,485),(386,626)).arc((367,646),(351,664)).assemble().push([(516,796)]).circle(706).push([(514,798)]).rect(580,855,mode='s').finalize().extrude(80).union(w1.sketch().segment((435,361),(650,360)).segment((650,320)).segment((841,320)).segment((839,366)).segment((559,367)).segment((561,536)).segment((436,535)).close().assemble().finalize().extrude(77))
\ No newline at end of file
diff --git a/test/extrude/525/525.stl b/test/extrude/525/525.stl
index 428adaffd04b79d897774ba46afc49720efb6b93..387f3deb64822618d87b7a12dad0ec7f6b68b3eb 100644
Binary files a/test/extrude/525/525.stl and b/test/extrude/525/525.stl differ
diff --git a/test/extrude/526/526.py b/test/extrude/526/526.py
index 69e7942042521d77c6b244d5f3d967dc3be7ecfb..96e508a9cbab378614f4bb71613c4e10aac8b73e 100644
--- a/test/extrude/526/526.py
+++ b/test/extrude/526/526.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(490,490,543))
-r=w0.sketch().push([(214,920)]).rect(1000,628).rect(596,543,mode='s').reset().face(w0.sketch().arc((766,415),(734,1),(936,373)).segment((819,309)).close().assemble()).finalize().extrude(384)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,537,499))
+r=w0.sketch().segment((936,106),(954,107)).segment((954,112)).arc((1000,165),(955,220)).segment((956,226)).segment((934,226)).segment((935,220)).arc((889,166),(936,112)).close().assemble().finalize().extrude(56).union(w0.sketch().segment((1,501),(399,502)).segment((402,895)).segment((346,894)).segment((346,645)).segment((210,646)).segment((210,896)).segment((1,895)).close().assemble().finalize().extrude(879))
\ No newline at end of file
diff --git a/test/extrude/526/526.stl b/test/extrude/526/526.stl
index a48d55a2b5b336bbf8e75a9bc7917ee84d6305f2..f211e4cd37886f683721d42cb2a7aba639ce07c0 100644
Binary files a/test/extrude/526/526.stl and b/test/extrude/526/526.stl differ
diff --git a/test/extrude/527/527.py b/test/extrude/527/527.py
index 741f3ef986da5cd347f50abb3e2b09c93b9cc105..1dcde2fa3925a53654e4f8ceec42a8771b8df8b4 100644
--- a/test/extrude/527/527.py
+++ b/test/extrude/527/527.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(762,569,569))
-r=w0.sketch().segment((444,239),(444,432)).segment((603,432)).segment((603,183)).segment((535,183)).arc((921,932),(444,239)).assemble().push([(852,699)]).rect(1000,716,mode='s').finalize().extrude(80).union(w0.sketch().segment((1,546),(285,546)).arc((273,625),(285,716)).segment((1,716)).close().assemble().finalize().extrude(671))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(704,501,501))
+w1=cq.Workplane('YZ',origin=(789,500,501))
+r=w0.sketch().segment((162,95),(600,1)).segment((686,384)).arc((801,531),(622,504)).segment((266,580)).close().assemble().finalize().extrude(472).union(w1.sketch().segment((195,181),(841,181)).segment((840,480)).segment((716,481)).segment((715,1000)).segment((515,1000)).segment((515,481)).segment((195,481)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/527/527.stl b/test/extrude/527/527.stl
index cfb6f7aef33bf7494f9fcb579a9f89ded6a3970a..ccff24310a9866cb3c3fb7eaaa0b0ca6fc08e6d7 100644
Binary files a/test/extrude/527/527.stl and b/test/extrude/527/527.stl differ
diff --git a/test/extrude/528/528.py b/test/extrude/528/528.py
index e447bd685a36a2333272c7eca11fa1e83846a85b..24aa9c16540541801bad1e86eabd6dd55a7d9d09 100644
--- a/test/extrude/528/528.py
+++ b/test/extrude/528/528.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).box(361,494,1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,526,500))
+r=w0.sketch().segment((36,526),(471,346)).segment((511,445)).arc((960,581),(579,856)).segment((230,1000)).segment((125,741)).segment((101,739)).segment((101,686)).close().assemble().push([(306,635)]).circle(514,mode='s').finalize().extrude(156).union(w0.sketch().segment((145,97),(177,95)).arc((222,2),(260,101)).segment((262,181)).segment((146,180)).close().assemble().finalize().extrude(795))
\ No newline at end of file
diff --git a/test/extrude/528/528.stl b/test/extrude/528/528.stl
index cdf57050c57ca5e9c5ceb28eed73dbbd479b9923..28cc20b9b00354fb561c84043feccb07d53c86e9 100644
Binary files a/test/extrude/528/528.stl and b/test/extrude/528/528.stl differ
diff --git a/test/extrude/529/529.py b/test/extrude/529/529.py
index 7e5ad0f2ed14a1a1766bf736f3f812d59b406309..1d73ff5fc853d6965fba78d11e1be95c8a7cd8ac 100644
--- a/test/extrude/529/529.py
+++ b/test/extrude/529/529.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(412,671,412))
-r=w0.workplane(offset=148).moveTo(119,154).cylinder(941,706).union(w0.sketch().segment((459,647),(1000,647)).segment((1000,965)).segment((730,965)).segment((765,847)).segment((459,753)).close().assemble().push([(947,671)]).rect(424,459,mode='s').finalize().extrude(1)).translate((141,1,176))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,499,1))
+r=w0.sketch().arc((525,460),(516,485),(544,487)).arc((460,525),(525,461)).assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/529/529.stl b/test/extrude/529/529.stl
index 8f05f1e3b7f8d28a74f3051239b1c005863735f2..69762cd8714b30b7ebdea6ff7360936a09713b85 100644
Binary files a/test/extrude/529/529.stl and b/test/extrude/529/529.stl differ
diff --git a/test/extrude/53/53.py b/test/extrude/53/53.py
index 3a657f02edea885b74487046b76c544f54a327da..1c06362cb55b6f8f1c8c1100c08553b8c72e9a1e 100644
--- a/test/extrude/53/53.py
+++ b/test/extrude/53/53.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(520,645,520))
-w1=cq.Workplane('XY',origin=(520,520,558))
-r=w0.sketch().segment((260,654),(280,654)).arc((568,318),(721,731)).segment((721,472)).segment((289,472)).segment((289,789)).segment((385,789)).segment((385,952)).segment((260,952)).close().assemble().finalize().extrude(135).union(w0.sketch().segment((328,203),(404,193)).segment((404,87)).segment((1000,87)).segment((1000,549)).segment((558,549)).arc((616,577),(693,587)).segment((721,769)).segment((433,817)).close().assemble().finalize().extrude(769)).union(w1.sketch().segment((347,87),(914,87)).segment((914,808)).segment((721,808)).arc((318,885),(347,481)).close().assemble().push([(424,741)]).circle(597,mode='s').push([(486,827)]).rect(549,558,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(76,7,42))
+r=w0.sketch().segment((295,939),(647,939)).segment((647,587)).arc((471,412),(295,587)).close().assemble().push([(430,751)]).circle(106,mode='s').finalize().extrude(324)
diff --git a/test/extrude/53/53.stl b/test/extrude/53/53.stl
index 25cc32a5193997f50d9c2ab14db6bf12d3c30ee8..05f2791abe7a9fdad7f87337d81ad7638860a9b4 100644
Binary files a/test/extrude/53/53.stl and b/test/extrude/53/53.stl differ
diff --git a/test/extrude/530/530.py b/test/extrude/530/530.py
index a874c5095e5b562bd2df6e8a111d098a4629b111..3508e97a3216be7c5a1fbea8998d19b615c6bf28 100644
--- a/test/extrude/530/530.py
+++ b/test/extrude/530/530.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(457,457,533))
-r=w0.workplane(offset=213).moveTo(370,131).cylinder(946,674).union(w0.workplane(offset=272).moveTo(577,598).cylinder(826,490)).union(w0.sketch().segment((186,544),(522,544)).segment((522,653)).arc((381,1000),(186,674)).close().assemble().reset().face(w0.sketch().arc((577,55),(663,1),(718,77)).arc((598,316),(577,55)).assemble()).push([(631,186)]).circle(577,mode='s').finalize().extrude(783)).translate((1,87,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,511,500))
+r=w0.sketch().segment((436,1),(525,2)).segment((525,387)).segment((501,386)).arc((312,511),(436,325)).close().assemble().push([(717,831)]).rect(507,840).finalize().extrude(476)
\ No newline at end of file
diff --git a/test/extrude/530/530.stl b/test/extrude/530/530.stl
index aed7cf415bef12d3c4c887dc9f57a1a0e5c5a6e9..433839f75ddd272da112b8ce04b226fc7030e2fc 100644
Binary files a/test/extrude/530/530.stl and b/test/extrude/530/530.stl differ
diff --git a/test/extrude/531/531.py b/test/extrude/531/531.py
index cec08f7e6a5ddbe19cc9420e92b6b8bbf6152641..3a6aa4055e3d0e739cec24ed8b0dda7c7a58c429 100644
--- a/test/extrude/531/531.py
+++ b/test/extrude/531/531.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,650,500))
-r=w0.sketch().segment((401,980),(560,980)).arc((481,1000),(401,980)).assemble().finalize().extrude(91).union(w0.sketch().segment((391,161),(391,351)).segment((870,351)).arc((640,510),(401,371)).arc((131,251),(401,141)).arc((640,1),(870,161)).close().assemble().push([(481,845)]).rect(740,570).finalize().extrude(600))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,851))
+r=w0.sketch().arc((3,238),(306,332),(557,152)).arc((342,546),(2,236)).assemble().finalize().extrude(1).union(w0.workplane(offset=276).moveTo(777,653).box(944,894,950))
\ No newline at end of file
diff --git a/test/extrude/531/531.stl b/test/extrude/531/531.stl
index aee1c2a120a759d73e5a236ebe1873324d1871a5..899f4107e38a7c84efa5739ccee102180cc74e68 100644
Binary files a/test/extrude/531/531.stl and b/test/extrude/531/531.stl differ
diff --git a/test/extrude/532/532.py b/test/extrude/532/532.py
index a19e82df752d828023cff341fca00bd3be911511..8e9b8a919d32f3e84649b1e2d29ac62ce7bc1f33 100644
--- a/test/extrude/532/532.py
+++ b/test/extrude/532/532.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().circle(887).circle(674,mode='s').push([(787,680)]).circle(700,mode='s').finalize().extrude(1).translate((221,1,221))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,955,499))
+w1=cq.Workplane('YZ',origin=(2,500,500))
+r=w0.sketch().segment((331,455),(401,456)).segment((330,556)).close().assemble().finalize().extrude(1).union(w1.sketch().segment((47,511),(206,512)).segment((207,441)).segment((550,440)).segment((549,510)).segment((709,510)).segment((709,601)).segment((601,599)).arc((564,531),(551,606)).segment((550,670)).segment((205,670)).segment((205,600)).segment((46,601)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/532/532.stl b/test/extrude/532/532.stl
index 06f97908a4a7ec12a3abcc8742afaa47f38f3da5..7192762f88241363ed7ffc0291ee820bd87d0a9c 100644
Binary files a/test/extrude/532/532.stl and b/test/extrude/532/532.stl differ
diff --git a/test/extrude/533/533.py b/test/extrude/533/533.py
index fb6fa4bb2728b93b5902bb1be19a0671fd915f90..18372f50767127a22cbb7cd3af7300e6d5aaa302 100644
--- a/test/extrude/533/533.py
+++ b/test/extrude/533/533.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(720,431,431))
-r=w0.workplane(offset=146).moveTo(630,351).cylinder(1000,730).union(w0.sketch().push([(61,630)]).rect(690,790).push([(1,660)]).circle(481,mode='s').push([(76,466)]).rect(461,461,mode='s').finalize().extrude(151))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(241,501,500))
+w1=cq.Workplane('YZ',origin=(256,500,500))
+r=w0.workplane(offset=565).moveTo(226,880).cylinder(629,620).union(w0.sketch().segment((750,715),(816,714)).segment((820,751)).segment((761,760)).close().assemble().finalize().extrude(1000)).union(w1.sketch().segment((391,2),(790,1)).segment((791,481)).segment((894,480)).segment((894,936)).segment((671,936)).segment((671,550)).segment((390,552)).close().assemble().finalize().extrude(626))
\ No newline at end of file
diff --git a/test/extrude/533/533.stl b/test/extrude/533/533.stl
index e171347fcf4f78253b9520a846193549cacbbfdc..8a955aab2e911a7761b9f50c631233d2f30fb5b8 100644
Binary files a/test/extrude/533/533.stl and b/test/extrude/533/533.stl differ
diff --git a/test/extrude/534/534.py b/test/extrude/534/534.py
index fef9a855458531539782344815aea9a50c0ef090..d626b6fa7167539a96408aeb6a1db0129eb1299a 100644
--- a/test/extrude/534/534.py
+++ b/test/extrude/534/534.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((600,660),(734,660)).arc((667,674),(600,660)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(691,501,500))
+w1=cq.Workplane('ZX',origin=(500,600,501))
+r=w0.workplane(offset=307).moveTo(721,861).cylinder(886,639).union(w0.workplane(offset=479).moveTo(779,146).cylinder(542,579)).union(w1.workplane(offset=271).moveTo(3,339).box(505,517,961))
\ No newline at end of file
diff --git a/test/extrude/534/534.stl b/test/extrude/534/534.stl
index 474bb300fe794203e100e4e6c96ed4f929276bf6..505dd6f856437047d9b1380e29a0a77a8f0e2206 100644
Binary files a/test/extrude/534/534.stl and b/test/extrude/534/534.stl differ
diff --git a/test/extrude/535/535.py b/test/extrude/535/535.py
index 89110851b3d7887bc243b009d6f63daec38b2f83..992d591415d5328e6a3627f4b328acffc4e6f853 100644
--- a/test/extrude/535/535.py
+++ b/test/extrude/535/535.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(510,510,765))
-r=w0.sketch().arc((109,21),(177,50),(275,70)).arc((452,608),(912,873)).segment((256,1000)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(196,250,251))
+r=w0.sketch().push([(251,371)]).circle(381).push([(263,8)]).circle(258).finalize().extrude(292).union(w0.sketch().push([(263,9)]).rect(480,260).reset().face(w0.sketch().segment((258,8),(268,4)).segment((270,9)).segment((260,14)).close().assemble(),mode='s').finalize().extrude(360))
\ No newline at end of file
diff --git a/test/extrude/535/535.stl b/test/extrude/535/535.stl
index df1de56575edbe30e323f1334504c4d28715cf80..6c0fa6bf1d7df79a49f1c2bed07dbf7b15456c47 100644
Binary files a/test/extrude/535/535.stl and b/test/extrude/535/535.stl differ
diff --git a/test/extrude/536/536.py b/test/extrude/536/536.py
index ec294cc51dbd4a9f8bbfadbcabfe0816b1a85ae1..c3e30be67adb00c2698efc17fe1f8a088a8c7240 100644
--- a/test/extrude/536/536.py
+++ b/test/extrude/536/536.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(521,521,584))
-w1=cq.Workplane('ZX',origin=(521,428,521))
-r=w0.sketch().segment((1,667),(188,573)).segment((324,844)).segment((303,844)).segment((303,823)).segment((292,823)).segment((292,844)).segment((261,844)).segment((261,875)).segment((292,875)).segment((292,896)).segment((303,896)).segment((303,875)).segment((334,875)).segment((334,854)).segment((355,896)).segment((178,1000)).close().assemble().push([(605,573)]).circle(677).push([(599,568)]).rect(573,553,mode='s').push([(740,220)]).circle(594).finalize().extrude(95).union(w0.workplane(offset=672).moveTo(844,235).box(917,906,823)).union(w1.sketch().arc((625,334),(729,438),(875,448)).arc((615,677),(625,334)).assemble().finalize().extrude(886))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,589,500))
+r=w0.sketch().segment((1,290),(940,186)).segment((1000,710)).segment((60,816)).close().assemble().finalize().extrude(315)
\ No newline at end of file
diff --git a/test/extrude/536/536.stl b/test/extrude/536/536.stl
index 746a1999be4b2eb4f9a9934102eee962e75329f4..e58a53084b4cea22fa19c2868c76a8227fd2b3a8 100644
Binary files a/test/extrude/536/536.stl and b/test/extrude/536/536.stl differ
diff --git a/test/extrude/537/537.py b/test/extrude/537/537.py
index 1d1a87c2c6cefc408ccab169b4994ea6addb4cac..e921457884092baae828b095ad89c0f44dd4f8bd 100644
--- a/test/extrude/537/537.py
+++ b/test/extrude/537/537.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(496,486,496))
-w1=cq.Workplane('XY',origin=(496,496,505))
-r=w0.sketch().segment((70,624),(189,80)).segment((624,179)).segment((505,703)).segment((654,703)).segment((654,496)).segment((881,496)).segment((881,911)).segment((169,911)).segment((169,703)).segment((426,703)).close().assemble().finalize().extrude(1000).union(w1.sketch().arc((555,585),(555,446),(654,357)).segment((654,1)).segment((733,1)).segment((733,357)).arc((832,604),(565,594)).segment((575,594)).segment((575,585)).close().assemble().finalize().extrude(911))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(696,500,502))
+r=w0.sketch().arc((196,455),(46,173),(342,281)).arc((183,286),(195,457)).assemble().reset().face(w0.sketch().segment((645,382),(845,380)).segment((844,610)).segment((796,611)).arc((377,799),(645,426)).close().assemble()).finalize().extrude(113).union(w0.sketch().segment((611,422),(612,485)).segment((745,487)).segment((747,565)).segment((1000,567)).arc((906,610),(805,586)).arc((571,300),(945,302)).arc((975,317),(999,336)).segment((744,336)).segment((745,421)).close().assemble().finalize().extrude(356))
\ No newline at end of file
diff --git a/test/extrude/537/537.stl b/test/extrude/537/537.stl
index 25533659ec4dfa33b036940c5123143b7f954e96..693001d0b47f0559642ffc2f985d0b42f73b395f 100644
Binary files a/test/extrude/537/537.stl and b/test/extrude/537/537.stl differ
diff --git a/test/extrude/538/538.py b/test/extrude/538/538.py
index 37fc48f8aa7bef205f667fcf224777bfecf18b0e..3ee9e6ccae1e492dbed7d5715e1b6892266f00c8 100644
--- a/test/extrude/538/538.py
+++ b/test/extrude/538/538.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(516,444,516))
-r=w0.sketch().segment((1,516),(475,382)).segment((475,413)).arc((495,382),(537,361)).segment((537,83)).segment((640,83)).segment((640,361)).arc((670,382),(691,413)).segment((743,413)).segment((743,557)).segment((691,557)).arc((629,609),(537,609)).segment((598,804)).segment((135,949)).close().assemble().push([(578,485)]).circle(526,mode='s').finalize().extrude(557).union(w0.workplane(offset=583).moveTo(789,372).box(1000,660,650)).union(w0.sketch().push([(181,413)]).rect(876,804).push([(300,660)]).circle(547).finalize().extrude(660))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,445,501))
+w1=cq.Workplane('XY',origin=(501,500,166))
+r=w0.sketch().segment((221,146),(386,147)).segment((385,500)).segment((336,500)).segment((336,825)).segment((270,825)).segment((270,501)).segment((221,500)).close().assemble().push([(340,175)]).rect(540,521,mode='s').finalize().extrude(375).union(w0.sketch().segment((362,1),(835,1)).segment((836,365)).segment((360,366)).segment((361,190)).segment((385,191)).segment((385,117)).segment((361,116)).close().assemble().finalize().extrude(824)).union(w1.workplane(offset=741).moveTo(794,435).cylinder(980,705))
\ No newline at end of file
diff --git a/test/extrude/538/538.stl b/test/extrude/538/538.stl
index 2078475dbd0bb339a56b57d60e326c5189d13f2a..e8a68e1e36e08506d71d7a857418b87d13374f29 100644
Binary files a/test/extrude/538/538.stl and b/test/extrude/538/538.stl differ
diff --git a/test/extrude/539/539.py b/test/extrude/539/539.py
index d4822ad1578c2ecdfc989e35d9db162b9e7f63cf..ca6d03f12659ade79441eb7fb0a9214828d1840d 100644
--- a/test/extrude/539/539.py
+++ b/test/extrude/539/539.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((68,361),(234,254)).segment((347,434)).segment((227,514)).arc((128,547),(121,441)).close().assemble().finalize().extrude(674).union(w0.sketch().push([(394,314)]).circle(540).push([(391,317)]).rect(447,727,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1000,500,501))
+r=w0.sketch().segment((55,726),(137,724)).arc((416,804),(691,714)).segment((771,710)).arc((415,855),(55,724)).assemble().reset().face(w0.sketch().arc((915,146),(944,307),(924,461)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/539/539.stl b/test/extrude/539/539.stl
index 46897d944f6344e12eb53a36e5c4fa29caed272f..fe4c7db2f727c9df9b889b415588495dbecc971b 100644
Binary files a/test/extrude/539/539.stl and b/test/extrude/539/539.stl differ
diff --git a/test/extrude/54/54.py b/test/extrude/54/54.py
index ef73cab052d920e60054c8affbecca0517f558c6..5b454ea93225aa807dabc377bb0a30d7efa6cd7a 100644
--- a/test/extrude/54/54.py
+++ b/test/extrude/54/54.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(475,475,506))
-w1=cq.Workplane('ZX',origin=(475,1,475))
-r=w0.workplane(offset=299).moveTo(788,142).cylinder(828,516).union(w0.sketch().push([(183,738)]).circle(687).push([(788,142)]).circle(536).push([(798,122)]).circle(485,mode='s').finalize().extrude(173)).union(w1.workplane(offset=738).moveTo(596,788).cylinder(1000,667)).translate((31,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(39,21,10))
+r=w0.sketch().segment((892,552),(346,552)).segment((346,328)).segment((892,328)).close().assemble().push([(655,458)]).rect(84,142,mode='s').finalize().extrude(290)
diff --git a/test/extrude/54/54.stl b/test/extrude/54/54.stl
index 9c5d21ea1e07c5c8a11bc8d327c529de1e46e991..fde94d23854b1cbecad6241e20eb936be09c3d65 100644
Binary files a/test/extrude/54/54.stl and b/test/extrude/54/54.stl differ
diff --git a/test/extrude/540/540.py b/test/extrude/540/540.py
index 128a7474ad8d838873b286b4d70d53a136436734..80cd3a4868efdde5dbd0db3b1ebbaed74979ef67 100644
--- a/test/extrude/540/540.py
+++ b/test/extrude/540/540.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).cylinder(1000,461).translate((128,128,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,367))
+r=w0.sketch().segment((281,606),(291,626)).arc((391,556),(500,615)).segment((501,560)).arc((544,671),(501,781)).segment((500,740)).segment((511,734)).segment((501,716)).arc((399,786),(295,726)).segment((295,780)).arc((245,669),(296,561)).segment((295,601)).close().assemble().finalize().extrude(445).union(w0.sketch().segment((160,621),(525,620)).arc((925,864),(480,721)).segment((160,721)).close().assemble().reset().face(w0.sketch().segment((310,640),(371,641)).segment((371,635)).segment((420,634)).segment((420,706)).segment((370,704)).segment((371,674)).segment((310,676)).close().assemble(),mode='s').finalize().extrude(615)).union(w0.workplane(offset=665).moveTo(231,182).cylinder(830,681))
\ No newline at end of file
diff --git a/test/extrude/540/540.stl b/test/extrude/540/540.stl
index 2299fbde8bb4b899aeb1c122a3502baffe62cfe1..0897bd0b8630e7679ee1d5fbedc217c9197beeb9 100644
Binary files a/test/extrude/540/540.stl and b/test/extrude/540/540.stl differ
diff --git a/test/extrude/541/541.py b/test/extrude/541/541.py
index 24ebfd4521be28314c67046ec6f7ec1b3a24c7df..9ce004741205c98264aaedd8c07c2df55a4d8812 100644
--- a/test/extrude/541/541.py
+++ b/test/extrude/541/541.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,1))
-w1=cq.Workplane('YZ',origin=(540,500,500))
-r=w0.sketch().segment((351,201),(371,91)).segment((840,181)).segment((820,301)).close().assemble().finalize().extrude(780).union(w1.sketch().arc((900,800),(910,900),(900,1000)).close().assemble().finalize().extrude(121))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(706,499,500))
+r=w0.sketch().arc((475,317),(680,220),(665,2)).segment((849,120)).segment((650,430)).close().assemble().finalize().extrude(91).union(w0.workplane(offset=338).moveTo(264,823).box(726,856,826))
\ No newline at end of file
diff --git a/test/extrude/541/541.stl b/test/extrude/541/541.stl
index 7e2e1a20f140bbe22c62b646d07464a3043d8f3b..558006787193ca8512e91f57d53e77f34c6a46a1 100644
Binary files a/test/extrude/541/541.stl and b/test/extrude/541/541.stl differ
diff --git a/test/extrude/542/542.py b/test/extrude/542/542.py
index 9f931aef74ae26a621efcd6e28bf81dacb958394..788d3ce03b3e269481f2d4b746a27a2e51fef739 100644
--- a/test/extrude/542/542.py
+++ b/test/extrude/542/542.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(373,491,491))
-r=w0.sketch().segment((1,667),(559,667)).segment((520,598)).segment((500,598)).segment((500,559)).segment((491,559)).segment((500,549)).segment((500,412)).segment((598,412)).arc((687,363),(794,383)).segment((863,344)).segment((902,412)).segment((922,412)).segment((922,452)).segment((931,461)).segment((922,461)).segment((922,598)).segment((824,598)).arc((736,647),(628,628)).segment((569,667)).segment((598,667)).segment((598,814)).segment((1,814)).close().assemble().finalize().extrude(216).union(w0.workplane(offset=745).moveTo(922,226).cylinder(1000,549))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(345,500,499))
+r=w0.sketch().segment((634,850),(720,1000)).arc((666,930),(635,850)).assemble().finalize().extrude(726).union(w0.sketch().segment((282,466),(336,1)).segment((589,32)).segment((537,501)).close().assemble().finalize().extrude(809))
\ No newline at end of file
diff --git a/test/extrude/542/542.stl b/test/extrude/542/542.stl
index d4a45863f0679407600bbdcfa059b515147f7d20..b21a83b9311da12751bea4a5f7186dbacebb3bcb 100644
Binary files a/test/extrude/542/542.stl and b/test/extrude/542/542.stl differ
diff --git a/test/extrude/543/543.py b/test/extrude/543/543.py
index d6d29cfa097aac7d13213350f0b357e7338f4b8c..fb9e4cebbe9c796c4ee510bf76e9aaaf3960643e 100644
--- a/test/extrude/543/543.py
+++ b/test/extrude/543/543.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().arc((281,148),(387,334),(281,520)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,170))
+r=w0.sketch().push([(793,606)]).rect(895,1000).push([(827,576)]).rect(816,590,mode='s').finalize().extrude(924).union(w0.sketch().arc((186,375),(70,57),(390,171)).segment((556,171)).segment((555,582)).segment((185,581)).close().assemble().push([(204,192)]).rect(605,611,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/543/543.stl b/test/extrude/543/543.stl
index 7ec0786b6b0badb1b484c1237e7ba57d0e44c7b5..0765b37d942567f5466fd5b7c7e2d0dc662ba3b6 100644
Binary files a/test/extrude/543/543.stl and b/test/extrude/543/543.stl differ
diff --git a/test/extrude/544/544.py b/test/extrude/544/544.py
index 4e9523b3720b1eb7e3be89a717814e3f2456a0c9..801d44ddb4fc135e4856106b57dff2df7b2c4f27 100644
--- a/test/extrude/544/544.py
+++ b/test/extrude/544/544.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().circle(987).circle(840,mode='s').finalize().extrude(1).translate((321,321,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,636))
+w1=cq.Workplane('XY',origin=(499,500,735))
+r=w0.sketch().push([(246,167)]).circle(666).push([(441,830)]).circle(671).reset().face(w0.sketch().segment((555,187),(681,187)).segment((681,150)).segment((845,152)).arc((881,181),(921,200)).segment((920,576)).segment((555,576)).close().assemble()).finalize().extrude(125).union(w0.sketch().push([(700,496)]).circle(605).circle(521,mode='s').finalize().extrude(321)).union(w1.sketch().push([(517,195)]).circle(630).push([(517,197)]).rect(655,651,mode='s').finalize().extrude(370))
\ No newline at end of file
diff --git a/test/extrude/544/544.stl b/test/extrude/544/544.stl
index 2dbe3d504077e995fd29bb942a957c49ce8e8aa6..cccf9368b0222ebfef2fe8bc9f1fa1147e1ac9fd 100644
Binary files a/test/extrude/544/544.stl and b/test/extrude/544/544.stl differ
diff --git a/test/extrude/545/545.py b/test/extrude/545/545.py
index e4beabf24273f10566f591cb1cffd196ec7b4a32..65cec90efe5fb8e70c15331b796428cd3697be71 100644
--- a/test/extrude/545/545.py
+++ b/test/extrude/545/545.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(286,286,1))
-r=w0.sketch().circle(1000).circle(572,mode='s').finalize().extrude(857).translate((715,715,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,475))
+r=w0.sketch().push([(801,875)]).circle(626).push([(816,926)]).circle(515,mode='s').finalize().extrude(146).union(w0.sketch().segment((76,205),(295,205)).segment((296,1)).segment((410,1)).segment((410,206)).segment((630,207)).segment((631,326)).segment((410,325)).segment((411,531)).segment((295,531)).segment((296,326)).segment((271,327)).segment((270,281)).segment((75,281)).close().assemble().finalize().extrude(870)).union(w0.workplane(offset=703).moveTo(300,436).cylinder(906,621))
\ No newline at end of file
diff --git a/test/extrude/545/545.stl b/test/extrude/545/545.stl
index 45c2cb3ccbf1edda6d8962da585b525ae83721a0..fc70f7bb7e6042f0f7eb6ce6fecb2ca28ff60f40 100644
Binary files a/test/extrude/545/545.stl and b/test/extrude/545/545.stl differ
diff --git a/test/extrude/546/546.py b/test/extrude/546/546.py
index 0a47898fc2606277fac1112c89bb2101ecb7026a..6f860013ff50025fe8b198f034ccb4c949329a52 100644
--- a/test/extrude/546/546.py
+++ b/test/extrude/546/546.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(485,485,485))
-w1=cq.Workplane('XY',origin=(485,485,674))
-r=w0.sketch().arc((295,621),(274,1),(800,338)).segment((874,338)).segment((874,895)).segment((779,895)).arc((642,1000),(474,1000)).arc((548,968),(579,895)).segment((369,895)).segment((369,800)).arc((348,863),(359,937)).arc((274,790),(295,621)).assemble().push([(621,616)]).rect(653,832,mode='s').finalize().extrude(295).union(w1.sketch().arc((663,506),(674,548),(663,590)).close().assemble().finalize().extrude(737))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,506))
+w1=cq.Workplane('YZ',origin=(665,501,501))
+r=w0.workplane(offset=684).moveTo(500,82).box(930,665,870).union(w1.sketch().segment((216,484),(260,485)).segment((261,125)).segment((955,125)).segment((956,486)).segment((1000,486)).segment((999,505)).segment((956,507)).segment((955,865)).segment((262,865)).segment((260,505)).segment((215,505)).close().assemble().finalize().extrude(465))
\ No newline at end of file
diff --git a/test/extrude/546/546.stl b/test/extrude/546/546.stl
index 68eefe019a652cd30db0111ce1c374f58d09e852..a8e31ebda2653d9c1ccc46557987d4eda050ad0a 100644
Binary files a/test/extrude/546/546.stl and b/test/extrude/546/546.stl differ
diff --git a/test/extrude/547/547.py b/test/extrude/547/547.py
index 9e37959f8d8b3d05459bc328ce30b1ee02a5c148..69837977db9df21e6be88eb3bdf1ee90bf12b137 100644
--- a/test/extrude/547/547.py
+++ b/test/extrude/547/547.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(482,383,383))
-r=w0.sketch().arc((1,741),(100,112),(186,741)).close().assemble().reset().face(w0.sketch().segment((692,100),(963,26)).segment((1000,161)).segment((729,235)).close().assemble()).reset().face(w0.sketch().segment((741,124),(766,124)).segment((766,100)).segment((926,100)).segment((926,124)).segment((938,124)).segment((938,137)).segment((926,137)).segment((926,161)).segment((766,161)).segment((766,137)).segment((741,137)).close().assemble(),mode='s').finalize().extrude(186)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,499,489))
+r=w0.workplane(offset=255).moveTo(540,560).box(561,621,989).union(w0.workplane(offset=588).moveTo(662,284).box(654,954,674)).union(w0.workplane(offset=755).moveTo(330,876).cylinder(1000,571))
\ No newline at end of file
diff --git a/test/extrude/547/547.stl b/test/extrude/547/547.stl
index ec268a08cf11791c29d6f93c724f504c02653934..4ddfc8fa8c399a8265ad66401aae9be57ceb492c 100644
Binary files a/test/extrude/547/547.stl and b/test/extrude/547/547.stl differ
diff --git a/test/extrude/548/548.py b/test/extrude/548/548.py
index ed8672a0cdedf914f8c8a1558f2facba78f727a4..9efa1efd3c00dc696e72dd0aa9ab3f1ba7cb09e3 100644
--- a/test/extrude/548/548.py
+++ b/test/extrude/548/548.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(443,443,165))
-r=w0.workplane(offset=713).moveTo(476,902).cylinder(984,803).union(w0.workplane(offset=722).moveTo(427,1).cylinder(1000,820)).translate((1,377,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,545))
+w1=cq.Workplane('XY',origin=(501,501,795))
+r=w0.sketch().segment((181,731),(549,730)).arc((556,749),(564,764)).segment((181,766)).close().assemble().reset().face(w0.sketch().arc((556,616),(275,205),(680,490)).arc((604,535),(554,617)).assemble()).reset().face(w0.sketch().arc((941,726),(945,716),(945,701)).segment((1000,701)).segment((1000,726)).close().assemble()).finalize().extrude(162).union(w0.sketch().push([(21,245)]).rect(539,900).push([(382,798)]).rect(546,526).finalize().extrude(301)).union(w1.sketch().push([(387,795)]).circle(659).circle(551,mode='s').finalize().extrude(122))
\ No newline at end of file
diff --git a/test/extrude/548/548.stl b/test/extrude/548/548.stl
index 4de795a59b5ea6c7ff2842a5dbfedc44a4faf1a5..33339511b35beab32450d50c106d62609bcac74b 100644
Binary files a/test/extrude/548/548.stl and b/test/extrude/548/548.stl differ
diff --git a/test/extrude/549/549.py b/test/extrude/549/549.py
index f7af976aabd4009ebd6051251661e97ac273a398..6f2aceba6841537826707315d629cb6ba2ff5d49 100644
--- a/test/extrude/549/549.py
+++ b/test/extrude/549/549.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(361,361,172))
-r=w0.workplane(offset=230).moveTo(568,244).box(739,703,622).union(w0.sketch().push([(1,100)]).circle(397).push([(433,595)]).circle(424).finalize().extrude(1000)).translate((37,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,242))
+w1=cq.Workplane('ZX',origin=(499,541,500))
+r=w0.workplane(offset=762).moveTo(291,71).cylinder(1000,570).union(w1.sketch().segment((450,750),(596,751)).arc((519,780),(450,750)).assemble().finalize().extrude(961))
\ No newline at end of file
diff --git a/test/extrude/549/549.stl b/test/extrude/549/549.stl
index 23091f2a5ba8342a233b3e369d21a5d91bbac66e..e964036b6d43f776168db6303b9b270313c69c4e 100644
Binary files a/test/extrude/549/549.stl and b/test/extrude/549/549.stl differ
diff --git a/test/extrude/55/55.py b/test/extrude/55/55.py
index 556f0971db02d5288f7161d292613bb6c0c06f74..908d74d23ab93fd790bfce49df23aad32ecf01aa 100644
--- a/test/extrude/55/55.py
+++ b/test/extrude/55/55.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(304,227,304))
-r=w0.workplane(offset=33).moveTo(923,188).cylinder(845,330).union(w0.workplane(offset=420).moveTo(549,304).cylinder(536,510)).union(w0.workplane(offset=652).moveTo(1,265).box(987,355,1000)).translate((1,164,190))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(632,503,503))
+r=w0.sketch().segment((354,220),(717,218)).segment((716,712)).segment((479,711)).arc((51,811),(353,488)).close().assemble().finalize().extrude(240).union(w0.sketch().push([(209,866)]).circle(636).reset().face(w0.sketch().arc((458,493),(185,71),(573,398)).arc((583,524),(458,493)).assemble()).push([(433,348)]).circle(617,mode='s').push([(766,751)]).circle(727).finalize().extrude(393))
\ No newline at end of file
diff --git a/test/extrude/55/55.stl b/test/extrude/55/55.stl
index c438561ff8c7e4f91e1a67cdfb4b16ad134139df..22a1b85b055faf7df526bbc2fa2831c9b1f7d388 100644
Binary files a/test/extrude/55/55.stl and b/test/extrude/55/55.stl differ
diff --git a/test/extrude/550/550.py b/test/extrude/550/550.py
index c27e5df8ca859dfab79d30d091e552478faff440..67d3f7bfe99981c1f4eeed05b8fcced327be54c2 100644
--- a/test/extrude/550/550.py
+++ b/test/extrude/550/550.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(764,506,506))
-r=w0.sketch().arc((474,420),(270,65),(667,119)).arc((774,355),(549,463)).segment((570,452)).segment((592,452)).segment((592,441)).segment((656,420)).segment((624,345)).arc((570,388),(495,420)).segment((517,452)).arc((495,441),(474,420)).assemble().finalize().extrude(1).union(w0.workplane(offset=323).moveTo(506,796).box(1000,1000,871))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(116,501,499))
+r=w0.workplane(offset=580).moveTo(676,501).cylinder(660,826).union(w0.workplane(offset=888).moveTo(26,554).cylinder(1000,526))
\ No newline at end of file
diff --git a/test/extrude/550/550.stl b/test/extrude/550/550.stl
index 43b0d7e7d75a9e119dd8829755395aecaa17994f..c99119e9337ac0c451ae7a3472de52b985a42874 100644
Binary files a/test/extrude/550/550.stl and b/test/extrude/550/550.stl differ
diff --git a/test/extrude/551/551.py b/test/extrude/551/551.py
index a753134d341ded789f91fafb3102d3413f82844f..645db6f89b6750c089cad4f27a0cfd7d4b8d0edd 100644
--- a/test/extrude/551/551.py
+++ b/test/extrude/551/551.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(590,880,590))
-r=w0.sketch().segment((445,206),(582,163)).segment((949,163)).segment((949,556)).segment((906,556)).arc((872,590),(829,556)).segment((804,556)).arc((428,1000),(445,419)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(696,501,502))
+r=w0.sketch().segment((112,700),(177,607)).arc((31,235),(401,86)).arc((996,376),(375,616)).arc((306,631),(237,626)).segment((356,706)).segment((166,1000)).segment((167,699)).close().assemble().reset().face(w0.sketch().arc((540,481),(571,367),(556,247)).segment((870,247)).segment((870,481)).close().assemble(),mode='s').finalize().extrude(112).union(w0.workplane(offset=366).moveTo(636,362).box(1000,532,770))
\ No newline at end of file
diff --git a/test/extrude/551/551.stl b/test/extrude/551/551.stl
index fa7c049ec0d215fd942c5d0491d8a6b05447362a..8302295007054a63a5eb98b1b29aba0dd5817ea6 100644
Binary files a/test/extrude/551/551.stl and b/test/extrude/551/551.stl differ
diff --git a/test/extrude/552/552.py b/test/extrude/552/552.py
index fee436d6873698fc0e7cf17b472f0bc50c72c76f..2ab8971fb7f92891eb1b23d5c55c6e323caeb1ed 100644
--- a/test/extrude/552/552.py
+++ b/test/extrude/552/552.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(481,270,481))
-r=w0.sketch().segment((241,789),(328,510)).segment((721,635)).segment((635,914)).segment((568,894)).segment((539,962)).segment((481,942)).segment((510,875)).close().assemble().reset().face(w0.sketch().segment((481,827),(529,827)).segment((520,846)).segment((481,846)).close().assemble(),mode='s').push([(611,837)]).rect(529,500,mode='s').finalize().extrude(625).union(w0.sketch().push([(481,712)]).rect(1000,769).reset().face(w0.sketch().segment((308,1),(395,1)).arc((347,116),(395,222)).segment((308,222)).close().assemble()).reset().face(w0.sketch().segment((568,1),(664,1)).segment((664,222)).segment((568,222)).arc((625,116),(568,1)).assemble()).finalize().extrude(914))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,704,501))
+w1=cq.Workplane('YZ',origin=(310,501,502))
+r=w0.sketch().arc((355,300),(406,496),(390,296)).segment((409,329)).arc((450,366),(455,411)).segment((461,426)).segment((450,431)).arc((335,441),(369,332)).close().assemble().finalize().extrude(105).union(w0.workplane(offset=618).moveTo(556,840).cylinder(735,661)).union(w1.workplane(offset=346).moveTo(151,678).box(680,525,811))
\ No newline at end of file
diff --git a/test/extrude/552/552.stl b/test/extrude/552/552.stl
index 8bba3933f4fa8901154c4b963a487e65193bc972..98043ed56276e42953644ab3265c80fbcd2f3dc2 100644
Binary files a/test/extrude/552/552.stl and b/test/extrude/552/552.stl differ
diff --git a/test/extrude/553/553.py b/test/extrude/553/553.py
index ded50aee56d59af2fa48deeb7fbada76daf5116d..1d75dc28e91b51e7a7fb6c7ac8672ffe8a32cbd7 100644
--- a/test/extrude/553/553.py
+++ b/test/extrude/553/553.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(469,649,469))
-r=w0.sketch().arc((277,575),(1,171),(437,394)).segment((617,288)).segment((787,575)).segment((1000,575)).segment((1000,702)).segment((702,702)).segment((437,851)).close().assemble().finalize().extrude(107)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,531,501))
+r=w0.sketch().arc((437,637),(442,87),(877,432)).arc((836,921),(436,635)).assemble().finalize().extrude(435).union(w0.sketch().segment((2,446),(100,446)).arc((417,302),(105,457)).segment((2,456)).close().assemble().finalize().extrude(476))
\ No newline at end of file
diff --git a/test/extrude/553/553.stl b/test/extrude/553/553.stl
index f69e68f5834dc5ec4137c7751ab3d9ce2089d196..a359010af8fe2cb293577898a30c06dcdbb1c44a 100644
Binary files a/test/extrude/553/553.stl and b/test/extrude/553/553.stl differ
diff --git a/test/extrude/554/554.py b/test/extrude/554/554.py
index d534ab9fbddcb65a51e644f387ee6fba2724d5b7..3e3831e135d90c52c16b2f3b410070af0e72a4ee 100644
--- a/test/extrude/554/554.py
+++ b/test/extrude/554/554.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,657))
-r=w0.sketch().arc((11,445),(1,284),(92,142)).segment((92,72)).segment((253,72)).arc((506,1),(758,72)).segment((919,72)).segment((919,223)).arc((1000,495),(919,768)).segment((919,919)).segment((758,919)).arc((506,990),(253,919)).segment((92,919)).segment((92,768)).arc((21,617),(11,445)).assemble().finalize().extrude(183)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,575,501))
+w1=cq.Workplane('ZX',origin=(500,651,501))
+r=w0.sketch().segment((401,45),(436,46)).arc((571,2),(711,47)).segment((744,47)).segment((746,72)).arc((815,240),(744,411)).segment((745,440)).segment((709,440)).arc((571,485),(435,442)).segment((401,441)).segment((400,412)).arc((331,240),(401,71)).close().assemble().finalize().extrude(740).union(w1.sketch().segment((186,740),(381,741)).segment((380,646)).segment((610,645)).segment((610,740)).segment((800,740)).segment((801,906)).segment((611,904)).segment((611,1000)).segment((380,1000)).segment((381,904)).segment((185,905)).close().assemble().finalize().extrude(37))
\ No newline at end of file
diff --git a/test/extrude/554/554.stl b/test/extrude/554/554.stl
index 5c505b1fe7665c1e5b3f7d28508c49c22a80a1e3..f483f35b6997912352b8a08e89d4e54f18b0b366 100644
Binary files a/test/extrude/554/554.stl and b/test/extrude/554/554.stl differ
diff --git a/test/extrude/555/555.py b/test/extrude/555/555.py
index b9ecb090f8e4d9d463b0a4a9af62633a50a4c66b..f9b34d02b3608956c61b5259ea05852885b67281 100644
--- a/test/extrude/555/555.py
+++ b/test/extrude/555/555.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(455,495,495))
-r=w0.sketch().push([(1,566)]).rect(516,596).push([(758,697)]).circle(566).reset().face(w0.sketch().segment((778,203),(1000,203)).segment((1000,556)).segment((778,455)).close().assemble()).push([(965,273)]).rect(526,536,mode='s').reset().face(w0.sketch().segment((939,788),(1000,647)).segment((1000,788)).close().assemble()).finalize().extrude(586)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,390,501))
+w1=cq.Workplane('ZX',origin=(500,296,500))
+r=w0.workplane(offset=494).moveTo(637,405).box(746,1000,516).union(w0.sketch().segment((550,696),(626,97)).segment((724,111)).segment((650,711)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=354).moveTo(346,866).box(711,581,796))
\ No newline at end of file
diff --git a/test/extrude/555/555.stl b/test/extrude/555/555.stl
index a6964ce08499d01dd20333031040de2ce7eba764..6455e0480c1a301b8de3c41d65944e9bcafb2a8d 100644
Binary files a/test/extrude/555/555.stl and b/test/extrude/555/555.stl differ
diff --git a/test/extrude/556/556.py b/test/extrude/556/556.py
index ceea7342f7277db35f580f4ae66c2ebd4bef7739..8c61f84189df6cee5d4fb282ce907672d4b8a2db 100644
--- a/test/extrude/556/556.py
+++ b/test/extrude/556/556.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(441,471,471))
-r=w0.workplane(offset=236).moveTo(401,231).cylinder(940,650).union(w0.sketch().segment((161,311),(201,311)).arc((401,1),(610,311)).arc((880,680),(441,800)).arc((371,880),(271,920)).segment((271,940)).segment((241,940)).segment((241,920)).arc((51,750),(161,530)).close().assemble().push([(406,226)]).rect(540,640,mode='s').push([(610,590)]).circle(570,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,395,500))
+w1=cq.Workplane('ZX',origin=(499,300,501))
+r=w0.sketch().segment((75,296),(610,294)).segment((610,460)).segment((620,460)).arc((719,441),(816,460)).segment((846,460)).segment((845,476)).arc((954,681),(846,879)).segment((846,894)).segment((815,894)).arc((720,915),(621,896)).segment((594,896)).segment((595,880)).arc((511,795),(481,685)).segment((391,685)).arc((150,951),(75,601)).close().assemble().push([(721,678)]).rect(739,855,mode='s').finalize().extrude(929).union(w1.workplane(offset=435).moveTo(714,330).cylinder(631,785))
\ No newline at end of file
diff --git a/test/extrude/556/556.stl b/test/extrude/556/556.stl
index 1534da6f1fc73772ac9bc8c16361bb4d8169cff4..896ab40994b56590365f7d93c6f72b4531c95167 100644
Binary files a/test/extrude/556/556.stl and b/test/extrude/556/556.stl differ
diff --git a/test/extrude/557/557.py b/test/extrude/557/557.py
index e2c6855bceaa19c307f0c1e5a04c8ca36bd3a265..87fd9588847ae513a7670709acf0fe78d334319c 100644
--- a/test/extrude/557/557.py
+++ b/test/extrude/557/557.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,520).translate((1,187,187))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(306,501,500))
+r=w0.sketch().arc((306,177),(296,85),(325,5)).segment((326,95)).segment((360,96)).arc((395,75),(431,66)).segment((402,12)).segment((414,1)).segment((451,67)).arc((511,71),(566,96)).segment((605,96)).segment((606,6)).arc((631,52),(639,96)).segment((724,96)).segment((725,370)).segment((561,370)).arc((462,402),(365,370)).segment((321,371)).segment((320,321)).arc((297,251),(306,176)).assemble().finalize().extrude(829).union(w0.workplane(offset=696).moveTo(377,868).box(705,765,889))
\ No newline at end of file
diff --git a/test/extrude/557/557.stl b/test/extrude/557/557.stl
index 9bbcb1d2b40d765f1d642ba342165a1349655281..289a586358de3d31685dec6f4db8a12d626b1911 100644
Binary files a/test/extrude/557/557.stl and b/test/extrude/557/557.stl differ
diff --git a/test/extrude/558/558.py b/test/extrude/558/558.py
index d76fe57a51a02317e9a659115b39a0192f37730f..69ea21316d04c7eec56e079563caedd05f9db6fe 100644
--- a/test/extrude/558/558.py
+++ b/test/extrude/558/558.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(75,75,1))
-r=w0.workplane(offset=149).box(796,1000,223).translate((324,426,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(198,252,251))
+r=w0.workplane(offset=235).moveTo(238,345).cylinder(284,406).union(w0.sketch().push([(219,281)]).rect(500,500).push([(171,269)]).circle(274,mode='s').push([(396,24)]).circle(274).finalize().extrude(391))
\ No newline at end of file
diff --git a/test/extrude/558/558.stl b/test/extrude/558/558.stl
index 05b46bc66b3568470bfa3b5aba878ddb8c9fe1b0..9dbf2e111ab5bf7b712665cc883502c4609912d5 100644
Binary files a/test/extrude/558/558.stl and b/test/extrude/558/558.stl differ
diff --git a/test/extrude/559/559.py b/test/extrude/559/559.py
index 756280955d2c309852f65b8bfbcd8c86ac6cb3ba..28f5c0052df13071637236769744527cda47583a 100644
--- a/test/extrude/559/559.py
+++ b/test/extrude/559/559.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(531,490,490))
-r=w0.sketch().arc((235,776),(368,1),(898,582)).segment((898,867)).segment((806,867)).arc((786,1000),(755,867)).segment((235,867)).close().assemble().finalize().extrude(409)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,307))
+w1=cq.Workplane('YZ',origin=(246,501,501))
+r=w0.workplane(offset=467).moveTo(306,480).cylinder(570,610).union(w0.workplane(offset=669).moveTo(779,501).cylinder(840,721)).union(w0.sketch().segment((1,440),(327,441)).segment((325,431)).arc((336,436),(341,442)).segment((370,441)).segment((371,614)).segment((1,615)).close().assemble().finalize().extrude(965)).union(w1.workplane(offset=590).moveTo(700,320).cylinder(679,510))
\ No newline at end of file
diff --git a/test/extrude/559/559.stl b/test/extrude/559/559.stl
index f71a1bb15a5437f0be9d8a0494e732893a7f579b..d399faa981ddb135415744ba339b41ff65f53763 100644
Binary files a/test/extrude/559/559.stl and b/test/extrude/559/559.stl differ
diff --git a/test/extrude/56/56.py b/test/extrude/56/56.py
index 0a4e446f941733b6f4cf662ce9564646708f77a2..a13baff490b1ff19d3e56d79e9c9441684f20c7e 100644
--- a/test/extrude/56/56.py
+++ b/test/extrude/56/56.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(941,630,630))
-r=w0.sketch().segment((260,748),(519,756)).segment((978,756)).segment((978,763)).segment((1000,763)).segment((1000,911)).segment((741,911)).segment((282,911)).segment((282,896)).segment((260,896)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((748,756),(785,652)).segment((785,556)).arc((778,541),(785,526)).segment((785,408)).segment((867,408)).segment((889,349)).segment((941,364)).segment((904,467)).segment((904,711)).segment((815,711)).segment((800,771)).close().assemble().finalize().extrude(90))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,566,502))
+w1=cq.Workplane('YZ',origin=(591,499,500))
+r=w0.sketch().arc((1,655),(71,745),(180,796)).segment((182,990)).segment((1,991)).close().assemble().finalize().extrude(80).union(w0.sketch().segment((641,11),(965,10)).segment((966,486)).segment((875,485)).arc((635,826),(640,411)).close().assemble().push([(806,250)]).circle(550,mode='s').finalize().extrude(784)).union(w1.workplane(offset=275).moveTo(699,913).box(576,675,949))
\ No newline at end of file
diff --git a/test/extrude/56/56.stl b/test/extrude/56/56.stl
index da0405d63ae9865d2770ae2ba7b1b89ab7bc4874..b93dee8d7acb57c8ed972da51850951ba46dc798 100644
Binary files a/test/extrude/56/56.stl and b/test/extrude/56/56.stl differ
diff --git a/test/extrude/560/560.py b/test/extrude/560/560.py
index 5011434a9d6c1fc2eae7b192afba2e0ec1c91465..f802937866894618ae47172aef867ef33306003e 100644
--- a/test/extrude/560/560.py
+++ b/test/extrude/560/560.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().arc((367,487),(674,647),(880,374)).arc((734,947),(367,487)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,636))
+r=w0.sketch().segment((171,540),(350,540)).segment((352,694)).segment((411,696)).arc((446,654),(494,635)).segment((495,585)).segment((586,584)).segment((586,635)).arc((636,655),(670,694)).segment((741,696)).segment((740,900)).segment((671,900)).arc((636,936),(584,955)).segment((586,1000)).segment((496,999)).segment((496,954)).arc((445,936),(411,900)).segment((340,901)).segment((341,694)).segment((170,695)).close().assemble().reset().face(w0.sketch().segment((460,901),(496,901)).segment((497,915)).arc((481,909),(461,899)).assemble(),mode='s').reset().face(w0.sketch().segment((585,900),(615,899)).arc((600,911),(584,916)).close().assemble(),mode='s').finalize().extrude(227).union(w0.sketch().push([(636,195)]).circle(695).circle(689,mode='s').finalize().extrude(367))
\ No newline at end of file
diff --git a/test/extrude/560/560.stl b/test/extrude/560/560.stl
index 45ca2dc2b882ff6f06d134dc68b9b9479cc07aaf..6aa085c8be2c62454623d7090e636a3876abef35 100644
Binary files a/test/extrude/560/560.stl and b/test/extrude/560/560.stl differ
diff --git a/test/extrude/561/561.py b/test/extrude/561/561.py
index 3ae85bcdcf3890a2fafa77bdc19543769a5169e5..f098d7b2d009cb3de2144f45f37926452ffe51a7 100644
--- a/test/extrude/561/561.py
+++ b/test/extrude/561/561.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(426,426,334))
-r=w0.sketch().segment((139,529),(277,483)).segment((277,437)).segment((437,437)).segment((437,426)).segment((449,437)).segment((460,437)).segment((575,403)).segment((656,656)).segment((690,701)).segment((678,724)).segment((713,874)).segment((575,908)).segment((575,966)).segment((414,966)).segment((403,966)).segment((391,966)).segment((277,1000)).segment((196,736)).segment((162,690)).segment((173,678)).close().assemble().push([(529,1)]).circle(575).finalize().extrude(610).translate((1,150,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,501,500))
+r=w0.sketch().arc((469,696),(370,356),(695,487)).arc((466,460),(472,694)).assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/561/561.stl b/test/extrude/561/561.stl
index 9330ca251268b53bb07733abfee120f44530b7db..6fb9e9101e875b1ac0b851534a2115be00806d3d 100644
Binary files a/test/extrude/561/561.stl and b/test/extrude/561/561.stl differ
diff --git a/test/extrude/562/562.py b/test/extrude/562/562.py
index a9a766a6fb2712b924e2d6e6ff73c258f943192c..f3fda73726c6bd5b4b0de5bb1d308158f2d5ff2d 100644
--- a/test/extrude/562/562.py
+++ b/test/extrude/562/562.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,580))
-r=w0.sketch().segment((351,81),(820,81)).segment((820,461)).segment((760,461)).arc((540,1000),(351,451)).close().assemble().finalize().extrude(341).union(w0.sketch().segment((141,61),(331,61)).segment((331,1)).segment((840,1)).segment((840,540)).segment((331,540)).segment((331,311)).segment((141,311)).close().assemble().finalize().extrude(431))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,260,500))
+w1=cq.Workplane('YZ',origin=(237,499,500))
+r=w0.sketch().segment((525,377),(685,377)).segment((781,360)).segment((780,375)).segment((904,376)).segment((906,984)).segment((745,986)).segment((651,1000)).segment((651,986)).segment((526,985)).close().assemble().finalize().extrude(821).union(w0.sketch().segment((250,231),(276,230)).arc((311,225),(352,231)).segment((467,230)).segment((465,295)).arc((262,641),(250,235)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=382).moveTo(225,358).box(669,555,736))
\ No newline at end of file
diff --git a/test/extrude/562/562.stl b/test/extrude/562/562.stl
index fc6c07f84c023e6e99bb4ce6e1254e7ff0bb3204..7c181a3ccb875b4bac309a7756d937e2fa2518dd 100644
Binary files a/test/extrude/562/562.stl and b/test/extrude/562/562.stl differ
diff --git a/test/extrude/563/563.py b/test/extrude/563/563.py
index a1e4911ee45d47f8c7d775e9fb769dd027dfa79f..030476796e049fce0bc81ef971713bc36b5c7901 100644
--- a/test/extrude/563/563.py
+++ b/test/extrude/563/563.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(594,383,383))
-r=w0.workplane(offset=74).moveTo(537,565).box(805,781,1000).union(w0.workplane(offset=423).moveTo(261,586).box(870,480,464)).union(w0.sketch().push([(220,391)]).circle(472).reset().face(w0.sketch().arc((228,237),(261,204),(302,204)).segment((302,1)).segment((699,1)).segment((699,391)).segment((383,391)).arc((334,285),(228,237)).assemble()).finalize().extrude(578))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(441,501,501))
+r=w0.workplane(offset=408).moveTo(825,639).cylinder(685,562).union(w0.sketch().push([(277,459)]).circle(776).push([(824,640)]).circle(675).finalize().extrude(805))
\ No newline at end of file
diff --git a/test/extrude/563/563.stl b/test/extrude/563/563.stl
index 82768fff5c42fb4f4093a8537f50fd6d7e8c795d..b7f3daa089817c279d76a5f87d351834685f62dd 100644
Binary files a/test/extrude/563/563.stl and b/test/extrude/563/563.stl differ
diff --git a/test/extrude/564/564.py b/test/extrude/564/564.py
index 560ada78e79ce92daadd2f5dc0577fe49a36bfc5..63b06c31f7238f5d26dfc5f7095c513b1d289a1c 100644
--- a/test/extrude/564/564.py
+++ b/test/extrude/564/564.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(398,398,398))
-w1=cq.Workplane('YZ',origin=(446,398,398))
-r=w0.sketch().push([(1,73)]).rect(807,759).rect(567,639,mode='s').finalize().extrude(266).union(w0.sketch().segment((446,398),(458,398)).segment((458,531)).arc((1000,567),(458,591)).segment((458,904)).segment((446,904)).close().assemble().finalize().extrude(350)).union(w1.sketch().arc((350,531),(338,458),(362,398)).segment((362,374)).segment((386,374)).arc((482,338),(567,374)).segment((687,374)).segment((687,482)).arc((507,386),(350,531)).assemble().finalize().extrude(170)).translate((6,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(503,632,502))
+r=w0.sketch().arc((122,762),(112,627),(189,515)).arc((152,129),(318,477)).arc((492,742),(198,851)).arc((172,795),(123,761)).assemble().push([(207,317)]).circle(675,mode='s').reset().face(w0.sketch().segment((217,611),(262,507)).segment((298,521)).segment((251,627)).close().assemble(),mode='s').reset().face(w0.sketch().segment((561,346),(750,346)).segment((751,476)).arc((835,496),(871,577)).segment((970,576)).segment((969,348)).segment((1000,347)).segment((1000,612)).segment((861,612)).arc((770,675),(680,612)).segment((560,611)).close().assemble()).finalize().extrude(74).union(w0.sketch().push([(462,452)]).circle(721).push([(342,402)]).circle(552,mode='s').finalize().extrude(670))
\ No newline at end of file
diff --git a/test/extrude/564/564.stl b/test/extrude/564/564.stl
index dc8f198da91e42c5ad2f66dd20ce2415de68ec32..93c6043b681bac096020009692d99d84506e47cc 100644
Binary files a/test/extrude/564/564.stl and b/test/extrude/564/564.stl differ
diff --git a/test/extrude/565/565.py b/test/extrude/565/565.py
index 767c65b3b671d61ec782ef4419d40d7befa258fa..40b25878859e64d4cf46c474a0e4ba6af5cdfb38 100644
--- a/test/extrude/565/565.py
+++ b/test/extrude/565/565.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(325,325,285))
-r=w0.workplane(offset=345).moveTo(1,444).box(1000,590,365).union(w0.sketch().segment((378,21),(987,21)).segment((987,563)).arc((669,457),(378,630)).close().assemble().finalize().extrude(418)).translate((175,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(672,500,499))
+r=w0.sketch().segment((1,410),(280,341)).segment((345,590)).segment((65,659)).close().assemble().finalize().extrude(156).union(w0.sketch().segment((526,480),(999,480)).segment((1000,501)).segment((785,500)).arc((780,494),(776,499)).segment((526,502)).close().assemble().finalize().extrude(380))
\ No newline at end of file
diff --git a/test/extrude/565/565.stl b/test/extrude/565/565.stl
index 30c85df17994c3c66e1f10bcc2970379b1c8c389..989e339b6c6dfafc26afe35345c54de8621133ee 100644
Binary files a/test/extrude/565/565.stl and b/test/extrude/565/565.stl differ
diff --git a/test/extrude/566/566.py b/test/extrude/566/566.py
index 2a3f4486e5a2c6ae83f926f49f2f2cda13b821ac..165d1dafc25be062bb8b27ef190236059c70793c 100644
--- a/test/extrude/566/566.py
+++ b/test/extrude/566/566.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(103,374,374))
-r=w0.sketch().segment((560,644),(661,611)).segment((712,763)).segment((611,797)).close().assemble().finalize().extrude(297).union(w0.sketch().push([(196,111)]).circle(534).reset().face(w0.sketch().segment((86,86),(170,1)).segment((306,136)).segment((221,221)).close().assemble(),mode='s').finalize().extrude(1000)).translate((1,1,50))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(37,501,500))
+r=w0.sketch().push([(716,741)]).circle(755).push([(576,881)]).circle(521,mode='s').finalize().extrude(1000).union(w0.sketch().segment((2,5),(1000,6)).segment((1000,979)).segment((700,979)).segment((700,866)).segment((1,866)).close().assemble().push([(500,494)]).rect(760,664,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/566/566.stl b/test/extrude/566/566.stl
index c3e20ab9ad0e4a08b8b2be6c7532484aae38ca05..10f3907015a57acd05b4ce0a83fd250a9aa82694 100644
Binary files a/test/extrude/566/566.stl and b/test/extrude/566/566.stl differ
diff --git a/test/extrude/567/567.py b/test/extrude/567/567.py
index b87865874eab0b832a8bfb2762e24a37d30f48ed..f5b6bbb535361bc39ef1207e2d94bc1baf52e462 100644
--- a/test/extrude/567/567.py
+++ b/test/extrude/567/567.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,441,500))
-r=w0.sketch().segment((1,600),(471,600)).arc((421,481),(510,391)).segment((510,261)).segment((760,261)).segment((750,251)).segment((780,241)).segment((790,261)).segment((1000,261)).segment((1000,760)).segment((510,760)).segment((510,740)).segment((1,740)).close().assemble().finalize().extrude(630)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,401,500))
+r=w0.sketch().segment((1,525),(344,177)).segment((656,475)).segment((555,577)).segment((454,534)).segment((380,715)).segment((410,724)).segment((310,824)).close().assemble().finalize().extrude(476).union(w0.workplane(offset=612).moveTo(732,287).box(1000,721,726))
\ No newline at end of file
diff --git a/test/extrude/567/567.stl b/test/extrude/567/567.stl
index f6facf47b997a6a4c036923b93177d96369dc8ba..a7ed140f1575ddac7e7d7db468899162869b1498 100644
Binary files a/test/extrude/567/567.stl and b/test/extrude/567/567.stl differ
diff --git a/test/extrude/568/568.py b/test/extrude/568/568.py
index 15e9bd394ce3bb547202de86eba1e86d8b81e4a8..2476f461ad799680817f770c5275f70db3b26b8c 100644
--- a/test/extrude/568/568.py
+++ b/test/extrude/568/568.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(331,161,331))
-r=w0.sketch().push([(321,570)]).circle(570).push([(421,730)]).circle(381,mode='s').finalize().extrude(1).union(w0.sketch().push([(331,156)]).rect(930,940).push([(111,41)]).circle(391,mode='s').reset().face(w0.sketch().segment((211,131),(261,251)).arc((221,201),(211,131)).assemble(),mode='s').reset().face(w0.sketch().arc((241,81),(291,41),(351,41)).close().assemble(),mode='s').reset().face(w0.sketch().segment((311,271),(421,231)).arc((371,271),(311,271)).assemble(),mode='s').reset().face(w0.sketch().arc((401,61),(441,111),(451,181)).close().assemble(),mode='s').push([(530,216)]).rect(451,401,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,771,502))
+r=w0.sketch().segment((71,999),(931,2)).arc((659,650),(72,999)).assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/568/568.stl b/test/extrude/568/568.stl
index bd77fd88818cd56f09bf930d3dff6fa1d224503b..98dbd5231585a4f0a32e2c6b93353aac0c560923 100644
Binary files a/test/extrude/568/568.stl and b/test/extrude/568/568.stl differ
diff --git a/test/extrude/569/569.py b/test/extrude/569/569.py
index f960f157ef21ebe1792c162b75462307994945bd..673e0992ec604294816ae3afdb4a8b8c9b3fbcd0 100644
--- a/test/extrude/569/569.py
+++ b/test/extrude/569/569.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(313,313,386))
-r=w0.workplane(offset=235).moveTo(1,480).cylinder(469,521).union(w0.sketch().push([(157,355)]).circle(386).push([(761,282)]).rect(459,1000).finalize().extrude(168)).translate((208,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,351))
+w1=cq.Workplane('XY',origin=(500,501,2))
+r=w0.sketch().rect(821,739).rect(641,720,mode='s').finalize().extrude(1000).union(w1.sketch().rect(609,979).push([(462,605)]).rect(516,520,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/569/569.stl b/test/extrude/569/569.stl
index 61edc24aca31e5a222bde7a06b695d86816afdc4..128109eb358e3cf8ceeab581582cb1b3a4cabcc9 100644
Binary files a/test/extrude/569/569.stl and b/test/extrude/569/569.stl differ
diff --git a/test/extrude/57/57.py b/test/extrude/57/57.py
index 7ba65c5d7d8478698f263fe9a68a08a840154541..2ce1462ee620760bb869efdbebbee638ee7ec018 100644
--- a/test/extrude/57/57.py
+++ b/test/extrude/57/57.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(412,412,314))
-w1=cq.Workplane('YZ',origin=(589,412,412))
-r=w0.sketch().segment((246,138),(452,138)).segment((452,324)).segment((324,324)).segment((324,569)).segment((452,569)).segment((452,765)).segment((246,765)).close().assemble().reset().face(w0.sketch().segment((461,138),(667,138)).segment((667,765)).segment((461,765)).segment((461,569)).segment((589,569)).segment((589,324)).segment((461,324)).close().assemble()).finalize().extrude(755).union(w0.sketch().arc((158,540),(187,520),(216,540)).close().assemble().finalize().extrude(1000)).union(w1.workplane(offset=442).moveTo(138,1).cylinder(471,491)).translate((1,1,79))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(80,31,74))
+r=w0.sketch().segment((674,359),(674,811)).segment((565,811)).segment((565,716)).segment((185,716)).segment((185,809)).segment((76,809)).segment((76,678)).segment((630,678)).segment((630,370)).arc((633,362),(641,359)).close().assemble().finalize().extrude(277).union(w0.workplane(offset=192).sketch().segment((782,481),(757,481)).segment((681,481)).segment((681,304)).segment((656,304)).segment((656,481)).segment((656,507)).segment((757,507)).segment((757,650)).segment((782,650)).close().assemble().finalize().extrude(128)).union(w0.workplane(offset=26).sketch().segment((493,590),(203,590)).segment((202,476)).segment((479,476)).close().assemble().finalize().extrude(183))
diff --git a/test/extrude/57/57.stl b/test/extrude/57/57.stl
index 2791075d694b28c0c96870d57eb7041d0b629966..b87099fc22ae9662e675242fad665024744d8ab9 100644
Binary files a/test/extrude/57/57.stl and b/test/extrude/57/57.stl differ
diff --git a/test/extrude/570/570.py b/test/extrude/570/570.py
index 19fe4d28b1f5898d867eaf1664f6c1f9acfb2318..c63497069d92201dce5e35cda3a237d10e3ca105 100644
--- a/test/extrude/570/570.py
+++ b/test/extrude/570/570.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(358,358,37))
-r=w0.sketch().segment((1,37),(94,37)).arc((194,1),(294,37)).segment((386,37)).segment((386,251)).arc((593,686),(308,301)).segment((294,301)).arc((194,329),(94,301)).segment((1,301)).close().assemble().finalize().extrude(900).union(w0.workplane(offset=679).moveTo(472,486).cylinder(1000,429))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(296,502,502))
+r=w0.workplane(offset=392).moveTo(950,622).cylinder(721,550).union(w0.sketch().segment((422,96),(626,96)).segment((625,482)).segment((486,480)).arc((86,831),(421,415)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/570/570.stl b/test/extrude/570/570.stl
index 174421389552bda41c36fc87dd7426647a75e715..50501ff9e9490e142c4879481603e5478eb8b295 100644
Binary files a/test/extrude/570/570.stl and b/test/extrude/570/570.stl differ
diff --git a/test/extrude/571/571.py b/test/extrude/571/571.py
index c22c725fa0e2efe2fa1352bae2ee8b92adc3131c..bebd98a524283df9cbc946c3a8c67f3190ee89b3 100644
--- a/test/extrude/571/571.py
+++ b/test/extrude/571/571.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(368,368,235))
-r=w0.sketch().segment((409,134),(521,134)).segment((521,62)).segment((704,62)).segment((704,134)).segment((878,134)).segment((878,246)).segment((409,246)).close().assemble().push([(643,190)]).rect(388,480,mode='s').finalize().extrude(1).union(w0.sketch().push([(83,404)]).rect(817,908).push([(6,490)]).rect(623,490,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,376,501))
+r=w0.sketch().segment((150,2),(851,1)).segment((849,160)).segment((592,42)).segment((151,1000)).close().assemble().finalize().extrude(755)
\ No newline at end of file
diff --git a/test/extrude/571/571.stl b/test/extrude/571/571.stl
index de7920594456b5a324ca5e376aa43524610b6e3a..f9c638004bfcb6050e432efc7b556280894e8276 100644
Binary files a/test/extrude/571/571.stl and b/test/extrude/571/571.stl differ
diff --git a/test/extrude/572/572.py b/test/extrude/572/572.py
index 60cb4f77e1a1a21042a817cb1ae6abfbdd690681..d2fa06d7d3ca6c3aab566f4910dfc058f9b485d5 100644
--- a/test/extrude/572/572.py
+++ b/test/extrude/572/572.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(481,688,481))
-w1=cq.Workplane('ZX',origin=(481,624,481))
-r=w0.sketch().segment((217,576),(504,576)).segment((504,568)).segment((616,568)).segment((616,752)).segment((688,576)).segment((880,576)).segment((880,776)).segment((616,776)).segment((616,840)).segment((504,840)).segment((504,664)).segment((457,776)).segment((217,776)).close().assemble().finalize().extrude(1).union(w1.workplane(offset=544).moveTo(217,381).box(752,1000,608))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,335))
+r=w0.sketch().push([(704,476)]).circle(710).push([(707,475)]).rect(806,789,mode='s').finalize().extrude(540).union(w0.sketch().segment((1,586),(260,470)).segment((291,535)).segment((30,646)).close().assemble().push([(147,561)]).circle(536,mode='s').push([(851,585)]).circle(651).circle(616,mode='s').finalize().extrude(836))
\ No newline at end of file
diff --git a/test/extrude/572/572.stl b/test/extrude/572/572.stl
index 73512b8cbe37b1d218716fd852ac2e0a01903f87..e48e71fd191ab3710d536f43d2fee94b1aae0632 100644
Binary files a/test/extrude/572/572.stl and b/test/extrude/572/572.stl differ
diff --git a/test/extrude/573/573.py b/test/extrude/573/573.py
index 548ced4fc898f46ef1e33772c5030b94e8fc6158..6c0244621402a268751dcdd1bcb847724cf4c0d7 100644
--- a/test/extrude/573/573.py
+++ b/test/extrude/573/573.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(830,557,557))
-r=w0.sketch().segment((171,585),(303,406)).arc((189,152),(472,189)).segment((491,189)).segment((830,435)).segment((519,849)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((218,340),(293,265)).segment((350,312)).arc((397,293),(444,284)).segment((321,416)).segment((416,500)).segment((538,369)).segment((453,284)).arc((604,369),(614,548)).segment((670,595)).arc((840,1000),(576,651)).segment((548,623)).arc((321,614),(274,387)).close().assemble().finalize().extrude(510))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,596))
+r=w0.sketch().segment((55,750),(382,750)).segment((310,1000)).segment((55,999)).close().assemble().reset().face(w0.sketch().segment((332,280),(641,1)).segment((946,335)).segment((866,412)).segment((866,281)).close().assemble()).finalize().extrude(305)
\ No newline at end of file
diff --git a/test/extrude/573/573.stl b/test/extrude/573/573.stl
index 4a0c1e6b9c81436f3b8e2dd68ec458317c5ba088..7b6712fd4011175d52cc4be8df415a95389490c0 100644
Binary files a/test/extrude/573/573.stl and b/test/extrude/573/573.stl differ
diff --git a/test/extrude/574/574.py b/test/extrude/574/574.py
index 28b479637ee459b702c103fb9eaab6d3482caf70..1025942e66edea0f5c0a7fba59bc302cfb98d4c9 100644
--- a/test/extrude/574/574.py
+++ b/test/extrude/574/574.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(445,645,445))
-w1=cq.Workplane('XY',origin=(445,445,334))
-r=w0.sketch().segment((412,345),(634,334)).segment((634,168)).segment((1000,168)).segment((1000,467)).segment((634,467)).segment((634,378)).segment((412,390)).close().assemble().finalize().extrude(278).union(w1.sketch().push([(700,267)]).circle(467).circle(456,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,471,502))
+r=w0.workplane(offset=444).moveTo(713,215).cylinder(617,716).union(w0.workplane(offset=480).moveTo(803,752).cylinder(541,651)).union(w0.sketch().arc((91,652),(130,472),(297,558)).arc((362,981),(91,651)).assemble().push([(272,782)]).circle(662,mode='s').finalize().extrude(678))
\ No newline at end of file
diff --git a/test/extrude/574/574.stl b/test/extrude/574/574.stl
index 76251acf938c0606dc6d295cbbb30c100e3cec82..5af56cf529d9cd070b971bcda1034f787c96c69a 100644
Binary files a/test/extrude/574/574.stl and b/test/extrude/574/574.stl differ
diff --git a/test/extrude/575/575.py b/test/extrude/575/575.py
index dbf457dca924f7ffc80b846ad629f380d4d5f995..be4c858a835899d4a3967d71d64b028beadb3217 100644
--- a/test/extrude/575/575.py
+++ b/test/extrude/575/575.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((8,594),(207,414)).arc((241,221),(434,227)).segment((640,48)).segment((660,74)).segment((461,254)).arc((427,447),(234,441)).segment((28,620)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,280))
+r=w0.sketch().push([(217,850)]).circle(650).reset().face(w0.sketch().arc((502,420),(605,541),(766,545)).arc((516,725),(500,420)).assemble()).finalize().extrude(625).union(w0.sketch().push([(736,200)]).circle(699).circle(690,mode='s').finalize().extrude(945))
\ No newline at end of file
diff --git a/test/extrude/575/575.stl b/test/extrude/575/575.stl
index a59d0138506d3da055651a3c9f893abdd176a56c..acc68c3c40d8e14027232f884815ee6647127d85 100644
Binary files a/test/extrude/575/575.stl and b/test/extrude/575/575.stl differ
diff --git a/test/extrude/576/576.py b/test/extrude/576/576.py
index d7e9a224ba0a4a21031da3375f7c867e3fdbe7bd..b95e2d3c0f3eb2788bbef8953ca1a5d5d1a814ca 100644
--- a/test/extrude/576/576.py
+++ b/test/extrude/576/576.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(710,500,500))
-r=w0.sketch().segment((41,311),(481,1)).segment((960,660)).segment((481,1000)).segment((530,351)).close().assemble().finalize().extrude(71)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,851,501))
+r=w0.workplane(offset=151).box(1000,1000,1000)
\ No newline at end of file
diff --git a/test/extrude/576/576.stl b/test/extrude/576/576.stl
index 199d1b9113d3bb3932f4190c0ee997af95162595..294397785ea2c81d685420371a7a7affb97e00b2 100644
Binary files a/test/extrude/576/576.stl and b/test/extrude/576/576.stl differ
diff --git a/test/extrude/577/577.py b/test/extrude/577/577.py
index 34fcb60359f39f03e850665144b9495d77889912..84f0d68bee5d6f18ea27812220bca741f220a8c3 100644
--- a/test/extrude/577/577.py
+++ b/test/extrude/577/577.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(449,449,308))
-w1=cq.Workplane('XY',origin=(449,449,398))
-r=w0.workplane(offset=276).moveTo(321,885).cylinder(795,654).union(w0.sketch().arc((513,539),(424,206),(693,424)).arc((731,693),(513,539)).assemble().finalize().extrude(680)).union(w1.workplane(offset=725).moveTo(283,1).cylinder(1000,641)).translate((1,192,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,500,500))
+r=w0.workplane(offset=252).moveTo(195,270).cylinder(1000,586).union(w0.sketch().push([(722,625)]).rect(835,879).push([(711,654)]).rect(641,776,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/577/577.stl b/test/extrude/577/577.stl
index 4e0d89661db085e2955ff6a286032b961baf88b1..58aaa463540c942d020d0909f90f4554b6be43ae 100644
Binary files a/test/extrude/577/577.stl and b/test/extrude/577/577.stl differ
diff --git a/test/extrude/578/578.py b/test/extrude/578/578.py
index 991d3861f60595e1cd1b27eff446814af10976ea..55415b1741cb2c889b134e2558cfe27ad0ed3c7e 100644
--- a/test/extrude/578/578.py
+++ b/test/extrude/578/578.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(523,451,451))
-r=w0.workplane(offset=343).moveTo(734,626).box(712,1000,667).union(w0.sketch().segment((37,82),(163,1)).segment((244,145)).segment((118,226)).segment((109,208)).arc((118,172),(91,172)).close().assemble().finalize().extrude(523))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(395,501,500))
+r=w0.workplane(offset=303).moveTo(695,733).box(860,915,894).union(w0.sketch().segment((126,61),(400,60)).segment((401,500)).arc((272,446),(125,450)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/578/578.stl b/test/extrude/578/578.stl
index 46e5cfa74a4b963d5c512131c791a4dfcfecdcde..84fa3ee5d6d757fc1dbcfa1edf9075b3a9905179 100644
Binary files a/test/extrude/578/578.stl and b/test/extrude/578/578.stl differ
diff --git a/test/extrude/579/579.py b/test/extrude/579/579.py
index 1ad8bead5ef6a57e7891c1ccae8f56e257be4f55..fb09130ef5a7a6a7c26a37bdcee62fa3894b79da 100644
--- a/test/extrude/579/579.py
+++ b/test/extrude/579/579.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(288,288,498))
-r=w0.workplane(offset=10).moveTo(1,288).box(626,1000,845).union(w0.sketch().segment((626,234),(635,206)).segment((745,243)).segment((735,270)).close().assemble().finalize().extrude(416)).translate((25,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,547,500))
+w1=cq.Workplane('XY',origin=(502,500,326))
+r=w0.sketch().arc((370,955),(405,971),(430,1000)).segment((371,1000)).close().assemble().finalize().extrude(241).union(w0.sketch().segment((20,465),(135,465)).segment((135,315)).segment((346,315)).segment((346,464)).segment((465,464)).segment((465,566)).segment((346,565)).segment((346,711)).segment((137,711)).segment((135,566)).segment((22,565)).close().assemble().push([(723,879)]).rect(1000,670).finalize().extrude(440)).union(w1.workplane(offset=341).moveTo(35,675).cylinder(819,536))
\ No newline at end of file
diff --git a/test/extrude/579/579.stl b/test/extrude/579/579.stl
index ab57bffacb3a5a4ad3f7e1a68b7d57a3ca4bcdfb..9c7d3e4d1ea442c982e927bfafaf4ca73a9556ef 100644
Binary files a/test/extrude/579/579.stl and b/test/extrude/579/579.stl differ
diff --git a/test/extrude/58/58.py b/test/extrude/58/58.py
index c1acdeb4d10c1d1cb61b683e0b608d0c1d0b9551..e79cc12a748c012a6a36df275d02600577e194fa 100644
--- a/test/extrude/58/58.py
+++ b/test/extrude/58/58.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(394,1,394))
-w1=cq.Workplane('ZX',origin=(394,182,394))
-r=w0.sketch().segment((166,245),(355,245)).arc((426,221),(489,245)).segment((622,245)).segment((622,567)).segment((166,567)).close().assemble().finalize().extrude(536).union(w1.workplane(offset=697).moveTo(394,406).box(756,685,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,485,500))
+r=w0.sketch().push([(161,16)]).circle(516).reset().face(w0.sketch().segment((386,366),(446,365)).arc((495,285),(551,365)).segment((854,366)).segment((856,855)).segment((386,856)).close().assemble()).push([(621,611)]).circle(565,mode='s').finalize().extrude(255).union(w0.sketch().segment((147,750),(350,751)).segment((351,635)).segment((391,635)).segment((390,750)).segment((596,750)).segment((596,884)).segment((391,886)).segment((389,1000)).segment((351,999)).segment((351,886)).segment((145,885)).close().assemble().finalize().extrude(779))
\ No newline at end of file
diff --git a/test/extrude/58/58.stl b/test/extrude/58/58.stl
index d5f2166faaaba1cb34da1debdd4a80bd89dced1d..f4d0b311effbc4265c812a9bdd026bd366b42cf8 100644
Binary files a/test/extrude/58/58.stl and b/test/extrude/58/58.stl differ
diff --git a/test/extrude/580/580.py b/test/extrude/580/580.py
index 471c19614e140c9744fac838b8b40728a15ef931..3813e8b570719ff308f34fe8f1b92be04d5d8c77 100644
--- a/test/extrude/580/580.py
+++ b/test/extrude/580/580.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(451,401,451))
-r=w0.sketch().segment((381,500),(411,500)).arc((590,431),(770,500)).segment((790,500)).segment((790,540)).arc((830,670),(790,810)).segment((790,850)).segment((770,850)).arc((590,920),(411,850)).segment((381,850)).segment((381,810)).arc((341,670),(381,540)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((391,700),(411,520)).arc((121,91),(610,241)).segment((650,241)).segment((650,560)).arc((520,600),(441,710)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,486,501))
+r=w0.sketch().push([(321,290)]).circle(690).push([(625,461)]).rect(580,890).finalize().extrude(17).union(w0.workplane(offset=758).moveTo(786,794).box(670,714,1000))
\ No newline at end of file
diff --git a/test/extrude/580/580.stl b/test/extrude/580/580.stl
index 598af92fd2058524124a8755b1b2c0bd4c9d98ee..9850466481bb8ebbbe53e90fb8d8ba2a54691e7a 100644
Binary files a/test/extrude/580/580.stl and b/test/extrude/580/580.stl differ
diff --git a/test/extrude/581/581.py b/test/extrude/581/581.py
index 5765b2cfa083ba801572975f6fd542a12c8946cb..bb5e41d513999858e5d14a44bd050e0abe82944e 100644
--- a/test/extrude/581/581.py
+++ b/test/extrude/581/581.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(490,490,521))
-w1=cq.Workplane('ZX',origin=(490,562,490))
-r=w0.workplane(offset=271).moveTo(1,256).box(531,837,929).union(w0.sketch().push([(745,643)]).circle(745).circle(572,mode='s').finalize().extrude(144)).union(w0.sketch().segment((490,613),(633,613)).arc((745,521),(867,613)).segment((1000,613)).segment((1000,674)).segment((867,674)).arc((745,766),(633,674)).segment((490,674)).close().assemble().finalize().extrude(429)).union(w1.sketch().segment((450,439),(500,439)).segment((500,286)).segment((827,286)).segment((827,439)).segment((888,439)).segment((888,450)).segment((827,450)).segment((827,602)).segment((572,602)).arc((286,918),(500,551)).segment((500,450)).segment((450,450)).close().assemble().finalize().extrude(154))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(486,500,502))
+r=w0.sketch().arc((366,664),(290,520),(452,565)).arc((386,596),(366,665)).assemble().finalize().extrude(17).union(w0.sketch().segment((197,330),(396,330)).segment((396,327)).segment((606,326)).segment((605,331)).segment((805,332)).segment((806,671)).segment((605,671)).segment((607,675)).segment((397,674)).segment((397,669)).segment((196,671)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/581/581.stl b/test/extrude/581/581.stl
index ed7f43ac6dec9c3ee4f8d8a5c2fb138d22694991..a6c7e73dd6289a69ba4e9f4d3f05d08d69278d3d 100644
Binary files a/test/extrude/581/581.stl and b/test/extrude/581/581.stl differ
diff --git a/test/extrude/582/582.py b/test/extrude/582/582.py
index e2d14cdafff7a4f7524d9e2403dff14859c26f05..997b7d063c1dba51cca1840f279af8298636e354 100644
--- a/test/extrude/582/582.py
+++ b/test/extrude/582/582.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,600))
-w1=cq.Workplane('XY',origin=(500,500,710))
-r=w0.sketch().segment((920,101),(1000,101)).segment((1000,560)).segment((930,560)).segment((930,471)).segment((920,471)).close().assemble().finalize().extrude(181).union(w0.sketch().segment((211,241),(211,271)).arc((201,131),(231,271)).segment((231,241)).close().assemble().finalize().extrude(570)).union(w1.sketch().arc((181,500),(720,620),(181,720)).arc((1,610),(181,500)).assemble().finalize().extrude(101))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,735,499))
+r=w0.sketch().segment((590,9),(589,243)).segment((930,243)).arc((214,909),(590,8)).assemble().finalize().extrude(28)
\ No newline at end of file
diff --git a/test/extrude/582/582.stl b/test/extrude/582/582.stl
index 88bf1754e4051bc3f7ec058e0849d8bca146a964..78f45403cf5a8183d7e0c1e8013a5713ac81c122 100644
Binary files a/test/extrude/582/582.stl and b/test/extrude/582/582.stl differ
diff --git a/test/extrude/583/583.py b/test/extrude/583/583.py
index 042eb6d0f77d20e3f288ca1eb595d682d4259865..965a060b842328f348951179b137bf337806d7e9 100644
--- a/test/extrude/583/583.py
+++ b/test/extrude/583/583.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((600,547),(734,547)).segment((600,787)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,172,500))
+w1=cq.Workplane('XY',origin=(499,500,754))
+r=w0.workplane(offset=833).moveTo(580,186).cylinder(1000,684).union(w1.sketch().segment((701,207),(835,205)).segment((834,485)).segment((1000,486)).segment((1000,491)).segment((699,491)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/583/583.stl b/test/extrude/583/583.stl
index ab52f99510972227eb80435057634f0103f1f765..29b73ad8b8b925d83d5612aee73c7e73b8cf59c4 100644
Binary files a/test/extrude/583/583.stl and b/test/extrude/583/583.stl differ
diff --git a/test/extrude/584/584.py b/test/extrude/584/584.py
index 25f11174a757b0a4a8c65d02c0401f4e9adf829a..d662dc5554c64d80bf60ce9ffb5ad943c4264f3e 100644
--- a/test/extrude/584/584.py
+++ b/test/extrude/584/584.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,251))
-r=w0.sketch().segment((550,351),(720,351)).segment((720,271)).segment((830,271)).segment((830,351)).segment((1000,351)).segment((1000,431)).segment((830,431)).segment((830,510)).segment((720,510)).segment((720,500)).arc((740,481),(720,451)).segment((720,431)).segment((550,431)).close().assemble().finalize().extrude(550).union(w0.sketch().segment((1,441),(91,441)).arc((241,21),(401,441)).segment((481,441)).segment((481,970)).segment((1,970)).close().assemble().reset().face(w0.sketch().segment((810,920),(860,920)).segment((860,940)).arc((850,940),(860,950)).segment((860,980)).segment((810,980)).close().assemble()).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,502,502))
+w1=cq.Workplane('YZ',origin=(482,501,500))
+r=w0.workplane(offset=250).moveTo(626,566).cylinder(1000,726).union(w0.sketch().arc((142,337),(181,261),(262,261)).arc((332,501),(140,337)).assemble().finalize().extrude(971)).union(w0.sketch().push([(402,595)]).rect(930,970).reset().face(w0.sketch().segment((699,211),(750,171)).segment((869,335)).segment((819,376)).close().assemble()).finalize().extrude(999)).union(w1.workplane(offset=395).moveTo(549,629).box(699,586,709))
\ No newline at end of file
diff --git a/test/extrude/584/584.stl b/test/extrude/584/584.stl
index 3bb1b92f919d49e56e9f05ebdb57ee22eeb5ff8d..4ae875566c38718162cb41e3e95b1c62b3010c8c 100644
Binary files a/test/extrude/584/584.stl and b/test/extrude/584/584.stl differ
diff --git a/test/extrude/585/585.py b/test/extrude/585/585.py
index 2702d49da2f24f71ba58e59e7eb40d40fc7681c6..6cd4a6d519650b07f49259cff6ee477b841af59a 100644
--- a/test/extrude/585/585.py
+++ b/test/extrude/585/585.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,613,613))
-w1=cq.Workplane('XY',origin=(613,613,918))
-r=w0.sketch().push([(317,745)]).circle(755).push([(312,745)]).rect(827,755,mode='s').push([(317,745)]).circle(643).finalize().extrude(735).union(w1.sketch().push([(419,735)]).circle(929).reset().face(w1.sketch().segment((399,480),(429,480)).segment((429,602)).arc((551,735),(429,867)).segment((429,990)).segment((399,990)).segment((399,867)).arc((276,735),(399,602)).close().assemble(),mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,660,500))
+r=w0.sketch().segment((1,856),(235,854)).arc((250,851),(270,856)).segment((505,856)).segment((505,930)).segment((272,931)).arc((250,935),(236,930)).segment((2,929)).close().assemble().push([(251,889)]).circle(517,mode='s').reset().face(w0.sketch().segment((571,81),(580,66)).segment((1000,311)).segment((990,331)).close().assemble()).finalize().extrude(175)
\ No newline at end of file
diff --git a/test/extrude/585/585.stl b/test/extrude/585/585.stl
index 159fd88e3d26950fc6c95cb07a017ea61c3ca6b0..bd2888b02112867ea493923e1f51c78d83a760d7 100644
Binary files a/test/extrude/585/585.stl and b/test/extrude/585/585.stl differ
diff --git a/test/extrude/586/586.py b/test/extrude/586/586.py
index 85dc6ae34c439e1445ad239cf95c59dd9dd6e6d6..e7c6139dfeea5cb7a26c124f4435d67128600f02 100644
--- a/test/extrude/586/586.py
+++ b/test/extrude/586/586.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(476,476,418))
-w1=cq.Workplane('XY',origin=(476,476,350))
-r=w0.sketch().segment((476,117),(796,1)).segment((961,505)).segment((641,612)).close().assemble().finalize().extrude(1000).union(w1.sketch().segment((88,544),(98,544)).segment((98,534)).arc((146,505),(195,496)).arc((263,253),(282,505)).arc((437,661),(379,874)).segment((370,874)).segment((370,893)).arc((40,864),(88,544)).assemble().finalize().extrude(127))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,1000))
+r=w0.workplane(offset=2).box(631,649,1000)
\ No newline at end of file
diff --git a/test/extrude/586/586.stl b/test/extrude/586/586.stl
index 69eaccd0646c559e7e2f8dc28ec4e2c7763eecd0..ffb0e450f90e01a63113c0dab64c168336c4b286 100644
Binary files a/test/extrude/586/586.stl and b/test/extrude/586/586.stl differ
diff --git a/test/extrude/587/587.py b/test/extrude/587/587.py
index cc00ea651c58a09d85386265c1c6e547ccbb1fc2..4421257a7aec19b5fab9fe971c8ffad02aa38380 100644
--- a/test/extrude/587/587.py
+++ b/test/extrude/587/587.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(451,500,500))
-r=w0.sketch().segment((21,131),(1000,131)).segment((1000,840)).segment((500,840)).segment((500,870)).segment((481,870)).segment((481,840)).segment((21,840)).segment((21,650)).arc((1,550),(21,441)).close().assemble().finalize().extrude(600)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,661))
+r=w0.sketch().push([(382,25)]).circle(526).push([(641,889)]).rect(931,726).push([(640,889)]).rect(641,511,mode='s').finalize().extrude(175).union(w0.sketch().segment((146,521),(167,442)).segment((282,470)).segment((280,279)).segment((409,280)).segment((411,505)).segment((551,541)).segment((532,619)).segment((410,584)).segment((410,775)).segment((282,776)).segment((280,556)).close().assemble().finalize().extrude(211))
\ No newline at end of file
diff --git a/test/extrude/587/587.stl b/test/extrude/587/587.stl
index 2deb2118d82c7c49e155f6a6a4e20ecb13fd9d9c..741332b7fbfe91763893ef6b60338adeddd7f0a9 100644
Binary files a/test/extrude/587/587.stl and b/test/extrude/587/587.stl differ
diff --git a/test/extrude/588/588.py b/test/extrude/588/588.py
index f8b0f44d9a990e9b00039879a050c465c7a3a6f0..9babd14530a8a1dbf937860739c5870940c0c505 100644
--- a/test/extrude/588/588.py
+++ b/test/extrude/588/588.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().push([(461,720)]).circle(680).push([(464,720)]).rect(687,680,mode='s').push([(840,647)]).circle(714).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(964,502,501))
+r=w0.sketch().segment((1,170),(316,172)).segment((316,31)).segment((684,32)).segment((684,170)).segment((999,171)).segment((1000,830)).segment((686,830)).segment((685,970)).segment((315,971)).segment((316,831)).segment((1,829)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/588/588.stl b/test/extrude/588/588.stl
index 115b9c977fbace6475deb2d99e0b4cf9008f08d6..0b178685df920dfe45d0653ab4a078d8877aad86 100644
Binary files a/test/extrude/588/588.stl and b/test/extrude/588/588.stl differ
diff --git a/test/extrude/589/589.py b/test/extrude/589/589.py
index 340120a30dbb5100a2ff35508b1a50b977587aa0..f0a0cce067301b63ff4a9c3b1545bca576650247 100644
--- a/test/extrude/589/589.py
+++ b/test/extrude/589/589.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(496,743,496))
-r=w0.workplane(offset=243).moveTo(634,530).box(753,842,1000).union(w0.sketch().push([(426,792)]).circle(693).reset().face(w0.sketch().segment((367,644),(436,644)).segment((446,852)).segment((377,852)).close().assemble(),mode='s').finalize().extrude(377)).union(w0.sketch().segment((357,1),(515,1)).arc((505,31),(505,50)).segment((357,50)).close().assemble().finalize().extrude(387))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(467,501,500))
+w1=cq.Workplane('ZX',origin=(500,406,501))
+r=w0.sketch().push([(167,75)]).circle(574).push([(151,16)]).circle(507,mode='s').finalize().extrude(530).union(w0.sketch().segment((190,715),(245,715)).segment((245,596)).segment((306,595)).segment((306,1000)).segment((190,1000)).close().assemble().reset().face(w0.sketch().segment((226,785),(236,786)).segment((237,751)).segment((261,751)).segment((260,786)).segment((271,785)).segment((271,811)).segment((261,811)).segment((260,844)).segment((235,845)).segment((236,809)).segment((227,810)).close().assemble(),mode='s').finalize().extrude(705)).union(w1.sketch().segment((345,276),(530,275)).segment((531,416)).arc((371,465),(531,510)).segment((532,726)).segment((345,726)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/589/589.stl b/test/extrude/589/589.stl
index 1d6004caa06d06dcb37dc01a4dec3506fecacc94..34e21263205b1a7a37b084dafea72a99413e15ad 100644
Binary files a/test/extrude/589/589.stl and b/test/extrude/589/589.stl differ
diff --git a/test/extrude/59/59.py b/test/extrude/59/59.py
index 82897e0f3feda6b40b821712232777c84242054b..16b90905abfbf8054f1ef4a98be3a432277666ec 100644
--- a/test/extrude/59/59.py
+++ b/test/extrude/59/59.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.workplane(offset=667).cylinder(1000,441).translate((1,108,108))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,576,499))
+w1=cq.Workplane('ZX',origin=(502,656,500))
+r=w0.sketch().push([(799,315)]).circle(700).push([(966,350)]).circle(526,mode='s').finalize().extrude(66).union(w0.workplane(offset=643).moveTo(544,705).cylinder(786,680)).union(w1.workplane(offset=601).moveTo(78,535).box(655,639,701))
\ No newline at end of file
diff --git a/test/extrude/59/59.stl b/test/extrude/59/59.stl
index 33b64c1cd0b4af60d3613356b807427217ecdd11..b7ca47119d33440685519eff1a453f7ed27efd72 100644
Binary files a/test/extrude/59/59.stl and b/test/extrude/59/59.stl differ
diff --git a/test/extrude/590/590.py b/test/extrude/590/590.py
index 6f2207f1a45ba58b08f4c33534bf3dc7a9dfc9b2..ebab51f09ffaee3e0d6a1a27f4834e37d6e7653d 100644
--- a/test/extrude/590/590.py
+++ b/test/extrude/590/590.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(550,528,550))
-w1=cq.Workplane('YZ',origin=(341,550,550))
-r=w0.sketch().push([(133,111)]).circle(572).push([(528,1000)]).circle(561).finalize().extrude(627).union(w0.sketch().segment((1,264),(166,264)).segment((166,243)).segment((352,264)).segment((671,264)).segment((671,363)).segment((275,363)).segment((1,363)).close().assemble().finalize().extrude(682)).union(w1.workplane(offset=588).moveTo(550,956).box(945,835,627))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,135))
+r=w0.sketch().segment((1,584),(145,171)).segment((835,411)).segment((1000,410)).segment((999,481)).segment((821,481)).segment((695,830)).close().assemble().reset().face(w0.sketch().segment((621,481),(650,481)).arc((636,487),(621,480)).assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/590/590.stl b/test/extrude/590/590.stl
index cd4b067441667b3bb6011c6c2b66ad13737c68b1..687c33b3a05771c0f44e59de3e82513bbc71faef 100644
Binary files a/test/extrude/590/590.stl and b/test/extrude/590/590.stl differ
diff --git a/test/extrude/591/591.py b/test/extrude/591/591.py
index 15ea16aa54ce805269ae73a76e2cf69c6c5efd70..66ae2c5821c9f138657db0a6525b6a07ccd7c2ee 100644
--- a/test/extrude/591/591.py
+++ b/test/extrude/591/591.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(544,587,544))
-r=w0.sketch().segment((348,77),(348,120)).segment((446,120)).segment((446,66)).segment((370,66)).arc((772,164),(685,577)).segment((718,924)).arc((891,1000),(696,989)).segment((642,989)).segment((598,609)).arc((240,446),(348,77)).assemble().finalize().extrude(88).union(w0.sketch().arc((370,609),(468,1),(729,566)).segment((772,653)).segment((479,815)).close().assemble().finalize().extrude(902))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(421,501,500))
+r=w0.sketch().push([(375,979)]).circle(520).circle(514,mode='s').push([(510,136)]).circle(635).finalize().extrude(666)
\ No newline at end of file
diff --git a/test/extrude/591/591.stl b/test/extrude/591/591.stl
index 7817440888a4769817282cef374f5ad026569908..93c60e2c8bf568ebe0f10e0984315c2f366e65c2 100644
Binary files a/test/extrude/591/591.stl and b/test/extrude/591/591.stl differ
diff --git a/test/extrude/592/592.py b/test/extrude/592/592.py
index 97b94e4c7884b2ed099b5b248792e9072982350a..05a244de855f3fff58e240b91400e5a71c3fbda2 100644
--- a/test/extrude/592/592.py
+++ b/test/extrude/592/592.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,463,334))
-r=w0.workplane(offset=1).moveTo(517,377).cylinder(1000,398).union(w0.sketch().segment((87,237),(377,237)).arc((388,227),(398,237)).segment((474,237)).segment((474,409)).segment((87,409)).close().assemble().finalize().extrude(742)).translate((1,37,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,621))
+w1=cq.Workplane('YZ',origin=(424,501,501))
+r=w0.sketch().segment((2,305),(35,307)).segment((36,285)).segment((71,286)).segment((70,305)).segment((101,306)).segment((11,401)).segment((125,506)).segment((72,506)).segment((70,525)).segment((35,524)).segment((35,506)).segment((2,504)).close().assemble().push([(666,210)]).circle(580).finalize().extrude(151).union(w0.sketch().segment((631,635),(696,511)).segment((1000,675)).segment((895,871)).segment((636,726)).arc((515,684),(630,636)).assemble().finalize().extrude(152)).union(w1.sketch().push([(553,599)]).rect(624,761).reset().face(w1.sketch().arc((495,599),(586,596),(501,610)).arc((494,605),(496,601)).assemble(),mode='s').finalize().extrude(754))
\ No newline at end of file
diff --git a/test/extrude/592/592.stl b/test/extrude/592/592.stl
index f8cc97b31f25917bcd1d7197ae0c0b3bec5079ae..1853c3d9a59b5ff14cb41962c4b2a05c199542b7 100644
Binary files a/test/extrude/592/592.stl and b/test/extrude/592/592.stl differ
diff --git a/test/extrude/593/593.py b/test/extrude/593/593.py
index 961aadbfdcd1367f4495955fd10db2f92c07adf6..3095ec8481b00448719a35897e7ce43ef8906bfe 100644
--- a/test/extrude/593/593.py
+++ b/test/extrude/593/593.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(552,552,828))
-w1=cq.Workplane('XY',origin=(552,552,759))
-r=w0.workplane(offset=328).moveTo(351,902).box(610,656,1000).union(w0.sketch().push([(357,265)]).circle(621).push([(885,483)]).circle(793).finalize().extrude(127)).union(w1.sketch().arc((1,449),(70,185),(345,231)).arc((541,254),(391,391)).arc((242,564),(24,495)).arc((35,460),(1,449)).assemble().push([(30,357)]).rect(656,621,mode='s').finalize().extrude(70))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,1))
+w1=cq.Workplane('ZX',origin=(501,625,502))
+r=w0.sketch().segment((15,347),(220,347)).arc((247,291),(286,240)).segment((287,232)).segment((296,232)).arc((471,166),(641,232)).segment((651,231)).segment((652,242)).arc((711,327),(727,431)).segment((921,431)).segment((922,836)).segment((426,835)).segment((427,801)).segment((16,801)).close().assemble().push([(699,633)]).rect(516,715,mode='s').finalize().extrude(1000).union(w1.sketch().segment((907,876),(907,937)).segment((945,937)).arc((667,701),(985,877)).close().assemble().finalize().extrude(282))
\ No newline at end of file
diff --git a/test/extrude/593/593.stl b/test/extrude/593/593.stl
index 308ee2c2072c94a2ffb43dcb75ee42d4118b7ab1..1330fd6938674256d38f5839ac67f3ae8f7f3855 100644
Binary files a/test/extrude/593/593.stl and b/test/extrude/593/593.stl differ
diff --git a/test/extrude/594/594.py b/test/extrude/594/594.py
index 38f31249adcd803971289cb9e27c28ce32a5dcf8..22dbb9e0bc714191ec70bdc9322d6edc1409b651 100644
--- a/test/extrude/594/594.py
+++ b/test/extrude/594/594.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(387,142,387))
-r=w0.sketch().push([(222,1)]).rect(743,841).reset().face(w0.sketch().segment((559,975),(595,779)).segment((730,804)).segment((694,1000)).close().assemble()).finalize().extrude(877).translate((34,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(871,502,501))
+r=w0.sketch().segment((1,435),(265,12)).segment((277,16)).arc((196,196),(201,397)).segment((127,511)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((516,456),(726,346)).segment((1000,885)).segment((789,991)).segment((735,885)).close().assemble().finalize().extrude(202))
\ No newline at end of file
diff --git a/test/extrude/594/594.stl b/test/extrude/594/594.stl
index 0ce061f6a9b91e6ae5c3abf248b913fd410f1c1c..1bc072eb33d96b15782c925c258b006d5813724d 100644
Binary files a/test/extrude/594/594.stl and b/test/extrude/594/594.stl differ
diff --git a/test/extrude/595/595.py b/test/extrude/595/595.py
index 023b752d39e582bc31bbf37a1c36f7ce1f4cfb0a..a93086b0ef9663e9a9119da0c63de834f79d361e 100644
--- a/test/extrude/595/595.py
+++ b/test/extrude/595/595.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(568,314,314))
-w1=cq.Workplane('XY',origin=(314,314,195))
-r=w0.workplane(offset=456).moveTo(217,1000).box(985,433,597).union(w1.workplane(offset=1).moveTo(16,508).cylinder(940,553)).translate((224,1,275))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(496,501,502))
+r=w0.workplane(offset=253).moveTo(514,591).cylinder(995,710).union(w0.sketch().segment((346,501),(570,502)).arc((811,580),(577,676)).segment((347,676)).close().assemble().finalize().extrude(476)).union(w0.sketch().segment((520,200),(609,201)).segment((611,635)).segment((540,635)).arc((192,506),(520,342)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/595/595.stl b/test/extrude/595/595.stl
index acc77e4e712a84ec95e553b62f80374d0bc7bf65..79353ecbd79b9ebfe8ef4d567ef50934c5936c90 100644
Binary files a/test/extrude/595/595.stl and b/test/extrude/595/595.stl differ
diff --git a/test/extrude/596/596.py b/test/extrude/596/596.py
index 3c72e2805787ba2f206362cf46ec97fbeb2f6c8d..0d62bfee425e3cef6d22410da0fa4021c2f24c6d 100644
--- a/test/extrude/596/596.py
+++ b/test/extrude/596/596.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(496,496,248))
-r=w0.sketch().segment((1,308),(842,100)).segment((990,683)).segment((921,703)).segment((852,585)).segment((763,634)).segment((812,723)).segment((149,891)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(639,500,500))
+r=w0.workplane(offset=196).moveTo(501,731).cylinder(1000,771).union(w0.sketch().segment((575,1),(631,1)).segment((575,65)).close().assemble().finalize().extrude(1)).union(w0.sketch().segment((405,809),(596,809)).arc((501,855),(406,810)).assemble().finalize().extrude(831))
\ No newline at end of file
diff --git a/test/extrude/596/596.stl b/test/extrude/596/596.stl
index 7da6123cb41e3029c47380319a011537bd667734..d62c5808c019c06b7d74511ea0bcf2537cd9eb6d 100644
Binary files a/test/extrude/596/596.stl and b/test/extrude/596/596.stl differ
diff --git a/test/extrude/597/597.py b/test/extrude/597/597.py
index 5d09b65bdff8aa910820fe41b0db4f811ba0f1d2..cdccb790cd3732b69f03428d3894abec827079b8 100644
--- a/test/extrude/597/597.py
+++ b/test/extrude/597/597.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(326,419,419))
-w1=cq.Workplane('XY',origin=(419,419,419))
-r=w0.sketch().segment((1,559),(106,373)).segment((117,384)).segment((13,570)).close().assemble().push([(640,408)]).circle(628).finalize().extrude(36).union(w0.workplane(offset=704).moveTo(640,872).cylinder(988,547)).union(w1.workplane(offset=129).moveTo(338,59).cylinder(1000,489)).translate((1,13,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(361,499,500))
+w1=cq.Workplane('XY',origin=(500,500,745))
+r=w0.workplane(offset=321).moveTo(681,698).box(631,606,861).union(w1.sketch().arc((840,251),(1000,500),(839,750)).close().assemble().finalize().extrude(6))
\ No newline at end of file
diff --git a/test/extrude/597/597.stl b/test/extrude/597/597.stl
index 183004ad232e265aff60026004b291edb0856230..ab7c8846c0bca19814a4f7d20a77701aad7802ab 100644
Binary files a/test/extrude/597/597.stl and b/test/extrude/597/597.stl differ
diff --git a/test/extrude/598/598.py b/test/extrude/598/598.py
index 456dccfc47d6596942f53a3be35a8de2e50588d7..4f93009dcdf3827aa793a3aa88a9cf26c9a7c35b 100644
--- a/test/extrude/598/598.py
+++ b/test/extrude/598/598.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(496,496,248))
-r=w0.sketch().segment((1,723),(11,713)).segment((130,782)).close().assemble().reset().face(w0.sketch().segment((426,298),(486,298)).arc((654,407),(812,298)).segment((990,298)).segment((990,733)).segment((703,733)).segment((753,634)).arc((792,604),(802,555)).segment((871,416)).segment((792,367)).segment((713,505)).arc((683,545),(683,585)).segment((594,733)).segment((426,733)).close().assemble()).reset().face(w0.sketch().arc((486,169),(486,31),(624,60)).arc((545,90),(486,169)).assemble()).finalize().extrude(545).union(w0.sketch().arc((199,753),(248,268),(624,585)).arc((525,960),(199,753)).assemble().finalize().extrude(743)).union(w0.sketch().segment((357,476),(565,238)).segment((585,258)).segment((387,496)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,705))
+r=w0.sketch().push([(519,494)]).rect(656,881).reset().face(w0.sketch().segment((482,481),(550,482)).segment((557,479)).segment((556,510)).segment((550,510)).arc((516,535),(481,510)).close().assemble(),mode='s').push([(510,672)]).rect(529,525,mode='s').finalize().extrude(1).union(w0.sketch().segment((122,410),(165,412)).arc((881,456),(191,656)).segment((316,656)).segment((316,625)).segment((181,624)).segment((175,625)).segment((121,625)).close().assemble().push([(248,398)]).rect(636,525,mode='s').push([(509,397)]).rect(636,525,mode='s').push([(508,640)]).rect(634,530,mode='s').finalize().extrude(795))
\ No newline at end of file
diff --git a/test/extrude/598/598.stl b/test/extrude/598/598.stl
index 36264834787bcf2f189d925621edcdf5d0e6ccb4..1f7bb7234a3265c2a7a47bb81a05db850fa210bd 100644
Binary files a/test/extrude/598/598.stl and b/test/extrude/598/598.stl differ
diff --git a/test/extrude/599/599.py b/test/extrude/599/599.py
index b4ac4bac6eac1fb626c09c723cd965a3b7d16e89..f2ba54b5c43c6e894aff0104a73d681b1792df9c 100644
--- a/test/extrude/599/599.py
+++ b/test/extrude/599/599.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(368,368,390))
-w1=cq.Workplane('XY',origin=(368,368,523))
-r=w0.sketch().segment((1,243),(310,243)).arc((368,229),(427,243)).segment((736,243)).segment((736,493)).segment((508,493)).arc((500,486),(486,493)).segment((427,493)).arc((368,508),(310,493)).segment((1,493)).close().assemble().push([(493,302)]).rect(486,427,mode='s').finalize().extrude(60).union(w0.sketch().rect(721,1000).push([(453,644)]).rect(420,405,mode='s').finalize().extrude(243)).union(w1.sketch().arc((332,324),(427,368),(332,412)).close().assemble().finalize().extrude(500)).translate((1,133,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,500,501))
+r=w0.workplane(offset=1000).box(582,1000,1000)
\ No newline at end of file
diff --git a/test/extrude/599/599.stl b/test/extrude/599/599.stl
index aaf1e72c2c0f166fe7e651b448890fcdc3da0eac..62c4f29ec06106bbcd02281102715e6a8f43f893 100644
Binary files a/test/extrude/599/599.stl and b/test/extrude/599/599.stl differ
diff --git a/test/extrude/6/6.py b/test/extrude/6/6.py
index a23664b056b649208445929eb642e545c0817261..b239ca76d5396134a9d1881cf6a1842e8b88b2ec 100644
--- a/test/extrude/6/6.py
+++ b/test/extrude/6/6.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(560,500,500))
-w1=cq.Workplane('XY',origin=(500,500,421))
-r=w0.sketch().segment((500,950),(870,790)).segment((890,840)).segment((520,1000)).close().assemble().finalize().extrude(461).union(w0.sketch().segment((111,161),(131,1)).segment((600,51)).segment((580,211)).segment((291,181)).segment((311,101)).segment((211,81)).segment((191,171)).close().assemble().push([(401,426)]).rect(540,850).finalize().extrude(690)).union(w1.sketch().push([(271,411)]).circle(520).circle(510,mode='s').finalize().extrude(491))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(24,60,40))
+r=w0.sketch().segment((930,864),(128,864)).segment((128,62)).segment((930,62)).close().assemble().push([(452,411)]).rect(207,261,mode='s').finalize().extrude(255)
diff --git a/test/extrude/6/6.stl b/test/extrude/6/6.stl
index 767f972e271e963182d169cbc2f212c806884e67..b408a22c24d2ca4414e4d15b097a6d07b68216ec 100644
Binary files a/test/extrude/6/6.stl and b/test/extrude/6/6.stl differ
diff --git a/test/extrude/60/60.py b/test/extrude/60/60.py
index 89b91cad07be3d93b5758d61171d75862c5415c5..dd120c590f4eb9e8b772116007544b15fa70ecb7 100644
--- a/test/extrude/60/60.py
+++ b/test/extrude/60/60.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(495,471,495))
-w1=cq.Workplane('YZ',origin=(389,495,495))
-r=w0.sketch().segment((542,295),(565,283)).segment((565,330)).close().assemble().finalize().extrude(224).union(w0.sketch().push([(495,824)]).circle(753).push([(630,436)]).rect(1000,706).push([(824,412)]).rect(542,565,mode='s').finalize().extrude(506)).union(w0.workplane(offset=512).moveTo(518,1).cylinder(530,589)).union(w1.sketch().segment((236,342),(401,342)).segment((401,72)).segment((542,72)).segment((542,342)).segment((788,342)).segment((788,918)).segment((236,918)).close().assemble().finalize().extrude(553)).translate((94,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(48,17,52))
+r=w0.sketch().segment((627,860),(643,860)).segment((643,158)).segment((627,158)).close().assemble().finalize().extrude(318).union(w0.sketch().segment((46,401),(464,401)).segment((464,391)).segment((46,391)).close().assemble().finalize().extrude(41)).union(w0.sketch().segment((326,186),(326,434)).segment((276,434)).segment((276,379)).segment((299,379)).segment((299,186)).close().assemble().finalize().extrude(193))
diff --git a/test/extrude/60/60.stl b/test/extrude/60/60.stl
index 9202414dc9ae569b01c404448bd05551653c3d9d..1d79bf323c4bfa0863932f70bcd844c70c139770 100644
Binary files a/test/extrude/60/60.stl and b/test/extrude/60/60.stl differ
diff --git a/test/extrude/600/600.py b/test/extrude/600/600.py
index b14efb31462d850d7a4c9b2900f06adfca4130f9..8bfb4ec4bb0ba42ac93f20bba6deff1b8df23995 100644
--- a/test/extrude/600/600.py
+++ b/test/extrude/600/600.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((148,287),(520,287)).arc((327,381),(148,287)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,405,501))
+w1=cq.Workplane('YZ',origin=(362,500,501))
+r=w0.sketch().segment((475,656),(545,600)).segment((636,705)).arc((699,721),(740,775)).segment((790,775)).segment((790,894)).segment((830,939)).segment((759,1000)).segment((680,905)).segment((565,906)).segment((566,831)).arc((555,801),(566,765)).close().assemble().finalize().extrude(564).union(w1.workplane(offset=320).moveTo(506,216).box(681,589,860))
\ No newline at end of file
diff --git a/test/extrude/600/600.stl b/test/extrude/600/600.stl
index 2fc67ea6edb9ce594cc218c15b7e06776f0d4482..1228f55bff48763f8df56a13144d61da2432d858 100644
Binary files a/test/extrude/600/600.stl and b/test/extrude/600/600.stl differ
diff --git a/test/extrude/601/601.py b/test/extrude/601/601.py
index 31e7e0e7f47d476569e260d66a5cacbb92a82123..5cff1053bb1696515ad0293341edfe5f23d8bbb7 100644
--- a/test/extrude/601/601.py
+++ b/test/extrude/601/601.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(519,285,519))
-r=w0.workplane(offset=630).moveTo(920,938).box(581,914,741).union(w0.workplane(offset=760).moveTo(186,1).cylinder(1000,618)).translate((99,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(500,499,502))
+r=w0.sketch().segment((140,236),(861,236)).segment((860,370)).arc((716,421),(611,530)).segment((451,530)).segment((450,749)).arc((436,780),(425,816)).segment((140,816)).close().assemble().finalize().extrude(201).union(w0.sketch().push([(429,886)]).circle(615).push([(374,925)]).rect(556,549,mode='s').push([(541,161)]).circle(661).finalize().extrude(806))
\ No newline at end of file
diff --git a/test/extrude/601/601.stl b/test/extrude/601/601.stl
index f5cfeb131ed5674c71ff45c8b6a36262d8fd782d..6110f9735003c10b3b28e1b451a5fe0d0e532808 100644
Binary files a/test/extrude/601/601.stl and b/test/extrude/601/601.stl differ
diff --git a/test/extrude/602/602.py b/test/extrude/602/602.py
index 77f41909fd41acba5eaebd7c0f189821f87f5e58..660bd12a40d188425ad2b3ef3bae86ea430905c0 100644
--- a/test/extrude/602/602.py
+++ b/test/extrude/602/602.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,301))
-r=w0.sketch().segment((81,351),(221,121)).segment((301,171)).segment((261,231)).segment((401,231)).segment((401,221)).segment((550,221)).segment((550,231)).segment((690,231)).segment((690,660)).segment((550,660)).segment((550,670)).segment((401,670)).segment((401,660)).segment((381,660)).segment((381,1000)).segment((281,1000)).segment((281,660)).segment((251,660)).segment((251,251)).segment((161,401)).close().assemble().finalize().extrude(850).union(w0.sketch().segment((481,281),(590,71)).segment((620,1)).segment((920,151)).segment((780,431)).close().assemble().finalize().extrude(900))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,526,501))
+w1=cq.Workplane('ZX',origin=(501,754,501))
+r=w0.sketch().arc((610,610),(27,475),(624,440)).arc((999,555),(610,610)).assemble().push([(799,541)]).circle(590,mode='s').finalize().extrude(215).union(w1.sketch().segment((2,270),(50,270)).segment((52,235)).segment((604,235)).segment((606,271)).segment((655,271)).segment((655,729)).segment((606,729)).segment((606,766)).segment((51,764)).segment((50,729)).segment((1,729)).close().assemble().finalize().extrude(246))
\ No newline at end of file
diff --git a/test/extrude/602/602.stl b/test/extrude/602/602.stl
index ecc3e79fc356eb3b7a9085d49e5e5978b23d50f7..4e1468efb60f7482d0aba05ffa72ccb64b055709 100644
Binary files a/test/extrude/602/602.stl and b/test/extrude/602/602.stl differ
diff --git a/test/extrude/603/603.py b/test/extrude/603/603.py
index edefa6ecbfb8752bb70623d02a54d78e0be4a2df..282dbd3e314624ff129dfdc925b572e4ad3f5fae 100644
--- a/test/extrude/603/603.py
+++ b/test/extrude/603/603.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(448,106,448))
-w1=cq.Workplane('YZ',origin=(685,448,448))
-r=w0.sketch().segment((606,1),(685,1)).segment((685,185)).segment((606,185)).arc((1,106),(606,1)).assemble().finalize().extrude(711).union(w0.sketch().segment((448,316),(448,395)).arc((553,1),(500,408)).segment((500,316)).close().assemble().push([(855,1000)]).circle(487).finalize().extrude(882)).union(w1.sketch().segment((514,553),(790,553)).arc((645,658),(514,553)).assemble().finalize().extrude(869))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,115))
+r=w0.sketch().arc((1,435),(311,409),(615,311)).segment((615,517)).segment((999,514)).segment((1000,691)).segment((2,691)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/603/603.stl b/test/extrude/603/603.stl
index 7451c855d7df6bdd53ed3afb9eede8f1b4245916..3be8d4b8b062e834a69d9e7faf32e6c06b84c3a9 100644
Binary files a/test/extrude/603/603.stl and b/test/extrude/603/603.stl differ
diff --git a/test/extrude/604/604.py b/test/extrude/604/604.py
index df9b820cb68e103efd63422aadfc815047dc0e90..3d545d7d5b62413125c24e18d5178e6d487fd906 100644
--- a/test/extrude/604/604.py
+++ b/test/extrude/604/604.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,331,500))
-r=w0.sketch().segment((141,660),(181,640)).segment((181,431)).segment((321,431)).arc((401,391),(491,421)).segment((510,421)).segment((510,1)).segment((860,1)).segment((860,451)).segment((750,451)).segment((750,1000)).segment((181,1000)).segment((181,720)).close().assemble().finalize().extrude(840)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,639,500))
+r=w0.workplane(offset=222).moveTo(462,265).cylinder(1000,764).union(w0.sketch().push([(552,746)]).circle(755).reset().face(w0.sketch().segment((375,855),(380,811)).segment((484,809)).segment((484,855)).close().assemble(),mode='s').finalize().extrude(776))
\ No newline at end of file
diff --git a/test/extrude/604/604.stl b/test/extrude/604/604.stl
index 76e9c0043ecead523706c7204954889813715e17..c76123b7898b08cdbfa206269d7bdf026e7f30b3 100644
Binary files a/test/extrude/604/604.stl and b/test/extrude/604/604.stl differ
diff --git a/test/extrude/605/605.py b/test/extrude/605/605.py
index db3dd32250eae7815c659fa4ae8d75b56570e71f..507ca0c1991fdf3838d9a44459480182b250b246 100644
--- a/test/extrude/605/605.py
+++ b/test/extrude/605/605.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(662,662,993))
-r=w0.sketch().segment((528,325),(798,325)).segment((798,467)).arc((899,662),(798,858)).segment((798,1000)).segment((528,1000)).segment((528,858)).arc((426,662),(528,467)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(310,500,501))
+r=w0.sketch().segment((531,505),(600,505)).segment((600,376)).arc((759,539),(530,507)).assemble().finalize().extrude(575).union(w0.sketch().push([(302,143)]).rect(640,785).push([(660,890)]).circle(611).finalize().extrude(880))
\ No newline at end of file
diff --git a/test/extrude/605/605.stl b/test/extrude/605/605.stl
index 161c0abbcbd02182488d683674d840fec6234ed7..6d08eb2b6c1959d93f80d7861d8501799b9779fe 100644
Binary files a/test/extrude/605/605.stl and b/test/extrude/605/605.stl differ
diff --git a/test/extrude/606/606.py b/test/extrude/606/606.py
index c0f1d8532b370ba4b078319cbfd4975000e2c13a..5edbb210c0723311c0615667b630a7b5f7ae7dcf 100644
--- a/test/extrude/606/606.py
+++ b/test/extrude/606/606.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(435,435,586))
-r=w0.sketch().push([(213,435)]).rect(1000,818).push([(788,475)]).circle(495).reset().face(w0.sketch().segment((808,495),(818,485)).segment((828,506)).segment((818,506)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=495).moveTo(783,475).box(748,455,556))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,627))
+r=w0.sketch().segment((71,95),(256,96)).segment((255,170)).arc((326,307),(255,434)).segment((256,511)).segment((71,510)).segment((72,435)).arc((1,307),(70,170)).close().assemble().reset().face(w0.sketch().segment((442,402),(886,401)).segment((886,316)).arc((580,190),(886,72)).segment((885,45)).segment((1000,47)).segment((1000,400)).segment((1000,984)).segment((440,986)).close().assemble()).finalize().extrude(251)
\ No newline at end of file
diff --git a/test/extrude/606/606.stl b/test/extrude/606/606.stl
index d683fa492a762247882ae46677908ccd0107a4a0..50cda32ee796cf2af99f4373dac98f181458fa1f 100644
Binary files a/test/extrude/606/606.stl and b/test/extrude/606/606.stl differ
diff --git a/test/extrude/607/607.py b/test/extrude/607/607.py
index cf25561a07dde9b4aefb234d12c2ea1852cd3ecb..8174d01a45e1fb7fe1ec71807fc17019d09291eb 100644
--- a/test/extrude/607/607.py
+++ b/test/extrude/607/607.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(417,417,547))
-r=w0.sketch().segment((47,149),(426,149)).segment((426,66)).segment((667,66)).segment((667,288)).segment((732,473)).segment((667,491)).segment((667,667)).segment((426,667)).segment((426,491)).arc((473,436),(408,399)).segment((371,306)).segment((47,306)).close().assemble().push([(519,172)]).rect(602,538,mode='s').push([(496,52)]).rect(1000,426).finalize().extrude(84).union(w0.workplane(offset=408).moveTo(121,1).cylinder(436,464)).union(w0.sketch().push([(168,690)]).rect(473,796).push([(168,686)]).circle(426,mode='s').push([(172,801)]).rect(445,464,mode='s').finalize().extrude(491)).translate((1,47,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(525,501,500))
+r=w0.sketch().segment((216,131),(266,130)).segment((265,171)).arc((481,406),(266,644)).segment((265,680)).segment((215,680)).segment((215,646)).arc((1,405),(215,170)).close().assemble().reset().face(w0.sketch().arc((769,615),(824,289),(905,612)).segment((904,870)).segment((770,871)).close().assemble()).finalize().extrude(447)
\ No newline at end of file
diff --git a/test/extrude/607/607.stl b/test/extrude/607/607.stl
index 57196a13440e80e05d09302a1b75d67da615740b..1eb30dde9bada968aac9175e2feac5eed008e96f 100644
Binary files a/test/extrude/607/607.stl and b/test/extrude/607/607.stl differ
diff --git a/test/extrude/608/608.py b/test/extrude/608/608.py
index a077114529648b5a7a8eb5438d6376038c93eba7..05115331059070922654fbe071351330a8823703 100644
--- a/test/extrude/608/608.py
+++ b/test/extrude/608/608.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,462))
-w1=cq.Workplane('ZX',origin=(495,144,495))
-r=w0.sketch().arc((396,473),(758,506),(583,813)).arc((23,879),(396,473)).assemble().push([(561,605)]).circle(572,mode='s').finalize().extrude(177).union(w0.sketch().arc((188,264),(528,1),(319,374)).segment((462,232)).segment((330,111)).close().assemble().finalize().extrude(627)).union(w1.sketch().segment((308,385),(407,385)).arc((440,330),(506,341)).segment((506,352)).segment((517,352)).arc((517,363),(528,385)).segment((846,385)).segment((846,1000)).segment((308,1000)).close().assemble().finalize().extrude(352))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(121,501,502))
+w1=cq.Workplane('ZX',origin=(502,571,500))
+r=w0.sketch().segment((865,106),(1000,107)).segment((1000,176)).arc((936,160),(866,177)).close().assemble().finalize().extrude(656).union(w1.sketch().arc((390,610),(417,465),(546,395)).arc((850,775),(390,610)).assemble().reset().face(w1.sketch().segment((536,436),(571,435)).segment((571,480)).arc((765,526),(571,570)).segment((570,696)).segment((534,695)).close().assemble(),mode='s').finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/608/608.stl b/test/extrude/608/608.stl
index 289ffe074f06dc69d7e0361098ce811b952de6fc..62cbb5cb3468a8cc9645659ede5d2229c33e3dac 100644
Binary files a/test/extrude/608/608.stl and b/test/extrude/608/608.stl differ
diff --git a/test/extrude/609/609.py b/test/extrude/609/609.py
index fec56504762a0063516e85632764aa001aa77d92..7577527e5661f07c7af0eb3ac5f7cb51c8a7af4e 100644
--- a/test/extrude/609/609.py
+++ b/test/extrude/609/609.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(331,459,459))
-r=w0.sketch().arc((1,551),(129,441),(303,450)).arc((817,111),(505,643)).segment((505,551)).close().assemble().reset().face(w0.sketch().segment((1,780),(413,780)).arc((203,899),(1,780)).assemble()).finalize().extrude(432).union(w0.sketch().push([(601,336)]).rect(835,1000).push([(514,313)]).circle(478,mode='s').finalize().extrude(743))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,461))
+r=w0.sketch().push([(409,933)]).rect(995,634).push([(622,198)]).rect(934,896).push([(410,306)]).circle(504,mode='s').finalize().extrude(581)
\ No newline at end of file
diff --git a/test/extrude/609/609.stl b/test/extrude/609/609.stl
index bbcf21a5032fe090c63b3a0c5da55345431a2f69..273b92bcfd4ca2c8c8fabea97dbfcebce50d7163 100644
Binary files a/test/extrude/609/609.stl and b/test/extrude/609/609.stl differ
diff --git a/test/extrude/61/61.py b/test/extrude/61/61.py
index 1916cd00a8573787c07b64ab48a364e203a6abd9..9d82e6a15cc771c338f2c04c5e2c067f577211cc 100644
--- a/test/extrude/61/61.py
+++ b/test/extrude/61/61.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(458,533,458))
-w1=cq.Workplane('XY',origin=(458,458,524))
-r=w0.workplane(offset=188).moveTo(225,20).box(683,496,1000).union(w0.workplane(offset=547).moveTo(589,300).cylinder(636,477)).union(w0.sketch().segment((328,804),(402,785)).segment((440,888)).segment((356,916)).close().assemble().reset().face(w0.sketch().segment((664,1),(804,1)).segment((804,225)).segment((776,225)).arc((449,440),(664,104)).close().assemble()).reset().face(w0.sketch().segment((543,188),(608,178)).segment((645,402)).segment((580,412)).close().assemble(),mode='s').finalize().extrude(851)).union(w1.workplane(offset=594).moveTo(146,510).box(673,673,729))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(12,48,57))
+r=w0.sketch().segment((137,16),(739,16)).arc((800,41),(825,102)).segment((825,704)).segment((739,704)).segment((739,102)).segment((137,102)).close().assemble().finalize().extrude(361).union(w0.workplane(offset=90).sketch().segment((334,758),(710,758)).segment((710,386)).segment((334,386)).close().assemble().finalize().extrude(48)).translate((1,314,1))
diff --git a/test/extrude/61/61.stl b/test/extrude/61/61.stl
index d8776ff61aa7253b4386e6a548ce27ca9e6862a0..a22bfc5324c10e8cc00dbd3821088323680af4c4 100644
Binary files a/test/extrude/61/61.stl and b/test/extrude/61/61.stl differ
diff --git a/test/extrude/610/610.py b/test/extrude/610/610.py
index 92307a8b7da9e629eb8f6d8b0548eecdbc3bc08b..d95c289b28aa7f0830cfc68f984c2ebac0460f22 100644
--- a/test/extrude/610/610.py
+++ b/test/extrude/610/610.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(627,640,627))
-w1=cq.Workplane('ZX',origin=(627,680,627))
-r=w0.sketch().push([(574,987)]).circle(933).reset().face(w0.sketch().segment((614,520),(694,374)).segment((800,441)).segment((707,587)).close().assemble()).finalize().extrude(853).union(w0.workplane(offset=814).moveTo(700,481).box(694,787,1000)).union(w1.sketch().arc((427,454),(387,1),(787,214)).arc((853,707),(427,454)).assemble().finalize().extrude(187))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(376,502,501))
+r=w0.workplane(offset=555).moveTo(458,154).box(606,805,611).union(w0.workplane(offset=626).moveTo(500,840).box(871,820,751))
\ No newline at end of file
diff --git a/test/extrude/610/610.stl b/test/extrude/610/610.stl
index 2f5353a6a00b238d8c7abb5dc38a2aa3b18a9a80..982a95ce81ac993a24e0a71697f9a3f59bafdc29 100644
Binary files a/test/extrude/610/610.stl and b/test/extrude/610/610.stl differ
diff --git a/test/extrude/611/611.py b/test/extrude/611/611.py
index 85ce7babbcbed846775a75fbbb5c32d1343f35d3..9b60f1123882a90906f2682f20f526eb5f47643a 100644
--- a/test/extrude/611/611.py
+++ b/test/extrude/611/611.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(631,316,316))
-r=w0.workplane(offset=1).box(617,1000,945).translate((1,1,185))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,136,501))
+w1=cq.Workplane('YZ',origin=(821,501,502))
+r=w0.sketch().push([(292,776)]).circle(725).reset().face(w0.sketch().segment((267,486),(361,1)).segment((551,40)).arc((321,246),(452,525)).close().assemble()).finalize().extrude(604).union(w1.workplane(offset=540).moveTo(571,640).cylinder(579,795))
\ No newline at end of file
diff --git a/test/extrude/611/611.stl b/test/extrude/611/611.stl
index 050e06b231672cc7c8139232c653ac0b700ab6a1..13e644603cf4570ac59a390ecfa93d2639cb8e2a 100644
Binary files a/test/extrude/611/611.stl and b/test/extrude/611/611.stl differ
diff --git a/test/extrude/612/612.py b/test/extrude/612/612.py
index b5e3dda9506b946241095dc8eec502af6d76c4fa..cf30103d2ba91d064d3314b72bd70c844b68a393 100644
--- a/test/extrude/612/612.py
+++ b/test/extrude/612/612.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(74,382,382))
-w1=cq.Workplane('YZ',origin=(137,382,382))
-r=w0.sketch().circle(528).push([(382,1)]).rect(455,528).push([(382,764)]).rect(455,528).finalize().extrude(1000).union(w1.sketch().arc((19,155),(65,164),(37,128)).arc((737,628),(19,155)).assemble().circle(718,mode='s').finalize().extrude(328)).translate((1,147,147))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,537,500))
+r=w0.sketch().arc((301,292),(360,270),(427,267)).segment((425,231)).segment((861,230)).segment((860,286)).segment((894,285)).segment((896,445)).segment((1000,444)).segment((1000,705)).segment((861,704)).segment((860,741)).segment((850,741)).segment((850,770)).segment((699,770)).segment((701,740)).segment((426,741)).segment((425,721)).arc((360,716),(301,696)).segment((425,695)).segment((426,685)).segment((386,685)).segment((385,290)).close().assemble().finalize().extrude(166).union(w0.sketch().segment((2,440),(332,441)).arc((681,566),(306,596)).segment((1,595)).close().assemble().finalize().extrude(761))
\ No newline at end of file
diff --git a/test/extrude/612/612.stl b/test/extrude/612/612.stl
index 703acf16dea043db420d9824c14c9805ecb12fd0..e686b8cd9640e289b3ffac609c06d4b808ee7b8a 100644
Binary files a/test/extrude/612/612.stl and b/test/extrude/612/612.stl differ
diff --git a/test/extrude/613/613.py b/test/extrude/613/613.py
index 45d925a3e5cf0cd0cce5dc07a5c52c0836c3d6f2..f94b693816b58bbf93cbac3efba3040cfe2d1001 100644
--- a/test/extrude/613/613.py
+++ b/test/extrude/613/613.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(395,395,591))
-w1=cq.Workplane('YZ',origin=(168,395,395))
-r=w0.sketch().segment((251,160),(251,168)).segment((319,168)).segment((319,152)).arc((357,743),(251,160)).assemble().push([(281,410)]).rect(637,591,mode='s').finalize().extrude(1).union(w0.sketch().segment((115,395),(266,266)).segment((629,289)).segment((629,395)).segment((523,395)).arc((326,659),(122,395)).close().assemble().reset().face(w0.sketch().segment((281,395),(342,395)).segment((342,531)).segment((326,531)).segment((326,546)).segment((304,546)).segment((304,531)).segment((281,531)).close().assemble(),mode='s').finalize().extrude(168)).union(w1.sketch().push([(115,379)]).circle(463).circle(417,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,525))
+w1=cq.Workplane('YZ',origin=(456,501,501))
+r=w0.sketch().segment((402,440),(646,331)).segment((465,331)).segment((465,2)).segment((750,1)).segment((751,330)).segment((666,332)).segment((751,530)).segment((606,594)).segment((604,620)).segment((546,620)).segment((489,646)).segment((480,620)).segment((477,621)).segment((475,606)).close().assemble().push([(602,139)]).rect(585,645,mode='s').finalize().extrude(221).union(w0.sketch().segment((766,635),(871,634)).segment((871,641)).segment((860,641)).segment((860,711)).segment((869,711)).segment((871,721)).segment((765,721)).close().assemble().finalize().extrude(626)).union(w0.workplane(offset=612).moveTo(405,879).cylinder(726,621)).union(w1.workplane(offset=338).moveTo(282,440).cylinder(825,542))
\ No newline at end of file
diff --git a/test/extrude/613/613.stl b/test/extrude/613/613.stl
index a77f425410b433d519ee32dc2c8fbe9589d518a5..7925159f63de3613eb1d4943cbbf96f928972b56 100644
Binary files a/test/extrude/613/613.stl and b/test/extrude/613/613.stl differ
diff --git a/test/extrude/614/614.py b/test/extrude/614/614.py
index 83ff835a8b08d86a89da26a033fcaa3e9bc9f700..723b8499e7d836e53c7a8a07a0915c01489ea9f5 100644
--- a/test/extrude/614/614.py
+++ b/test/extrude/614/614.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,323,323))
-r=w0.sketch().push([(151,98)]).circle(635).reset().face(w0.sketch().arc((377,710),(420,721),(388,764)).close().assemble()).finalize().extrude(302).union(w0.sketch().segment((721,828),(807,828)).segment((807,860)).segment((764,860)).segment((764,850)).segment((753,850)).segment((753,860)).segment((721,860)).close().assemble().finalize().extrude(1000)).translate((1,162,215))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,342,501))
+r=w0.sketch().segment((230,403),(281,376)).arc((387,387),(476,326)).segment((616,618)).segment((425,707)).arc((96,941),(337,611)).close().assemble().push([(577,57)]).circle(556).circle(535,mode='s').push([(888,310)]).circle(588).finalize().extrude(822)
\ No newline at end of file
diff --git a/test/extrude/614/614.stl b/test/extrude/614/614.stl
index 5e39567dcf0206566c780e9b248141a39267ca7d..c11e4c32b3a4282a7a52c6325a59c0219a6a4adb 100644
Binary files a/test/extrude/614/614.stl and b/test/extrude/614/614.stl differ
diff --git a/test/extrude/615/615.py b/test/extrude/615/615.py
index 80a179013d7f4096381afbfc2d29efcb21ec5a5b..7f7ff220675c0d995448d0a98499d6139067cbc2 100644
--- a/test/extrude/615/615.py
+++ b/test/extrude/615/615.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(564,500,564))
-w1=cq.Workplane('YZ',origin=(673,564,564))
-r=w0.sketch().arc((319,573),(691,292),(900,718)).segment((882,718)).segment((900,573)).segment((555,546)).segment((555,573)).arc((628,628),(664,709)).segment((827,718)).segment((827,755)).segment((882,755)).arc((782,855),(646,900)).arc((273,955),(319,573)).assemble().finalize().extrude(183).union(w0.workplane(offset=519).moveTo(619,591).cylinder(655,609)).union(w1.sketch().arc((201,673),(573,655),(573,273)).arc((718,273),(827,373)).arc((1000,401),(846,482)).arc((791,591),(682,655)).arc((682,682),(673,709)).arc((619,737),(609,800)).arc((364,864),(201,673)).assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(476,501,501))
+r=w0.sketch().push([(162,237)]).rect(826,885).push([(755,710)]).circle(745).rect(691,761,mode='s').finalize().extrude(172).union(w0.workplane(offset=483).moveTo(215,531).cylinder(535,611)).union(w0.workplane(offset=689).moveTo(214,530).box(815,519,879))
\ No newline at end of file
diff --git a/test/extrude/615/615.stl b/test/extrude/615/615.stl
index 61df8803a58c999ad188fb6417b06589d8f309dd..eb7d0b06dc817f096ea2d93eeb2f0b2b4245d27d 100644
Binary files a/test/extrude/615/615.stl and b/test/extrude/615/615.stl differ
diff --git a/test/extrude/616/616.py b/test/extrude/616/616.py
index 554487180ed6b8deccf3ec106e4ceda10ec73aef..229254274fa4a45650ae9d7cb5d28b57f8987d8a 100644
--- a/test/extrude/616/616.py
+++ b/test/extrude/616/616.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(512,512,315))
-r=w0.sketch().segment((1,222),(349,222)).segment((349,257)).segment((500,257)).arc((1000,82),(547,361)).segment((547,919)).segment((280,919)).segment((280,803)).segment((535,803)).segment((535,582)).segment((257,582)).segment((257,779)).segment((1,779)).close().assemble().finalize().extrude(884).union(w0.workplane(offset=710).moveTo(274,849).box(965,1000,907))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(457,289,288))
+r=w0.workplane(offset=117).moveTo(362,340).cylinder(574,351).union(w0.sketch().push([(211,111)]).circle(398).reset().face(w0.sketch().segment((383,481),(474,480)).segment((475,515)).segment((394,515)).arc((288,537),(383,486)).close().assemble()).finalize().extrude(120))
\ No newline at end of file
diff --git a/test/extrude/616/616.stl b/test/extrude/616/616.stl
index a4c95f29f7e501be2d30af6562eba6421aa636ca..5414a6e0e440c827ebe1c1f65ae30771ed252b58 100644
Binary files a/test/extrude/616/616.stl and b/test/extrude/616/616.stl differ
diff --git a/test/extrude/617/617.py b/test/extrude/617/617.py
index f18aab6074cf8a42dc96f979e2b7cfab3e7e16b9..0b1a2cd15134d705ca7dbb9d240daa27c7535d60 100644
--- a/test/extrude/617/617.py
+++ b/test/extrude/617/617.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(592,592,722))
-r=w0.sketch().push([(563,551)]).rect(911,911).push([(568,557)]).circle(651,mode='s').finalize().extrude(48).union(w0.sketch().push([(734,852)]).circle(734).push([(994,379)]).circle(781).push([(1000,385)]).rect(840,628,mode='s').finalize().extrude(403)).union(w0.sketch().segment((1,604),(36,509)).arc((36,403),(107,320)).segment((143,214)).segment((367,297)).segment((332,403)).arc((332,509),(261,592)).segment((226,687)).close().assemble().finalize().extrude(864))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,417,501))
+w1=cq.Workplane('ZX',origin=(502,357,502))
+r=w0.sketch().push([(856,782)]).rect(790,656).push([(730,820)]).rect(520,542,mode='s').finalize().extrude(149).union(w1.sketch().arc((307,212),(640,301),(352,492)).arc((2,401),(307,212)).assemble().push([(198,371)]).rect(670,800,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/617/617.stl b/test/extrude/617/617.stl
index ac8ed9cdaae3ba6d8dab2d9b88c7ff9d66f79a9c..5be93947ed1c263c87ee2bb379d1ea384956a2a9 100644
Binary files a/test/extrude/617/617.stl and b/test/extrude/617/617.stl differ
diff --git a/test/extrude/618/618.py b/test/extrude/618/618.py
index aa71219858affa6874c9b38113a2df915a7c2652..7f4df127c9001eca8b709fd1594c3dd86b8b57ca 100644
--- a/test/extrude/618/618.py
+++ b/test/extrude/618/618.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,740,500))
-r=w0.sketch().segment((471,1),(471,411)).arc((401,500),(471,590)).segment((471,1000)).arc((1,500),(471,1)).assemble().reset().face(w0.sketch().arc((530,1),(1000,500),(530,1000)).segment((530,590)).arc((600,500),(530,411)).close().assemble()).finalize().extrude(21).union(w0.workplane(offset=276).box(560,1000,950))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(401,499,501))
+r=w0.workplane(offset=561).moveTo(554,324).box(865,739,619).union(w0.sketch().segment((2,500),(46,316)).segment((370,394)).segment((415,396)).segment((416,407)).segment((565,440)).segment((535,561)).segment((534,570)).segment((521,621)).segment((195,545)).segment((156,546)).arc((151,515),(130,495)).segment((320,497)).segment((320,445)).segment((66,446)).segment((65,490)).arc((55,495),(45,509)).close().assemble().reset().face(w0.sketch().segment((615,691),(1000,630)).arc((831,794),(616,691)).assemble()).finalize().extrude(701))
\ No newline at end of file
diff --git a/test/extrude/618/618.stl b/test/extrude/618/618.stl
index a52a869de48ae7e09b554e6fecc2247b554408ef..a08f88f86d04ef889ce60f37999e26d76f973c53 100644
Binary files a/test/extrude/618/618.stl and b/test/extrude/618/618.stl differ
diff --git a/test/extrude/619/619.py b/test/extrude/619/619.py
index 9eb1502b3b09fe20b16cfafc2a8fe76bc06ae931..aa3144887509db62824438cf71710b98e7e2bd84 100644
--- a/test/extrude/619/619.py
+++ b/test/extrude/619/619.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(566,566,409))
-w1=cq.Workplane('ZX',origin=(566,696,566))
-r=w0.sketch().segment((305,531),(679,531)).segment((679,705)).arc((453,783),(557,1000)).segment((305,1000)).close().assemble().finalize().extrude(453).union(w0.sketch().segment((444,826),(548,826)).arc((496,844),(444,826)).assemble().finalize().extrude(557)).union(w1.sketch().segment((244,444),(418,444)).segment((418,401)).segment((644,401)).segment((644,409)).segment((739,409)).segment((739,444)).segment((887,444)).segment((887,679)).segment((818,679)).segment((818,774)).segment((644,774)).segment((644,826)).segment((418,826)).segment((418,774)).segment((244,774)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,415,501))
+r=w0.sketch().push([(396,348)]).rect(1000,1000).push([(317,436)]).circle(705,mode='s').reset().face(w0.sketch().segment((527,831),(551,745)).segment((726,795)).arc((967,896),(707,886)).close().assemble()).finalize().extrude(406).union(w0.workplane(offset=630).moveTo(253,316).box(947,1000,761))
\ No newline at end of file
diff --git a/test/extrude/619/619.stl b/test/extrude/619/619.stl
index 53ad99237a493af628d068e3d4ed89cefad85dfd..7db3f2190481a966e74ad8fc8e64b0a0af65b917 100644
Binary files a/test/extrude/619/619.stl and b/test/extrude/619/619.stl differ
diff --git a/test/extrude/62/62.py b/test/extrude/62/62.py
index f95a99f5651da72770db32cdcea79fdda872f701..b877223738ad2d9c2235c2850d758ebd82f8d62e 100644
--- a/test/extrude/62/62.py
+++ b/test/extrude/62/62.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(332,442,442))
-r=w0.sketch().push([(993,759)]).circle(580).push([(1000,752)]).rect(649,511,mode='s').finalize().extrude(414).union(w0.sketch().push([(1,180)]).rect(938,828).circle(456,mode='s').finalize().extrude(690)).translate((1,27,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(27,65,6))
+r=w0.sketch().segment((430,998),(932,998)).segment((932,184)).segment((430,184)).close().assemble().push([(644,549)]).rect(185,269,mode='s').finalize().extrude(267)
diff --git a/test/extrude/62/62.stl b/test/extrude/62/62.stl
index 800d6e5b00adffadb9161f8243bcfbafe2217fb9..1e324a9bf3011be60c97d4a6db4e168390658ee2 100644
Binary files a/test/extrude/62/62.stl and b/test/extrude/62/62.stl differ
diff --git a/test/extrude/620/620.py b/test/extrude/620/620.py
index 27bd4d19940e8a83a2612f52ddcf700f423fabf8..29d0ed32f8650e9bc89a3f41175b1c2537cee42d 100644
--- a/test/extrude/620/620.py
+++ b/test/extrude/620/620.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(511,266,511))
-r=w0.sketch().segment((1,500),(195,500)).arc((419,256),(674,480)).arc((847,684),(572,684)).arc((490,725),(399,725)).segment((1,725)).close().assemble().push([(990,562)]).circle(541).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(783,500,498))
+w1=cq.Workplane('YZ',origin=(549,498,500))
+r=w0.sketch().segment((329,689),(329,823)).segment((699,822)).arc((430,987),(330,689)).assemble().finalize().extrude(369).union(w1.sketch().push([(504,176)]).circle(674).reset().face(w1.sketch().segment((434,145),(634,144)).segment((635,195)).segment((524,195)).arc((505,201),(485,195)).segment((436,195)).close().assemble(),mode='s').finalize().extrude(165))
\ No newline at end of file
diff --git a/test/extrude/620/620.stl b/test/extrude/620/620.stl
index ba0613d85b2011c7f0aa3b4912c30fbf2359ff44..facc80410fed75aeda1cf0e1d89be4bcef1f74fa 100644
Binary files a/test/extrude/620/620.stl and b/test/extrude/620/620.stl differ
diff --git a/test/extrude/621/621.py b/test/extrude/621/621.py
index 8ee37a4461c0115d26c7df318c76c57ac9dd6f61..dc809f60eee333c9bab4928696d4089f8cb6c614 100644
--- a/test/extrude/621/621.py
+++ b/test/extrude/621/621.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).box(401,694,1000).translate((1,14,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,522))
+w1=cq.Workplane('ZX',origin=(502,726,500))
+r=w0.sketch().arc((720,515),(726,510),(724,506)).segment((1000,506)).segment((1000,516)).close().assemble().finalize().extrude(746).union(w1.sketch().segment((282,51),(282,116)).segment((387,116)).segment((385,13)).segment((342,12)).arc((490,306),(281,52)).assemble().push([(523,193)]).rect(525,586,mode='s').finalize().extrude(48))
\ No newline at end of file
diff --git a/test/extrude/621/621.stl b/test/extrude/621/621.stl
index cc4b41cc0888637d6d73b9a5caa1519c649c3091..f0fb58c9b5d47622b7f1500e06c4c3d9812688d7 100644
Binary files a/test/extrude/621/621.stl and b/test/extrude/621/621.stl differ
diff --git a/test/extrude/622/622.py b/test/extrude/622/622.py
index 9463d6a583f533171629c4b09320bf679582151b..8b1f83274e4e72d611b4227724490d46e28816f4 100644
--- a/test/extrude/622/622.py
+++ b/test/extrude/622/622.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(477,239,477))
-r=w0.sketch().arc((420,629),(87,410),(439,210)).segment((439,201)).segment((600,267)).segment((562,267)).segment((562,686)).close().assemble().reset().face(w0.sketch().segment((638,715),(677,715)).segment((677,296)).segment((952,420)).segment((800,781)).close().assemble()).finalize().extrude(439).union(w0.sketch().segment((1,524),(125,172)).segment((172,182)).segment((125,324)).arc((134,324),(144,334)).segment((144,324)).segment((172,324)).segment((172,334)).arc((163,344),(153,344)).arc((153,391),(106,401)).segment((49,543)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,640,502))
+r=w0.sketch().segment((120,455),(276,710)).segment((291,699)).segment((291,470)).segment((616,470)).segment((616,771)).segment((370,771)).arc((126,709),(121,455)).assemble().finalize().extrude(15).union(w0.sketch().push([(40,151)]).circle(541).reset().face(w0.sketch().segment((500,231),(806,231)).segment((806,221)).segment((845,221)).segment((844,125)).arc((864,170),(874,220)).segment((1000,222)).segment((1000,330)).segment((850,330)).arc((636,415),(499,230)).assemble()).push([(892,706)]).rect(615,869).finalize().extrude(699))
\ No newline at end of file
diff --git a/test/extrude/622/622.stl b/test/extrude/622/622.stl
index 9b8e906eb17462efc5ed96b8d5570a010f91d286..83b933973d5e58ed89640f1fd72c5f3199707aa9 100644
Binary files a/test/extrude/622/622.stl and b/test/extrude/622/622.stl differ
diff --git a/test/extrude/623/623.py b/test/extrude/623/623.py
index 46be82f709afff2b367e5e9ac40fd047a4d624e8..d217fb5dd7a407982cb2522f6ac14a87d4dcb8d2 100644
--- a/test/extrude/623/623.py
+++ b/test/extrude/623/623.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(414,276,276))
-r=w0.sketch().rect(320,1000).circle(291,mode='s').finalize().extrude(1).translate((1,1,225))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,421,501))
+r=w0.sketch().segment((670,306),(675,306)).segment((695,275)).arc((696,300),(671,310)).close().assemble().finalize().extrude(80).union(w0.workplane(offset=628).moveTo(493,540).box(886,870,755)).union(w0.sketch().arc((340,430),(450,426),(534,356)).arc((685,541),(546,726)).arc((455,681),(361,674)).arc((306,556),(341,430)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/623/623.stl b/test/extrude/623/623.stl
index 4e5ac87a3fa052389fabf2302fd8008317c7e314..87ac87aed9b4390bece2864fd43bb3be0f5e7451 100644
Binary files a/test/extrude/623/623.stl and b/test/extrude/623/623.stl differ
diff --git a/test/extrude/624/624.py b/test/extrude/624/624.py
index 374cdf6f2f74f025298152c010d8a671300e0d33..df652c4f273c80b76e4f3b4b02fcaed2bc04cb76 100644
--- a/test/extrude/624/624.py
+++ b/test/extrude/624/624.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,520))
-r=w0.sketch().arc((391,970),(421,980),(461,980)).segment((461,990)).segment((401,1000)).close().assemble().finalize().extrude(441).union(w0.sketch().arc((481,1),(600,141),(580,331)).segment((580,311)).segment((481,311)).close().assemble().finalize().extrude(510))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(387,502,500))
+r=w0.sketch().arc((995,601),(1000,646),(996,690)).close().assemble().finalize().extrude(296).union(w0.sketch().arc((13,312),(22,351),(33,311)).segment((28,317)).segment((33,317)).segment((33,341)).segment((12,342)).segment((13,316)).segment((18,316)).close().assemble().finalize().extrude(940))
\ No newline at end of file
diff --git a/test/extrude/624/624.stl b/test/extrude/624/624.stl
index a42e62b43ae5fd7d6d8ae1d4ef26cdc7f5b21deb..1e2176d8b6c6e532fd20a84080bad009cb07b9a8 100644
Binary files a/test/extrude/624/624.stl and b/test/extrude/624/624.stl differ
diff --git a/test/extrude/625/625.py b/test/extrude/625/625.py
index 11f7842b6b47292a60d668479880b7e30f716812..7d200c7076a3da36a97d75b40fadb3c74f2388af 100644
--- a/test/extrude/625/625.py
+++ b/test/extrude/625/625.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(8,336,336))
-r=w0.sketch().segment((1,135),(195,135)).segment((195,21)).segment((477,21)).segment((477,135)).segment((671,135)).segment((671,537)).segment((477,537)).segment((477,651)).segment((195,651)).segment((195,537)).segment((1,537)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(291,501,500))
+w1=cq.Workplane('ZX',origin=(500,706,500))
+r=w0.sketch().push([(237,557)]).rect(975,584).reset().face(w0.sketch().segment((545,565),(645,480)).segment((644,514)).segment((764,516)).segment((764,381)).segment((876,286)).segment((1000,436)).segment((676,715)).close().assemble()).finalize().extrude(925).union(w1.sketch().push([(422,427)]).circle(534).rect(551,551,mode='s').finalize().extrude(560))
\ No newline at end of file
diff --git a/test/extrude/625/625.stl b/test/extrude/625/625.stl
index f936344f71e69fa2ea31a2aa56e5664b8108773a..568a3784746618386fd70c8b828fe44e1799e1ef 100644
Binary files a/test/extrude/625/625.stl and b/test/extrude/625/625.stl differ
diff --git a/test/extrude/626/626.py b/test/extrude/626/626.py
index c6fc52d37cf164c5087b97c692ad4b7876cc7321..c72d94ea55bdff45dfbfe36b4f3eac51131a9caa 100644
--- a/test/extrude/626/626.py
+++ b/test/extrude/626/626.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(541,541,455))
-r=w0.workplane(offset=573).moveTo(800,379).cylinder(606,725).union(w0.sketch().segment((1,476),(141,411)).segment((185,476)).segment((98,476)).segment((98,617)).segment((77,627)).close().assemble().reset().face(w0.sketch().segment((444,822),(476,811)).arc((541,725),(638,779)).segment((671,768)).segment((681,779)).segment((638,789)).arc((573,876),(487,822)).segment((444,833)).close().assemble()).push([(1000,449)]).rect(703,768).push([(984,498)]).circle(584,mode='s').finalize().extrude(725))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,270))
+w1=cq.Workplane('YZ',origin=(281,499,500))
+r=w0.sketch().segment((116,215),(561,216)).segment((561,784)).segment((405,784)).arc((287,661),(162,785)).segment((116,786)).close().assemble().finalize().extrude(1000).union(w0.workplane(offset=791).moveTo(337,501).cylinder(1000,835)).union(w1.sketch().segment((297,152),(626,150)).segment((627,247)).segment((676,245)).segment((674,495)).segment((625,495)).segment((625,554)).segment((295,555)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/626/626.stl b/test/extrude/626/626.stl
index be49f151647267c0c607d95c1226261947b3bd2d..e2a59fc0b9090d86a3984cf055a1cab9bfac9f14 100644
Binary files a/test/extrude/626/626.stl and b/test/extrude/626/626.stl differ
diff --git a/test/extrude/627/627.py b/test/extrude/627/627.py
index 92425ffa49b993a4da6914639596427487913542..ea899f015d3625dc795700c78ce8e040e088e8a1 100644
--- a/test/extrude/627/627.py
+++ b/test/extrude/627/627.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,481,500))
-r=w0.sketch().segment((451,1),(550,1)).segment((550,411)).arc((610,500),(550,590)).segment((550,1000)).segment((451,1000)).segment((451,590)).arc((391,500),(451,411)).close().assemble().finalize().extrude(540)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(487,501,500))
+w1=cq.Workplane('XY',origin=(500,502,40))
+r=w0.workplane(offset=671).moveTo(556,516).cylinder(840,945).union(w1.workplane(offset=607).moveTo(271,96).cylinder(716,596))
\ No newline at end of file
diff --git a/test/extrude/627/627.stl b/test/extrude/627/627.stl
index 2a6b697f9dcfd6c48ca11350fb8a4ff3da2b40d4..282a27eac546c3745ed95f9a2d54212d63ed6fec 100644
Binary files a/test/extrude/627/627.stl and b/test/extrude/627/627.stl differ
diff --git a/test/extrude/628/628.py b/test/extrude/628/628.py
index 3673d1fd805d3c90a8d1111613cfe12da73180a1..38f72d3e50d353234faac352aaab750d5f781b8c 100644
--- a/test/extrude/628/628.py
+++ b/test/extrude/628/628.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(596,596,524))
-w1=cq.Workplane('ZX',origin=(596,964,596))
-r=w0.sketch().segment((144,489),(405,489)).segment((405,1)).segment((917,1)).segment((917,572)).segment((643,572)).segment((643,643)).segment((144,643)).close().assemble().push([(762,851)]).rect(905,703).finalize().extrude(382).union(w1.sketch().segment((382,310),(750,310)).segment((750,500)).arc((917,643),(822,857)).arc((393,1000),(382,548)).close().assemble().push([(596,816)]).rect(929,822,mode='s').finalize().extrude(822))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,524,500))
+r=w0.sketch().segment((1,759),(12,596)).segment((196,606)).segment((187,769)).close().assemble().push([(844,376)]).rect(814,790).finalize().extrude(200).union(w0.sketch().segment((430,661),(441,660)).arc((455,661),(475,655)).segment((519,651)).segment((525,660)).segment((435,666)).close().assemble().reset().face(w0.sketch().segment((440,710),(530,706)).segment((530,711)).segment((440,721)).close().assemble()).finalize().extrude(746))
\ No newline at end of file
diff --git a/test/extrude/628/628.stl b/test/extrude/628/628.stl
index 5a6feb2781548f873c60a46039143d5fd988fdbc..9c111f2be28990fe57479b2431f129c2c47f2122 100644
Binary files a/test/extrude/628/628.stl and b/test/extrude/628/628.stl differ
diff --git a/test/extrude/629/629.py b/test/extrude/629/629.py
index 13eef482935002a373ae274e800a6857b4b7ab19..9d71a585a12e69cb24aabc165b2573b456f5123e 100644
--- a/test/extrude/629/629.py
+++ b/test/extrude/629/629.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(129,428,428))
-w1=cq.Workplane('YZ',origin=(172,428,428))
-r=w0.sketch().segment((27,590),(112,402)).segment((112,1)).segment((752,1)).segment((752,368)).segment((829,394)).segment((752,556)).segment((752,812)).segment((641,812)).segment((624,855)).segment((530,812)).segment((112,812)).segment((112,624)).close().assemble().finalize().extrude(624).union(w1.sketch().push([(428,492)]).rect(530,1000).push([(394,317)]).circle(445,mode='s').push([(419,377)]).circle(471,mode='s').finalize().extrude(983))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,564,501))
+w1=cq.Workplane('YZ',origin=(440,502,501))
+r=w0.sketch().segment((2,210),(535,212)).segment((535,485)).arc((600,440),(670,426)).arc((885,440),(826,645)).arc((696,756),(535,700)).segment((534,716)).segment((2,716)).close().assemble().push([(271,466)]).circle(530,mode='s').push([(715,187)]).circle(666).finalize().extrude(371).union(w1.sketch().segment((486,632),(536,632)).segment((534,547)).segment((549,545)).segment((551,629)).segment((565,629)).segment((565,780)).segment((550,779)).segment((550,1000)).segment((535,1000)).segment((536,779)).segment((487,781)).arc((506,706),(485,630)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/629/629.stl b/test/extrude/629/629.stl
index f6939fc56dc5ae437e69abda1d4055fb8079dd78..da6d733b328adb4241fe49092890792b0d303c75 100644
Binary files a/test/extrude/629/629.stl and b/test/extrude/629/629.stl differ
diff --git a/test/extrude/63/63.py b/test/extrude/63/63.py
index c4fb7bae3a5a1335f2d0ab4ee40595cb4a49cbb9..f82c63fa896cf65cc7321f99aa6778d1b440ad7a 100644
--- a/test/extrude/63/63.py
+++ b/test/extrude/63/63.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(627,940,627))
-r=w0.sketch().segment((329,866),(508,866)).arc((627,761),(747,866)).segment((925,866)).segment((925,896)).segment((747,896)).arc((627,1000),(508,896)).segment((329,896)).close().assemble().reset().face(w0.sketch().segment((500,254),(806,254)).segment((814,605)).segment((508,612)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(32,60,46))
+r=w0.sketch().segment((205,718),(63,718)).segment((63,750)).segment((205,750)).segment((337,882)).segment((705,514)).segment((705,467)).segment((804,467)).segment((804,434)).segment((491,430)).close().assemble().finalize().extrude(101).union(w0.workplane(offset=67).sketch().segment((181,599),(491,599)).segment((491,279)).segment((181,279)).close().assemble().finalize().extrude(166)).union(w0.workplane(offset=192).sketch().segment((187,467),(555,467)).segment((555,801)).segment((187,801)).close().assemble().finalize().extrude(105))
diff --git a/test/extrude/63/63.stl b/test/extrude/63/63.stl
index ca31fa248f63e4034fde31613211a578bd08fb23..4aa2c62d4035de45782e6f101ae9e5ac4f1f3d4c 100644
Binary files a/test/extrude/63/63.stl and b/test/extrude/63/63.stl differ
diff --git a/test/extrude/630/630.py b/test/extrude/630/630.py
index 637cf21638b0e60c2b55e4ec4b2a70acf2b9d8f6..6341dcd8cdef943fef47e6539ab3d72223c76ac7 100644
--- a/test/extrude/630/630.py
+++ b/test/extrude/630/630.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(374,90,374))
-w1=cq.Workplane('XY',origin=(374,374,747))
-r=w0.sketch().segment((98,143),(187,143)).segment((187,240)).arc((277,374),(187,508)).segment((187,605)).segment((98,605)).segment((98,508)).arc((1,374),(98,240)).close().assemble().finalize().extrude(1000).union(w1.workplane(offset=273).moveTo(441,53).box(493,418,575))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,691,502))
+r=w0.sketch().push([(77,128)]).rect(594,755).reset().face(w0.sketch().segment((579,954),(675,314)).segment((969,355)).segment((881,1000)).close().assemble()).finalize().extrude(121)
\ No newline at end of file
diff --git a/test/extrude/630/630.stl b/test/extrude/630/630.stl
index a686bdfe39eb9eb6e08d55f6a08be63709dc22c5..114dcb56d5e7dd6937a58bcad9af7f821305f0c1 100644
Binary files a/test/extrude/630/630.stl and b/test/extrude/630/630.stl differ
diff --git a/test/extrude/631/631.py b/test/extrude/631/631.py
index 3241a382c0f62df51e795da2ac2891777cc42929..00a1734a7cea090fff0eb72f7ab56457974c7cfd 100644
--- a/test/extrude/631/631.py
+++ b/test/extrude/631/631.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(457,383,383))
-w1=cq.Workplane('XY',origin=(383,383,260))
-r=w0.sketch().segment((309,112),(963,50)).segment((1000,519)).segment((346,568)).close().assemble().finalize().extrude(248).union(w0.sketch().push([(1,309)]).circle(618).push([(1,316)]).rect(482,766,mode='s').finalize().extrude(297)).union(w1.sketch().push([(383,655)]).circle(655).circle(630,mode='s').finalize().extrude(840)).translate((1,235,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,501,502))
+r=w0.sketch().segment((340,321),(605,280)).segment((661,681)).segment((395,719)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/631/631.stl b/test/extrude/631/631.stl
index 708fcaaa09c4779fba3b026b2f3c0f56849d7d25..b13563a9752d80f15867d3cd15e0e86d6e151e3d 100644
Binary files a/test/extrude/631/631.stl and b/test/extrude/631/631.stl differ
diff --git a/test/extrude/632/632.py b/test/extrude/632/632.py
index 503e585c2398def8794cc8ac90ea3b1c3a788dae..466069845de0ac5ba63a522a1fc5b3b6c2f64bf3 100644
--- a/test/extrude/632/632.py
+++ b/test/extrude/632/632.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(223,223,223))
-r=w0.sketch().push([(417,491)]).rect(612,612).push([(565,510)]).circle(260,mode='s').finalize().extrude(1).union(w0.workplane(offset=339).moveTo(223,38).box(1000,778,454)).translate((55,129,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,399))
+r=w0.sketch().segment((600,520),(871,521)).segment((870,869)).segment((599,871)).segment((600,755)).arc((454,659),(599,566)).close().assemble().finalize().extrude(411).union(w0.sketch().arc((255,280),(509,256),(365,470)).arc((26,541),(256,280)).assemble().reset().face(w0.sketch().segment((564,132),(911,130)).segment((910,425)).segment((989,425)).segment((990,519)).arc((999,570),(989,620)).segment((989,716)).segment((751,715)).segment((749,619)).arc((740,576),(745,531)).segment((666,529)).arc((501,820),(564,491)).close().assemble()).finalize().extrude(790))
\ No newline at end of file
diff --git a/test/extrude/632/632.stl b/test/extrude/632/632.stl
index 087ccf5312b2331511f183afcc17f1abb39bf506..962bc5d24ed0f9fb42150f7c687e435d93527fec 100644
Binary files a/test/extrude/632/632.stl and b/test/extrude/632/632.stl differ
diff --git a/test/extrude/633/633.py b/test/extrude/633/633.py
index 39afa7ab79ff12feb361f66220f925a115c1a6b8..eaeb59accbfb85ea23864733b59f3ea859ed76ac 100644
--- a/test/extrude/633/633.py
+++ b/test/extrude/633/633.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(451,181,451))
-r=w0.sketch().segment((1,523),(415,442)).segment((415,469)).segment((451,469)).segment((10,550)).close().assemble().reset().face(w0.sketch().segment((451,433),(892,352)).segment((901,379)).segment((487,460)).segment((487,433)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(706,502,501))
+w1=cq.Workplane('YZ',origin=(486,500,501))
+r=w0.workplane(offset=174).moveTo(416,470).cylinder(1000,915).union(w0.sketch().segment((726,575),(756,576)).segment((756,620)).arc((770,659),(755,706)).segment((756,855)).segment((726,855)).segment((726,726)).arc((636,659),(725,595)).close().assemble().finalize().extrude(1)).union(w1.sketch().segment((152,331),(220,331)).arc((576,131),(924,331)).segment((1000,332)).segment((1000,745)).segment((925,745)).arc((721,919),(445,926)).segment((444,736)).segment((245,735)).segment((246,780)).arc((237,760),(220,746)).segment((152,745)).close().assemble().finalize().extrude(964))
\ No newline at end of file
diff --git a/test/extrude/633/633.stl b/test/extrude/633/633.stl
index b2b0a74e25266ec777e0656d990c2442bf0ef307..7cc9fa63fa182dd1d6b6cd896493d464ca450b65 100644
Binary files a/test/extrude/633/633.stl and b/test/extrude/633/633.stl differ
diff --git a/test/extrude/634/634.py b/test/extrude/634/634.py
index f7e7191f7683211ce8bb1e065bd7fdb4dd3ef466..b2d5ed8efbc8ba64e54ae213cd64f9195a365a4e 100644
--- a/test/extrude/634/634.py
+++ b/test/extrude/634/634.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(26,348,348))
-r=w0.sketch().segment((265,158),(472,133)).segment((472,1)).segment((670,1)).segment((670,678)).segment((637,678)).segment((645,728)).segment((323,761)).close().assemble().finalize().extrude(926).union(w0.sketch().push([(150,257)]).circle(472).push([(406,51)]).rect(381,579).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,492))
+r=w0.sketch().segment((320,664),(332,544)).segment((859,580)).segment((859,596)).segment((581,595)).segment((582,679)).close().assemble().finalize().extrude(11).union(w0.workplane(offset=419).moveTo(226,784).box(670,512,665)).union(w0.sketch().push([(340,241)]).rect(781,561).circle(521,mode='s').circle(522).push([(535,351)]).circle(557).finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/634/634.stl b/test/extrude/634/634.stl
index 11019c2d44c65decad216e2e3bdc2a1e23267f0e..309d3bec6166bb16c8eebdb00ee3853d98b08e73 100644
Binary files a/test/extrude/634/634.stl and b/test/extrude/634/634.stl differ
diff --git a/test/extrude/635/635.py b/test/extrude/635/635.py
index 639d9b5786f6f780d832ee41cf619f50f1ac82e0..e4d30a04967b8deaa136391094f7ff703e99023b 100644
--- a/test/extrude/635/635.py
+++ b/test/extrude/635/635.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(412,412,154))
-w1=cq.Workplane('YZ',origin=(142,412,412))
-r=w0.sketch().segment((283,483),(612,483)).segment((612,565)).arc((683,741),(612,918)).segment((612,1000)).segment((283,1000)).segment((283,918)).arc((201,741),(283,565)).close().assemble().finalize().extrude(83).union(w1.sketch().push([(1,824)]).circle(589).circle(471,mode='s').finalize().extrude(918)).translate((1,177,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(146,501,500))
+r=w0.sketch().segment((212,277),(230,275)).segment((231,95)).segment((301,97)).arc((405,1),(511,96)).segment((791,97)).segment((791,301)).segment((210,301)).close().assemble().push([(500,983)]).rect(1000,536).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/635/635.stl b/test/extrude/635/635.stl
index ba543a92602ed052e6cb5d195b4ea347bd0e4575..89b877eef2db9d5356acb4c4cb1201263eb601f0 100644
Binary files a/test/extrude/635/635.stl and b/test/extrude/635/635.stl differ
diff --git a/test/extrude/636/636.py b/test/extrude/636/636.py
index 06f713c58046ac61cf0d3d299540ad9e3e752cc2..886f5239caaa039c8e353d76c7622c3cf1c96c1e 100644
--- a/test/extrude/636/636.py
+++ b/test/extrude/636/636.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().arc((321,194),(347,334),(321,474)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,351))
+w1=cq.Workplane('YZ',origin=(499,500,501))
+r=w0.sketch().arc((596,945),(696,820),(626,965)).arc((610,949),(595,945)).assemble().finalize().extrude(529).union(w0.sketch().arc((557,959),(686,771),(695,1000)).arc((629,976),(556,960)).assemble().finalize().extrude(541)).union(w0.workplane(offset=653).moveTo(262,690).cylinder(804,537)).union(w1.sketch().push([(284,495)]).rect(1000,521).rect(510,511,mode='s').finalize().extrude(460))
\ No newline at end of file
diff --git a/test/extrude/636/636.stl b/test/extrude/636/636.stl
index 9be69c86c33357dcd2ccbe2a14bfee71a7024442..c52c8bb39ba528558e668ebe0b2b1e1c600bda5d 100644
Binary files a/test/extrude/636/636.stl and b/test/extrude/636/636.stl differ
diff --git a/test/extrude/637/637.py b/test/extrude/637/637.py
index 6f7a616ddffd6dcd63669ad02e99b5cedb05d06e..5ef2a841c40dea1004762578862482457e17de56 100644
--- a/test/extrude/637/637.py
+++ b/test/extrude/637/637.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(584,480,480))
-r=w0.sketch().arc((823,459),(823,448),(834,428)).segment((834,459)).close().assemble().finalize().extrude(32).union(w0.sketch().arc((396,407),(1,84),(469,292)).segment((927,292)).segment((927,407)).close().assemble().finalize().extrude(365)).union(w0.sketch().segment((396,750),(584,750)).segment((584,657)).segment((584,563)).segment((802,553)).segment((802,657)).segment((813,657)).segment((813,750)).segment((1000,750)).segment((1000,802)).segment((813,802)).segment((813,896)).segment((813,990)).segment((594,1000)).segment((594,896)).segment((584,896)).segment((584,802)).segment((396,802)).close().assemble().finalize().extrude(709))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,392))
+r=w0.sketch().push([(720,531)]).circle(779).reset().face(w0.sketch().segment((631,445),(632,621)).arc((596,530),(630,446)).assemble(),mode='s').reset().face(w0.sketch().arc((805,445),(839,531),(804,620)).close().assemble(),mode='s').finalize().extrude(147).union(w0.sketch().segment((1,739),(15,190)).segment((624,205)).segment((615,521)).segment((1000,521)).segment((1000,547)).segment((614,545)).segment((611,755)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/637/637.stl b/test/extrude/637/637.stl
index 132d7134b91b0a139a04050b620e2da12ae1f81e..2c2fbd71e291bf862a04d909159248c4bab9652b 100644
Binary files a/test/extrude/637/637.stl and b/test/extrude/637/637.stl differ
diff --git a/test/extrude/638/638.py b/test/extrude/638/638.py
index 6a2be094ebd447c5735a7f9776aa5bc821f48352..8d7f51ce76077b4fc57820163854e453d9a53856 100644
--- a/test/extrude/638/638.py
+++ b/test/extrude/638/638.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(457,196,457))
-r=w0.sketch().segment((435,837),(457,805)).segment((772,957)).segment((750,1000)).close().assemble().finalize().extrude(566).union(w0.sketch().push([(707,82)]).rect(674,794).push([(718,1)]).circle(511,mode='s').push([(772,175)]).rect(479,500,mode='s').finalize().extrude(739)).union(w0.workplane(offset=718).moveTo(272,403).cylinder(978,631))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(95,499,500))
+w1=cq.Workplane('XY',origin=(500,501,526))
+r=w0.sketch().arc((420,220),(440,191),(460,156)).segment((581,156)).segment((579,846)).segment((421,846)).close().assemble().finalize().extrude(1000).union(w1.sketch().segment((2,460),(211,460)).arc((330,376),(451,460)).segment((661,461)).segment((660,540)).segment((450,541)).arc((331,626),(212,540)).segment((1,540)).close().assemble().finalize().extrude(750))
\ No newline at end of file
diff --git a/test/extrude/638/638.stl b/test/extrude/638/638.stl
index f86247fb37a2a7dc961a524e043ed7f856a2cd36..bd1a02a7549e84e8922f69dffaeb2b0b4e4c0c75 100644
Binary files a/test/extrude/638/638.stl and b/test/extrude/638/638.stl differ
diff --git a/test/extrude/639/639.py b/test/extrude/639/639.py
index cc65b650e14297b740ba99595975b4b902d6d7be..c09a65c4e989e9c5c49186ee448dee2501bab2f6 100644
--- a/test/extrude/639/639.py
+++ b/test/extrude/639/639.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(225,461,461))
-r=w0.workplane(offset=444).moveTo(46,787).cylinder(495,607).union(w0.sketch().push([(1000,12)]).circle(484).push([(1000,1)]).circle(472,mode='s').finalize().extrude(966)).translate((1,101,12))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,316))
+r=w0.workplane(offset=404).moveTo(317,729).cylinder(694,556).union(w0.workplane(offset=405).moveTo(741,294).box(930,1000,691)).union(w0.workplane(offset=783).moveTo(315,730).cylinder(1000,771))
\ No newline at end of file
diff --git a/test/extrude/639/639.stl b/test/extrude/639/639.stl
index ab45756e57420bba78bc65f7b028fb97394e55e9..31b417510f12dd786c3921f29a517e48c1b1584c 100644
Binary files a/test/extrude/639/639.stl and b/test/extrude/639/639.stl differ
diff --git a/test/extrude/64/64.py b/test/extrude/64/64.py
index 50ff0bc290ca67fee27fea48717e07186a13ae76..ab5899a702edacb78e70b6f80e3a27fa1a3ab6bd 100644
--- a/test/extrude/64/64.py
+++ b/test/extrude/64/64.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(504,593,504))
-r=w0.sketch().push([(160,1)]).rect(682,771).push([(326,478)]).circle(669).reset().face(w0.sketch().segment((262,466),(376,466)).segment((389,491)).segment((262,491)).close().assemble(),mode='s').finalize().extrude(20).union(w0.workplane(offset=656).moveTo(758,1000).box(860,784,809))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(21,51,72))
+r=w0.sketch().segment((367,957),(533,957)).segment((533,107)).segment((367,107)).close().assemble().push([(476,604)]).rect(82,98,mode='s').push([(487,278)]).rect(71,124,mode='s').push([(414,769)]).rect(56,86,mode='s').push([(395,732)]).rect(70,69,mode='s').finalize().extrude(210)
diff --git a/test/extrude/64/64.stl b/test/extrude/64/64.stl
index b5da5fc4060521e2c41d033b2db837aaa2266e18..d582912abe929fe48d38906fa117a0f5868e2994 100644
Binary files a/test/extrude/64/64.stl and b/test/extrude/64/64.stl differ
diff --git a/test/extrude/640/640.py b/test/extrude/640/640.py
index 332c96a2b79c323e75cc45f1f45b9069783ef877..6369374d099b317acc08744746a6727496c466b6 100644
--- a/test/extrude/640/640.py
+++ b/test/extrude/640/640.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(481,491,491))
-r=w0.sketch().segment((231,261),(451,261)).arc((491,251),(530,261)).segment((750,261)).segment((750,401)).segment((530,401)).arc((491,411),(451,401)).segment((231,401)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=745).moveTo(540,550).cylinder(1000,670))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,744))
+r=w0.workplane(offset=254).moveTo(564,814).box(995,871,995).union(w0.sketch().push([(406,215)]).circle(715).push([(398,809)]).rect(576,537).finalize().extrude(41))
\ No newline at end of file
diff --git a/test/extrude/640/640.stl b/test/extrude/640/640.stl
index d1376fd72823fd96e4f556f6be25ff874fcdfbac..f49ee18c44fca602a4eb5227d58c5d4143c03e0f 100644
Binary files a/test/extrude/640/640.stl and b/test/extrude/640/640.stl differ
diff --git a/test/extrude/641/641.py b/test/extrude/641/641.py
index c2ed4ca819f2a634b1bd6db1130c46d244712478..9750e2ead1d0999ce6abbba3bfa003f455784080 100644
--- a/test/extrude/641/641.py
+++ b/test/extrude/641/641.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(535,610,535))
-r=w0.workplane(offset=460).moveTo(1000,818).box(674,824,685).union(w0.sketch().segment((1,279),(33,204)).segment((300,332)).segment((268,407)).close().assemble().push([(498,247)]).rect(738,813).finalize().extrude(428))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,1,500))
+r=w0.workplane(offset=626).moveTo(505,152).box(901,655,751).union(w0.sketch().segment((210,271),(485,270)).segment((486,226)).segment((525,227)).segment((524,271)).segment((789,271)).segment((789,880)).segment((525,880)).segment((526,925)).segment((486,926)).segment((485,881)).segment((210,881)).close().assemble().reset().face(w0.sketch().segment((650,571),(650,745)).arc((579,656),(650,570)).assemble(),mode='s').reset().face(w0.sketch().arc((681,571),(750,657),(680,745)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/641/641.stl b/test/extrude/641/641.stl
index 5b127a13413adae5a12a5c1512b8548e652afc87..b4ce222e84fbed6c61cbd27e43884b7a2796a75b 100644
Binary files a/test/extrude/641/641.stl and b/test/extrude/641/641.stl differ
diff --git a/test/extrude/642/642.py b/test/extrude/642/642.py
index 8aa8ec59430759ddf57fdd89ea241dc75a6609af..3190ed81ab8c50b330e39c1c5a7baf300ba9c149 100644
--- a/test/extrude/642/642.py
+++ b/test/extrude/642/642.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(322,470,470))
-w1=cq.Workplane('XY',origin=(470,470,433))
-r=w0.sketch().segment((544,926),(556,803)).arc((433,568),(593,334)).segment((593,223)).segment((840,235)).segment((827,359)).arc((963,605),(803,827)).segment((790,938)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((396,618),(1000,618)).arc((692,889),(396,618)).assemble().finalize().extrude(704)).union(w0.sketch().segment((667,544),(679,544)).segment((716,618)).segment((704,618)).close().assemble().finalize().extrude(827)).union(w1.workplane(offset=254).moveTo(1000,26).cylinder(901,556)).translate((1,61,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,405))
+r=w0.workplane(offset=596).box(1000,941,690)
\ No newline at end of file
diff --git a/test/extrude/642/642.stl b/test/extrude/642/642.stl
index 1aec3e19f1ac10daf3f94f48fada31770afab513..7bb150669ee82a6a9b45cbe149a460014e4bd9dc 100644
Binary files a/test/extrude/642/642.stl and b/test/extrude/642/642.stl differ
diff --git a/test/extrude/643/643.py b/test/extrude/643/643.py
index 36d53066b40a4d91e215ca9da046ec3b5bc16a10..75a6588ec3746fbdd7afe08d03e03ab83b523ff3 100644
--- a/test/extrude/643/643.py
+++ b/test/extrude/643/643.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().segment((241,447),(414,214)).segment((427,221)).segment((254,454)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,501,500))
+r=w0.sketch().segment((90,142),(146,140)).arc((401,210),(651,142)).segment((911,140)).segment((911,859)).segment((92,861)).close().assemble().push([(620,818)]).rect(540,555,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/643/643.stl b/test/extrude/643/643.stl
index 446c50bc5ef4d411c4ef75cfd21b113b6649075b..87ff23ef5ecdbff2517ff70a5c460dee1f087cda 100644
Binary files a/test/extrude/643/643.stl and b/test/extrude/643/643.stl differ
diff --git a/test/extrude/644/644.py b/test/extrude/644/644.py
index 2bd4ff45fe8915444b05240cbf6e6cd416a1c744..6c85950a37c0144051f05fd94764cd0a7fc24172 100644
--- a/test/extrude/644/644.py
+++ b/test/extrude/644/644.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).moveTo(594,607).cylinder(1000,394).union(w0.sketch().segment((14,8),(88,8)).arc((48,48),(14,94)).close().assemble().finalize().extrude(294))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,634))
+w1=cq.Workplane('ZX',origin=(500,491,500))
+r=w0.sketch().segment((109,705),(160,624)).arc((194,551),(244,489)).segment((280,434)).arc((705,45),(690,621)).arc((695,640),(700,665)).segment((740,689)).segment((689,770)).arc((661,845),(610,904)).segment((559,985)).segment((515,955)).arc((281,930),(155,730)).close().assemble().finalize().extrude(864).union(w1.sketch().segment((41,419),(611,419)).segment((611,571)).segment((256,570)).arc((79,700),(41,491)).close().assemble().push([(127,583)]).rect(516,725,mode='s').finalize().extrude(854))
\ No newline at end of file
diff --git a/test/extrude/644/644.stl b/test/extrude/644/644.stl
index 8dcb824083adb6abc20ad5fb0967d1aaf81fd610..eb1bb3b21e58e6c8424e0502fc29ff3de2817240 100644
Binary files a/test/extrude/644/644.stl and b/test/extrude/644/644.stl differ
diff --git a/test/extrude/645/645.py b/test/extrude/645/645.py
index 1fa4380b22c3ed7ddd9ac05fe15a7d06dd735784..f75fa983e38beb33d1c15832670a6c546b6fd865 100644
--- a/test/extrude/645/645.py
+++ b/test/extrude/645/645.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,401,500))
-r=w0.sketch().arc((371,670),(1,381),(441,241)).arc((820,211),(990,550)).segment((1000,560)).segment((990,600)).segment((980,600)).arc((690,830),(371,670)).assemble().finalize().extrude(700)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,195))
+r=w0.sketch().segment((430,471),(432,621)).segment((641,621)).arc((760,687),(880,621)).segment((980,620)).arc((930,699),(854,765)).arc((771,764),(700,811)).arc((589,796),(495,746)).segment((495,714)).segment((467,715)).arc((560,215),(1000,472)).segment((879,470)).arc((759,406),(640,472)).close().assemble().finalize().extrude(560).union(w0.sketch().segment((640,496),(690,495)).segment((690,502)).segment((699,502)).segment((700,495)).segment((740,497)).segment((741,505)).segment((639,506)).close().assemble().finalize().extrude(1000)).union(w0.workplane(offset=809).moveTo(263,383).box(1000,654,1000))
\ No newline at end of file
diff --git a/test/extrude/645/645.stl b/test/extrude/645/645.stl
index 45d6b902934e5a56ec2eebf6ca252cc2d3fc0a72..6231c1bd7313bef6b46aa2153e5f53a8d0a8ac19 100644
Binary files a/test/extrude/645/645.stl and b/test/extrude/645/645.stl differ
diff --git a/test/extrude/646/646.py b/test/extrude/646/646.py
index 56a7afd41b165cba88e438631f3d566acb89fd22..25a04e257d8fc7c126d41641ac8e82cda77acee2 100644
--- a/test/extrude/646/646.py
+++ b/test/extrude/646/646.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(476,214,476))
-r=w0.workplane(offset=623).moveTo(934,951).cylinder(771,820).union(w0.workplane(offset=738).moveTo(17,1).cylinder(1000,820)).translate((344,1,328))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(401,500,500))
+r=w0.workplane(offset=374).moveTo(256,576).cylinder(756,754).union(w0.workplane(offset=728).moveTo(964,205).cylinder(954,536))
\ No newline at end of file
diff --git a/test/extrude/646/646.stl b/test/extrude/646/646.stl
index 8ba5c0935eece9934f60e414b2690eda1bf5ea0b..308df2c7fdd797a599ffa9e7405e100c878bbc74 100644
Binary files a/test/extrude/646/646.stl and b/test/extrude/646/646.stl differ
diff --git a/test/extrude/647/647.py b/test/extrude/647/647.py
index 4be9c8c175eb8f86118421f83935e787821a1fb9..2296ef5d0c1d3d4eff4354b728bc5e0f751b4ab9 100644
--- a/test/extrude/647/647.py
+++ b/test/extrude/647/647.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((287,434),(327,234)).segment((381,261)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(340,501,501))
+w1=cq.Workplane('XY',origin=(500,501,805))
+r=w0.sketch().arc((180,102),(215,95),(202,67)).arc((474,237),(181,100)).assemble().push([(780,756)]).circle(556).finalize().extrude(815).union(w1.sketch().push([(484,778)]).rect(525,566).reset().face(w1.sketch().segment((477,770),(489,774)).segment((490,784)).segment((475,785)).close().assemble(),mode='s').finalize().extrude(695))
\ No newline at end of file
diff --git a/test/extrude/647/647.stl b/test/extrude/647/647.stl
index f89a1964fd03fc2b122cac4dd04002ad7851a83b..c410c2bd25a13fe666fe1d64cca6626a0deb5f77 100644
Binary files a/test/extrude/647/647.stl and b/test/extrude/647/647.stl differ
diff --git a/test/extrude/648/648.py b/test/extrude/648/648.py
index f6e7b457c5a2098e4828121f65dc6493678dbefc..b7f5a73190b4522114cf2a13981d0ac0662e7179 100644
--- a/test/extrude/648/648.py
+++ b/test/extrude/648/648.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(511,643,511))
-r=w0.sketch().push([(348,1000)]).rect(959,551).reset().face(w0.sketch().segment((317,195),(572,62)).segment((572,1)).segment((653,1)).segment((653,21)).segment((684,1)).segment((898,419)).segment((653,541)).segment((653,613)).segment((572,613)).segment((572,592)).segment((541,602)).close().assemble()).finalize().extrude(246)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(215,501,501))
+r=w0.workplane(offset=652).moveTo(465,926).box(580,649,805).union(w0.sketch().push([(500,310)]).circle(810).reset().face(w0.sketch().segment((301,281),(305,256)).segment((699,347)).segment((695,367)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/648/648.stl b/test/extrude/648/648.stl
index 2483d544ceb7f47e5b0953a1e73c013782ea0242..26878134391571b4fb4f2af291bc2da68f55e574 100644
Binary files a/test/extrude/648/648.stl and b/test/extrude/648/648.stl differ
diff --git a/test/extrude/649/649.py b/test/extrude/649/649.py
index bbd680a825400cf640b26786b9cd88f11f3a2fd4..5da85bbc38abbe4ca4b7dc33c17c264d7ecdd9aa 100644
--- a/test/extrude/649/649.py
+++ b/test/extrude/649/649.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(660,500,500))
-r=w0.sketch().segment((1,231),(141,171)).segment((221,351)).segment((81,411)).close().assemble().push([(535,246)]).rect(850,670).reset().face(w0.sketch().segment((750,800),(850,411)).segment((1000,451)).segment((900,840)).close().assemble()).finalize().extrude(181)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(569,501,501))
+r=w0.workplane(offset=363).moveTo(940,357).cylinder(776,561).union(w0.workplane(offset=568).moveTo(165,549).box(830,809,636))
\ No newline at end of file
diff --git a/test/extrude/649/649.stl b/test/extrude/649/649.stl
index da614c02b3b3c9ff9582264cf3115b23df3912dc..6e0cff695f432662db323f9449fcfed43a489a5a 100644
Binary files a/test/extrude/649/649.stl and b/test/extrude/649/649.stl differ
diff --git a/test/extrude/65/65.py b/test/extrude/65/65.py
index 58dbb5c44e2db25188f017c593634370ae7930c3..10703f85f21b3266a619cfe3c48408b7ecfd9d82 100644
--- a/test/extrude/65/65.py
+++ b/test/extrude/65/65.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(500,500,500))
-r=w0.sketch().segment((1,800),(31,800)).arc((21,810),(31,820)).segment((1,820)).close().assemble().reset().face(w0.sketch().segment((181,461),(351,71)).segment((810,271)).segment((750,411)).segment((920,411)).segment((920,530)).arc((950,550),(960,580)).segment((1000,590)).segment((920,860)).segment((920,930)).segment((580,930)).segment((580,770)).segment((491,740)).segment((510,690)).segment((391,690)).segment((391,550)).close().assemble()).finalize().extrude(510)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,346))
+r=w0.sketch().push([(856,824)]).circle(644).circle(635,mode='s').finalize().extrude(621).union(w0.sketch().segment((100,41),(120,41)).arc((157,37),(197,42)).segment((215,41)).segment((217,46)).arc((316,191),(216,335)).segment((217,341)).segment((195,340)).arc((156,345),(121,341)).segment((100,341)).segment((100,336)).arc((1,192),(100,45)).close().assemble().finalize().extrude(815))
\ No newline at end of file
diff --git a/test/extrude/65/65.stl b/test/extrude/65/65.stl
index aa52022c1fb3d421897675f95a79688fdf09c08a..da37f1575a29b4e88001aad4cfc872e342a9b41f 100644
Binary files a/test/extrude/65/65.stl and b/test/extrude/65/65.stl differ
diff --git a/test/extrude/650/650.py b/test/extrude/650/650.py
index 2c1d4628b149f2cab9071d9107887343b59de28c..798d0e73e78c6cfcc2a6297cde81fe0713edfa39 100644
--- a/test/extrude/650/650.py
+++ b/test/extrude/650/650.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(299,532,532))
-r=w0.sketch().segment((192,107),(341,107)).arc((500,54),(649,107)).segment((798,107)).segment((798,532)).segment((649,532)).arc((500,586),(341,532)).segment((192,532)).close().assemble().finalize().extrude(639).union(w0.sketch().segment((203,1),(798,1)).segment((798,639)).segment((543,639)).arc((586,511),(543,394)).segment((671,394)).segment((671,107)).segment((469,107)).segment((469,330)).arc((330,299),(203,373)).close().assemble().finalize().extrude(862)).union(w0.workplane(offset=766).moveTo(554,745).cylinder(1000,851))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,569,500))
+r=w0.sketch().segment((599,250),(641,251)).arc((696,232),(750,252)).segment((794,251)).segment((796,357)).segment((750,355)).arc((696,377),(641,355)).segment((600,355)).close().assemble().reset().face(w0.sketch().segment((686,246),(715,245)).segment((714,267)).segment((696,271)).close().assemble(),mode='s').finalize().extrude(157).union(w0.sketch().segment((1,271),(510,271)).segment((510,345)).segment((780,345)).segment((781,420)).segment((512,420)).segment((511,791)).segment((1,790)).close().assemble().push([(962,316)]).rect(576,710).finalize().extrude(705))
\ No newline at end of file
diff --git a/test/extrude/650/650.stl b/test/extrude/650/650.stl
index a58360510e6236c90984ddd5505bdf890bb7e145..4b9b917229a50b25d59ec3b024253d9db3e45056 100644
Binary files a/test/extrude/650/650.stl and b/test/extrude/650/650.stl differ
diff --git a/test/extrude/651/651.py b/test/extrude/651/651.py
index 72616995c1ede724d9fed612c832d386bb285fd6..2d6962acdd5751dca71ba1b7bf45a8072c046d99 100644
--- a/test/extrude/651/651.py
+++ b/test/extrude/651/651.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(407,115,407))
-r=w0.workplane(offset=606).moveTo(131,764).cylinder(805,456).union(w0.sketch().arc((163,277),(269,90),(472,33)).segment((496,1)).segment((570,58)).arc((618,90),(659,123)).segment((732,180)).segment((708,212)).arc((724,245),(724,277)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(391,501,501))
+r=w0.sketch().segment((286,25),(465,27)).segment((467,2)).segment((566,1)).segment((566,26)).segment((570,26)).arc((561,32),(544,31)).segment((491,32)).segment((489,66)).arc((455,156),(491,247)).segment((490,275)).segment((546,276)).arc((585,285),(625,277)).segment((680,275)).segment((681,246)).arc((715,156),(680,67)).segment((680,32)).segment((625,32)).arc((610,32),(600,26)).segment((730,26)).segment((730,416)).segment((741,416)).segment((741,545)).segment((451,545)).segment((451,425)).segment((286,426)).close().assemble().finalize().extrude(411).union(w0.sketch().push([(439,863)]).rect(860,776).push([(292,990)]).circle(504,mode='s').finalize().extrude(816))
\ No newline at end of file
diff --git a/test/extrude/651/651.stl b/test/extrude/651/651.stl
index 9e0077c6290a9bf3d2a71f6447644ed2264f3060..2d5e3c9f9274019564d2e413bfa3737ceb61bed2 100644
Binary files a/test/extrude/651/651.stl and b/test/extrude/651/651.stl differ
diff --git a/test/extrude/652/652.py b/test/extrude/652/652.py
index 30b25dfd3f3b6c2412526402d691f8572ebcfecc..b067486febdda83d4e1d2017f0769bd46216561f 100644
--- a/test/extrude/652/652.py
+++ b/test/extrude/652/652.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(428,428,292))
-r=w0.workplane(offset=277).moveTo(636,178).cylinder(729,698).union(w0.sketch().segment((292,605),(584,605)).segment((584,948)).segment((292,948)).segment((292,615)).arc((1,490),(292,605)).assemble().push([(438,178)]).rect(719,448).finalize().extrude(1000)).translate((1,93,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(569,500,501))
+r=w0.sketch().push([(529,133)]).rect(999,764).reset().face(w0.sketch().segment((465,27),(585,20)).segment((595,241)).segment((475,246)).close().assemble(),mode='s').finalize().extrude(155).union(w0.workplane(offset=601).moveTo(316,906).cylinder(699,596))
\ No newline at end of file
diff --git a/test/extrude/652/652.stl b/test/extrude/652/652.stl
index fbd08f925bd98634dbcfa1ce515beb33cadd5963..94c005201efe182f0f681cea0ef5b8029afdf184 100644
Binary files a/test/extrude/652/652.stl and b/test/extrude/652/652.stl differ
diff --git a/test/extrude/653/653.py b/test/extrude/653/653.py
index de13f1e2775b9ce5ec8039da7ac69603084d40a8..9fdc5245209de2d346e7113c6857d3c07ef28a70 100644
--- a/test/extrude/653/653.py
+++ b/test/extrude/653/653.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(607,906,607))
-r=w0.sketch().segment((213,630),(284,386)).segment((1000,583)).segment((929,827)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(692,499,500))
+r=w0.sketch().segment((421,840),(545,840)).segment((545,909)).segment((426,911)).arc((724,746),(420,901)).close().assemble().finalize().extrude(81).union(w0.workplane(offset=518).moveTo(376,121).cylinder(536,620))
\ No newline at end of file
diff --git a/test/extrude/653/653.stl b/test/extrude/653/653.stl
index 57edeba3fb7819f4f0dbdcd586276100b439c1a8..f28a9c1d705678ea582073c2bb3e6719ec24ef16 100644
Binary files a/test/extrude/653/653.stl and b/test/extrude/653/653.stl differ
diff --git a/test/extrude/654/654.py b/test/extrude/654/654.py
index 3f25cf5cfedede5e1ebffd774cb7225c743c6006..bb985731ac61e043229cfa41d60af02a3c4957ae 100644
--- a/test/extrude/654/654.py
+++ b/test/extrude/654/654.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(653,979,653))
-r=w0.sketch().circle(1000).reset().face(w0.sketch().segment((612,390),(653,390)).arc((695,362),(743,390)).segment((785,390)).segment((785,424)).segment((743,424)).arc((695,452),(653,424)).segment((612,424)).close().assemble(),mode='s').finalize().extrude(1).translate((348,1,348))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(969,500,500))
+r=w0.sketch().segment((206,85),(221,87)).arc((499,2),(780,86)).segment((795,85)).segment((795,95)).arc((1000,501),(795,905)).segment((795,915)).segment((781,916)).arc((500,1000),(220,914)).segment((206,915)).segment((206,904)).arc((1,500),(207,95)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/654/654.stl b/test/extrude/654/654.stl
index f3299c742d025fba818a5bc1a155de32fa9a4a9b..60be9d4c0b27d4aee74116520ac686b49df9dc61 100644
Binary files a/test/extrude/654/654.stl and b/test/extrude/654/654.stl differ
diff --git a/test/extrude/655/655.py b/test/extrude/655/655.py
index b0b2976d0f679b37ff1bbe201d4781e3d4e05504..54a95bbd8f06a0c9d8e67c64290f86cb6ec9e530 100644
--- a/test/extrude/655/655.py
+++ b/test/extrude/655/655.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(658,852,658))
-r=w0.sketch().segment((316,436),(454,436)).arc((658,362),(861,436)).segment((1000,436)).segment((1000,880)).segment((861,880)).arc((658,954),(454,880)).segment((316,880)).close().assemble().reset().face(w0.sketch().segment((491,556),(806,538)).segment((824,760)).segment((510,778)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=792).box(732,787,926))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(360,500,500))
+r=w0.workplane(offset=327).moveTo(739,734).box(900,660,849).union(w0.sketch().arc((481,749),(555,550),(754,476)).segment((540,690)).segment((959,691)).segment((959,754)).segment((1000,714)).arc((925,920),(726,994)).segment((934,779)).segment((519,780)).segment((520,710)).close().assemble().reset().face(w0.sketch().segment((495,835),(639,974)).arc((555,918),(495,836)).assemble()).finalize().extrude(211)).union(w0.sketch().segment((1,375),(335,5)).segment((813,441)).segment((743,519)).segment((915,521)).segment((914,948)).segment((560,949)).segment((560,719)).segment((480,810)).segment((276,624)).segment((510,595)).segment((455,157)).segment((180,186)).segment((231,585)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/655/655.stl b/test/extrude/655/655.stl
index 28162d7bc09e8e525cede6554f250e81e21b341b..7642c51162388c3faee29c3cb611f206c97e27ec 100644
Binary files a/test/extrude/655/655.stl and b/test/extrude/655/655.stl differ
diff --git a/test/extrude/656/656.py b/test/extrude/656/656.py
index 36c1ddf0feae184035b9630906e4682ddc26be5a..d5990a330862e44be15ff946dad47db72ae281f5 100644
--- a/test/extrude/656/656.py
+++ b/test/extrude/656/656.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(424,360,360))
-r=w0.sketch().push([(1,232)]).circle(641).reset().face(w0.sketch().arc((987,705),(987,718),(1000,731)).arc((936,757),(987,705)).assemble()).finalize().extrude(232).translate((1,281,50))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(836,501,501))
+r=w0.sketch().arc((1,866),(86,719),(31,555)).segment((215,557)).segment((215,410)).arc((471,811),(1,866)).assemble().finalize().extrude(1).union(w0.sketch().segment((270,295),(665,31)).segment((1000,525)).segment((600,795)).close().assemble().reset().face(w0.sketch().segment((816,375),(855,375)).segment((855,451)).segment((814,451)).arc((820,411),(815,376)).assemble(),mode='s').finalize().extrude(52))
\ No newline at end of file
diff --git a/test/extrude/656/656.stl b/test/extrude/656/656.stl
index 8b5322d53ce04000cabe42e19768ad0b06646caa..9b814bf3734549d5064fa932aabbb4202d3410e2 100644
Binary files a/test/extrude/656/656.stl and b/test/extrude/656/656.stl differ
diff --git a/test/extrude/657/657.py b/test/extrude/657/657.py
index 5d4566d56ee87b3481ed91d4149cfe7724a8650f..e4622c5bb25aafb1833f3d76143364676c2bb637 100644
--- a/test/extrude/657/657.py
+++ b/test/extrude/657/657.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(750,500,500))
-r=w0.sketch().push([(126,773)]).circle(693).reset().face(w0.sketch().segment((637,217),(637,228)).segment((682,228)).segment((682,171)).segment((648,171)).arc((671,126),(705,92)).arc((762,69),(830,46)).arc((1000,421),(637,217)).assemble()).finalize().extrude(1).translate((1,69,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,236))
+r=w0.sketch().push([(435,656)]).circle(816).reset().face(w0.sketch().arc((786,446),(874,634),(785,836)).close().assemble()).finalize().extrude(266).union(w0.sketch().segment((220,362),(420,361)).segment((420,412)).segment((580,410)).segment((581,360)).segment((595,360)).segment((580,150)).segment((580,110)).arc((685,97),(776,35)).segment((836,30)).segment((859,360)).segment((874,360)).segment((875,886)).segment((220,885)).close().assemble().reset().face(w0.sketch().segment((515,786),(621,776)).segment((630,861)).segment((524,871)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/657/657.stl b/test/extrude/657/657.stl
index 509dbf31ceeec551e1b017203830638dac8e1a0d..ec781e1412c5dc028607c8e030a97ba67827c629 100644
Binary files a/test/extrude/657/657.stl and b/test/extrude/657/657.stl differ
diff --git a/test/extrude/658/658.py b/test/extrude/658/658.py
index 2d8011e04d22ef3bf3be20c1b85848dd8eb43e0d..f7a91ed46e266efbaf03dc30e11e4f28cce69223 100644
--- a/test/extrude/658/658.py
+++ b/test/extrude/658/658.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(485,588,485))
-r=w0.workplane(offset=238).moveTo(954,109).box(516,763,979).union(w0.sketch().segment((1,495),(52,454)).segment((52,104)).segment((640,104)).segment((640,619)).segment((598,619)).segment((609,609)).segment((444,495)).segment((361,619)).segment((197,619)).arc((258,763),(392,670)).segment((506,753)).segment((516,732)).segment((588,835)).segment((331,1000)).segment((83,619)).segment((52,619)).segment((52,588)).close().assemble().finalize().extrude(763))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,501,500))
+r=w0.sketch().segment((157,1),(476,1)).segment((476,470)).segment((415,470)).arc((400,481),(381,490)).arc((347,485),(316,512)).arc((250,501),(195,470)).segment((155,471)).segment((157,426)).arc((136,340),(155,257)).close().assemble().push([(727,379)]).rect(975,950).reset().face(w0.sketch().segment((521,307),(759,165)).segment((935,461)).segment((694,599)).close().assemble(),mode='s').finalize().extrude(130).union(w0.workplane(offset=684).moveTo(149,943).box(724,615,870))
\ No newline at end of file
diff --git a/test/extrude/658/658.stl b/test/extrude/658/658.stl
index df3b798a47907385354e130853779c178257dfae..a9fb551ca02146e5a48188b5491a580a9dda8fc2 100644
Binary files a/test/extrude/658/658.stl and b/test/extrude/658/658.stl differ
diff --git a/test/extrude/659/659.py b/test/extrude/659/659.py
index 0d1f27c7de16879ccff50090c6446061e4da7303..e5792150fd51bf20e4a1a539fb7b4dee5ac0eb1a 100644
--- a/test/extrude/659/659.py
+++ b/test/extrude/659/659.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,286,286))
-r=w0.workplane(offset=579).cylinder(872,1000).translate((1,715,715))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,209))
+r=w0.sketch().arc((521,411),(5,245),(544,261)).arc((470,325),(520,411)).assemble().finalize().extrude(751).union(w0.sketch().segment((786,449),(834,451)).segment((836,525)).arc((1000,714),(834,905)).segment((835,979)).segment((786,980)).segment((784,904)).arc((620,715),(786,526)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/659/659.stl b/test/extrude/659/659.stl
index ed02bda1721ccf8f9b3892ecdc54d17db5e00f37..b232b5483fa1bb2250446052c04d40a1fb2f2da6 100644
Binary files a/test/extrude/659/659.stl and b/test/extrude/659/659.stl differ
diff --git a/test/extrude/66/66.py b/test/extrude/66/66.py
index ca9e14292b99dbbbf89b12b6961333e178463edb..8ffa7c6cd8913be37943b95548cc99d9eb7f4c73 100644
--- a/test/extrude/66/66.py
+++ b/test/extrude/66/66.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(779,519,519))
-r=w0.sketch().segment((203,241),(368,241)).arc((519,203),(671,241)).segment((836,241)).segment((836,798)).segment((671,798)).arc((519,836),(368,798)).segment((203,798)).close().assemble().rect(772,1000,mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(44,69,13))
+r=w0.sketch().segment((605,802),(529,802)).segment((29,27)).segment((47,28)).segment((538,787)).segment((605,787)).close().assemble().push([(424,253)]).circle(33,mode='s').push([(208,221)]).rect(71,46,mode='s').finalize().extrude(276).translate((1,208,1))
diff --git a/test/extrude/66/66.stl b/test/extrude/66/66.stl
index 1fd92574345310008312cbd9741c0547639bd034..e61e37897680202abe9d0566e80c52049fd96023 100644
Binary files a/test/extrude/66/66.stl and b/test/extrude/66/66.stl differ
diff --git a/test/extrude/660/660.py b/test/extrude/660/660.py
index 9c69b24b10714927cdc85cb34be3f79d056852b3..6c42b5c7ff6c05244227463e7a25eb160e77161b 100644
--- a/test/extrude/660/660.py
+++ b/test/extrude/660/660.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(156,380,380))
-r=w0.sketch().arc((317,665),(466,144),(504,690)).arc((380,1000),(317,665)).assemble().reset().face(w0.sketch().segment((206,380),(392,243)).segment((516,429)).segment((330,566)).close().assemble(),mode='s').finalize().extrude(442).union(w0.sketch().push([(82,1)]).rect(454,863).rect(404,442,mode='s').finalize().extrude(839)).translate((1,1,52))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,670))
+r=w0.workplane(offset=328).moveTo(201,905).cylinder(844,595).union(w0.sketch().segment((287,1),(780,2)).segment((779,190)).segment((895,191)).segment((895,371)).segment((780,371)).segment((781,660)).segment((285,661)).close().assemble().finalize().extrude(475))
\ No newline at end of file
diff --git a/test/extrude/660/660.stl b/test/extrude/660/660.stl
index 4d9f3a14e87f48e70518be7a893a2b4605e1ec18..d9d072d82b369a537ca020b911b8d6b7cc3f2abf 100644
Binary files a/test/extrude/660/660.stl and b/test/extrude/660/660.stl differ
diff --git a/test/extrude/661/661.py b/test/extrude/661/661.py
index a22dd9c0e6dcf27cf596df6a5da01f575530b116..19f77229553e533d1dc348e83d3a6a6442da12dc 100644
--- a/test/extrude/661/661.py
+++ b/test/extrude/661/661.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(415,193,415))
-r=w0.sketch().segment((475,253),(495,183)).segment((728,263)).segment((728,284)).arc((334,1),(687,334)).close().assemble().finalize().extrude(273).union(w0.workplane(offset=707).moveTo(324,657).cylinder(1000,677))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,310,502))
+r=w0.workplane(offset=408).moveTo(441,421).cylinder(684,700).union(w0.workplane(offset=433).moveTo(839,761).cylinder(636,660)).union(w0.sketch().push([(50,130)]).circle(550).reset().face(w0.sketch().segment((106,296),(740,296)).segment((739,367)).arc((726,546),(555,490)).segment((106,491)).close().assemble()).push([(236,382)]).circle(516,mode='s').reset().face(w0.sketch().segment((646,350),(681,350)).segment((680,360)).arc((756,451),(681,540)).segment((679,549)).segment((645,550)).segment((645,540)).arc((569,451),(647,361)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/661/661.stl b/test/extrude/661/661.stl
index 2fcc7cd8035e5afea7ca71f9224e0f02604414f4..a0695ecb67d8e9322fa577b94a7237b8d7acbb47 100644
Binary files a/test/extrude/661/661.stl and b/test/extrude/661/661.stl differ
diff --git a/test/extrude/662/662.py b/test/extrude/662/662.py
index a903871e5728f3979d6bef7dbd785d828d80fa7b..e04fde911461554cd038ca6f4e342f77aed0dea6 100644
--- a/test/extrude/662/662.py
+++ b/test/extrude/662/662.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(532,532,479))
-r=w0.workplane(offset=511).moveTo(171,1000).cylinder(575,596).union(w0.sketch().arc((862,1),(968,118),(862,235)).close().assemble().finalize().extrude(681))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(871,500,500))
+r=w0.sketch().push([(110,484)]).rect(720,995).reset().face(w0.sketch().segment((231,237),(356,235)).segment((356,2)).segment((815,1)).segment((814,550)).segment((452,551)).segment((452,731)).segment((232,729)).close().assemble()).finalize().extrude(1).union(w0.sketch().arc((424,686),(535,650),(619,575)).segment((1000,576)).segment((1000,1000)).segment((427,1000)).close().assemble().finalize().extrude(251))
\ No newline at end of file
diff --git a/test/extrude/662/662.stl b/test/extrude/662/662.stl
index f0b92e85ad943897d2978defbf6fec6c0924a0f9..872348657d6e77827802ef3e9fdad96357a661a6 100644
Binary files a/test/extrude/662/662.stl and b/test/extrude/662/662.stl differ
diff --git a/test/extrude/663/663.py b/test/extrude/663/663.py
index 137abee938fa1693f34b9c27973c98f654f16846..75e40f3170e8cb6c50fb96cdd4619d7c6b961362 100644
--- a/test/extrude/663/663.py
+++ b/test/extrude/663/663.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(681,532,532))
-r=w0.sketch().segment((44,320),(288,65)).segment((426,192)).segment((160,479)).segment((139,447)).close().assemble().reset().face(w0.sketch().segment((586,107),(628,107)).segment((628,182)).arc((734,299),(628,426)).segment((628,500)).segment((586,500)).segment((586,426)).arc((490,299),(586,182)).close().assemble()).push([(1000,596)]).circle(596).finalize().extrude(224).union(w0.sketch().segment((1,373),(352,373)).segment((352,554)).segment((607,554)).segment((607,1000)).segment((299,1000)).segment((299,702)).segment((1,702)).close().assemble().finalize().extrude(277))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,574,501))
+r=w0.sketch().segment((1,515),(31,480)).segment((416,482)).segment((416,37)).segment((445,6)).segment((697,220)).arc((725,245),(751,270)).segment((1000,486)).segment((556,996)).segment((307,779)).arc((275,756),(251,731)).close().assemble().finalize().extrude(351)
\ No newline at end of file
diff --git a/test/extrude/663/663.stl b/test/extrude/663/663.stl
index c992d1aeabcfc7f79efe8dfc0b2dc6fdaee3ff9c..79110c466f898414ebafdaad6155bd4d13e49921 100644
Binary files a/test/extrude/663/663.stl and b/test/extrude/663/663.stl differ
diff --git a/test/extrude/664/664.py b/test/extrude/664/664.py
index 77d74b17e7d296217dbacc0e4c233c3e223bc156..fd98dbb638a425f6921df17b3b1dd5dc47ebf95b 100644
--- a/test/extrude/664/664.py
+++ b/test/extrude/664/664.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().arc((307,94),(361,334),(307,574)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,302))
+r=w0.sketch().segment((41,210),(57,211)).arc((446,7),(744,336)).arc((980,550),(721,741)).segment((465,1000)).segment((267,795)).segment((265,960)).segment((41,959)).segment((41,470)).arc((22,366),(41,261)).close().assemble().finalize().extrude(899)
\ No newline at end of file
diff --git a/test/extrude/664/664.stl b/test/extrude/664/664.stl
index 13fc6b04e3929b8881d75c47894af2659cefa828..a8e5e2bbb4f7439d0682c2f6a10edf704b7a8d13 100644
Binary files a/test/extrude/664/664.stl and b/test/extrude/664/664.stl differ
diff --git a/test/extrude/665/665.py b/test/extrude/665/665.py
index 24d1ff21d3488d08965be0b017fa8a58f2950a67..4af41ca020116637db41803507b82d54051d0ea7 100644
--- a/test/extrude/665/665.py
+++ b/test/extrude/665/665.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(408,408,198))
-w1=cq.Workplane('YZ',origin=(457,408,408))
-r=w0.sketch().push([(56,38)]).rect(716,630).rect(568,457,mode='s').finalize().extrude(1).union(w0.sketch().push([(322,137)]).circle(519).reset().face(w0.sketch().segment((211,174),(248,50)).segment((420,100)).segment((396,211)).close().assemble(),mode='s').reset().face(w0.sketch().segment((433,544),(482,544)).arc((531,470),(605,420)).segment((605,309)).segment((741,309)).segment((741,420)).arc((815,470),(852,544)).segment((914,544)).segment((914,642)).segment((852,642)).arc((815,729),(741,778)).segment((741,889)).segment((605,889)).segment((605,778)).arc((531,729),(482,642)).segment((433,642)).close().assemble()).finalize().extrude(272)).union(w1.workplane(offset=346).moveTo(235,803).box(1000,852,531))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,499,370))
+w1=cq.Workplane('ZX',origin=(500,686,500))
+r=w0.sketch().push([(255,540)]).circle(755).reset().face(w0.sketch().arc((600,531),(635,486),(679,445)).segment((681,345)).segment((946,346)).segment((946,506)).arc((891,784),(611,731)).arc((571,639),(645,701)).arc((675,601),(601,532)).assemble()).finalize().extrude(730).union(w0.workplane(offset=631).moveTo(780,621).box(940,970,761)).union(w1.sketch().arc((397,669),(446,779),(396,889)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/665/665.stl b/test/extrude/665/665.stl
index 053fd746adb0ee571b39056eb2cbc3f586ffd672..dd8cac986200c0658d9a3756d4a0a2095bc705a8 100644
Binary files a/test/extrude/665/665.stl and b/test/extrude/665/665.stl differ
diff --git a/test/extrude/666/666.py b/test/extrude/666/666.py
index 2319c29dcd7975acdd803a20b5be3e4c51199fd8..560b4c3b50cf9baed22fba7c61ab615d3d42878e 100644
--- a/test/extrude/666/666.py
+++ b/test/extrude/666/666.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(803,618,618))
-r=w0.workplane(offset=426).moveTo(901,901).cylinder(1000,951).union(w0.sketch().segment((1,433),(149,1)).segment((667,186)).segment((667,235)).arc((285,235),(1,433)).assemble().finalize().extrude(519))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,929,501))
+r=w0.workplane(offset=68).box(529,1000,1000)
\ No newline at end of file
diff --git a/test/extrude/666/666.stl b/test/extrude/666/666.stl
index a518591eb29ea68eb9cc2a4de3afe7bfb01231a7..afdb16853d3859827b35abfed2b07b473f3abc28 100644
Binary files a/test/extrude/666/666.stl and b/test/extrude/666/666.stl differ
diff --git a/test/extrude/667/667.py b/test/extrude/667/667.py
index 98d202cc082536847f8cf3aca42f2c9e1f86d3c7..4e39f2eb61a5d4e08950151a3a42b11a8c441f7e 100644
--- a/test/extrude/667/667.py
+++ b/test/extrude/667/667.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(350,29,350))
-r=w0.sketch().segment((1,169),(700,169)).segment((700,511)).segment((378,511)).segment((378,532)).segment((329,532)).segment((329,511)).segment((1,511)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,271,499))
+r=w0.workplane(offset=609).moveTo(854,863).box(664,775,716).union(w0.sketch().segment((65,170),(526,2)).segment((676,430)).segment((216,590)).close().assemble().finalize().extrude(961))
\ No newline at end of file
diff --git a/test/extrude/667/667.stl b/test/extrude/667/667.stl
index 145d28fb75a00c6705e14ba2dec0c7c53c4f7a8a..a75c90d926dfe622a68b0bd1fae198cb7ff3e7f0 100644
Binary files a/test/extrude/667/667.stl and b/test/extrude/667/667.stl differ
diff --git a/test/extrude/668/668.py b/test/extrude/668/668.py
index b5211ca17c3b726abb311e375452e258b883f9de..b2d34438d890d12c6a1796756fea5356118b188d 100644
--- a/test/extrude/668/668.py
+++ b/test/extrude/668/668.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.workplane(offset=667).cylinder(1000,824).translate((491,1,491))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,470))
+r=w0.workplane(offset=483).moveTo(385,604).cylinder(537,686).union(w0.sketch().push([(216,201)]).circle(701).push([(780,794)]).circle(705).circle(571,mode='s').finalize().extrude(600))
\ No newline at end of file
diff --git a/test/extrude/668/668.stl b/test/extrude/668/668.stl
index ee887f62f71ac8ac92dd5e800fdfed95d059d404..61029ff23500dc52a6fb93ee3bf94f240d7351fa 100644
Binary files a/test/extrude/668/668.stl and b/test/extrude/668/668.stl differ
diff --git a/test/extrude/669/669.py b/test/extrude/669/669.py
index ef4f62e7e65b03d93da38357d104bfaddd80172c..b079ee6d4495ddee98f5f19d06124279b9e0d355 100644
--- a/test/extrude/669/669.py
+++ b/test/extrude/669/669.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(358,358,37))
-r=w0.sketch().arc((436,1),(479,65),(436,129)).close().assemble().finalize().extrude(829).union(w0.sketch().push([(358,525)]).rect(829,736).reset().face(w0.sketch().segment((301,500),(358,458)).segment((415,550)).segment((358,586)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(186,499,499))
+r=w0.sketch().arc((141,399),(245,385),(220,280)).arc((395,166),(609,151)).arc((643,474),(957,554)).arc((454,994),(141,399)).assemble().push([(259,489)]).circle(555,mode='s').finalize().extrude(590).union(w0.workplane(offset=814).moveTo(501,400).box(1000,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/669/669.stl b/test/extrude/669/669.stl
index f2b46de33d73f409fc191f911f4a64bfbb52316c..2601ec1937f391a1aa165bbc89aa6556db574a26 100644
Binary files a/test/extrude/669/669.stl and b/test/extrude/669/669.stl differ
diff --git a/test/extrude/67/67.py b/test/extrude/67/67.py
index b8148719870fbd7a5da30e0e1fbcb4d9b13ffa10..86c7a2d79985e84804949595ba0f57d7891cdd26 100644
--- a/test/extrude/67/67.py
+++ b/test/extrude/67/67.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(157,435,435))
-r=w0.sketch().segment((236,27),(566,1)).segment((635,844)).segment((305,870)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(27,9,14))
+r=w0.sketch().segment((777,502),(355,502)).arc((467,648),(537,818)).segment((995,818)).arc((899,722),(767,687)).segment((582,687)).arc((569,675),(582,664)).segment((1000,664)).arc((891,517),(822,346)).segment((364,346)).arc((461,443),(593,478)).segment((778,478)).arc((789,490),(778,502)).close().assemble().push([(702,587)]).circle(132,mode='s').finalize().extrude(315).translate((1,307,1))
diff --git a/test/extrude/67/67.stl b/test/extrude/67/67.stl
index b9e4558d58c4708e17eb815ae9d241828ed60c97..101cecb3e019ad87289acc2307c100737a8ead55 100644
Binary files a/test/extrude/67/67.stl and b/test/extrude/67/67.stl differ
diff --git a/test/extrude/670/670.py b/test/extrude/670/670.py
index 89ca20cba5ad6468b868d08756a27732278a1a7f..db75ad25ab8c402fe7f392a2d14f7452bdbd923b 100644
--- a/test/extrude/670/670.py
+++ b/test/extrude/670/670.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(834,559,559))
-r=w0.sketch().arc((589,314),(1000,207),(785,579)).arc((148,863),(589,314)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,459))
+r=w0.sketch().push([(380,906)]).circle(596).push([(382,907)]).rect(626,615,mode='s').finalize().extrude(207).union(w0.sketch().segment((302,1),(655,1)).segment((656,81)).arc((681,316),(451,366)).segment((471,366)).segment((472,330)).segment((430,329)).segment((431,356)).arc((376,294),(355,216)).segment((646,217)).segment((646,161)).segment((301,161)).close().assemble().finalize().extrude(874))
\ No newline at end of file
diff --git a/test/extrude/670/670.stl b/test/extrude/670/670.stl
index ac4fae7e2def1c0e46eadff88ee98cee290415a2..ed4ea8bdf2e27232bac3169f4192e19fc9718806 100644
Binary files a/test/extrude/670/670.stl and b/test/extrude/670/670.stl differ
diff --git a/test/extrude/671/671.py b/test/extrude/671/671.py
index 0a5590b32b0f71418b89ab0009a67cee4b1bf55d..ad2c2fd45f5fecdc6d6127d23f92ce99b37bfacd 100644
--- a/test/extrude/671/671.py
+++ b/test/extrude/671/671.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(461,461,361))
-w1=cq.Workplane('ZX',origin=(461,31,461))
-r=w0.sketch().segment((391,540),(391,650)).segment((421,650)).segment((421,520)).arc((431,510),(431,500)).segment((481,500)).segment((481,421)).segment((421,421)).segment((421,271)).segment((421,1)).segment((960,1)).segment((960,500)).segment((680,500)).arc((590,920),(391,540)).assemble().push([(500,860)]).rect(540,520,mode='s').finalize().extrude(610).union(w1.sketch().push([(461,186)]).rect(1000,910).push([(381,106)]).rect(620,670,mode='s').finalize().extrude(540))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,125,502))
+w1=cq.Workplane('XY',origin=(501,501,410))
+r=w0.sketch().push([(570,501)]).circle(930).push([(505,508)]).rect(751,687,mode='s').finalize().extrude(1000).union(w1.workplane(offset=296).moveTo(499,226).cylinder(910,686))
\ No newline at end of file
diff --git a/test/extrude/671/671.stl b/test/extrude/671/671.stl
index 139f03b2e7cb79785acad58f24f76c3ee645b2c0..b5cc3fd029c13bb8ba7939a24d9fc14e3821ebfb 100644
Binary files a/test/extrude/671/671.stl and b/test/extrude/671/671.stl differ
diff --git a/test/extrude/672/672.py b/test/extrude/672/672.py
index 6903969d6b21a642e536e29600c3e6a00ca24122..2a55d906fd7f35852f9b1d8269f2a4dc6b40a5ec 100644
--- a/test/extrude/672/672.py
+++ b/test/extrude/672/672.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(603,603,663))
-r=w0.sketch().segment((1,555),(25,543)).segment((182,988)).segment((157,1000)).close().assemble().push([(555,362)]).circle(892).push([(916,844)]).circle(892).finalize().extrude(482)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,376))
+r=w0.sketch().push([(343,837)]).rect(1000,666).rect(575,655,mode='s').reset().face(w0.sketch().arc((715,171),(944,116),(939,349)).arc((545,611),(715,171)).assemble()).reset().face(w0.sketch().segment((840,210),(861,211)).segment((861,227)).arc((851,215),(841,210)).assemble(),mode='s').finalize().extrude(750)
\ No newline at end of file
diff --git a/test/extrude/672/672.stl b/test/extrude/672/672.stl
index 8303e8803296adb9a2e1ce2ddea8e93c11dcfafd..0778d2f912bd14ca989c08775aa2272f6a183cdc 100644
Binary files a/test/extrude/672/672.stl and b/test/extrude/672/672.stl differ
diff --git a/test/extrude/673/673.py b/test/extrude/673/673.py
index c8566e113b94aa92620a3fb9c73553ade4db2113..96a8768aac40bad0f9ec5c2b889cf843b0e83d32 100644
--- a/test/extrude/673/673.py
+++ b/test/extrude/673/673.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(454,454,630))
-r=w0.sketch().push([(103,394)]).rect(676,1000).reset().face(w0.sketch().segment((639,278),(769,278)).segment((769,352)).arc((898,528),(769,713)).segment((769,787)).segment((639,787)).segment((639,713)).arc((510,528),(639,352)).close().assemble()).finalize().extrude(1).union(w0.workplane(offset=500).moveTo(658,473).cylinder(547,713))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,936))
+r=w0.sketch().push([(257,181)]).circle(680).push([(594,671)]).circle(831).finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/673/673.stl b/test/extrude/673/673.stl
index dc411dddbf72c9fed1e3edf20e54e31abc4aac7b..fcb960ea6e0c1f8ce8d3c9c9dbe60ecc3e10614b 100644
Binary files a/test/extrude/673/673.stl and b/test/extrude/673/673.stl differ
diff --git a/test/extrude/674/674.py b/test/extrude/674/674.py
index c14b58f322b1dcf4282822ab3e34cf8bcf76dee4..7cd753b907e569e95114ff4fcca62e15682e0473 100644
--- a/test/extrude/674/674.py
+++ b/test/extrude/674/674.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(547,419,419))
-r=w0.workplane(offset=291).moveTo(1,117).cylinder(675,582).union(w0.sketch().arc((628,803),(826,756),(930,593)).segment((1000,652)).segment((895,791)).segment((884,803)).segment((861,837)).segment((837,814)).segment((652,884)).close().assemble().finalize().extrude(291)).translate((1,163,47))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(468,334,335))
+r=w0.workplane(offset=200).moveTo(105,108).cylinder(605,438).union(w0.sketch().segment((430,441),(471,442)).segment((472,397)).segment((564,397)).segment((667,398)).segment((667,650)).segment((590,650)).segment((591,665)).segment((432,663)).segment((431,611)).segment((436,615)).segment((438,607)).segment((432,603)).close().assemble().reset().face(w0.sketch().segment((472,448),(472,601)).arc((447,523),(472,448)).assemble(),mode='s').finalize().extrude(171))
\ No newline at end of file
diff --git a/test/extrude/674/674.stl b/test/extrude/674/674.stl
index 6befe4e96eeee23133c0a56504098aee1b3c6870..b431cb8ca99daa56759a7a932473bd5dd396aae9 100644
Binary files a/test/extrude/674/674.stl and b/test/extrude/674/674.stl differ
diff --git a/test/extrude/675/675.py b/test/extrude/675/675.py
index 6ae790345f962a8472dcd308984b72994f55dbd7..0248b6f84c0756918cc29e270e9f2c53580252f4 100644
--- a/test/extrude/675/675.py
+++ b/test/extrude/675/675.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(563,284,284))
-r=w0.workplane(offset=1).box(928,1000,850).translate((1,181,217))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(175,500,502))
+r=w0.sketch().segment((42,311),(386,310)).arc((916,132),(531,541)).segment((530,1000)).segment((42,1000)).close().assemble().finalize().extrude(1000).union(w0.workplane(offset=829).moveTo(445,415).cylinder(1000,846))
\ No newline at end of file
diff --git a/test/extrude/675/675.stl b/test/extrude/675/675.stl
index 56b106c9f98fa4201baa44b69ce07075c536557c..1f102a81c42971541826feafecba889f4aec23ca 100644
Binary files a/test/extrude/675/675.stl and b/test/extrude/675/675.stl differ
diff --git a/test/extrude/676/676.py b/test/extrude/676/676.py
index 5d1cb22d9d85a963a07bd324a1ed4075d7f6844a..86f6e027d9d049d4bbbadde70722d48671f50f6e 100644
--- a/test/extrude/676/676.py
+++ b/test/extrude/676/676.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(545,545,711))
-r=w0.workplane(offset=373).moveTo(1000,312).cylinder(889,645).union(w0.sketch().arc((123,789),(1,456),(290,245)).arc((656,656),(123,789)).assemble().reset().face(w0.sketch().segment((23,500),(34,500)).arc((34,523),(23,545)).close().assemble(),mode='s').finalize().extrude(512))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,285))
+r=w0.workplane(offset=622).moveTo(335,266).cylinder(746,766).union(w0.workplane(offset=718).moveTo(850,921).cylinder(935,580))
\ No newline at end of file
diff --git a/test/extrude/676/676.stl b/test/extrude/676/676.stl
index aaeeffe708e9d933013bdf1e0032c6f1c95b59c0..0cb00952c69b1bf1b742f5109a29fdee584b0bba 100644
Binary files a/test/extrude/676/676.stl and b/test/extrude/676/676.stl differ
diff --git a/test/extrude/677/677.py b/test/extrude/677/677.py
index b40410a595d307d36c0927346dfca7b89bd8e051..39812385464a861f16c4d6c31ceed963c49732f7 100644
--- a/test/extrude/677/677.py
+++ b/test/extrude/677/677.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(520,520,731))
-r=w0.sketch().segment((39,491),(212,491)).arc((260,769),(433,549)).segment((472,520)).segment((472,981)).segment((39,981)).close().assemble().push([(385,337)]).circle(645).finalize().extrude(1).union(w0.sketch().push([(366,251)]).circle(712).reset().face(w0.sketch().arc((693,645),(750,654),(798,645)).arc((875,693),(856,606)).arc((885,549),(885,472)).segment((1000,472)).segment((1000,837)).segment((693,837)).close().assemble()).finalize().extrude(616))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(531,501,501))
+r=w0.sketch().push([(466,716)]).circle(667).circle(611,mode='s').finalize().extrude(1).union(w0.sketch().segment((475,152),(521,151)).segment((520,120)).segment((701,122)).segment((701,295)).segment((520,296)).segment((521,267)).segment((475,265)).close().assemble().finalize().extrude(970))
\ No newline at end of file
diff --git a/test/extrude/677/677.stl b/test/extrude/677/677.stl
index c18566b04b07bc51eecbe77fa250cda794dd294f..19340fb118c47b0eb9032c79d0403391ccf7f366 100644
Binary files a/test/extrude/677/677.stl and b/test/extrude/677/677.stl differ
diff --git a/test/extrude/678/678.py b/test/extrude/678/678.py
index a605706157a56ca3f0ff8c5a9b98e7c8a4de335b..1273f336d2c56a54cfd6c7e9e76605bd52d2c385 100644
--- a/test/extrude/678/678.py
+++ b/test/extrude/678/678.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(326,397,397))
-r=w0.workplane(offset=290).moveTo(207,366).box(413,1000,612).union(w0.sketch().segment((1,310),(80,231)).segment((17,326)).close().assemble().finalize().extrude(524)).union(w0.sketch().segment((96,160),(318,160)).segment((318,580)).segment((223,580)).arc((191,469),(96,397)).close().assemble().push([(770,707)]).circle(421).finalize().extrude(754))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(711,500,500))
+r=w0.workplane(offset=288).moveTo(785,930).cylinder(926,570).union(w0.workplane(offset=348).moveTo(760,187).cylinder(806,530)).union(w0.sketch().segment((147,77),(385,76)).arc((530,2),(686,43)).arc((690,81),(725,77)).arc((636,445),(327,221)).segment((147,222)).close().assemble().push([(639,355)]).rect(506,600,mode='s').finalize().extrude(305))
\ No newline at end of file
diff --git a/test/extrude/678/678.stl b/test/extrude/678/678.stl
index b800b90168aac05e23ca7f24929da3eed786cd64..0d9de8d7c8f35694ac63bcb773aa96932a2c1ace 100644
Binary files a/test/extrude/678/678.stl and b/test/extrude/678/678.stl differ
diff --git a/test/extrude/679/679.py b/test/extrude/679/679.py
index 3d8cd446755ea67633f9545afd6a750ae9f447dc..cc8d679b5a24c73bed4f340c1b4c5d0d7a4aa019 100644
--- a/test/extrude/679/679.py
+++ b/test/extrude/679/679.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(314,314,453))
-w1=cq.Workplane('YZ',origin=(1,314,314))
-r=w0.sketch().push([(10,609)]).circle(375).reset().face(w0.sketch().segment((1,583),(10,583)).segment((10,592)).close().assemble(),mode='s').finalize().extrude(609).union(w1.workplane(offset=657).moveTo(183,105).cylinder(1000,540)).translate((53,45,123))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,361))
+w1=cq.Workplane('ZX',origin=(500,355,499))
+r=w0.workplane(offset=424).moveTo(108,722).box(686,765,654).union(w0.sketch().push([(455,769)]).circle(636).reset().face(w0.sketch().segment((326,780),(360,681)).segment((406,695)).arc((481,685),(535,739)).segment((585,755)).segment((550,860)).segment((501,841)).arc((425,851),(376,799)).close().assemble(),mode='s').push([(809,176)]).circle(676).finalize().extrude(475)).union(w0.sketch().arc((441,620),(471,287),(660,566)).segment((620,560)).segment((616,610)).arc((566,630),(517,635)).arc((587,790),(462,895)).segment((460,999)).segment((445,1000)).segment((444,894)).arc((315,760),(439,621)).assemble().finalize().extrude(866)).union(w1.workplane(offset=637).moveTo(753,221).box(585,531,774))
\ No newline at end of file
diff --git a/test/extrude/679/679.stl b/test/extrude/679/679.stl
index 178989bd270453ff769f94169447b7315ab8fad9..a7bce228039c4c4899b312db56f8ee88bf4fa667 100644
Binary files a/test/extrude/679/679.stl and b/test/extrude/679/679.stl differ
diff --git a/test/extrude/68/68.py b/test/extrude/68/68.py
index 060e441e2e89767888041e07e07113e9ed1180f4..cadbe5b809b1acfb1a8a1c9ca2be524718bc6f0f 100644
--- a/test/extrude/68/68.py
+++ b/test/extrude/68/68.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(405,405,341))
-w1=cq.Workplane('XY',origin=(405,405,384))
-r=w0.workplane(offset=171).moveTo(171,261).box(1000,819,872).union(w0.sketch().arc((479,734),(277,575),(500,415)).arc((564,362),(649,341)).arc((724,554),(936,639)).arc((745,830),(479,734)).assemble().finalize().extrude(54)).union(w1.workplane(offset=681).moveTo(644,1).box(564,469,957))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(13,61,18))
+r=w0.sketch().segment((331,35),(939,643)).segment((331,643)).close().assemble().reset().segment((660,492),(660,340)).segment((508,340)).close().assemble(mode='s').finalize().extrude(253)
diff --git a/test/extrude/68/68.stl b/test/extrude/68/68.stl
index b99930037f8969c6d3158df1b081d7d08d55b17e..6ac25b99434c82973965dbf1d26ff82678157cb9 100644
Binary files a/test/extrude/68/68.stl and b/test/extrude/68/68.stl differ
diff --git a/test/extrude/680/680.py b/test/extrude/680/680.py
index 4bd48021e75f70ed25dca3e61bad1e948a9ce40f..f60be4c77ee676b3f4cf98a718bb192b92300e97 100644
--- a/test/extrude/680/680.py
+++ b/test/extrude/680/680.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(156,273,273))
-w1=cq.Workplane('YZ',origin=(30,273,273))
-r=w0.workplane(offset=88).box(661,641,641).union(w0.workplane(offset=311).cylinder(350,360)).union(w1.sketch().segment((1,185),(11,185)).arc((273,1),(534,185)).segment((544,185)).segment((544,360)).segment((534,360)).arc((273,544),(11,360)).segment((1,360)).close().assemble().finalize().extrude(1000)).translate((78,88,88))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(258,229,257))
+r=w0.workplane(offset=280).moveTo(45,444).cylinder(304,301).union(w0.sketch().push([(48,56)]).circle(286).push([(395,328)]).rect(493,419).push([(368,166)]).rect(324,303).finalize().extrude(316))
\ No newline at end of file
diff --git a/test/extrude/680/680.stl b/test/extrude/680/680.stl
index 8df1b9315cafeb3c4180d69346d49cd0031c278e..be8f14aaa76e0fd7cba327b2812b4d6f7cc3125b 100644
Binary files a/test/extrude/680/680.stl and b/test/extrude/680/680.stl differ
diff --git a/test/extrude/681/681.py b/test/extrude/681/681.py
index 069430553aafe4b7cbc5bc53a238011d47c21189..c289508fe9a44aec812ed0cff673b432fda76f1f 100644
--- a/test/extrude/681/681.py
+++ b/test/extrude/681/681.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(729,452,452))
-r=w0.workplane(offset=179).moveTo(540,528).box(771,904,1000).union(w0.sketch().arc((206,218),(488,182),(609,434)).arc((458,236),(206,218)).assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(436,502,500))
+r=w0.sketch().segment((18,940),(146,939)).segment((147,746)).arc((298,760),(318,904)).segment((317,956)).segment((263,954)).arc((212,964),(168,954)).segment((114,954)).arc((74,995),(18,995)).close().assemble().finalize().extrude(427).union(w0.sketch().arc((905,82),(910,99),(931,114)).arc((511,447),(904,83)).assemble().push([(712,97)]).circle(566,mode='s').finalize().extrude(706))
\ No newline at end of file
diff --git a/test/extrude/681/681.stl b/test/extrude/681/681.stl
index c0fc7d93c1f1819b6fa920244a6f175998d3d2d7..a6039e09fcd2a491ab21229e8a63dc10e1a6cf03 100644
Binary files a/test/extrude/681/681.stl and b/test/extrude/681/681.stl differ
diff --git a/test/extrude/682/682.py b/test/extrude/682/682.py
index b714384eb7812ba55ce65e4342b747cd55eb5e2f..1d7b837c9949848886fd0e5c486cb2e9ea624af1 100644
--- a/test/extrude/682/682.py
+++ b/test/extrude/682/682.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(868,603,603))
-r=w0.sketch().segment((1,410),(458,410)).segment((458,627)).segment((446,627)).segment((446,615)).segment((410,615)).segment((410,627)).segment((170,627)).segment((170,1000)).segment((1,1000)).close().assemble().finalize().extrude(73).union(w0.sketch().push([(868,543)]).circle(940).reset().face(w0.sketch().segment((627,386),(651,386)).arc((639,410),(627,422)).close().assemble(),mode='s').reset().face(w0.sketch().arc((627,651),(639,675),(651,687)).segment((627,687)).close().assemble(),mode='s').finalize().extrude(386))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,450,501))
+r=w0.workplane(offset=467).moveTo(569,463).box(1000,606,571).union(w0.sketch().segment((356,820),(779,671)).segment((846,856)).segment((421,999)).close().assemble().finalize().extrude(662)).union(w0.sketch().arc((416,402),(150,132),(524,111)).arc((360,217),(415,401)).assemble().finalize().extrude(676))
\ No newline at end of file
diff --git a/test/extrude/682/682.stl b/test/extrude/682/682.stl
index 1523f3584322f6ac970a35dfc8d26998ae1f12a1..4083009e62549d6a03f5b8ba0d5de8d0802ed2f6 100644
Binary files a/test/extrude/682/682.stl and b/test/extrude/682/682.stl differ
diff --git a/test/extrude/683/683.py b/test/extrude/683/683.py
index bcef52d713053acc1cdfafce9bf45cb5aa851440..fa8597b37f58fe8499ef9b73094fe367ca51a789 100644
--- a/test/extrude/683/683.py
+++ b/test/extrude/683/683.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(571,711,571))
-r=w0.sketch().segment((930,544),(930,667)).segment((1000,667)).arc((553,834),(930,544)).assemble().finalize().extrude(1).union(w0.sketch().push([(395,439)]).circle(834).circle(588,mode='s').finalize().extrude(869))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(915,499,501))
+w1=cq.Workplane('ZX',origin=(500,236,501))
+r=w0.workplane(offset=390).moveTo(250,589).cylinder(721,589).union(w0.sketch().arc((304,121),(414,160),(385,46)).arc((795,145),(690,549)).segment((749,551)).segment((750,696)).segment((650,696)).segment((650,572)).arc((311,476),(305,122)).assemble().finalize().extrude(531)).union(w1.sketch().segment((220,135),(624,135)).segment((625,55)).segment((1000,57)).segment((1000,411)).arc((904,525),(916,676)).arc((799,674),(701,735)).segment((625,734)).segment((625,401)).segment((220,402)).close().assemble().reset().face(w1.sketch().segment((661,399),(746,400)).segment((745,360)).segment((964,361)).segment((965,430)).segment((661,432)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/683/683.stl b/test/extrude/683/683.stl
index 28d6914c7dc6d7ac3f27078377bf5f8c1bc5f90b..f980621f9dd01c80a8534c7edd28332fc628a8d7 100644
Binary files a/test/extrude/683/683.stl and b/test/extrude/683/683.stl differ
diff --git a/test/extrude/684/684.py b/test/extrude/684/684.py
index 764990d2faa873e728e9cbf47a35ba561d13f38f..71a18bec500685a7eb2a418b5c3c5e4880a51c05 100644
--- a/test/extrude/684/684.py
+++ b/test/extrude/684/684.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(442,280,442))
-w1=cq.Workplane('XY',origin=(442,442,466))
-r=w0.workplane(offset=721).moveTo(1,442).cylinder(1000,582).union(w1.sketch().segment((477,59),(535,59)).segment((535,257)).segment((535,303)).segment((535,500)).segment((477,500)).segment((477,303)).segment((477,257)).close().assemble().finalize().extrude(1000)).translate((1,1,140))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,195))
+r=w0.sketch().rect(1000,1000).rect(699,581,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/684/684.stl b/test/extrude/684/684.stl
index 492412031dc68b38fd01892546211603f1f18e26..c17dae9b2e314246487a3cfb0c955d2dc0b0ec3e 100644
Binary files a/test/extrude/684/684.stl and b/test/extrude/684/684.stl differ
diff --git a/test/extrude/685/685.py b/test/extrude/685/685.py
index 27978682a86815c3182f4f3bee08f063782362e0..351bd3809e911e9e4b42a09c9c40e766ed3240b0 100644
--- a/test/extrude/685/685.py
+++ b/test/extrude/685/685.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().segment((361,567),(587,441)).segment((587,967)).segment((607,967)).segment((594,980)).close().assemble().reset().face(w0.sketch().segment((727,367),(740,354)).segment((973,767)).segment((747,893)).segment((747,367)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,526,501))
+r=w0.sketch().arc((17,221),(52,82),(192,127)).segment((246,127)).segment((245,191)).segment((315,190)).segment((316,350)).segment((16,352)).close().assemble().push([(516,557)]).circle(666).finalize().extrude(196).union(w0.sketch().segment((685,856),(809,535)).segment((999,612)).segment((876,930)).close().assemble().finalize().extrude(754))
\ No newline at end of file
diff --git a/test/extrude/685/685.stl b/test/extrude/685/685.stl
index 1729bc9c1c17549551dd5b579ca6d945f90b7df0..4445c1d0a3aee4fdb53011406296136cc7a3893a 100644
Binary files a/test/extrude/685/685.stl and b/test/extrude/685/685.stl differ
diff --git a/test/extrude/686/686.py b/test/extrude/686/686.py
index f0d0e749be700e1a50fde1943aa0ca4e78bc4b01..f6ed11c1da4a99a15c98361e0ad2fb66040da0ef 100644
--- a/test/extrude/686/686.py
+++ b/test/extrude/686/686.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(643,529,529))
-w1=cq.Workplane('XY',origin=(529,529,781))
-r=w0.sketch().segment((139,862),(261,529)).segment((310,545)).arc((813,204),(521,740)).arc((464,821),(366,846)).segment((334,935)).close().assemble().reset().face(w0.sketch().arc((488,732),(505,740),(513,740)).arc((496,756),(488,732)).assemble(),mode='s').finalize().extrude(172).union(w0.workplane(offset=639).moveTo(375,687).box(1000,846,748)).union(w1.sketch().segment((253,553),(253,561)).arc((196,366),(261,180)).arc((521,326),(797,253)).arc((716,610),(350,643)).segment((415,643)).segment((415,553)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,430,501))
+w1=cq.Workplane('YZ',origin=(382,500,501))
+r=w0.sketch().push([(271,715)]).circle(755).push([(870,836)]).circle(615).circle(546,mode='s').finalize().extrude(72).union(w0.sketch().arc((232,276),(286,271),(330,240)).arc((425,665),(231,277)).assemble().finalize().extrude(1000)).union(w1.sketch().segment((312,112),(711,112)).segment((711,596)).segment((311,595)).segment((311,250)).arc((51,212),(310,170)).close().assemble().push([(511,353)]).rect(641,565,mode='s').finalize().extrude(151))
\ No newline at end of file
diff --git a/test/extrude/686/686.stl b/test/extrude/686/686.stl
index 6aebd7138dbb52d5ea4b14d96314a872ae23e21c..562661f1c859b7caa0c4442f7eac6b6f7a2fade5 100644
Binary files a/test/extrude/686/686.stl and b/test/extrude/686/686.stl differ
diff --git a/test/extrude/687/687.py b/test/extrude/687/687.py
index ef43016a0e007efcf686210b2a82259356ff21e4..3e0fb89660d34693713dd075e507c250ce851173 100644
--- a/test/extrude/687/687.py
+++ b/test/extrude/687/687.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(480,480,480))
-w1=cq.Workplane('XY',origin=(480,480,698))
-r=w0.sketch().segment((334,230),(542,230)).arc((490,334),(542,448)).segment((438,448)).arc((1,625),(334,292)).close().assemble().finalize().extrude(84).union(w1.sketch().segment((261,865),(438,865)).segment((438,761)).segment((698,761)).segment((698,865)).segment((875,865)).segment((875,886)).segment((698,886)).segment((698,1000)).segment((657,1000)).segment((657,969)).segment((438,969)).segment((438,886)).segment((261,886)).close().assemble().finalize().extrude(168))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(251,251,321))
+w1=cq.Workplane('ZX',origin=(251,311,251))
+r=w0.sketch().push([(168,383)]).circle(368).push([(361,279)]).circle(341).reset().face(w0.sketch().segment((340,204),(381,204)).segment((381,231)).arc((413,278),(381,326)).segment((381,353)).segment((340,354)).segment((341,326)).arc((311,279),(341,231)).close().assemble(),mode='s').push([(373,58)]).circle(308).push([(361,278)]).rect(255,321).finalize().extrude(77).union(w1.workplane(offset=171).moveTo(273,360).cylinder(411,334))
\ No newline at end of file
diff --git a/test/extrude/687/687.stl b/test/extrude/687/687.stl
index e6322f3e27eeaa0208d0db64e9fc0e203cfed507..2f3d2fb6b39209c36314699bcd6c35bb324db6b5 100644
Binary files a/test/extrude/687/687.stl and b/test/extrude/687/687.stl differ
diff --git a/test/extrude/688/688.py b/test/extrude/688/688.py
index 74df81d494be95cc22ba1c9cc6f231b87cf800e5..64b40afaf411489caa2990a7f1773bc4fc8a93d2 100644
--- a/test/extrude/688/688.py
+++ b/test/extrude/688/688.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(630,941,630))
-r=w0.sketch().segment((260,689),(364,430)).arc((415,393),(452,356)).segment((1000,571)).segment((859,926)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=600).cylinder(689,993)).translate((364,1,364))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,97))
+r=w0.sketch().segment((225,70),(359,40)).segment((401,245)).arc((367,245),(336,251)).segment((505,251)).segment((505,545)).segment((466,547)).segment((546,976)).segment((402,999)).segment((320,547)).segment((266,546)).segment((266,287)).close().assemble().reset().face(w0.sketch().segment((337,545),(435,546)).arc((391,552),(336,545)).assemble(),mode='s').push([(470,924)]).circle(555,mode='s').finalize().extrude(450).union(w0.sketch().segment((360,300),(544,1)).segment((775,145)).segment((684,300)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/688/688.stl b/test/extrude/688/688.stl
index f5e120eb1b2a54c2c96cfaec347c4822b45ddd1a..a4ce3834438680144158ca19721c96cd876669a4 100644
Binary files a/test/extrude/688/688.stl and b/test/extrude/688/688.stl differ
diff --git a/test/extrude/689/689.py b/test/extrude/689/689.py
index b9d432d412ae029b0e9ed2b2923fe8c90637b4b1..81905aa4c5ae5f5871ccdffe6a1ca93dba429e29 100644
--- a/test/extrude/689/689.py
+++ b/test/extrude/689/689.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().segment((387,387),(540,387)).segment((540,347)).segment((794,347)).segment((794,387)).segment((947,387)).segment((947,947)).segment((794,947)).segment((794,987)).segment((540,987)).segment((540,947)).segment((387,947)).close().assemble().reset().face(w0.sketch().segment((647,887),(707,853)).segment((740,920)).segment((680,953)).close().assemble(),mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,565,499))
+r=w0.sketch().segment((425,51),(471,50)).segment((470,2)).segment((492,1)).segment((490,51)).segment((536,50)).segment((535,250)).segment((491,252)).segment((485,301)).segment((470,300)).segment((469,250)).segment((424,252)).close().assemble().finalize().extrude(266).union(w0.workplane(offset=553).moveTo(500,734).cylinder(605,765))
\ No newline at end of file
diff --git a/test/extrude/689/689.stl b/test/extrude/689/689.stl
index 3f074bdee08e72a9c9b5ce97596f813d275029b1..8cbe18a70183e6e2c7a96250b1663a8cec927f73 100644
Binary files a/test/extrude/689/689.stl and b/test/extrude/689/689.stl differ
diff --git a/test/extrude/69/69.py b/test/extrude/69/69.py
index 79a9794fcd3cf554541b3231be943394d2684907..377989a4dcefa1ac1aefe983d00a491c6f2489cc 100644
--- a/test/extrude/69/69.py
+++ b/test/extrude/69/69.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(301,346,346))
-r=w0.workplane(offset=142).moveTo(1,373).cylinder(755,373).union(w0.sketch().push([(401,346)]).rect(982,1000).rect(764,709,mode='s').finalize().extrude(846)).translate((1,27,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(19,21,47))
+r=w0.sketch().segment((7,952),(695,952)).segment((695,332)).segment((7,332)).close().assemble().push([(123,409)]).rect(102,100,mode='s').push([(600,424)]).circle(55,mode='s').push([(315,576)]).circle(27,mode='s').push([(87,493)]).rect(47,87,mode='s').finalize().extrude(308).translate((1,288,1))
diff --git a/test/extrude/69/69.stl b/test/extrude/69/69.stl
index b2ebc659444e366f22fd3a1c1bf82af896110e51..8eb2c8ed80ee89f2d1107514e224099e3a353c07 100644
Binary files a/test/extrude/69/69.stl and b/test/extrude/69/69.stl differ
diff --git a/test/extrude/690/690.py b/test/extrude/690/690.py
index a2fb61830d9a16eaea32fd3aec83ee7a0ba74ba2..c7eef04a423348480357b08c577f41b8bcb43178 100644
--- a/test/extrude/690/690.py
+++ b/test/extrude/690/690.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,620,500))
-r=w0.sketch().segment((441,1),(560,1)).segment((560,431)).arc((590,500),(560,570)).segment((560,1000)).segment((441,1000)).segment((441,570)).arc((411,500),(441,431)).close().assemble().finalize().extrude(251)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,376))
+r=w0.workplane(offset=313).moveTo(840,683).box(691,865,876).union(w0.workplane(offset=813).moveTo(179,251).box(725,729,1000))
\ No newline at end of file
diff --git a/test/extrude/690/690.stl b/test/extrude/690/690.stl
index 4d2729eebf4a7bf131fd7e07733e1fcc9d63f970..fcb6fc9ff23e7355ab029c19c87de9ef47baece2 100644
Binary files a/test/extrude/690/690.stl and b/test/extrude/690/690.stl differ
diff --git a/test/extrude/691/691.py b/test/extrude/691/691.py
index 5f2a9b3d4de9849a5a89aa0316d3f06071c01e7d..28eab60d85e72aa0130af29de2fa15d8b299f7e6 100644
--- a/test/extrude/691/691.py
+++ b/test/extrude/691/691.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(480,480,688))
-r=w0.sketch().arc((32,1),(292,677),(1000,823)).arc((188,802),(32,1)).assemble().finalize().extrude(63)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,2,501))
+r=w0.sketch().segment((287,635),(380,275)).segment((714,366)).segment((621,725)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/691/691.stl b/test/extrude/691/691.stl
index b04a8e5dc8fd2cc66d03424dff3e58d864f98108..c10fb419d0af889648aaa2a48d0d4b6ab01c86c5 100644
Binary files a/test/extrude/691/691.stl and b/test/extrude/691/691.stl differ
diff --git a/test/extrude/692/692.py b/test/extrude/692/692.py
index d115f100afbc4e8ea281f598347fcef13b4828ec..f78285df22ad9edc25906cd4492fe6536eefae9c 100644
--- a/test/extrude/692/692.py
+++ b/test/extrude/692/692.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(445,445,467))
-w1=cq.Workplane('YZ',origin=(512,445,445))
-r=w0.sketch().arc((290,168),(356,101),(334,1)).arc((778,23),(545,401)).arc((123,778),(312,245)).arc((301,212),(290,168)).assemble().push([(545,145)]).circle(612,mode='s').finalize().extrude(123).union(w0.workplane(offset=584).moveTo(639,456).box(900,667,722)).union(w1.sketch().segment((423,445),(456,445)).segment((456,390)).segment((1000,390)).segment((1000,523)).segment((556,523)).arc((556,612),(478,678)).segment((478,689)).segment((423,689)).segment((423,678)).arc((345,567),(423,456)).close().assemble().finalize().extrude(834))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,390,501))
+r=w0.sketch().push([(727,724)]).rect(805,891).reset().face(w0.sketch().segment((625,720),(649,700)).arc((665,611),(750,596)).segment((775,575)).segment((811,609)).segment((789,630)).arc((776,719),(685,736)).segment((664,760)).close().assemble(),mode='s').finalize().extrude(112).union(w0.workplane(offset=805).moveTo(197,321).box(651,979,1000))
\ No newline at end of file
diff --git a/test/extrude/692/692.stl b/test/extrude/692/692.stl
index c500e136c2b74fd3970578a2ef2266306edeedeb..8d589c68da37cd5083e9ddb54fd839f9b37e5f3a 100644
Binary files a/test/extrude/692/692.stl and b/test/extrude/692/692.stl differ
diff --git a/test/extrude/693/693.py b/test/extrude/693/693.py
index 115145ce972a3a10ad505f5eb8457306a13341e8..2cbbecbb53ef47dfe5b6d837dea99c2a33bc2fc9 100644
--- a/test/extrude/693/693.py
+++ b/test/extrude/693/693.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,331,331))
-r=w0.sketch().segment((31,324),(91,316)).segment((91,181)).segment((316,181)).segment((316,301)).segment((377,301)).segment((377,76)).segment((632,76)).segment((632,707)).segment((377,707)).segment((377,354)).segment((316,362)).segment((316,549)).segment((91,549)).segment((91,377)).segment((31,384)).close().assemble().push([(504,392)]).circle(392,mode='s').finalize().extrude(579).union(w0.workplane(offset=666).moveTo(422,76).cylinder(1000,452)).translate((1,1,46))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,505,501))
+r=w0.sketch().push([(765,300)]).circle(736).push([(763,302)]).rect(746,840,mode='s').finalize().extrude(206).union(w0.workplane(offset=563).moveTo(190,746).cylinder(625,689)).union(w0.sketch().push([(337,331)]).circle(576).push([(346,298)]).rect(529,525,mode='s').finalize().extrude(780))
\ No newline at end of file
diff --git a/test/extrude/693/693.stl b/test/extrude/693/693.stl
index a900afe6a14651c12acb4a4e7b7bf24bc0a9a435..713e10f2d5529aff4b50c62a47442f67e3c816e7 100644
Binary files a/test/extrude/693/693.stl and b/test/extrude/693/693.stl differ
diff --git a/test/extrude/694/694.py b/test/extrude/694/694.py
index 680b41fb8aab2b1c2a9d4d4b42a18b458df0addd..4b72774855a8ab04130041e85d48e274a45625e4 100644
--- a/test/extrude/694/694.py
+++ b/test/extrude/694/694.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(304,506,506))
-r=w0.sketch().segment((243,152),(344,152)).segment((354,1)).segment((808,31)).segment((798,152)).segment((889,152)).segment((889,445)).segment((778,445)).segment((768,596)).segment((324,566)).segment((334,445)).segment((243,445)).close().assemble().push([(566,117)]).rect(909,576,mode='s').reset().face(w0.sketch().segment((364,445),(768,445)).segment((768,516)).segment((637,516)).segment((637,556)).segment((516,556)).segment((516,516)).segment((364,516)).close().assemble(),mode='s').finalize().extrude(677).union(w0.sketch().segment((233,213),(576,213)).segment((576,828)).segment((506,828)).arc((485,919),(405,990)).segment((405,960)).segment((374,960)).segment((374,1000)).arc((132,889),(233,637)).close().assemble().finalize().extrude(899))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,975))
+r=w0.workplane(offset=22).moveTo(51,256).cylinder(1000,550).union(w0.workplane(offset=257).moveTo(901,694).cylinder(990,601))
\ No newline at end of file
diff --git a/test/extrude/694/694.stl b/test/extrude/694/694.stl
index a9e767ed97483629710558ebb54d37a895ca6717..c3c4235741dd5cdf12f81275c7e426245cf34ae9 100644
Binary files a/test/extrude/694/694.stl and b/test/extrude/694/694.stl differ
diff --git a/test/extrude/695/695.py b/test/extrude/695/695.py
index d7749fe733ac1d39de8d1f2d77b7d047452959f5..2ddaf545d4b5da123359699815ed250615b90c34 100644
--- a/test/extrude/695/695.py
+++ b/test/extrude/695/695.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(521,521,573))
-r=w0.sketch().segment((448,500),(532,240)).segment((636,272)).segment((646,272)).segment((688,292)).segment((657,396)).arc((1000,729),(563,532)).segment((500,511)).segment((490,511)).close().assemble().finalize().extrude(95).union(w0.sketch().segment((168,199),(168,209)).segment((178,209)).segment((178,199)).arc((1,344),(168,199)).assemble().finalize().extrude(834))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,615))
+w1=cq.Workplane('XY',origin=(502,500,315))
+r=w0.workplane(offset=473).moveTo(13,98).box(526,546,555).union(w0.sketch().segment((631,740),(1000,745)).segment((1000,926)).segment((631,924)).close().assemble().finalize().extrude(725)).union(w1.workplane(offset=423).moveTo(80,502).box(566,825,655))
\ No newline at end of file
diff --git a/test/extrude/695/695.stl b/test/extrude/695/695.stl
index 19288daa25948ceadec85706e8fe479e2d35b837..9ac576a89cf5c8424c8dea0b4958652c2b0cfbf6 100644
Binary files a/test/extrude/695/695.stl and b/test/extrude/695/695.stl differ
diff --git a/test/extrude/696/696.py b/test/extrude/696/696.py
index a85a3455ecb99b7f003a2774f08b3d323a90ade6..6969e2bfe549c31af2ae3e382d24eaaad4d33375 100644
--- a/test/extrude/696/696.py
+++ b/test/extrude/696/696.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(245,245,1))
-r=w0.workplane(offset=146).moveTo(744,245).cylinder(442,326).union(w0.workplane(offset=593).moveTo(42,216).box(1000,280,942)).translate((214,1,75))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,150))
+r=w0.sketch().segment((1,746),(584,257)).segment((1000,746)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/696/696.stl b/test/extrude/696/696.stl
index f3abcc0bf9bd5ab382cad20fd4946d0ba3193e92..d0099f4e06d442722b052443307e41e82b88343d 100644
Binary files a/test/extrude/696/696.stl and b/test/extrude/696/696.stl differ
diff --git a/test/extrude/697/697.py b/test/extrude/697/697.py
index 87e46cce48c70153eb08277c2050d94330937e0a..b1a4cbed9b60c6f9b5c951815e3b504ce103963c 100644
--- a/test/extrude/697/697.py
+++ b/test/extrude/697/697.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(477,477,487))
-r=w0.workplane(offset=341).moveTo(1,137).box(571,487,749).union(w0.sketch().segment((247,310),(644,163)).segment((822,665)).segment((686,718)).arc((707,780),(759,822)).segment((676,822)).segment((676,780)).segment((655,780)).segment((655,728)).segment((425,812)).close().assemble().reset().face(w0.sketch().arc((854,822),(916,738),(885,634)).segment((979,634)).segment((979,676)).segment((1000,676)).segment((1000,780)).segment((979,780)).segment((979,822)).close().assemble()).finalize().extrude(728))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,561))
+r=w0.sketch().segment((287,689),(311,691)).segment((312,630)).segment((715,629)).segment((716,1000)).segment((286,1000)).close().assemble().push([(517,407)]).circle(605).finalize().extrude(241).union(w0.workplane(offset=571).moveTo(395,112).box(551,725,640))
\ No newline at end of file
diff --git a/test/extrude/697/697.stl b/test/extrude/697/697.stl
index 9e364e5a3fec51a069d4d4e00fea351b57994c2b..c083136d65fa1915a7d05d0f13595b3a9b234619 100644
Binary files a/test/extrude/697/697.stl and b/test/extrude/697/697.stl differ
diff --git a/test/extrude/698/698.py b/test/extrude/698/698.py
index 289f3e9807a0f6142b0ae3b47bc67a022e8adbeb..cbd76aba674318b291ec466bd05c2414b7b356cf 100644
--- a/test/extrude/698/698.py
+++ b/test/extrude/698/698.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(486,486,258))
-r=w0.workplane(offset=586).moveTo(258,1).cylinder(686,715).union(w0.workplane(offset=650).moveTo(636,1000).box(986,886,814)).union(w0.sketch().arc((729,486),(700,87),(829,472)).segment((829,715)).segment((729,715)).close().assemble().finalize().extrude(943)).translate((1,230,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,180,500))
+r=w0.workplane(offset=463).moveTo(85,291).cylinder(576,585).union(w0.sketch().segment((241,561),(345,560)).arc((376,579),(405,559)).segment((421,561)).arc((619,400),(819,560)).segment((1000,560)).segment((999,630)).segment((820,631)).arc((620,795),(421,630)).segment((242,630)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/698/698.stl b/test/extrude/698/698.stl
index 6b9a08d8c54a4e9b728b67ea2a80908a80688884..d388b8042c3da805ce355ded11bd30d655dbec70 100644
Binary files a/test/extrude/698/698.stl and b/test/extrude/698/698.stl differ
diff --git a/test/extrude/699/699.py b/test/extrude/699/699.py
index 2530fa038f85d352021a6fe6ba1eebd82854017b..bf22bb925c504b63553decea24d3155c504798fa 100644
--- a/test/extrude/699/699.py
+++ b/test/extrude/699/699.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().circle(774).rect(760,680,mode='s').finalize().extrude(1).translate((1,108,108))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,595,501))
+r=w0.sketch().segment((1,191),(155,190)).segment((156,110)).segment((241,110)).segment((241,191)).segment((395,192)).segment((396,810)).segment((240,810)).segment((240,891)).segment((156,890)).segment((156,810)).segment((1,810)).close().assemble().finalize().extrude(32).union(w0.workplane(offset=640).moveTo(766,535).cylinder(780,735))
\ No newline at end of file
diff --git a/test/extrude/699/699.stl b/test/extrude/699/699.stl
index 461fc8a80b057dbb23943172d1faf86994f1e7b5..458b949d3e2c454ae272eaabf6e75368e35e8def 100644
Binary files a/test/extrude/699/699.stl and b/test/extrude/699/699.stl differ
diff --git a/test/extrude/7/7.py b/test/extrude/7/7.py
index f6827f6930aa27061af8657ed5fa09778b01f99e..17f783421d1fc7d97d9503c48e4e199bd1fd9bea 100644
--- a/test/extrude/7/7.py
+++ b/test/extrude/7/7.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(334,387,387))
-w1=cq.Workplane('ZX',origin=(387,507,387))
-r=w0.sketch().arc((14,68),(81,1),(174,54)).arc((187,853),(14,68)).assemble().finalize().extrude(254).union(w1.workplane(offset=660).moveTo(214,394).box(1000,747,933))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(34,32,9))
+r=w0.sketch().segment((170,145),(780,145)).segment((780,268)).segment((475,519)).segment((170,268)).close().assemble().push([(476,253)]).rect(179,132,mode='s').finalize().extrude(193).union(w0.workplane(offset=216).sketch().segment((376,627),(744,627)).segment((744,365)).segment((376,365)).close().assemble().finalize().extrude(199))
diff --git a/test/extrude/7/7.stl b/test/extrude/7/7.stl
index 4dfc973038fd0ddc4ae99a79404456deb3f047e6..c00186acf6d39ca949a0bddfa690f9d13ed3b3a7 100644
Binary files a/test/extrude/7/7.stl and b/test/extrude/7/7.stl differ
diff --git a/test/extrude/70/70.py b/test/extrude/70/70.py
index 74d40a15b94cf8d00a01eb6f3aceaa820aaf0aaf..1f1cd88f304c54deaf12b3f4255efa11badd2305 100644
--- a/test/extrude/70/70.py
+++ b/test/extrude/70/70.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(340,340,10))
-w1=cq.Workplane('ZX',origin=(340,560,340))
-r=w0.sketch().push([(459,441)]).circle(679).push([(455,436)]).rect(826,533,mode='s').finalize().extrude(808).union(w0.sketch().push([(148,129)]).circle(569).circle(468,mode='s').finalize().extrude(1000)).union(w1.sketch().push([(436,19)]).rect(588,615).push([(436,24)]).rect(404,404,mode='s').finalize().extrude(1)).translate((82,101,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(79,67,52))
+r=w0.sketch().segment((198,670),(245,670)).arc((667,545),(245,421)).segment((198,421)).segment((197,232)).segment((717,232)).segment((717,856)).segment((197,856)).close().assemble().push([(317,584)]).circle(100,mode='s').finalize().extrude(371)
diff --git a/test/extrude/70/70.stl b/test/extrude/70/70.stl
index ac0b137d61a76ac6edd4d80ab5ddc5741c5a2646..f5db4d91339b599203d1cf817e2a3c67778abe89 100644
Binary files a/test/extrude/70/70.stl and b/test/extrude/70/70.stl differ
diff --git a/test/extrude/700/700.py b/test/extrude/700/700.py
index 75e19289501652a1f3f3252c134963ace779a7a6..2dd0268790588a49b6b398c50e019f3b3dfabd99 100644
--- a/test/extrude/700/700.py
+++ b/test/extrude/700/700.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(403,390,390))
-r=w0.sketch().push([(1,917)]).rect(1000,639).circle(431,mode='s').finalize().extrude(292).union(w0.workplane(offset=417).moveTo(709,112).cylinder(445,764)).translate((1,110,263))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,531,502))
+r=w0.sketch().segment((1,674),(135,675)).segment((136,450)).segment((426,450)).segment((425,675)).segment((559,675)).segment((561,875)).segment((536,875)).segment((535,855)).segment((81,856)).segment((81,875)).segment((2,875)).close().assemble().finalize().extrude(256).union(w0.sketch().push([(782,262)]).rect(936,776).push([(596,328)]).rect(511,545,mode='s').finalize().extrude(680))
\ No newline at end of file
diff --git a/test/extrude/700/700.stl b/test/extrude/700/700.stl
index 57c3ccaa745ab0de8a7ce73774228219ead315d0..b7e399c0192ec096cdd4c70a6bd9bbc128e9b9e8 100644
Binary files a/test/extrude/700/700.stl and b/test/extrude/700/700.stl differ
diff --git a/test/extrude/701/701.py b/test/extrude/701/701.py
index 499ee285f2160c25f7fdf58fe7a297cdd5684d2c..c55a37b48a90ddb8ac236aa32e99be3beb317532 100644
--- a/test/extrude/701/701.py
+++ b/test/extrude/701/701.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(599,898,599))
-r=w0.sketch().segment((172,419),(300,419)).arc((445,317),(590,419)).arc((1000,727),(496,624)).arc((377,624),(300,547)).segment((419,454)).segment((368,377)).segment((214,496)).segment((240,539)).segment((172,539)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,117))
+w1=cq.Workplane('YZ',origin=(560,501,502))
+r=w0.sketch().segment((35,216),(251,215)).arc((336,206),(422,215)).segment((491,216)).segment((491,1)).segment((850,1)).segment((850,295)).segment((631,296)).segment((629,415)).segment((706,416)).segment((706,471)).segment((630,471)).segment((630,740)).segment((420,741)).arc((335,750),(250,739)).segment((35,740)).close().assemble().finalize().extrude(540).union(w1.workplane(offset=703).moveTo(795,681).cylinder(906,705))
\ No newline at end of file
diff --git a/test/extrude/701/701.stl b/test/extrude/701/701.stl
index 426c842e6c7ca3fca9f06e7a9022dff1802f6261..93b61844277afac0f37b7b731bf074838f343492 100644
Binary files a/test/extrude/701/701.stl and b/test/extrude/701/701.stl differ
diff --git a/test/extrude/702/702.py b/test/extrude/702/702.py
index 86de929fd851522ef952d89aa226f2537a4d1484..83946530930922a336658826312d826315e756c6 100644
--- a/test/extrude/702/702.py
+++ b/test/extrude/702/702.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(262,468,468))
-r=w0.sketch().segment((1,178),(262,169)).segment((281,757)).segment((20,767)).close().assemble().finalize().extrude(356).union(w0.workplane(offset=734).moveTo(748,309).box(841,524,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(72,252,251))
+r=w0.workplane(offset=296).moveTo(192,152).cylinder(339,402).union(w0.sketch().push([(451,491)]).circle(262).reset().face(w0.sketch().segment((449,496),(452,484)).segment((456,487)).segment((451,499)).close().assemble(),mode='s').finalize().extrude(501))
\ No newline at end of file
diff --git a/test/extrude/702/702.stl b/test/extrude/702/702.stl
index 50f0c74440259697671230bbbc890590f477e1ff..38004baad445c1db5b6052ed600509d2b252f194 100644
Binary files a/test/extrude/702/702.stl and b/test/extrude/702/702.stl differ
diff --git a/test/extrude/703/703.py b/test/extrude/703/703.py
index 86e41ef0d414cdfa4fdc246008460240f06204d7..5e6cf9cc762e57ba38d3247439b3996a7e2f4c41 100644
--- a/test/extrude/703/703.py
+++ b/test/extrude/703/703.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).cylinder(1000,730).translate((397,397,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,179))
+r=w0.sketch().push([(200,386)]).circle(699).reset().face(w0.sketch().segment((565,196),(619,186)).arc((738,110),(873,146)).segment((928,140)).segment((962,375)).segment((908,384)).arc((904,390),(899,399)).arc((694,888),(594,369)).close().assemble()).reset().face(w0.sketch().arc((620,186),(738,112),(869,144)).close().assemble(),mode='s').reset().face(w0.sketch().segment((659,420),(908,385)).arc((789,454),(660,419)).assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/703/703.stl b/test/extrude/703/703.stl
index a2f019919845ca2106bfd27b131c893e24caba83..a71dea8068a34d75a0212f614834c427b8e3b16e 100644
Binary files a/test/extrude/703/703.stl and b/test/extrude/703/703.stl differ
diff --git a/test/extrude/704/704.py b/test/extrude/704/704.py
index 629661f1e546c3122f3a9513df2482f8264c3b35..fe5e9221ee3dcb8893408351c0c8597877377106 100644
--- a/test/extrude/704/704.py
+++ b/test/extrude/704/704.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(423,423,634))
-r=w0.workplane(offset=134).moveTo(667,356).cylinder(1000,523).union(w0.sketch().arc((267,578),(1,478),(278,534)).segment((512,534)).segment((512,978)).segment((267,978)).close().assemble().push([(345,900)]).circle(456,mode='s').finalize().extrude(179)).union(w0.sketch().push([(112,45)]).circle(600).reset().face(w0.sketch().arc((412,156),(500,123),(567,45)).segment((911,45)).segment((911,356)).segment((800,356)).segment((800,390)).segment((845,456)).segment((800,489)).segment((800,567)).segment((689,567)).segment((678,567)).segment((523,567)).segment((523,356)).segment((412,356)).close().assemble()).push([(567,256)]).circle(434,mode='s').finalize().extrude(567)).translate((66,133,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(729,501,502))
+r=w0.sketch().segment((402,1),(814,1)).segment((815,200)).segment((721,72)).segment((400,304)).close().assemble().finalize().extrude(35).union(w0.sketch().segment((185,679),(236,680)).arc((406,590),(576,679)).segment((625,681)).segment((626,910)).segment((576,910)).arc((407,1000),(236,910)).segment((185,911)).close().assemble().finalize().extrude(326))
\ No newline at end of file
diff --git a/test/extrude/704/704.stl b/test/extrude/704/704.stl
index 2f7602dab7ba04c1206f2a8ade283b3fda91a05f..d113a3d2d01029a4c004ef1ad22315fa9e549539 100644
Binary files a/test/extrude/704/704.stl and b/test/extrude/704/704.stl differ
diff --git a/test/extrude/705/705.py b/test/extrude/705/705.py
index c1af15ad58c2e7843d7ba3d55f79b1c55eda4d92..b70aa56788c74bc2b6296e96982c8c89c69cabd1 100644
--- a/test/extrude/705/705.py
+++ b/test/extrude/705/705.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,321,500))
-r=w0.sketch().arc((520,1000),(650,920),(770,1000)).close().assemble().finalize().extrude(600).union(w0.sketch().segment((231,1),(381,1)).segment((381,21)).segment((231,81)).close().assemble().finalize().extrude(870))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,52,501))
+r=w0.sketch().segment((399,990),(460,2)).segment((601,11)).segment((541,1000)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/705/705.stl b/test/extrude/705/705.stl
index 541aac50a0188622d9cd4d89a2989b2588eead32..fe01a050df08b12c431dbd741a5de884ce3191d0 100644
Binary files a/test/extrude/705/705.stl and b/test/extrude/705/705.stl differ
diff --git a/test/extrude/706/706.py b/test/extrude/706/706.py
index b3b36a450f584a9882f498c914aaa0751ae9280e..5c3416949d1183b7ab8f91c4f339dd91c909993f 100644
--- a/test/extrude/706/706.py
+++ b/test/extrude/706/706.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,381))
-r=w0.sketch().segment((1,241),(351,241)).segment((351,361)).arc((171,271),(1,361)).close().assemble().reset().face(w0.sketch().segment((500,351),(1000,351)).segment((1000,760)).segment((710,760)).arc((690,650),(620,570)).segment((910,570)).segment((910,540)).segment((590,540)).segment((590,550)).arc((550,530),(500,530)).close().assemble()).push([(740,560)]).circle(510).finalize().extrude(740)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(670,501,499))
+r=w0.sketch().segment((1,256),(131,255)).segment((131,125)).segment((250,126)).segment((251,254)).segment((374,255)).segment((376,649)).segment((251,650)).segment((250,780)).segment((130,778)).segment((130,649)).segment((1,649)).close().assemble().finalize().extrude(159).union(w0.sketch().arc((370,668),(710,202),(924,740)).segment((923,874)).segment((370,873)).close().assemble().push([(628,670)]).rect(874,890,mode='s').finalize().extrude(315))
\ No newline at end of file
diff --git a/test/extrude/706/706.stl b/test/extrude/706/706.stl
index eafd7cc8c7f9f36b55488617bc3af76837749405..518262f76758171c711793cb6a467bfaaa2a0813 100644
Binary files a/test/extrude/706/706.stl and b/test/extrude/706/706.stl differ
diff --git a/test/extrude/707/707.py b/test/extrude/707/707.py
index 93409e9508324ff893734ea0749a815cb2aec4f0..cc30c96d2a429800a9e6c76bc66c8acfcd00136b 100644
--- a/test/extrude/707/707.py
+++ b/test/extrude/707/707.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(329,367,367))
-w1=cq.Workplane('XY',origin=(367,367,506))
-r=w0.sketch().segment((221,321),(344,522)).segment((221,599)).close().assemble().finalize().extrude(445).union(w0.workplane(offset=580).moveTo(433,367).box(977,892,792)).union(w1.workplane(offset=329).moveTo(1,313).box(406,1000,445))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(242,500,501))
+r=w0.sketch().push([(821,176)]).circle(655).reset().face(w0.sketch().segment((724,215),(751,180)).arc((756,136),(806,100)).segment((821,72)).segment((916,140)).segment((901,165)).arc((880,221),(846,245)).segment((821,275)).close().assemble(),mode='s').finalize().extrude(720).union(w0.workplane(offset=650).moveTo(728,206).box(557,910,800)).union(w0.sketch().segment((26,315),(155,270)).arc((216,182),(307,216)).segment((441,167)).segment((456,206)).segment((326,260)).arc((270,340),(176,316)).segment((42,361)).close().assemble().reset().face(w0.sketch().segment((522,770),(696,656)).segment((849,874)).segment((675,1000)).segment((520,781)).close().assemble()).finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/707/707.stl b/test/extrude/707/707.stl
index 65a908939dc6e5ba855ac010e0970662c3e7f467..cfd5e2b31ea54d2af48bdf7cd0f4712b54dd5a4a 100644
Binary files a/test/extrude/707/707.stl and b/test/extrude/707/707.stl differ
diff --git a/test/extrude/708/708.py b/test/extrude/708/708.py
index 248ce0ee0dc0d834a6c1f1bd2043341a6c5afb98..e066dc51157c94f247c62fed4480a2b5ca625a58 100644
--- a/test/extrude/708/708.py
+++ b/test/extrude/708/708.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(491,491,481))
-r=w0.sketch().push([(481,351)]).circle(600).push([(560,655)]).rect(590,660).push([(560,660)]).circle(510,mode='s').finalize().extrude(1).union(w0.workplane(offset=745).moveTo(560,655).box(570,640,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,226,500))
+w1=cq.Workplane('XY',origin=(500,500,440))
+r=w0.sketch().segment((136,73),(625,72)).segment((626,76)).arc((938,336),(600,116)).segment((137,118)).close().assemble().finalize().extrude(326).union(w0.sketch().segment((350,430),(456,431)).segment((457,810)).segment((426,809)).arc((33,879),(351,636)).close().assemble().finalize().extrude(546)).union(w1.workplane(offset=445).moveTo(163,795).cylinder(611,655))
\ No newline at end of file
diff --git a/test/extrude/708/708.stl b/test/extrude/708/708.stl
index fd9fb6fdbd6d4fc6bcf65db33e8ff669f5a4919d..2439d61d606afc230184699edab1fd864abde538 100644
Binary files a/test/extrude/708/708.stl and b/test/extrude/708/708.stl differ
diff --git a/test/extrude/709/709.py b/test/extrude/709/709.py
index e24c679440dc3dfe1cecb85b97629336dec2c85b..f25fa1f3d4d06e7e9d086c24255d04ebb1295c86 100644
--- a/test/extrude/709/709.py
+++ b/test/extrude/709/709.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(516,516,279))
-r=w0.sketch().segment((1,248),(567,248)).arc((1000,176),(732,526)).segment((732,969)).segment((1,969)).close().assemble().push([(372,609)]).circle(722,mode='s').reset().face(w0.sketch().segment((609,186),(629,186)).segment((629,135)).segment((959,135)).segment((959,186)).segment((990,186)).segment((990,403)).segment((959,403)).segment((959,464)).segment((629,464)).segment((629,403)).segment((609,403)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(235,500,501))
+r=w0.sketch().segment((216,1),(786,2)).segment((785,395)).segment((215,500)).close().assemble().reset().face(w0.sketch().segment((215,604),(785,501)).segment((786,914)).arc((646,941),(516,1000)).segment((215,1000)).close().assemble()).finalize().extrude(946).union(w0.workplane(offset=766).box(969,911,1000))
\ No newline at end of file
diff --git a/test/extrude/709/709.stl b/test/extrude/709/709.stl
index d1dd1ad2af38506d0dfa90fe89ab62a5dcca0759..901f3c99c80e8fe06b5f53b9fbbc53976fa8b566 100644
Binary files a/test/extrude/709/709.stl and b/test/extrude/709/709.stl differ
diff --git a/test/extrude/71/71.py b/test/extrude/71/71.py
index 455988c7b6eefb7b9530b1ffcd4b489dabf00b21..09eef340cb3dd49541e1295f274f5143edceb603 100644
--- a/test/extrude/71/71.py
+++ b/test/extrude/71/71.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(283,500,500))
-r=w0.sketch().arc((218,1000),(500,1),(783,1000)).close().assemble().push([(609,729)]).rect(805,805,mode='s').finalize().extrude(924)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,530,501))
+r=w0.workplane(offset=236).moveTo(389,422).box(561,821,1000).union(w0.sketch().arc((231,281),(272,265),(296,231)).arc((536,260),(590,495)).segment((825,495)).segment((826,796)).segment((410,795)).segment((410,636)).arc((200,520),(232,281)).assemble().finalize().extrude(971))
\ No newline at end of file
diff --git a/test/extrude/71/71.stl b/test/extrude/71/71.stl
index 925e6160554c5cfdc510206e6f997f265e315f81..79b163666281aa72efc0b745a0b3804ad42ce055 100644
Binary files a/test/extrude/71/71.stl and b/test/extrude/71/71.stl differ
diff --git a/test/extrude/710/710.py b/test/extrude/710/710.py
index 018f7361598c79e5cb145b93ef995299bf717955..7cdfd4ad3e6e2818f39c2a45ff2823884505c09a 100644
--- a/test/extrude/710/710.py
+++ b/test/extrude/710/710.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(586,956,586))
-w1=cq.Workplane('YZ',origin=(423,586,586))
-r=w0.sketch().segment((504,652),(586,697)).segment((556,748)).arc((534,697),(504,652)).assemble().finalize().extrude(1).union(w1.sketch().push([(330,586)]).rect(815,1000).push([(282,578)]).circle(645,mode='s').push([(323,778)]).rect(593,600,mode='s').finalize().extrude(682))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(896,500,500))
+w1=cq.Workplane('ZX',origin=(500,171,501))
+r=w0.sketch().segment((31,225),(370,225)).arc((292,400),(356,586)).arc((406,485),(496,425)).arc((841,101),(755,566)).arc((739,710),(634,810)).segment((664,881)).segment((365,999)).segment((271,754)).segment((376,711)).arc((360,656),(356,596)).segment((30,594)).close().assemble().push([(560,621)]).circle(646,mode='s').finalize().extrude(136).union(w1.workplane(offset=524).moveTo(142,337).box(781,960,546))
\ No newline at end of file
diff --git a/test/extrude/710/710.stl b/test/extrude/710/710.stl
index 575e1730625d92ed8b3f594cd08af88a4c8a4592..cd16f1aaab675906eabf677b4cbe8afb670236d0 100644
Binary files a/test/extrude/710/710.stl and b/test/extrude/710/710.stl differ
diff --git a/test/extrude/711/711.py b/test/extrude/711/711.py
index 4c6f695fc7b1b0aaa9ddb4530b0fbacc616e2290..2b701b6a5d07418c00ab3f9e825bdc828039c354 100644
--- a/test/extrude/711/711.py
+++ b/test/extrude/711/711.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(176,376,376))
-r=w0.workplane(offset=463).moveTo(126,126).cylinder(550,750).union(w0.sketch().segment((488,126),(575,1)).segment((1000,251)).segment((975,288)).arc((875,276),(938,351)).segment((925,376)).close().assemble().reset().face(w0.sketch().arc((750,638),(825,813),(750,1000)).close().assemble()).finalize().extrude(788)).translate((1,249,249))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,460))
+r=w0.sketch().segment((2,226),(385,111)).segment((386,401)).arc((499,350),(615,400)).segment((615,81)).segment((496,80)).segment((775,1)).segment((999,775)).segment((615,891)).segment((615,600)).arc((500,650),(385,600)).segment((386,921)).segment((506,919)).segment((226,1000)).close().assemble().finalize().extrude(581)
\ No newline at end of file
diff --git a/test/extrude/711/711.stl b/test/extrude/711/711.stl
index f8b7e56ac44b3125c8e19734dea1b8af7757e52f..526c4a2a065bf247cdf4e3ed22b5cf4092175c92 100644
Binary files a/test/extrude/711/711.stl and b/test/extrude/711/711.stl differ
diff --git a/test/extrude/712/712.py b/test/extrude/712/712.py
index 8bd17e62ebd9e82544824c5e399afcdee3cbb71d..7e1ebe3648f0da50b7922e236cbd2cd458c16c14 100644
--- a/test/extrude/712/712.py
+++ b/test/extrude/712/712.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(277,231,277))
-r=w0.workplane(offset=168).moveTo(598,1).cylinder(495,495).union(w0.workplane(offset=311).moveTo(64,12).box(1000,713,345)).union(w0.sketch().segment((185,518),(265,277)).segment((851,495)).arc((805,633),(816,770)).segment((736,759)).segment((747,724)).close().assemble().finalize().extrude(598)).translate((218,1,160))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(457,502,501))
+r=w0.sketch().arc((117,770),(54,431),(397,438)).segment((536,202)).segment((825,378)).segment((839,381)).segment((836,388)).segment((1000,481)).segment((824,775)).segment((537,602)).segment((522,601)).segment((521,590)).segment((446,547)).arc((441,637),(398,721)).arc((263,670),(204,801)).arc((187,796),(169,792)).segment((119,792)).close().assemble().finalize().extrude(591)
\ No newline at end of file
diff --git a/test/extrude/712/712.stl b/test/extrude/712/712.stl
index 0eb0f94fd558d648ef251ef9ea53638458bea33d..2fc126c764b913802ba17aaa62732cadd031a435 100644
Binary files a/test/extrude/712/712.stl and b/test/extrude/712/712.stl differ
diff --git a/test/extrude/713/713.py b/test/extrude/713/713.py
index 4fca8030fd86d8fa2ac9ed9a37ae07deacfd3325..b27460e414d16fe70378ef320df9d8248173b31e 100644
--- a/test/extrude/713/713.py
+++ b/test/extrude/713/713.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(471,324,324))
-r=w0.workplane(offset=177).moveTo(295,247).box(1000,346,618).union(w0.sketch().arc((67,442),(141,302),(82,155)).segment((89,155)).arc((368,1),(647,155)).segment((655,155)).segment((655,170)).arc((500,618),(67,442)).assemble().finalize().extrude(141))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,674))
+r=w0.workplane(offset=242).moveTo(760,411).cylinder(1000,696).union(w0.sketch().push([(261,525)]).circle(760).push([(985,735)]).circle(515).finalize().extrude(664))
\ No newline at end of file
diff --git a/test/extrude/713/713.stl b/test/extrude/713/713.stl
index 5f0fb7fd2189b306e13785795e247d9377d24e10..2e51991e0c73f045273470ba947f4b3bc54bc81e 100644
Binary files a/test/extrude/713/713.stl and b/test/extrude/713/713.stl differ
diff --git a/test/extrude/714/714.py b/test/extrude/714/714.py
index df20fc46124d1f37a5d5520248bbeac7bdd4ad64..4b0ccd6afcbcf91128397dd9e4d7af25440e66ac 100644
--- a/test/extrude/714/714.py
+++ b/test/extrude/714/714.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(455,455,415))
-r=w0.workplane(offset=223).moveTo(541,349).box(849,485,919).union(w0.sketch().arc((1,253),(11,273),(1,294)).close().assemble().finalize().extrude(939)).union(w0.sketch().push([(637,455)]).circle(728).reset().face(w0.sketch().segment((465,273),(808,273)).segment((808,637)).segment((465,637)).segment((465,576)).arc((405,475),(465,374)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,321))
+r=w0.sketch().segment((52,499),(140,500)).segment((141,260)).segment((311,260)).arc((350,225),(385,200)).segment((386,1)).segment((711,2)).segment((710,201)).arc((749,226),(784,261)).segment((949,260)).segment((950,701)).segment((785,702)).arc((760,726),(735,741)).segment((734,999)).segment((52,999)).close().assemble().reset().face(w0.sketch().segment((435,415),(824,415)).segment((826,686)).segment((501,685)).arc((316,851),(436,635)).close().assemble(),mode='s').finalize().extrude(860)
\ No newline at end of file
diff --git a/test/extrude/714/714.stl b/test/extrude/714/714.stl
index 6ce73e1e39313785de8c4656253c8ba8848a0dfe..d6280ebb986bd4931cd738e02aedd630a8274eab 100644
Binary files a/test/extrude/714/714.stl and b/test/extrude/714/714.stl differ
diff --git a/test/extrude/715/715.py b/test/extrude/715/715.py
index ede199dc490e65b529d3f7545fcb79ea1fbfa27f..c049ec0783098e3bcca679907a3a75c1b3bba10c 100644
--- a/test/extrude/715/715.py
+++ b/test/extrude/715/715.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(283,283,316))
-r=w0.workplane(offset=39).moveTo(544,99).box(327,1000,772).union(w0.sketch().segment((1,805),(196,370)).segment((251,392)).segment((55,826)).close().assemble().finalize().extrude(696)).translate((1,119,32))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(651,503,503))
+r=w0.sketch().arc((7,411),(930,251),(331,972)).segment((331,412)).close().assemble().finalize().extrude(207)
\ No newline at end of file
diff --git a/test/extrude/715/715.stl b/test/extrude/715/715.stl
index 564da07963486e992e5654748543692916a260c8..570b565dbcf65d49a5f270e7f546c037bf0ddca7 100644
Binary files a/test/extrude/715/715.stl and b/test/extrude/715/715.stl differ
diff --git a/test/extrude/716/716.py b/test/extrude/716/716.py
index 70935bfe9dfd35ac01823f414f47cc8540131a14..a6e43310da88cd616a83165c0d34fdfce5e7e115 100644
--- a/test/extrude/716/716.py
+++ b/test/extrude/716/716.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.workplane(offset=667).cylinder(1000,640).translate((1,307,307))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(999,502,500))
+r=w0.workplane(offset=1).moveTo(499,504).box(611,580,1000).union(w0.sketch().arc((611,245),(676,365),(775,451)).arc((285,682),(609,247)).assemble().push([(501,507)]).circle(561,mode='s').finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/716/716.stl b/test/extrude/716/716.stl
index 69d77962a224104c500b7dde013c2812067efadc..cc60b3dad363f21d9efe087a77efd4ba4d1e7d91 100644
Binary files a/test/extrude/716/716.stl and b/test/extrude/716/716.stl differ
diff --git a/test/extrude/717/717.py b/test/extrude/717/717.py
index 644e22a2135ac40674eb47f7609705436fc1ddb0..e92c5c9da2b68050ba5c259d88d285a6aa1f81cf 100644
--- a/test/extrude/717/717.py
+++ b/test/extrude/717/717.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(558,558,832))
-r=w0.sketch().segment((346,116),(744,116)).segment((744,629)).arc((770,726),(744,832)).segment((744,1000)).segment((346,1000)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(2,501,500))
+r=w0.sketch().arc((452,120),(551,506),(451,881)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/717/717.stl b/test/extrude/717/717.stl
index 57410564d7804dc91d41210942eb273ae398050c..e3e2773e511cf9b10e3f363a8a04704c3cd40d77 100644
Binary files a/test/extrude/717/717.stl and b/test/extrude/717/717.stl differ
diff --git a/test/extrude/718/718.py b/test/extrude/718/718.py
index 757ddde4f3f86455725b3197a362d19b744d32b9..7655944843689649e3e4959daf0b2229e55aa89f 100644
--- a/test/extrude/718/718.py
+++ b/test/extrude/718/718.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(416,416,77))
-w1=cq.Workplane('YZ',origin=(299,416,416))
-r=w0.sketch().push([(649,7)]).circle(591).push([(649,1)]).rect(626,521,mode='s').finalize().extrude(1000).union(w1.sketch().push([(883,690)]).rect(649,544).push([(883,696)]).rect(486,533,mode='s').finalize().extrude(124)).translate((1,169,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,780,501))
+r=w0.sketch().push([(501,745)]).circle(756).reset().face(w0.sketch().segment((381,936),(385,915)).segment((400,919)).segment((402,935)).close().assemble(),mode='s').reset().face(w0.sketch().segment((346,1),(495,1)).segment((495,75)).segment((545,46)).segment((644,221)).segment((475,315)).segment((374,147)).segment((380,140)).segment((345,140)).close().assemble()).finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/718/718.stl b/test/extrude/718/718.stl
index fb14e4a5e282128127a72e936daf76f5f12aa753..68962e2184a14a505d4cab36a06ac4d7fe18238e 100644
Binary files a/test/extrude/718/718.stl and b/test/extrude/718/718.stl differ
diff --git a/test/extrude/719/719.py b/test/extrude/719/719.py
index 8391b8bfda41854c2e1d939fa471c94ff24c9a2c..6c3a9efb25babee388621147abe8d32643901fd3 100644
--- a/test/extrude/719/719.py
+++ b/test/extrude/719/719.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().arc((700,574),(687,654),(747,607)).arc((620,760),(700,574)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,266,500))
+r=w0.sketch().segment((316,61),(965,61)).segment((964,406)).segment((584,404)).segment((586,590)).segment((965,589)).segment((964,665)).segment((666,665)).arc((320,979),(316,510)).close().assemble().finalize().extrude(591).union(w0.sketch().arc((25,411),(111,230),(305,186)).segment((306,176)).segment((764,2)).segment((974,545)).segment((509,720)).segment((481,634)).segment((596,536)).segment((480,394)).arc((421,561),(254,631)).segment((255,410)).close().assemble().finalize().extrude(976))
\ No newline at end of file
diff --git a/test/extrude/719/719.stl b/test/extrude/719/719.stl
index 25eb15c00af0664827e6baa92acaa000b88af752..607ee9237a154a4bcf04c4b31451b57e99e2af65 100644
Binary files a/test/extrude/719/719.stl and b/test/extrude/719/719.stl differ
diff --git a/test/extrude/72/72.py b/test/extrude/72/72.py
index 944ee4d13c1225142d61a8300572f2054fa7675f..214c4dfd2d6f28d23bf1c49bc1dc4f5235f522c6 100644
--- a/test/extrude/72/72.py
+++ b/test/extrude/72/72.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(338,47,338))
-r=w0.sketch().push([(1,107)]).rect(987,590).reset().face(w0.sketch().segment((630,219),(669,193)).segment((1000,669)).segment((960,696)).close().assemble()).finalize().extrude(921).translate((1,1,156))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(70,23,37))
+r=w0.sketch().segment((125,303),(615,303)).segment((615,891)).segment((125,891)).close().assemble().push([(380,623)]).circle(104,mode='s').finalize().extrude(251)
diff --git a/test/extrude/72/72.stl b/test/extrude/72/72.stl
index 52331dc46394c228c82ad26ec9ffffd192190b3a..19c45e6e5e9349911bc1e3817f8d7cadb7ff9270 100644
Binary files a/test/extrude/72/72.stl and b/test/extrude/72/72.stl differ
diff --git a/test/extrude/720/720.py b/test/extrude/720/720.py
index 505e6f8c203d5bdf175424bdc273345912b5b1ef..c9fea037097feb85a0d6c445f49e724da7febbfb 100644
--- a/test/extrude/720/720.py
+++ b/test/extrude/720/720.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(472,472,321))
-r=w0.sketch().push([(274,694)]).rect(1000,972).push([(270,604)]).rect(727,642,mode='s').push([(270,783)]).rect(727,642,mode='s').finalize().extrude(293).union(w0.sketch().push([(708,435)]).circle(500).reset().face(w0.sketch().segment((859,1),(887,1)).arc((887,10),(896,1)).segment((934,1)).segment((934,472)).segment((859,472)).segment((859,237)).arc((925,133),(859,20)).close().assemble()).finalize().extrude(953))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(650,500,501))
+r=w0.sketch().segment((35,1),(661,1)).segment((661,246)).arc((476,85),(230,81)).segment((147,80)).segment((146,125)).arc((80,180),(37,245)).close().assemble().reset().face(w0.sketch().arc((36,590),(51,617),(70,641)).segment((77,661)).segment((80,655)).arc((391,771),(659,590)).segment((661,715)).segment((965,714)).segment((964,999)).segment((486,999)).segment((485,835)).segment((36,836)).close().assemble()).finalize().extrude(196)
\ No newline at end of file
diff --git a/test/extrude/720/720.stl b/test/extrude/720/720.stl
index 392afff9c4aff70f7c2e6d3670f6fa2b9a4d7a16..d956cf76de4e6f4344b2d896f9e6c003e0483c58 100644
Binary files a/test/extrude/720/720.stl and b/test/extrude/720/720.stl differ
diff --git a/test/extrude/721/721.py b/test/extrude/721/721.py
index 87793e374017d986525fb5903a47e642101d7054..df4b9c114afbff10ce4dd18d811d04ad7e062b77 100644
--- a/test/extrude/721/721.py
+++ b/test/extrude/721/721.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().segment((234,121),(321,247)).arc((334,381),(421,474)).segment((427,487)).segment((434,487)).arc((461,494),(481,507)).segment((500,540)).arc((207,427),(234,121)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,370,501))
+r=w0.sketch().segment((350,356),(355,355)).arc((686,171),(585,539)).segment((586,682)).segment((565,682)).segment((566,690)).segment((349,689)).close().assemble().finalize().extrude(596).union(w0.workplane(offset=612).moveTo(381,856).cylinder(726,647)).union(w0.workplane(offset=629).moveTo(419,137).cylinder(761,635))
\ No newline at end of file
diff --git a/test/extrude/721/721.stl b/test/extrude/721/721.stl
index ff047f7a8480a006db85ae98115fd652d5401e24..a0377adb48cadb697c05ef97272826583fb9efca 100644
Binary files a/test/extrude/721/721.stl and b/test/extrude/721/721.stl differ
diff --git a/test/extrude/722/722.py b/test/extrude/722/722.py
index bccf7de355716c8cd8624eb22f7deca850cc7cba..1a7883b8c425dab9fbaf0283f0fa17e66cdb4d0b 100644
--- a/test/extrude/722/722.py
+++ b/test/extrude/722/722.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(457,457,685))
-r=w0.sketch().push([(71,1)]).circle(877).push([(912,1000)]).circle(790).finalize().extrude(19).translate((351,421,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,476))
+r=w0.sketch().segment((66,112),(920,112)).segment((921,227)).arc((1000,422),(921,620)).segment((920,891)).segment((65,891)).close().assemble().push([(493,500)]).rect(616,630,mode='s').finalize().extrude(326).union(w0.workplane(offset=612).moveTo(281,659).box(1000,684,726))
\ No newline at end of file
diff --git a/test/extrude/722/722.stl b/test/extrude/722/722.stl
index 09a182828198cae9fd7222266a9d485064047fa6..48140828ce839824a8edcde60e33d1b855b222e9 100644
Binary files a/test/extrude/722/722.stl and b/test/extrude/722/722.stl differ
diff --git a/test/extrude/723/723.py b/test/extrude/723/723.py
index 24e0243174a96a5ceffa4b3f16365b775f3d1ef7..5cc929f1b874097717007de7390d3b8b3fdab9de 100644
--- a/test/extrude/723/723.py
+++ b/test/extrude/723/723.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(439,439,159))
-r=w0.workplane(offset=557).moveTo(816,492).cylinder(676,500).union(w0.sketch().segment((1,264),(80,264)).arc((352,115),(623,264)).segment((711,264)).segment((711,614)).segment((623,614)).arc((352,763),(80,614)).segment((1,614)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,666,502))
+w1=cq.Workplane('XY',origin=(502,501,871))
+r=w0.sketch().segment((133,602),(261,465)).segment((537,721)).segment((532,730)).segment((480,707)).segment((407,860)).close().assemble().finalize().extrude(526).union(w1.sketch().arc((97,411),(107,347),(126,281)).segment((126,207)).segment((163,208)).arc((905,207),(576,876)).segment((576,1000)).segment((127,999)).segment((126,830)).arc((33,627),(97,412)).assemble().push([(315,578)]).rect(896,696,mode='s').finalize().extrude(306))
\ No newline at end of file
diff --git a/test/extrude/723/723.stl b/test/extrude/723/723.stl
index 405d7e29a796d533ee3c3307b06bdc5081f2a74e..297742000f4dcb7c9dc736bf2a2a1f6aa7612578 100644
Binary files a/test/extrude/723/723.stl and b/test/extrude/723/723.stl differ
diff --git a/test/extrude/724/724.py b/test/extrude/724/724.py
index ba5fe35cf9163c230540779f0e62215f70269269..5670109ffaa9db40b632eb43b86d32d4b010fbdf 100644
--- a/test/extrude/724/724.py
+++ b/test/extrude/724/724.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,415,506))
-w1=cq.Workplane('YZ',origin=(384,506,506))
-r=w0.sketch().segment((1,405),(51,405)).arc((31,506),(51,606)).segment((1,606)).close().assemble().reset().face(w0.sketch().segment((112,152),(475,152)).arc((405,193),(344,243)).arc((223,243),(112,314)).close().assemble()).reset().face(w0.sketch().segment((112,828),(183,859)).segment((112,859)).close().assemble()).finalize().extrude(455).union(w0.sketch().push([(990,253)]).rect(546,606).reset().face(w0.sketch().segment((980,253),(1000,253)).segment((990,284)).segment((980,284)).close().assemble(),mode='s').finalize().extrude(828)).union(w1.workplane(offset=581).moveTo(495,294).cylinder(657,728))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,281,500))
+r=w0.sketch().segment((2,235),(296,235)).segment((295,496)).segment((197,495)).arc((162,564),(125,495)).segment((1,495)).close().assemble().reset().face(w0.sketch().segment((529,466),(666,317)).segment((999,616)).segment((864,766)).close().assemble()).finalize().extrude(940)
\ No newline at end of file
diff --git a/test/extrude/724/724.stl b/test/extrude/724/724.stl
index c17d09c2baa6daa5a261b5c0d1e13625b92fadf7..efcf8953c10e8a2528b9f9a2d131734cde335744 100644
Binary files a/test/extrude/724/724.stl and b/test/extrude/724/724.stl differ
diff --git a/test/extrude/725/725.py b/test/extrude/725/725.py
index 52fc19b09054a7615e5d051b4ca27b35b931aab3..7586e11d74b694706577736b3484482368006413 100644
--- a/test/extrude/725/725.py
+++ b/test/extrude/725/725.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(347,523,347))
-r=w0.sketch().segment((190,373),(504,373)).arc((347,510),(190,373)).assemble().finalize().extrude(1).union(w0.workplane(offset=190).box(1000,687,660)).translate((1,1,154))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(251,341,251))
+w1=cq.Workplane('XY',origin=(251,251,341))
+r=w0.sketch().segment((391,391),(391,399)).segment((401,398)).segment((401,383)).arc((473,475),(391,391)).assemble().finalize().extrude(2).union(w0.workplane(offset=286).moveTo(165,151).cylinder(322,401)).union(w1.workplane(offset=147).moveTo(430,428).cylinder(460,321))
\ No newline at end of file
diff --git a/test/extrude/725/725.stl b/test/extrude/725/725.stl
index 547f7fe503876a43973087f5a66775f9d07aa1bd..c7ed3116f6f69c27c7552bdbc9539da1d3ac134c 100644
Binary files a/test/extrude/725/725.stl and b/test/extrude/725/725.stl differ
diff --git a/test/extrude/726/726.py b/test/extrude/726/726.py
index 96a0bf78891c33448f6a7a6b8d92bfa18f82d077..2e3c7d804b00ed869e4f475b8acb8990c370e80b 100644
--- a/test/extrude/726/726.py
+++ b/test/extrude/726/726.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(311,70,311))
-r=w0.sketch().segment((104,1),(518,1)).segment((518,118)).arc((594,311),(518,504)).segment((518,621)).segment((104,621)).segment((104,504)).arc((29,311),(104,118)).close().assemble().finalize().extrude(669).union(w0.workplane(offset=552).box(1000,352,793)).translate((1,1,190))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,535))
+r=w0.sketch().segment((342,571),(360,571)).segment((360,636)).segment((356,637)).segment((351,666)).segment((361,666)).segment((360,784)).arc((426,844),(361,901)).segment((361,1000)).segment((341,1000)).segment((342,895)).arc((306,846),(341,791)).close().assemble().finalize().extrude(145).union(w0.workplane(offset=642).moveTo(501,256).cylinder(785,755))
\ No newline at end of file
diff --git a/test/extrude/726/726.stl b/test/extrude/726/726.stl
index 2e54e55a73f432dfc2b35f852258614b92f5614e..b6bfd2e7c75374057baa32089569495bf70abb9a 100644
Binary files a/test/extrude/726/726.stl and b/test/extrude/726/726.stl differ
diff --git a/test/extrude/727/727.py b/test/extrude/727/727.py
index dd0cf2b5f486b8965e65bdeff910643e92c55197..81b8a2d4be0244ddf5fd69a2b7ea8976ec3490f0 100644
--- a/test/extrude/727/727.py
+++ b/test/extrude/727/727.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(421,631,421))
-r=w0.workplane(offset=131).moveTo(219,689).cylinder(1000,572).union(w0.sketch().segment((438,1),(605,1)).segment((605,110)).arc((572,278),(664,135)).segment((664,1)).segment((773,1)).segment((773,396)).segment((438,396)).close().assemble().finalize().extrude(580))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,456,501))
+w1=cq.Workplane('XY',origin=(500,500,266))
+r=w0.sketch().push([(284,97)]).rect(625,695).push([(557,776)]).circle(726).circle(576,mode='s').finalize().extrude(636).union(w0.sketch().push([(486,920)]).rect(1000,651).circle(532,mode='s').finalize().extrude(660)).union(w1.workplane(offset=715).moveTo(451,421).box(590,561,930))
\ No newline at end of file
diff --git a/test/extrude/727/727.stl b/test/extrude/727/727.stl
index 64f27db3f088dc6e27ffd93ef32a064269119ef5..5a6276315f8f70e63350731007ab9e07d28c6600 100644
Binary files a/test/extrude/727/727.stl and b/test/extrude/727/727.stl differ
diff --git a/test/extrude/728/728.py b/test/extrude/728/728.py
index 16e266d281764fb660f47326fe5027b09c7874a6..2b6eac8dfcfd89c10d69533afbfca8226d6b908c 100644
--- a/test/extrude/728/728.py
+++ b/test/extrude/728/728.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(574,545,545))
-r=w0.sketch().push([(471,1000)]).circle(824).push([(721,1)]).circle(736).finalize().extrude(500).translate((1,1,191))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(197,501,500))
+r=w0.sketch().segment((2,491),(256,492)).segment((256,476)).segment((305,476)).arc((976,377),(426,766)).segment((255,766)).segment((255,750)).segment((1,751)).close().assemble().finalize().extrude(371).union(w0.sketch().segment((347,500),(410,500)).segment((412,505)).arc((400,517),(412,520)).segment((410,740)).segment((346,742)).segment((346,546)).arc((357,540),(346,532)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/728/728.stl b/test/extrude/728/728.stl
index 90be7faaa928adda54a61afcc5b08fc1313c88bb..73095952ec0130061181fc5d208add673a31b011 100644
Binary files a/test/extrude/728/728.stl and b/test/extrude/728/728.stl differ
diff --git a/test/extrude/729/729.py b/test/extrude/729/729.py
index 12932844159b341bff4590785f19257971d44c6e..95d50395a32d230b20849eb488e2b62a5f39224a 100644
--- a/test/extrude/729/729.py
+++ b/test/extrude/729/729.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(528,715,528))
-r=w0.sketch().push([(676,561)]).rect(605,572).push([(698,577)]).rect(539,539,mode='s').finalize().extrude(144).union(w0.sketch().arc((111,243),(133,1),(363,78)).arc((188,78),(111,243)).assemble().finalize().extrude(221)).union(w0.workplane(offset=473).moveTo(885,841).box(737,1000,638))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,247,499))
+r=w0.sketch().push([(362,498)]).rect(1000,1000).push([(640,252)]).circle(555,mode='s').finalize().extrude(644).union(w0.sketch().push([(365,500)]).circle(606).reset().face(w0.sketch().segment((505,406),(601,406)).segment((601,327)).segment((906,327)).segment((905,405)).segment((1000,404)).segment((1000,750)).segment((905,750)).segment((905,829)).segment((599,830)).segment((600,749)).segment((506,749)).close().assemble()).reset().face(w0.sketch().segment((704,421),(705,541)).arc((746,500),(806,487)).segment((804,420)).arc((880,465),(916,539)).arc((881,720),(705,685)).segment((705,735)).arc((585,581),(706,421)).assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/729/729.stl b/test/extrude/729/729.stl
index 1cadb76d333248b2b5dcc2c5552be6abeb8ff559..daa03bf66ec45765485f28c58496802d85a25c74 100644
Binary files a/test/extrude/729/729.stl and b/test/extrude/729/729.stl differ
diff --git a/test/extrude/73/73.py b/test/extrude/73/73.py
index c2120e893762698efaf508052d47ddc8f8d884b4..ccc11690dbdfe6ffcc36aa563716abb1059731ac 100644
--- a/test/extrude/73/73.py
+++ b/test/extrude/73/73.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(658,986,658))
-r=w0.sketch().segment((514,316),(802,316)).segment((802,932)).segment((514,1000)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(23,32,1))
+r=w0.sketch().segment((678,655),(636,655)).segment((636,114)).segment((534,114)).segment((534,655)).segment((492,655)).segment((492,926)).segment((678,926)).close().assemble().push([(634,592)]).circle(100,mode='s').finalize().extrude(356).translate((1,325,1))
diff --git a/test/extrude/73/73.stl b/test/extrude/73/73.stl
index 4516ee7dc551cc2c09b1eb78bd1f9059a422965e..1a9811273e1ed4608a6444286418b5d536200f32 100644
Binary files a/test/extrude/73/73.stl and b/test/extrude/73/73.stl differ
diff --git a/test/extrude/730/730.py b/test/extrude/730/730.py
index cdd64656c705c4bed8459354b8f96dcab0f51701..922c331dc044f78f7a612c2084bb4b48b32c0575 100644
--- a/test/extrude/730/730.py
+++ b/test/extrude/730/730.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(81,500,500))
-w1=cq.Workplane('ZX',origin=(500,890,500))
-r=w0.sketch().segment((351,201),(371,201)).segment((371,221)).arc((361,221),(371,231)).segment((371,341)).segment((351,341)).close().assemble().finalize().extrude(481).union(w0.sketch().segment((31,840),(181,840)).arc((81,441),(491,481)).segment((491,331)).segment((700,331)).arc((760,321),(820,331)).segment((870,331)).segment((870,391)).arc((890,441),(870,500)).segment((870,910)).segment((660,910)).segment((660,1000)).segment((31,1000)).close().assemble().reset().face(w0.sketch().arc((371,840),(441,790),(491,730)).segment((491,840)).close().assemble(),mode='s').finalize().extrude(540)).union(w1.sketch().arc((650,500),(740,580),(660,680)).arc((1,630),(650,500)).assemble().finalize().extrude(590))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,252))
+w1=cq.Workplane('YZ',origin=(376,502,500))
+r=w0.sketch().push([(789,792)]).rect(921,545).push([(885,780)]).circle(506,mode='s').finalize().extrude(1000).union(w1.workplane(offset=314).moveTo(357,470).box(844,770,876))
\ No newline at end of file
diff --git a/test/extrude/730/730.stl b/test/extrude/730/730.stl
index 2a4202d2f8744dd535c3e85cae74c15035549c48..82265b15c0104658c87df7d4aa2feb952ea24315 100644
Binary files a/test/extrude/730/730.stl and b/test/extrude/730/730.stl differ
diff --git a/test/extrude/731/731.py b/test/extrude/731/731.py
index 428705203a77e3ec2c2c48b8f55e2f01640634f9..89598bdf47ac616c8d3e74fb90bc87d32eddf7d3 100644
--- a/test/extrude/731/731.py
+++ b/test/extrude/731/731.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(562,842,562))
-r=w0.sketch().segment((641,281),(1000,281)).segment((1000,842)).segment((641,842)).segment((641,755)).arc((465,588),(641,422)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=452).moveTo(369,571).cylinder(781,807))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(925,501,501))
+r=w0.sketch().push([(191,405)]).circle(609).circle(566,mode='s').finalize().extrude(1).union(w0.workplane(offset=106).moveTo(951,875).box(595,579,1000)).union(w0.sketch().push([(189,408)]).rect(875,1000).reset().face(w0.sketch().segment((132,332),(135,160)).segment((215,160)).segment((211,335)).close().assemble(),mode='s').finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/731/731.stl b/test/extrude/731/731.stl
index 4e43d6fb0f2fd49c03817a7fe9a7a75ed0a3ed12..02aeff51880df3ff86a7ce7d55fe6ed39509f479 100644
Binary files a/test/extrude/731/731.stl and b/test/extrude/731/731.stl differ
diff --git a/test/extrude/732/732.py b/test/extrude/732/732.py
index 4699f36be8e5f47a338a2d57ea4749f9851cc947..dbb8e80b4eb5805b2e8284c7c1885ff1e0ff93e3 100644
--- a/test/extrude/732/732.py
+++ b/test/extrude/732/732.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,379,379))
-w1=cq.Workplane('ZX',origin=(379,220,379))
-r=w0.sketch().arc((111,866),(281,683),(196,440)).arc((635,744),(111,866)).assemble().finalize().extrude(903).union(w1.workplane(offset=391).moveTo(62,446).box(963,1000,403)).translate((1,1,42))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,594))
+r=w0.sketch().arc((275,529),(500,3),(570,569)).arc((570,610),(554,644)).segment((769,645)).segment((770,1000)).segment((275,999)).segment((274,646)).segment((283,644)).arc((269,589),(275,530)).assemble().finalize().extrude(1).union(w0.workplane(offset=554).moveTo(585,314).box(699,930,611)).union(w0.sketch().segment((14,100),(258,100)).segment((260,68)).segment((273,69)).segment((274,100)).segment((526,99)).segment((525,484)).segment((13,485)).close().assemble().reset().face(w0.sketch().segment((154,243),(385,244)).segment((384,339)).segment((246,340)).arc((209,276),(173,339)).segment((154,338)).close().assemble(),mode='s').push([(936,610)]).circle(549).finalize().extrude(880))
\ No newline at end of file
diff --git a/test/extrude/732/732.stl b/test/extrude/732/732.stl
index 55bdce2396065700011ad551c11a095fe760bccf..a26e50604ecc09f0d546088e35eb407c0edb89bb 100644
Binary files a/test/extrude/732/732.stl and b/test/extrude/732/732.stl differ
diff --git a/test/extrude/733/733.py b/test/extrude/733/733.py
index 96d4640237bace5017e5f4872296b4d191dd09dc..daf8b30238f85d3087b5b969655529167efb4d38 100644
--- a/test/extrude/733/733.py
+++ b/test/extrude/733/733.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(589,589,424))
-r=w0.workplane(offset=612).moveTo(1000,377).cylinder(636,765).union(w0.sketch().segment((1,471),(448,436)).arc((459,694),(683,859)).segment((683,918)).segment((48,976)).close().assemble().finalize().extrude(929))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,522,502))
+w1=cq.Workplane('XY',origin=(502,502,497))
+r=w0.workplane(offset=554).moveTo(578,390).box(556,592,607).union(w0.sketch().segment((317,516),(461,516)).arc((686,266),(471,520)).segment((316,520)).close().assemble().finalize().extrude(658)).union(w0.sketch().segment((287,527),(411,527)).arc((466,495),(527,527)).segment((655,527)).segment((656,592)).segment((525,592)).arc((466,622),(412,592)).segment((287,590)).close().assemble().finalize().extrude(902)).union(w1.sketch().segment((526,360),(536,361)).segment((535,252)).segment((566,251)).segment((567,101)).segment((536,100)).segment((537,2)).segment((752,1)).segment((752,361)).segment((813,360)).segment((811,450)).segment((532,452)).arc((257,756),(526,452)).close().assemble().push([(474,635)]).rect(526,542,mode='s').finalize().extrude(395))
\ No newline at end of file
diff --git a/test/extrude/733/733.stl b/test/extrude/733/733.stl
index 244f5af091d00bfdc9dcdb609da7d2094cc6717c..2decfb694cf9bc15df37c6967418c3da0ed743c0 100644
Binary files a/test/extrude/733/733.stl and b/test/extrude/733/733.stl differ
diff --git a/test/extrude/734/734.py b/test/extrude/734/734.py
index dd05d52aa9e860c4d48cce07cfad96b313e5eef5..7eb64ac198611e09646e7b820784f9f07d2ed49c 100644
--- a/test/extrude/734/734.py
+++ b/test/extrude/734/734.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(530,500,500))
-r=w0.sketch().segment((1,271),(760,271)).segment((760,341)).segment((1000,341)).segment((1000,560)).segment((760,560)).segment((760,730)).segment((1,730)).close().assemble().finalize().extrude(431)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,631,500))
+r=w0.sketch().segment((57,346),(491,346)).segment((490,370)).segment((590,371)).segment((591,206)).segment((715,205)).segment((716,370)).segment((945,370)).segment((944,700)).segment((851,701)).segment((880,654)).segment((710,556)).segment((590,555)).segment((592,441)).arc((566,446),(547,462)).segment((492,431)).segment((490,510)).segment((510,521)).arc((561,621),(670,615)).segment((825,699)).segment((490,701)).segment((492,1000)).segment((57,1000)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(211,62)]).circle(561).circle(546,mode='s').finalize().extrude(280)).union(w0.workplane(offset=627).moveTo(604,535).cylinder(754,557))
\ No newline at end of file
diff --git a/test/extrude/734/734.stl b/test/extrude/734/734.stl
index 90b755c47a2ab944a80d19fbd32b5be5be0b30b0..f6e9c118feff7e0d483e18c3829533048aabce11 100644
Binary files a/test/extrude/734/734.stl and b/test/extrude/734/734.stl differ
diff --git a/test/extrude/735/735.py b/test/extrude/735/735.py
index ccaee0c041b7ec3dfc39a9a6cf54526e53444b46..4ecdf855bc4c4b9e7d90689c5b1785ed7764d344 100644
--- a/test/extrude/735/735.py
+++ b/test/extrude/735/735.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(505,421,421))
-r=w0.workplane(offset=312).moveTo(144,551).box(706,1000,639).union(w0.sketch().segment((286,219),(790,1)).segment((840,119)).segment((337,337)).close().assemble().finalize().extrude(471))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(705,501,500))
+r=w0.workplane(offset=149).moveTo(500,227).box(1000,561,1000).union(w0.workplane(offset=467).moveTo(499,508).box(1000,1000,565)).union(w0.sketch().arc((615,460),(625,511),(615,555)).close().assemble().finalize().extrude(796))
\ No newline at end of file
diff --git a/test/extrude/735/735.stl b/test/extrude/735/735.stl
index 39a8b4be5462304e3f03aa62d8a325f0e13c5cfb..059871dc3cef6bd5179eccdb3c3dc4dc3de36b67 100644
Binary files a/test/extrude/735/735.stl and b/test/extrude/735/735.stl differ
diff --git a/test/extrude/736/736.py b/test/extrude/736/736.py
index b6839c8d71167df7428a419cfbb16e888d9d005b..cef3d31de4bf74bc32e7607f6e23ff156fbd7cf2 100644
--- a/test/extrude/736/736.py
+++ b/test/extrude/736/736.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(481,443,481))
-w1=cq.Workplane('XY',origin=(481,481,481))
-r=w0.sketch().segment((155,866),(174,875)).arc((222,856),(260,894)).segment((270,904)).segment((260,923)).segment((251,923)).arc((203,942),(164,904)).segment((155,894)).close().assemble().finalize().extrude(673).union(w0.workplane(offset=741).moveTo(126,174).cylinder(1000,520)).union(w1.sketch().segment((97,1),(116,1)).segment((116,11)).arc((193,97),(116,184)).segment((116,203)).segment((97,203)).segment((97,184)).arc((20,97),(97,11)).close().assemble().finalize().extrude(875))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(375,501,500))
+w1=cq.Workplane('XY',origin=(500,500,326))
+r=w0.workplane(offset=527).box(1000,1000,550).union(w1.sketch().segment((469,141),(589,142)).segment((590,429)).arc((626,500),(591,570)).segment((591,860)).segment((470,861)).segment((471,569)).arc((435,501),(470,431)).close().assemble().finalize().extrude(730))
\ No newline at end of file
diff --git a/test/extrude/736/736.stl b/test/extrude/736/736.stl
index b53c6b153be23f6e6d80f57f61126d7b60cefeab..1e0cb53240a94e68047662141d2e9b5e70965e17 100644
Binary files a/test/extrude/736/736.stl and b/test/extrude/736/736.stl differ
diff --git a/test/extrude/737/737.py b/test/extrude/737/737.py
index a7f44a09347e1132b15744691aa904e53a1d9bbf..43b1ad077fd3ca1287c4ba76c214699d78e68c36 100644
--- a/test/extrude/737/737.py
+++ b/test/extrude/737/737.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(445,334,334))
-r=w0.workplane(offset=1).cylinder(1000,545).union(w0.sketch().segment((156,190),(334,190)).segment((334,312)).segment((267,312)).arc((267,356),(301,401)).segment((301,434)).arc((245,378),(234,312)).segment((156,312)).close().assemble().reset().face(w0.sketch().arc((367,234),(434,334),(367,434)).segment((367,401)).arc((412,334),(367,267)).close().assemble()).finalize().extrude(778)).translate((55,212,212))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(326,500,501))
+w1=cq.Workplane('ZX',origin=(500,107,500))
+r=w0.workplane(offset=562).moveTo(238,628).box(975,815,625).union(w0.sketch().push([(785,430)]).circle(715).reset().face(w0.sketch().segment((626,391),(722,356)).segment((721,251)).segment((851,251)).segment((850,306)).segment((874,295)).segment((946,464)).segment((851,500)).segment((850,606)).segment((720,606)).segment((719,555)).segment((694,566)).close().assemble(),mode='s').finalize().extrude(1000)).union(w1.sketch().push([(628,239)]).rect(685,904).push([(629,237)]).rect(644,551,mode='s').push([(652,87)]).rect(544,550,mode='s').finalize().extrude(995))
\ No newline at end of file
diff --git a/test/extrude/737/737.stl b/test/extrude/737/737.stl
index a167e30bf80885e3bec96bae34c217c5f46f0c13..6169834bf8191ac57e3879ec3eb1e6b4c9e9b49c 100644
Binary files a/test/extrude/737/737.stl and b/test/extrude/737/737.stl differ
diff --git a/test/extrude/738/738.py b/test/extrude/738/738.py
index d40f6e9a9ac5de556c61f3a4566cf8325f516e3c..324045bc0e2b4491368931d25af0b29518f6543d 100644
--- a/test/extrude/738/738.py
+++ b/test/extrude/738/738.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(490,490,307))
-r=w0.sketch().segment((93,847),(205,521)).segment((664,684)).segment((551,1000)).close().assemble().push([(867,1)]).circle(511).finalize().extrude(867).translate((1,21,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,655,500))
+r=w0.sketch().segment((8,204),(90,30)).segment((334,144)).segment((325,174)).arc((235,540),(39,221)).close().assemble().push([(847,762)]).rect(804,915).finalize().extrude(184)
\ No newline at end of file
diff --git a/test/extrude/738/738.stl b/test/extrude/738/738.stl
index f2335c56b175220aca4545bc2a256eeae2615cb0..5923cf6fcc0248dd3f7ad04359f88f6f625831fa 100644
Binary files a/test/extrude/738/738.stl and b/test/extrude/738/738.stl differ
diff --git a/test/extrude/739/739.py b/test/extrude/739/739.py
index e587a6c8590c4770d75781b4ce6c1692023b1382..5291b236ad333f80361e4cd32582455690e98138 100644
--- a/test/extrude/739/739.py
+++ b/test/extrude/739/739.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(732,492,492))
-r=w0.sketch().push([(643,416)]).rect(634,1000).push([(643,313)]).circle(527,mode='s').finalize().extrude(1).union(w0.sketch().segment((90,527),(616,518)).segment((625,929)).segment((99,938)).close().assemble().push([(358,732)]).circle(563,mode='s').reset().face(w0.sketch().segment((304,90),(456,90)).arc((554,46),(652,90)).segment((893,90)).segment((893,474)).segment((304,474)).close().assemble()).finalize().extrude(37))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,580,500))
+r=w0.sketch().arc((392,556),(386,455),(426,360)).arc((574,210),(730,350)).arc((785,525),(675,676)).segment((676,664)).segment((650,665)).segment((650,686)).arc((537,691),(437,631)).segment((439,631)).segment((440,555)).close().assemble().finalize().extrude(67).union(w0.sketch().segment((125,341),(132,341)).arc((171,336),(211,340)).segment((215,340)).segment((311,601)).segment((525,600)).segment((526,846)).segment((157,846)).segment((155,676)).arc((147,669),(130,671)).segment((125,670)).segment((127,664)).arc((1,505),(126,340)).assemble().push([(861,295)]).circle(641).finalize().extrude(571)).union(w0.sketch().push([(585,494)]).rect(781,734).push([(582,494)]).rect(625,721,mode='s').finalize().extrude(775))
\ No newline at end of file
diff --git a/test/extrude/739/739.stl b/test/extrude/739/739.stl
index 60e4a692fe75913e3e28c17ef5eea87963468b80..eb2ae10db1427332989f8f7cdf7de521810d6ee2 100644
Binary files a/test/extrude/739/739.stl and b/test/extrude/739/739.stl differ
diff --git a/test/extrude/74/74.py b/test/extrude/74/74.py
index 3f1587be0baf813a7ca0ceedca47d2628c021596..174017396c53a7e339ff46b5cd62dd0f1d4809f5 100644
--- a/test/extrude/74/74.py
+++ b/test/extrude/74/74.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(346,120,346))
-r=w0.workplane(offset=441).moveTo(542,566).box(1000,548,536).union(w0.sketch().push([(7,655)]).rect(857,393).reset().face(w0.sketch().segment((1,655),(13,655)).segment((13,667)).close().assemble(),mode='s').push([(631,108)]).circle(655).finalize().extrude(572)).union(w0.sketch().segment((168,619),(358,239)).segment((489,298)).segment((596,298)).segment((596,358)).segment((905,512)).segment((715,893)).segment((584,834)).segment((477,834)).segment((477,786)).close().assemble().push([(542,572)]).rect(857,560,mode='s').finalize().extrude(798)).translate((202,1,77))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(62,32,40))
+r=w0.sketch().segment((177,1000),(597,1000)).segment((597,226)).segment((177,226)).close().assemble().push([(338,624)]).circle(113,mode='s').finalize().extrude(288).translate((1,257,1))
diff --git a/test/extrude/74/74.stl b/test/extrude/74/74.stl
index 3e11f34e2a5fb83ef018eb7f858afadf09cf1f25..97be4355f22d7d266690c762592c0b68a4bdcb1a 100644
Binary files a/test/extrude/74/74.stl and b/test/extrude/74/74.stl differ
diff --git a/test/extrude/740/740.py b/test/extrude/740/740.py
index 8f38c55c2c35e7efa905353215e9428f163c6ea7..eec856f7f53edfa2472e478b198ff2223ebfdb57 100644
--- a/test/extrude/740/740.py
+++ b/test/extrude/740/740.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(451,451,513))
-r=w0.workplane(offset=207).moveTo(938,1000).cylinder(938,525).union(w0.sketch().push([(63,1)]).circle(625).push([(113,13)]).circle(500,mode='s').finalize().extrude(825)).translate((112,174,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,756,499))
+w1=cq.Workplane('ZX',origin=(500,496,499))
+r=w0.workplane(offset=124).moveTo(500,584).cylinder(1000,915).union(w0.workplane(offset=624).moveTo(186,197).box(519,889,746)).union(w1.sketch().segment((132,517),(285,515)).segment((285,182)).segment((716,180)).segment((716,515)).segment((870,515)).segment((869,660)).segment((715,660)).segment((715,996)).segment((285,996)).segment((285,659)).segment((130,660)).close().assemble().reset().face(w1.sketch().segment((310,186),(691,185)).segment((690,515)).segment((657,517)).arc((669,585),(655,660)).segment((689,659)).segment((689,990)).segment((310,991)).segment((312,660)).segment((344,661)).arc((331,585),(345,516)).segment((312,517)).close().assemble(),mode='s').finalize().extrude(201))
\ No newline at end of file
diff --git a/test/extrude/740/740.stl b/test/extrude/740/740.stl
index 77a4d0d8ff2a6c3c39b098270b8a0eebf39a4a08..03a5f1ae1d00e452ad2126b7bc3cd358503aea8b 100644
Binary files a/test/extrude/740/740.stl and b/test/extrude/740/740.stl differ
diff --git a/test/extrude/741/741.py b/test/extrude/741/741.py
index daaac3e7287951a86ae02d915f665d77265891c8..c1edba1a305ad1604d47cff0bd9795aa164300a4 100644
--- a/test/extrude/741/741.py
+++ b/test/extrude/741/741.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,600))
-r=w0.sketch().segment((634,489),(800,434)).segment((822,489)).arc((722,500),(645,545)).close().assemble().finalize().extrude(68).union(w0.sketch().push([(234,1)]).circle(556).push([(612,806)]).rect(634,1000).finalize().extrude(722)).translate((1,57,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,500,500))
+r=w0.sketch().segment((91,616),(191,616)).arc((182,730),(191,851)).segment((91,849)).close().assemble().reset().face(w0.sketch().segment((464,150),(910,150)).segment((909,276)).arc((685,225),(466,277)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/741/741.stl b/test/extrude/741/741.stl
index 00fe1a9215557c728f45495cf70f0188e332a0bd..815963747907f4d1c8b3a7aec15d822eb57af9fd 100644
Binary files a/test/extrude/741/741.stl and b/test/extrude/741/741.stl differ
diff --git a/test/extrude/742/742.py b/test/extrude/742/742.py
index 9ecde81ff109e26b1576abeb4f29455be4016207..4b521fa35fff908df2fafc76fdaa396aebb78c1e 100644
--- a/test/extrude/742/742.py
+++ b/test/extrude/742/742.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(226,1,226))
-r=w0.workplane(offset=454).box(1000,814,682).translate((182,1,275))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,270,500))
+w1=cq.Workplane('YZ',origin=(385,499,502))
+r=w0.sketch().segment((470,335),(470,362)).segment((500,361)).arc((379,435),(481,335)).close().assemble().finalize().extrude(231).union(w1.sketch().segment((629,426),(710,426)).segment((710,410)).segment((925,410)).segment((924,426)).segment((1000,425)).segment((999,621)).segment((926,619)).segment((925,635)).segment((711,635)).segment((712,621)).segment((630,620)).close().assemble().finalize().extrude(796))
\ No newline at end of file
diff --git a/test/extrude/742/742.stl b/test/extrude/742/742.stl
index 8e96bfbee4a98d9ec78afc20fc25b9a9d7475ab9..94c70c35484561b88c4aee91d0d936870d437d6a 100644
Binary files a/test/extrude/742/742.stl and b/test/extrude/742/742.stl differ
diff --git a/test/extrude/743/743.py b/test/extrude/743/743.py
index 085d9a945e3947699300443b534abdb3bbf8f76b..0bf431c2ee81aac613fca0c929c60ae7299a00be 100644
--- a/test/extrude/743/743.py
+++ b/test/extrude/743/743.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((88,454),(381,161)).segment((574,347)).segment((314,607)).arc((487,108),(88,454)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,679))
+w1=cq.Workplane('YZ',origin=(526,500,502))
+r=w0.sketch().arc((221,401),(681,261),(246,461)).arc((91,485),(222,400)).assemble().push([(167,460)]).circle(565,mode='s').finalize().extrude(1).union(w0.sketch().push([(375,746)]).circle(635).reset().face(w0.sketch().segment((406,705),(480,691)).segment((496,781)).segment((426,796)).close().assemble(),mode='s').push([(807,186)]).rect(706,681).finalize().extrude(821)).union(w1.workplane(offset=684).moveTo(744,721).box(819,850,870))
\ No newline at end of file
diff --git a/test/extrude/743/743.stl b/test/extrude/743/743.stl
index 4a8b4c10586100e5fdd383d8ab72e8df195b1f44..25b43f49a0efc12a48af75ca0c34ba6a0cee2809 100644
Binary files a/test/extrude/743/743.stl and b/test/extrude/743/743.stl differ
diff --git a/test/extrude/744/744.py b/test/extrude/744/744.py
index 2afcdab61f201b67114bb1b453cbc365fa1b20e1..5848b15807b06448f1b242e2b921483da7ab28f7 100644
--- a/test/extrude/744/744.py
+++ b/test/extrude/744/744.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(628,500,500))
-w1=cq.Workplane('XY',origin=(500,500,692))
-r=w0.sketch().segment((171,469),(320,469)).segment((320,415)).segment((649,415)).segment((649,787)).segment((426,787)).segment((426,915)).segment((171,915)).close().assemble().finalize().extrude(22).union(w0.sketch().segment((214,554),(214,926)).arc((1,554),(426,532)).segment((426,75)).segment((915,75)).segment((915,617)).segment((830,617)).segment((830,554)).close().assemble().finalize().extrude(692)).union(w1.workplane(offset=437).moveTo(612,782).box(1000,1000,628))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,686))
+r=w0.workplane(offset=159).moveTo(499,266).box(911,561,1000).union(w0.sketch().segment((505,685),(505,765)).arc((460,725),(506,685)).assemble().finalize().extrude(814))
\ No newline at end of file
diff --git a/test/extrude/744/744.stl b/test/extrude/744/744.stl
index d72c29540bdcf0f324f1dbf6272453db5e790358..7c48b8073cb7eca9c94eae417fc41533c8fe1af1 100644
Binary files a/test/extrude/744/744.stl and b/test/extrude/744/744.stl differ
diff --git a/test/extrude/745/745.py b/test/extrude/745/745.py
index b2b0f92e61d1d96cad23393532d257d5c5b8c5ee..8ad99a4fa8342328527912fe251e42e81cc262a4 100644
--- a/test/extrude/745/745.py
+++ b/test/extrude/745/745.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(173,474,474))
-w1=cq.Workplane('ZX',origin=(474,699,474))
-r=w0.sketch().segment((76,323),(291,323)).segment((291,184)).segment((656,184)).segment((656,323)).segment((871,323)).segment((871,968)).segment((76,968)).close().assemble().push([(119,345)]).circle(495,mode='s').finalize().extrude(237).union(w1.workplane(offset=210).moveTo(1,973).box(517,549,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,346,500))
+r=w0.workplane(offset=381).moveTo(131,426).cylinder(739,520).union(w0.sketch().push([(639,500)]).rect(1000,1000).rect(959,1000,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/745/745.stl b/test/extrude/745/745.stl
index 29529fb742810720a5e3f933c13e29dac0935bfe..648b31c1d4ce3996f3aa5c10516b0662fbca49eb 100644
Binary files a/test/extrude/745/745.stl and b/test/extrude/745/745.stl differ
diff --git a/test/extrude/746/746.py b/test/extrude/746/746.py
index cf6700e4b8f3ce530029ef1bc450c5c73a9380fb..a9d077c6bade2695d4ed76020824356f243564c0 100644
--- a/test/extrude/746/746.py
+++ b/test/extrude/746/746.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(527,411,527))
-r=w0.sketch().segment((327,1),(748,1)).segment((748,169)).segment((853,169)).segment((853,548)).segment((800,548)).segment((800,727)).segment((769,727)).segment((769,548)).segment((506,548)).segment((516,569)).segment((464,590)).segment((443,548)).segment((432,548)).segment((432,516)).segment((411,485)).segment((432,474)).segment((432,380)).segment((327,380)).close().assemble().push([(627,117)]).rect(600,758,mode='s').finalize().extrude(485).union(w0.workplane(offset=663).moveTo(211,1000).box(548,632,800))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(310,501,499))
+r=w0.sketch().segment((160,394),(162,735)).segment((397,736)).segment((395,686)).arc((517,689),(624,645)).segment((626,1000)).segment((417,999)).segment((416,756)).arc((65,670),(210,341)).arc((205,371),(201,396)).close().assemble().reset().face(w0.sketch().segment((606,1),(959,1)).segment((960,600)).segment((680,600)).arc((741,374),(606,185)).close().assemble()).finalize().extrude(886)
\ No newline at end of file
diff --git a/test/extrude/746/746.stl b/test/extrude/746/746.stl
index 1d00a0f97148fec80dbb0ea446c02bf92ba19a31..7386acd54a5f7ce4a2d13ae731425e268e718bcd 100644
Binary files a/test/extrude/746/746.stl and b/test/extrude/746/746.stl differ
diff --git a/test/extrude/747/747.py b/test/extrude/747/747.py
index b24f56840d2ccd0abad9ccb1d2d59c30b8edf152..2b8a110f17fa7ef3d07f64c249749502ca9e52e0 100644
--- a/test/extrude/747/747.py
+++ b/test/extrude/747/747.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(416,494,494))
-w1=cq.Workplane('XY',origin=(494,494,248))
-r=w0.workplane(offset=241).moveTo(987,857).cylinder(1000,650).union(w0.sketch().segment((170,222),(209,222)).arc((442,66),(663,222)).segment((702,222)).segment((702,403)).segment((663,403)).arc((546,533),(377,559)).segment((377,533)).arc((442,481),(377,442)).segment((377,338)).segment((260,338)).segment((260,481)).arc((222,455),(209,403)).segment((170,403)).close().assemble().finalize().extrude(1)).union(w0.workplane(offset=565).moveTo(390,14).cylinder(637,533)).union(w1.sketch().push([(831,92)]).circle(741).push([(825,85)]).rect(559,818,mode='s').finalize().extrude(455)).translate((1,156,26))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(612,502,501))
+w1=cq.Workplane('YZ',origin=(565,501,501))
+r=w0.sketch().arc((661,246),(640,26),(845,108)).arc((881,207),(821,295)).segment((821,212)).arc((769,246),(710,257)).segment((709,296)).arc((681,271),(660,246)).assemble().finalize().extrude(196).union(w0.sketch().segment((96,715),(356,530)).arc((370,536),(371,521)).segment((381,515)).segment((395,531)).arc((382,586),(435,590)).segment((585,799)).segment((567,809)).arc((521,964),(361,955)).segment((302,1000)).close().assemble().finalize().extrude(580)).union(w1.sketch().push([(829,525)]).circle(575).reset().face(w1.sketch().segment((760,515),(791,516)).arc((829,485),(870,515)).segment((896,516)).segment((894,535)).segment((871,535)).arc((830,566),(790,535)).segment((759,535)).close().assemble(),mode='s').finalize().extrude(376))
\ No newline at end of file
diff --git a/test/extrude/747/747.stl b/test/extrude/747/747.stl
index 30a60f417ee34f0313d2589bd86677c0ce0ca574..eb70d5b93f79a6ed0f34879296fa0781dec2b7a7 100644
--- a/test/extrude/747/747.stl
+++ b/test/extrude/747/747.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:51dd4c543498452e1a243c7b53d70eaefb0c56d019b77f6ed7c1810f376dcc8a
-size 109284
+oid sha256:70c1fe401c11fb882a09091fedc9f4900b2f79062c42e49b8bbf3e293b697f4e
+size 118184
diff --git a/test/extrude/748/748.py b/test/extrude/748/748.py
index a3e91bad929c2d8d2c98619a8eb03f532f48896c..8360059b85d45f4fa7117a8df4acf1b05abba9d9 100644
--- a/test/extrude/748/748.py
+++ b/test/extrude/748/748.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(511,628,511))
-r=w0.sketch().arc((469,639),(469,564),(500,490)).arc((554,1),(926,309)).arc((1000,511),(841,639)).arc((702,787),(511,734)).arc((44,904),(469,639)).assemble().push([(660,256)]).circle(575,mode='s').finalize().extrude(288)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(421,499,500))
+r=w0.sketch().segment((1,387),(251,51)).segment((1000,615)).segment((751,951)).close().assemble().push([(205,307)]).rect(551,766,mode='s').finalize().extrude(661)
\ No newline at end of file
diff --git a/test/extrude/748/748.stl b/test/extrude/748/748.stl
index 4bce22a20ccd9b94b977126c2635f438afd1fc4a..0eeb7eca93d0aff8712a2af44123a82d95645306 100644
Binary files a/test/extrude/748/748.stl and b/test/extrude/748/748.stl differ
diff --git a/test/extrude/749/749.py b/test/extrude/749/749.py
index 1088f9e9804c572c629b31de58392d2d4b3855e3..f9ec065fb3a1e3c0abd8ea0eb98d2384e2161c5e 100644
--- a/test/extrude/749/749.py
+++ b/test/extrude/749/749.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(465,465,295))
-w1=cq.Workplane('XY',origin=(465,465,308))
-r=w0.sketch().segment((34,412),(112,347)).segment((112,465)).segment((203,465)).segment((125,530)).close().assemble().reset().face(w0.sketch().segment((230,256),(438,99)).segment((530,216)).segment((399,321)).segment((896,321)).segment((896,922)).segment((452,922)).segment((452,687)).segment((308,687)).segment((308,386)).segment((230,452)).close().assemble()).finalize().extrude(674).union(w0.workplane(offset=732).moveTo(151,974).box(569,752,1000)).union(w1.workplane(offset=360).moveTo(680,1).box(896,843,674))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,540,501))
+r=w0.sketch().segment((18,19),(576,18)).segment((576,32)).arc((835,68),(846,327)).segment((986,328)).segment((986,1000)).segment((391,1000)).segment((392,611)).segment((18,612)).close().assemble().reset().face(w0.sketch().arc((606,392),(726,408),(827,352)).arc((875,392),(879,457)).arc((626,940),(605,391)).assemble(),mode='s').push([(579,158)]).rect(727,580,mode='s').finalize().extrude(1).union(w0.sketch().push([(84,770)]).circle(547).push([(298,317)]).rect(1000,1000).finalize().extrude(931)).union(w0.workplane(offset=724).moveTo(288,860).cylinder(945,556))
\ No newline at end of file
diff --git a/test/extrude/749/749.stl b/test/extrude/749/749.stl
index a7e1a447acdfccb3a934b67753d2798d54e69ae7..2554bf079edc90471d311525bafc27b2d1849ff8 100644
Binary files a/test/extrude/749/749.stl and b/test/extrude/749/749.stl differ
diff --git a/test/extrude/75/75.py b/test/extrude/75/75.py
index 4b994862539d4187d7317bc2325896bf7f6a8702..a746eb7ae9fc0e2f8d60b039229f5e00d0c7b2b0 100644
--- a/test/extrude/75/75.py
+++ b/test/extrude/75/75.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(131,1,131))
-r=w0.workplane(offset=262).box(375,1000,392).translate((370,1,58))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(29,42,1))
+r=w0.sketch().segment((807,646),(864,288)).arc((637,23),(410,288)).segment((467,646)).segment((467,687)).segment((807,687)).close().assemble().push([(809,604)]).circle(38,mode='s').push([(611,166)]).rect(57,65,mode='s').push([(457,544)]).rect(65,78,mode='s').finalize().extrude(295)
diff --git a/test/extrude/75/75.stl b/test/extrude/75/75.stl
index 2da9df4b587ff55af387e9ee521ef56571c314fd..1c2c1ed3993324ad1b6b842be55fab1c79dad949 100644
Binary files a/test/extrude/75/75.stl and b/test/extrude/75/75.stl differ
diff --git a/test/extrude/750/750.py b/test/extrude/750/750.py
index 2bf58e7594ce3ccb17a584c562fd9b09a3948ed9..446cfbc9ebd09bbb8203d867e4c58eb5c54d93d7 100644
--- a/test/extrude/750/750.py
+++ b/test/extrude/750/750.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(638,491,491))
-w1=cq.Workplane('YZ',origin=(442,491,491))
-r=w0.sketch().push([(726,466)]).rect(1000,853).push([(745,638)]).circle(500,mode='s').finalize().extrude(422).union(w0.sketch().segment((138,638),(256,638)).segment((256,696)).arc((1,549),(138,696)).close().assemble().finalize().extrude(608)).union(w1.workplane(offset=383).moveTo(726,461).box(726,530,706))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,517,499))
+r=w0.workplane(offset=244).moveTo(590,679).box(560,576,1000).union(w0.sketch().arc((351,425),(329,67),(415,415)).segment((825,415)).segment((826,940)).segment((352,941)).close().assemble().push([(590,675)]).circle(581,mode='s').finalize().extrude(470)).union(w0.workplane(offset=744).moveTo(591,675).cylinder(985,580))
\ No newline at end of file
diff --git a/test/extrude/750/750.stl b/test/extrude/750/750.stl
index 33e8261441cd2985db5c47dfe53d8d4280718a36..b3d1ebf50ddfcb2088d6bc6bfed50fb1e3eea9b7 100644
Binary files a/test/extrude/750/750.stl and b/test/extrude/750/750.stl differ
diff --git a/test/extrude/751/751.py b/test/extrude/751/751.py
index 79ca458c7efb48b0823f59fcbb65077760a38ad7..bfe02bba2dda48dc0ef36dfbc815dcb3333d8dd4 100644
--- a/test/extrude/751/751.py
+++ b/test/extrude/751/751.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,145))
-r=w0.sketch().segment((1,253),(667,253)).segment((667,415)).segment((469,415)).segment((469,406)).segment((442,415)).arc((289,307),(136,415)).segment((1,415)).close().assemble().finalize().extrude(73).union(w0.workplane(offset=654).box(856,1000,973)).translate((95,167,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(141,501,502))
+r=w0.workplane(offset=480).moveTo(713,851).box(1000,759,540).union(w0.workplane(offset=881).moveTo(59,308).box(616,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/751/751.stl b/test/extrude/751/751.stl
index b4d692bbaef5de3e6af8cbb32f4a1160bd39fe00..de983b3f86176eb24d38d3488cd5ba3513c800a3 100644
Binary files a/test/extrude/751/751.stl and b/test/extrude/751/751.stl differ
diff --git a/test/extrude/752/752.py b/test/extrude/752/752.py
index ba2d1b056af1bd3879fb3f6321eaea36b732a90c..8e28fc963ab32677e9808e696e85eef6fb7c62c6 100644
--- a/test/extrude/752/752.py
+++ b/test/extrude/752/752.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(480,480,417))
-r=w0.workplane(offset=516).moveTo(906,32).cylinder(553,553).union(w0.sketch().segment((188,63),(188,542)).segment((938,542)).segment((938,303)).arc((875,719),(521,948)).segment((521,1000)).segment((428,1000)).segment((428,948)).arc((1,584),(188,63)).assemble().finalize().extrude(615)).translate((1,42,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(347,500,500))
+r=w0.sketch().segment((517,330),(871,142)).segment((999,385)).segment((640,575)).close().assemble().finalize().extrude(270).union(w0.sketch().push([(108,807)]).rect(715,605).reset().face(w0.sketch().segment((780,270),(796,236)).segment((816,246)).segment((799,285)).arc((791,281),(779,271)).assemble()).finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/752/752.stl b/test/extrude/752/752.stl
index 62eff6a4933ba2856aaf0178ce84afb0607a8c23..ee060171ad53b12ad79ceeb12468912fe0a782e6 100644
Binary files a/test/extrude/752/752.stl and b/test/extrude/752/752.stl differ
diff --git a/test/extrude/753/753.py b/test/extrude/753/753.py
index e34b71a50434e8e66ed2f4f7fb38155079094c0a..e51519036e6777d7ceb5e109e744df53485936ef 100644
--- a/test/extrude/753/753.py
+++ b/test/extrude/753/753.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(471,500,500))
-r=w0.sketch().segment((131,371),(141,371)).arc((251,21),(361,371)).segment((461,371)).segment((461,510)).segment((491,510)).segment((491,1000)).segment((261,1000)).segment((261,700)).segment((241,700)).segment((241,690)).segment((131,690)).close().assemble().reset().face(w0.sketch().segment((201,550),(221,481)).segment((391,510)).segment((371,590)).close().assemble(),mode='s').finalize().extrude(241).union(w0.sketch().segment((421,251),(850,1)).segment((890,71)).arc((940,91),(890,121)).segment((481,351)).close().assemble().finalize().extrude(830))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,721,500))
+r=w0.sketch().segment((141,546),(456,356)).segment((685,731)).segment((606,781)).segment((605,999)).segment((222,1000)).segment((220,696)).segment((230,695)).close().assemble().reset().face(w0.sketch().segment((545,2),(859,1)).segment((860,417)).segment((850,416)).arc((715,310),(574,416)).segment((545,416)).close().assemble()).finalize().extrude(57)
\ No newline at end of file
diff --git a/test/extrude/753/753.stl b/test/extrude/753/753.stl
index 9b0e41559ca403ede2bec968673a4b0df4fcd58b..04355b3b48dfa24d3b82034536d194304eb71b5f 100644
Binary files a/test/extrude/753/753.stl and b/test/extrude/753/753.stl differ
diff --git a/test/extrude/754/754.py b/test/extrude/754/754.py
index 43e691c4f653d4369835d6277955e7a3e3381182..65f36563f15a954f246e9fd85ac88cb0c98df315 100644
--- a/test/extrude/754/754.py
+++ b/test/extrude/754/754.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,600,500))
-r=w0.sketch().segment((121,1),(880,1)).segment((880,980)).segment((630,980)).segment((570,1000)).arc((690,860),(750,690)).arc((770,660),(750,630)).arc((530,281),(121,291)).close().assemble().finalize().extrude(301)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,705,500))
+w1=cq.Workplane('YZ',origin=(622,502,501))
+r=w0.sketch().arc((88,457),(248,277),(486,307)).arc((501,456),(591,572)).arc((571,635),(532,696)).arc((385,889),(147,891)).segment((146,731)).segment((131,731)).segment((131,881)).arc((2,676),(87,457)).assemble().push([(775,347)]).circle(726).finalize().extrude(545).union(w1.sketch().segment((252,132),(675,132)).segment((675,287)).segment((640,287)).segment((641,477)).segment((676,476)).segment((676,631)).segment((495,631)).arc((377,581),(251,600)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/754/754.stl b/test/extrude/754/754.stl
index 1a568b4033f4ae06a648388c09dca92f5cd394af..5354b4c6bda06aea933cd23a5436853448e646d9 100644
Binary files a/test/extrude/754/754.stl and b/test/extrude/754/754.stl differ
diff --git a/test/extrude/755/755.py b/test/extrude/755/755.py
index c7f1f3169adca5157b313e63da3a64921e48b952..eaacdf98c26e1a9aa771eaa4cb4f0b12769377d0 100644
--- a/test/extrude/755/755.py
+++ b/test/extrude/755/755.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).cylinder(1000,627).translate((294,294,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(552,500,500))
+r=w0.sketch().segment((67,511),(156,470)).segment((167,487)).arc((361,596),(306,816)).segment((312,830)).segment((217,869)).segment((210,855)).arc((16,745),(71,526)).close().assemble().push([(186,670)]).circle(636,mode='s').push([(826,671)]).circle(676).finalize().extrude(356).union(w0.sketch().segment((376,372),(467,370)).segment((591,131)).arc((626,181),(680,216)).segment((571,422)).segment((571,481)).segment((377,481)).close().assemble().reset().face(w0.sketch().segment((425,397),(465,387)).segment((526,417)).segment((530,440)).segment((441,465)).close().assemble(),mode='s').finalize().extrude(541))
\ No newline at end of file
diff --git a/test/extrude/755/755.stl b/test/extrude/755/755.stl
index f6118130dad0078f660e0d03ce0151e90e1f3687..bc57c998896ec5abcc8a9e96722aa754d538fc4e 100644
Binary files a/test/extrude/755/755.stl and b/test/extrude/755/755.stl differ
diff --git a/test/extrude/756/756.py b/test/extrude/756/756.py
index b0dda1412e7a98325fabce21546f450e206aa2e8..79b09f9c3ac3c26711a792a65ca558bb1c4c2f11 100644
--- a/test/extrude/756/756.py
+++ b/test/extrude/756/756.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,500,500))
-w1=cq.Workplane('ZX',origin=(500,431,500))
-r=w0.workplane(offset=715).moveTo(510,351).cylinder(930,660).union(w1.sketch().arc((790,1000),(790,960),(810,990)).arc((800,990),(790,1000)).assemble().finalize().extrude(401))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(931,500,500))
+w1=cq.Workplane('YZ',origin=(845,501,502))
+r=w0.workplane(offset=181).moveTo(476,502).cylinder(1000,964).union(w1.sketch().arc((617,1),(991,500),(615,1000)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/756/756.stl b/test/extrude/756/756.stl
index d017e5d3c15dce05cf545f5c95956e49935bc5ca..5612350f1a740a6f142f753fa03589a18c46f400 100644
Binary files a/test/extrude/756/756.stl and b/test/extrude/756/756.stl differ
diff --git a/test/extrude/757/757.py b/test/extrude/757/757.py
index 05b022214bbae21a01c2cdc33ed7c451bd980008..6ade4e90b463b56c0fee11ea08f733f02c99f558 100644
--- a/test/extrude/757/757.py
+++ b/test/extrude/757/757.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(305,533,533))
-w1=cq.Workplane('YZ',origin=(338,533,533))
-r=w0.workplane(offset=549).moveTo(805,663).cylinder(566,566).union(w0.workplane(offset=767).moveTo(365,897).box(653,891,1000)).union(w1.sketch().push([(457,218)]).circle(761).reset().face(w1.sketch().segment((392,1),(522,1)).segment((522,99)).arc((609,218),(522,338)).segment((522,435)).segment((392,435)).segment((392,283)).arc((370,218),(392,153)).close().assemble(),mode='s').finalize().extrude(631)).translate((1,1,11))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(120,500,499))
+r=w0.workplane(offset=440).moveTo(535,886).cylinder(621,541).union(w0.sketch().push([(501,141)]).rect(910,630).push([(655,132)]).circle(520,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/757/757.stl b/test/extrude/757/757.stl
index eeb6e7dcbbed2c2ecd0098815e8e4588a45b08dc..80ca79d829a77e62d8b08a44d6aaf51eb5004b5b 100644
Binary files a/test/extrude/757/757.stl and b/test/extrude/757/757.stl differ
diff --git a/test/extrude/758/758.py b/test/extrude/758/758.py
index dccafeb5edbc3aff70d6ef2b65eb7f738d2e1664..a3a76e82efdd0068b9634524299a62b9384ad3fb 100644
--- a/test/extrude/758/758.py
+++ b/test/extrude/758/758.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.sketch().segment((547,74),(547,214)).arc((414,301),(547,387)).segment((547,527)).segment((634,527)).arc((34,381),(574,74)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,670))
+r=w0.workplane(offset=207).moveTo(759,799).cylinder(1000,701).union(w0.workplane(offset=327).moveTo(839,225).box(530,951,851)).union(w0.sketch().segment((112,874),(141,834)).arc((86,555),(371,584)).segment((471,480)).segment((512,547)).segment((291,781)).arc((330,784),(365,771)).arc((305,825),(230,850)).segment((165,926)).close().assemble().reset().face(w0.sketch().arc((232,741),(180,565),(361,600)).close().assemble(),mode='s').finalize().extrude(741))
\ No newline at end of file
diff --git a/test/extrude/758/758.stl b/test/extrude/758/758.stl
index 967d36b044376dfe58099add861c0838c7eca84f..c0343fdecc047689840c48ee4a212968e180cbb3 100644
Binary files a/test/extrude/758/758.stl and b/test/extrude/758/758.stl differ
diff --git a/test/extrude/759/759.py b/test/extrude/759/759.py
index a2289eaeddb8f28103fa9f57ac9e681a23644c82..753fa594bab4b6fe97fd54714f0935591609018e 100644
--- a/test/extrude/759/759.py
+++ b/test/extrude/759/759.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).cylinder(1000,681).translate((348,348,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,400))
+r=w0.sketch().segment((1,586),(306,32)).segment((999,415)).segment((696,970)).close().assemble().finalize().extrude(701)
\ No newline at end of file
diff --git a/test/extrude/759/759.stl b/test/extrude/759/759.stl
index e41a39cefbba30fed5e1fa24cbdb16bb2e625376..0efb655dd6a360174f35734e7de06dbbdffd92ad 100644
Binary files a/test/extrude/759/759.stl and b/test/extrude/759/759.stl differ
diff --git a/test/extrude/76/76.py b/test/extrude/76/76.py
index 4c7623902e2d71ebc7f132338090705f14792422..5bbbb2a503702109ba813a9b30f00ec4410f2e57 100644
--- a/test/extrude/76/76.py
+++ b/test/extrude/76/76.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(381,381,690))
-r=w0.workplane(offset=71).moveTo(353,531).cylinder(1000,700).union(w0.workplane(offset=193).moveTo(601,1).box(634,559,756))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(38,40,76))
+r=w0.sketch().segment((256,371),(936,371)).segment((936,583)).segment((256,583)).close().assemble().push([(608,420)]).circle(63,mode='s').push([(633,431)]).rect(43,83,mode='s').finalize().extrude(270)
diff --git a/test/extrude/76/76.stl b/test/extrude/76/76.stl
index 3abf5eeb6e253ce1102275387020bd419ba50d7b..ea8d1406d9a2a2df090f35c5115c2385a9f9fb18 100644
Binary files a/test/extrude/76/76.stl and b/test/extrude/76/76.stl differ
diff --git a/test/extrude/760/760.py b/test/extrude/760/760.py
index 5b9fe4a2dabbcb8859c78236f57f7137fed1365f..6a23dea64f3746e2fd9fcda6ce3585c6f96bfdd0 100644
--- a/test/extrude/760/760.py
+++ b/test/extrude/760/760.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(334,360,360))
-r=w0.sketch().segment((923,693),(949,693)).segment((1000,949)).segment((974,949)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=180).moveTo(859,110).box(462,834,718)).union(w0.workplane(offset=571).moveTo(244,296).cylinder(782,885)).translate((1,282,230))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,396))
+r=w0.sketch().segment((1,166),(275,166)).arc((311,130),(346,166)).segment((375,166)).segment((375,291)).segment((1,292)).close().assemble().push([(910,781)]).circle(591).finalize().extrude(711)
\ No newline at end of file
diff --git a/test/extrude/760/760.stl b/test/extrude/760/760.stl
index bc76760a82b038157312fc6b9db8885e29deb0ca..93024beba25ea31ffb523ee78a80e2ce35f1ba95 100644
Binary files a/test/extrude/760/760.stl and b/test/extrude/760/760.stl differ
diff --git a/test/extrude/761/761.py b/test/extrude/761/761.py
index 92937141493adf7f7439086b006ffb4c6af842a3..36a91a62007c94462795e05151efdd1c39de0084 100644
--- a/test/extrude/761/761.py
+++ b/test/extrude/761/761.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(451,451,649))
-w1=cq.Workplane('YZ',origin=(352,451,451))
-r=w0.sketch().segment((1,442),(19,442)).segment((19,415)).segment((226,415)).segment((226,298)).segment((298,298)).segment((298,415)).segment((559,415)).segment((559,442)).segment((577,442)).segment((577,595)).segment((559,595)).segment((559,613)).segment((298,613)).segment((298,658)).segment((226,658)).segment((226,613)).segment((199,613)).segment((199,577)).segment((190,577)).segment((190,613)).segment((19,613)).segment((19,595)).segment((1,595)).close().assemble().finalize().extrude(55).union(w1.sketch().push([(334,487)]).circle(541).push([(330,492)]).rect(550,478,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,216,499))
+w1=cq.Workplane('YZ',origin=(56,500,500))
+r=w0.sketch().arc((775,556),(889,750),(775,944)).close().assemble().finalize().extrude(1000).union(w1.workplane(offset=820).moveTo(226,501).box(950,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/761/761.stl b/test/extrude/761/761.stl
index eb61c2d7929e23deb3a1b4ab73fe01414acb5a9e..0bfbcbd07d6689ef3f1c018fa895dc256ad8f9a2 100644
Binary files a/test/extrude/761/761.stl and b/test/extrude/761/761.stl differ
diff --git a/test/extrude/762/762.py b/test/extrude/762/762.py
index fec60b977281afc1030588274dfb7d01019d0611..6361005f41fbf32ff7332c7349bde4b6bb095b93 100644
--- a/test/extrude/762/762.py
+++ b/test/extrude/762/762.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(781,525,525))
-r=w0.sketch().push([(1,829)]).circle(610).push([(1000,269)]).circle(659).finalize().extrude(13).translate((1,85,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,460,499))
+r=w0.sketch().segment((281,684),(510,684)).segment((510,954)).segment((356,953)).arc((127,904),(282,734)).close().assemble().push([(489,388)]).rect(580,915).push([(498,528)]).rect(544,516,mode='s').finalize().extrude(564).union(w0.sketch().segment((655,72),(814,1)).segment((880,146)).segment((718,210)).close().assemble().finalize().extrude(586))
\ No newline at end of file
diff --git a/test/extrude/762/762.stl b/test/extrude/762/762.stl
index d70980649639b1c392f4c63399e1ab0322be4fff..fad83845f91a928ac31579f4c35b8c4b43b99f70 100644
Binary files a/test/extrude/762/762.stl and b/test/extrude/762/762.stl differ
diff --git a/test/extrude/763/763.py b/test/extrude/763/763.py
index 769a0923c55b914f6d1361443718d495b34ef5c6..5d071c32993bf5f91e5980cc3bac3fae6b435daf 100644
--- a/test/extrude/763/763.py
+++ b/test/extrude/763/763.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().segment((527,600),(574,547)).segment((807,734)).arc((780,760),(760,787)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(906,500,500))
+r=w0.sketch().arc((58,137),(166,256),(305,177)).arc((135,421),(56,137)).assemble().finalize().extrude(1).union(w0.workplane(offset=361).moveTo(926,790).cylinder(780,575))
\ No newline at end of file
diff --git a/test/extrude/763/763.stl b/test/extrude/763/763.stl
index 5214ac5086fe50d3aa77bbd432c5e3261698f791..554fc075a3422006785d76c37cea95d21fcdf17e 100644
Binary files a/test/extrude/763/763.stl and b/test/extrude/763/763.stl differ
diff --git a/test/extrude/764/764.py b/test/extrude/764/764.py
index 7249384c23cecb06cd70c96a4b43aa6f7d050270..c1f70f2214fd49bfb38bf6840360d3aadfe993d2 100644
--- a/test/extrude/764/764.py
+++ b/test/extrude/764/764.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(471,500,500))
-r=w0.sketch().segment((1,111),(211,111)).arc((281,61),(361,111)).segment((411,111)).arc((650,81),(421,181)).segment((361,181)).arc((281,231),(211,181)).segment((1,181)).close().assemble().finalize().extrude(431).union(w0.sketch().segment((590,610),(1000,610)).segment((1000,950)).segment((820,950)).segment((820,990)).segment((740,990)).segment((740,950)).segment((590,950)).close().assemble().finalize().extrude(630))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,321,500))
+r=w0.workplane(offset=376).moveTo(450,524).cylinder(749,950).union(w0.sketch().push([(986,40)]).circle(515).push([(989,42)]).rect(517,522,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/764/764.stl b/test/extrude/764/764.stl
index 9e2e634fb0dbccf4c51628966f9a1edf0639c722..11ccc1fa9d3393ba5ddc47a85f06705295a1fc63 100644
Binary files a/test/extrude/764/764.stl and b/test/extrude/764/764.stl differ
diff --git a/test/extrude/765/765.py b/test/extrude/765/765.py
index d92f8c0529f7708fd0c3f5fd7764a595347210fb..67c97afac948111de937b91a79290336bb9a3858 100644
--- a/test/extrude/765/765.py
+++ b/test/extrude/765/765.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(500,500,500))
-r=w0.workplane(offset=326).moveTo(775,820).box(850,660,850).union(w0.sketch().arc((111,401),(281,1),(530,351)).arc((590,550),(491,730)).segment((720,730)).segment((720,1000)).segment((201,1000)).segment((201,740)).arc((91,590),(111,401)).assemble().finalize().extrude(850))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,295,500))
+r=w0.sketch().push([(234,224)]).rect(746,944).push([(695,806)]).circle(696).finalize().extrude(859).union(w0.workplane(offset=708).moveTo(696,806).box(769,620,914))
\ No newline at end of file
diff --git a/test/extrude/765/765.stl b/test/extrude/765/765.stl
index 3f76b2ea789d2ce86b44dd9a8beffe9dfa5ad2ac..f6ef07f2ff13155f5721bd92768a61873c3018e4 100644
Binary files a/test/extrude/765/765.stl and b/test/extrude/765/765.stl differ
diff --git a/test/extrude/766/766.py b/test/extrude/766/766.py
index 77e7ee0fc235a50cccffd6077a89998235adc957..6b8409e2e45ab61b15ba574db0c92ff665b36309 100644
--- a/test/extrude/766/766.py
+++ b/test/extrude/766/766.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,381))
-r=w0.sketch().segment((1,281),(431,101)).segment((590,471)).segment((1000,471)).segment((1000,500)).segment((540,500)).segment((161,660)).close().assemble().push([(296,381)]).rect(790,600,mode='s').finalize().extrude(740).union(w0.workplane(offset=620).moveTo(710,740).cylinder(740,660))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,471))
+w1=cq.Workplane('ZX',origin=(500,650,499))
+r=w0.workplane(offset=265).moveTo(446,466).box(552,1000,971).union(w0.sketch().push([(445,465)]).rect(979,1000).rect(901,610,mode='s').finalize().extrude(1000)).union(w1.sketch().segment((415,171),(506,171)).segment((505,829)).segment((416,831)).segment((415,639)).arc((426,631),(414,619)).close().assemble().finalize().extrude(680))
\ No newline at end of file
diff --git a/test/extrude/766/766.stl b/test/extrude/766/766.stl
index 6f4e901895344abeaecdfcabdf3be7ab16916b68..3d97d6b92e6be12345098d30a4306690d7b9cdfe 100644
Binary files a/test/extrude/766/766.stl and b/test/extrude/766/766.stl differ
diff --git a/test/extrude/767/767.py b/test/extrude/767/767.py
index 0c0b97a4e4069404a19e713cad58922cbab504ed..d62ac16f24763749bd00bdcdbaa179d2bf7d6679 100644
--- a/test/extrude/767/767.py
+++ b/test/extrude/767/767.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(490,460,490))
-r=w0.sketch().segment((1,898),(266,378)).segment((276,378)).arc((908,123),(419,623)).segment((225,1000)).close().assemble().finalize().extrude(541)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(791,501,500))
+r=w0.sketch().rect(1000,1000).push([(281,471)]).circle(557,mode='s').push([(723,39)]).rect(527,543,mode='s').finalize().extrude(3)
\ No newline at end of file
diff --git a/test/extrude/767/767.stl b/test/extrude/767/767.stl
index 9f0eac3b7780324bcd68b2d7079f48790f3b5861..4582265235381a40e4e60316ada302233146aeb5 100644
Binary files a/test/extrude/767/767.stl and b/test/extrude/767/767.stl differ
diff --git a/test/extrude/768/768.py b/test/extrude/768/768.py
index 0e1e11f98f0df9fc49ffbada7d0c97782e8fb84c..976dbfc8fecd366f0101bd6e1f7a13855689ecfc 100644
--- a/test/extrude/768/768.py
+++ b/test/extrude/768/768.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(44,360,360))
-r=w0.sketch().segment((1,310),(159,310)).arc((360,159),(562,310)).segment((720,310)).segment((720,411)).segment((562,411)).arc((360,562),(159,411)).segment((1,411)).close().assemble().rect(418,648,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,357))
+w1=cq.Workplane('YZ',origin=(444,502,501))
+r=w0.sketch().arc((660,332),(794,506),(760,725)).close().assemble().finalize().extrude(401).union(w0.sketch().push([(523,576)]).rect(1000,1000).push([(277,475)]).circle(510,mode='s').finalize().extrude(655)).union(w0.sketch().segment((606,415),(1000,416)).segment((1000,855)).segment((604,854)).segment((606,605)).arc((436,575),(605,547)).close().assemble().finalize().extrude(690)).union(w1.workplane(offset=279).moveTo(217,559).box(671,870,944))
\ No newline at end of file
diff --git a/test/extrude/768/768.stl b/test/extrude/768/768.stl
index 0678fe1a2b1751a8181ccfab127d698c7006439a..8e85fd472351ede4b1fd55cb5e4569f478773362 100644
Binary files a/test/extrude/768/768.stl and b/test/extrude/768/768.stl differ
diff --git a/test/extrude/769/769.py b/test/extrude/769/769.py
index ab703be8f815d7bd6e3e562d4c14b748a6bc310b..8e8199e9776dab383e7bed0f128feb06ab580aa4 100644
--- a/test/extrude/769/769.py
+++ b/test/extrude/769/769.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(281,1,281))
-r=w0.sketch().rect(1000,899).push([(44,569)]).circle(296,mode='s').push([(116,547)]).rect(296,296,mode='s').push([(360,195)]).circle(497,mode='s').finalize().extrude(849).translate((170,1,220))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,456))
+w1=cq.Workplane('ZX',origin=(500,345,501))
+r=w0.sketch().arc((596,510),(327,135),(721,377)).segment((720,630)).segment((594,631)).close().assemble().finalize().extrude(474).union(w0.sketch().push([(500,297)]).circle(740).reset().face(w0.sketch().segment((514,316),(594,275)).segment((595,201)).segment((641,201)).segment((642,251)).segment((691,227)).segment((720,281)).segment((641,325)).segment((641,397)).segment((594,396)).segment((594,346)).segment((546,377)).close().assemble(),mode='s').reset().face(w0.sketch().segment((651,412),(666,315)).segment((706,322)).segment((686,415)).close().assemble(),mode='s').push([(683,735)]).rect(614,921).finalize().extrude(1000)).union(w1.workplane(offset=651).moveTo(137,496).cylinder(800,635))
\ No newline at end of file
diff --git a/test/extrude/769/769.stl b/test/extrude/769/769.stl
index f4f4dfe439fad662fd595c137afbe53face90c70..6d8ff902d193250d050073c4026db83c3c7b6257 100644
Binary files a/test/extrude/769/769.stl and b/test/extrude/769/769.stl differ
diff --git a/test/extrude/77/77.py b/test/extrude/77/77.py
index 6783651128d02a75298b49da6bcdf4e80c15767c..bd3560c44ac1ff01862b5584213a1ca1b3c2e570 100644
--- a/test/extrude/77/77.py
+++ b/test/extrude/77/77.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((647,620),(687,620)).segment((687,714)).segment((647,680)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(27,44,23))
+r=w0.sketch().segment((246,762),(597,762)).segment((597,884)).segment((855,884)).segment((855,762)).segment((855,176)).segment((1,176)).segment((1,762)).segment((1,877)).segment((246,877)).close().assemble().push([(633,364)]).rect(117,56,mode='s').push([(429,292)]).rect(110,127,mode='s').push([(308,808)]).circle(52,mode='s').push([(478,637)]).rect(105,94,mode='s').finalize().extrude(295)
diff --git a/test/extrude/77/77.stl b/test/extrude/77/77.stl
index 61d37997a860855aa2e329928fea8742a13eacda..bdd5ccb71125a4685c0db202e0676d29c876d9aa 100644
Binary files a/test/extrude/77/77.stl and b/test/extrude/77/77.stl differ
diff --git a/test/extrude/770/770.py b/test/extrude/770/770.py
index 768a2d5d6c69f31095789e523ab697d0e8850aa4..78245fc3d7b984e8b8291c4d1f7e383672234b61 100644
--- a/test/extrude/770/770.py
+++ b/test/extrude/770/770.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(654,464,464))
-w1=cq.Workplane('ZX',origin=(464,263,464))
-r=w0.sketch().push([(85,609)]).circle(643).push([(866,710)]).rect(777,978).finalize().extrude(297).union(w1.workplane(offset=693).moveTo(1,464).box(542,1000,922)).translate((1,95,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(106,500,500))
+r=w0.sketch().arc((342,1),(636,450),(586,1000)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/770/770.stl b/test/extrude/770/770.stl
index dd0cbeb26c4d8f0eb9ecc9b0e9ec22ddcd292b80..da7647e59140db2d9756aa2ff11c034066e5ec7f 100644
Binary files a/test/extrude/770/770.stl and b/test/extrude/770/770.stl differ
diff --git a/test/extrude/771/771.py b/test/extrude/771/771.py
index 6db812d83af7ac1a7132c8f0d04b54cb1280d9fb..c8ff21c3380b765c409188511521be7667ba72a9 100644
--- a/test/extrude/771/771.py
+++ b/test/extrude/771/771.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(206,468,468))
-r=w0.sketch().segment((66,599),(365,599)).arc((328,571),(300,543)).segment((290,543)).arc((216,328),(290,122)).segment((290,113)).segment((300,113)).arc((543,1),(795,113)).segment((795,122)).arc((869,328),(795,543)).segment((673,636)).segment((673,935)).segment((66,935)).close().assemble().push([(547,239)]).rect(907,589,mode='s').push([(547,421)]).rect(907,599,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,671,500))
+r=w0.workplane(offset=166).box(1000,1000,1000).union(w0.sketch().segment((439,480),(494,481)).segment((482,492)).segment((505,519)).segment((441,520)).close().assemble().finalize().extrude(831))
\ No newline at end of file
diff --git a/test/extrude/771/771.stl b/test/extrude/771/771.stl
index 078ed10e8c633d2a9aa35d52f4421ad1916f3edb..95b7b04cec836653714b76a8594749c633dc335a 100644
Binary files a/test/extrude/771/771.stl and b/test/extrude/771/771.stl differ
diff --git a/test/extrude/772/772.py b/test/extrude/772/772.py
index bd11ae50094710903e0cb3bfc3a2d7deb074f975..3044fcf2760eb12b01fa09113c87f7150f7f81ab 100644
--- a/test/extrude/772/772.py
+++ b/test/extrude/772/772.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(533,533,795))
-r=w0.sketch().segment((561,66),(645,66)).arc((692,122),(729,66)).segment((869,66)).segment((869,757)).segment((561,757)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((197,711),(337,636)).segment((533,1000)).segment((356,1000)).close().assemble().finalize().extrude(206))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(805,499,500))
+r=w0.workplane(offset=194).moveTo(690,840).cylinder(1000,660).union(w0.workplane(offset=445).moveTo(479,203).box(1000,905,609))
\ No newline at end of file
diff --git a/test/extrude/772/772.stl b/test/extrude/772/772.stl
index 507685df2233e5af3344fcf87e4054f462a92592..518079b2d1d0b2e77ca5a7f37d65a8573f584c95 100644
Binary files a/test/extrude/772/772.stl and b/test/extrude/772/772.stl differ
diff --git a/test/extrude/773/773.py b/test/extrude/773/773.py
index ce58f5c16f5d8e6b12b238b13b446d4851725885..eaf55afbe302e8ac04bc2ca55f0891ab8da1bd20 100644
--- a/test/extrude/773/773.py
+++ b/test/extrude/773/773.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().segment((367,481),(807,481)).arc((880,527),(967,540)).segment((967,853)).segment((367,853)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,580,500))
+r=w0.sketch().rect(1000,659).push([(442,563)]).rect(536,514,mode='s').finalize().extrude(341)
\ No newline at end of file
diff --git a/test/extrude/773/773.stl b/test/extrude/773/773.stl
index 50b6c0a0ae157c48a2cef22503d2350707e8f72b..11e46ecc7837be3d62c092739f23b1312a49f9c9 100644
Binary files a/test/extrude/773/773.stl and b/test/extrude/773/773.stl differ
diff --git a/test/extrude/774/774.py b/test/extrude/774/774.py
index 511bf5ceac6c11d7dd7b1eeed23ec98d40ed3bfc..5ce88626fb2b3f0f87fbc4c403f16f5076bcbae2 100644
--- a/test/extrude/774/774.py
+++ b/test/extrude/774/774.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(654,903,654))
-w1=cq.Workplane('XY',origin=(654,654,823))
-r=w0.sketch().segment((557,355),(742,355)).segment((742,331)).segment((815,331)).segment((815,355)).segment((1000,355)).segment((1000,952)).segment((815,952)).segment((815,976)).segment((742,976)).segment((742,952)).segment((557,952)).close().assemble().finalize().extrude(1).union(w1.sketch().push([(500,968)]).circle(742).push([(480,956)]).rect(662,710,mode='s').finalize().extrude(138))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,212))
+r=w0.workplane(offset=559).moveTo(964,434).cylinder(616,510).union(w0.sketch().arc((60,205),(1,171),(65,141)).arc((102,181),(62,207)).assemble().finalize().extrude(1000)).union(w0.sketch().push([(704,634)]).rect(1000,976).push([(708,636)]).rect(805,679,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/774/774.stl b/test/extrude/774/774.stl
index 11ff8feda3bd3e82b7eea543c9ae5a1436e53401..4b6697a69d81e985e2dcf94390150bb22e87f1ce 100644
Binary files a/test/extrude/774/774.stl and b/test/extrude/774/774.stl differ
diff --git a/test/extrude/775/775.py b/test/extrude/775/775.py
index be3d8a3f0306d5dfe16cc1e6e76d9a6d6d83b1b6..8be53f81715845635cc737117d8ba438bd7def79 100644
--- a/test/extrude/775/775.py
+++ b/test/extrude/775/775.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,740).union(w0.workplane(offset=127).moveTo(565,570).box(537,431,748)).translate((1,407,407))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,416))
+r=w0.sketch().push([(395,824)]).circle(619).push([(765,850)]).circle(651).push([(859,896)]).circle(524,mode='s').finalize().extrude(621).union(w0.sketch().push([(197,10)]).rect(721,521).push([(107,3)]).rect(505,506,mode='s').finalize().extrude(675))
\ No newline at end of file
diff --git a/test/extrude/775/775.stl b/test/extrude/775/775.stl
index 70ebd9758091275426da6a66e91529763af0e589..41e32101e43a5611c9cfab552715c8d06dd8d423 100644
Binary files a/test/extrude/775/775.stl and b/test/extrude/775/775.stl differ
diff --git a/test/extrude/776/776.py b/test/extrude/776/776.py
index a20b4f18ecd17d58f7a0a2faf3cc06f770f3f492..3519a9a01753f8d66303ca202f5d522473b7272b 100644
--- a/test/extrude/776/776.py
+++ b/test/extrude/776/776.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(527,495,527))
-r=w0.sketch().push([(1,715)]).rect(549,688).reset().face(w0.sketch().segment((55,624),(398,624)).arc((517,549),(646,549)).arc((925,98),(731,592)).arc((678,968),(355,753)).segment((55,753)).close().assemble()).reset().face(w0.sketch().segment((624,270),(635,270)).segment((946,431)).segment((946,452)).segment((817,452)).segment((699,506)).segment((688,452)).segment((656,452)).segment((656,377)).close().assemble(),mode='s').reset().face(w0.sketch().segment((656,205),(807,205)).segment((914,173)).segment((925,205)).segment((946,205)).segment((946,280)).segment((1000,388)).segment((979,388)).segment((656,237)).close().assemble(),mode='s').finalize().extrude(334).union(w0.workplane(offset=656).moveTo(581,764).cylinder(785,731))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,704,500))
+w1=cq.Workplane('ZX',origin=(500,749,502))
+r=w0.sketch().segment((2,487),(186,271)).segment((187,111)).segment((316,111)).segment((406,12)).segment((422,26)).segment((596,26)).segment((595,111)).segment((819,111)).segment((820,362)).segment((1000,515)).segment((821,729)).segment((820,891)).segment((685,890)).segment((595,989)).segment((579,976)).segment((405,976)).segment((406,889)).segment((186,890)).segment((187,641)).close().assemble().finalize().extrude(41).union(w1.sketch().segment((2,241),(385,240)).segment((385,5)).segment((616,7)).segment((616,241)).segment((871,241)).segment((871,282)).segment((615,280)).segment((616,994)).segment((386,995)).segment((387,281)).segment((1,280)).close().assemble().finalize().extrude(5))
\ No newline at end of file
diff --git a/test/extrude/776/776.stl b/test/extrude/776/776.stl
index e02583d96e5eb6712de4595b8d5ffb3519a36d63..7c305a71568154f7f9652ecbfa7927ac321aefa8 100644
Binary files a/test/extrude/776/776.stl and b/test/extrude/776/776.stl differ
diff --git a/test/extrude/777/777.py b/test/extrude/777/777.py
index d16269cc68421d6c4fd4dc2da1401dbb2fcb3367..d50acff3f36f94a9ea9b06838b85b7f4a7232e7b 100644
--- a/test/extrude/777/777.py
+++ b/test/extrude/777/777.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(474,474,614))
-r=w0.sketch().push([(1,48)]).rect(696,720).reset().face(w0.sketch().segment((30,579),(357,311)).segment((603,603)).segment((357,813)).arc((112,1000),(124,696)).close().assemble()).push([(994,597)]).rect(603,743).finalize().extrude(194)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(506,501,501))
+r=w0.sketch().segment((415,121),(771,122)).segment((771,409)).arc((790,500),(771,592)).segment((771,880)).segment((417,881)).segment((415,590)).arc((397,500),(416,411)).close().assemble().push([(460,150)]).circle(520,mode='s').finalize().extrude(60).union(w0.workplane(offset=471).moveTo(523,206).box(1000,911,560)).union(w0.workplane(offset=712).moveTo(491,666).cylinder(926,836))
\ No newline at end of file
diff --git a/test/extrude/777/777.stl b/test/extrude/777/777.stl
index 1564013b5cffe36b25f246af96d05f481e7cb678..6bb066f290868562c3fa959f73c91a331c0a1a1e 100644
Binary files a/test/extrude/777/777.stl and b/test/extrude/777/777.stl differ
diff --git a/test/extrude/778/778.py b/test/extrude/778/778.py
index 52d0af2e7ca4109e5701b3404e62e9836fffbd57..514a405423237a23e94ac983cbff6f2ce57a7ab2 100644
--- a/test/extrude/778/778.py
+++ b/test/extrude/778/778.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(620,620,740))
-r=w0.sketch().segment((351,510),(351,520)).segment((361,520)).segment((361,510)).arc((371,560),(351,510)).assemble().push([(540,510)]).circle(770).push([(860,910)]).circle(680).push([(870,720)]).circle(650).finalize().extrude(1).union(w0.sketch().push([(610,461)]).circle(810).reset().face(w0.sketch().segment((481,510),(500,491)).segment((520,520)).segment((500,540)).close().assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(637,499,499))
+r=w0.sketch().segment((201,1),(801,1)).segment((801,771)).segment((456,771)).arc((366,1000),(282,771)).segment((202,771)).close().assemble().push([(367,868)]).rect(689,625,mode='s').finalize().extrude(230)
\ No newline at end of file
diff --git a/test/extrude/778/778.stl b/test/extrude/778/778.stl
index 65454ed61f2f912d3b43ff648f4f5ce3c8982eba..71d99924c5a819bbd62965887dd3157576646632 100644
Binary files a/test/extrude/778/778.stl and b/test/extrude/778/778.stl differ
diff --git a/test/extrude/779/779.py b/test/extrude/779/779.py
index 98201998cb7e7d95f41ae4a3db913677d2193b6e..66db410b3813173cbc8b4253944f9685382cb622 100644
--- a/test/extrude/779/779.py
+++ b/test/extrude/779/779.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(464,234,234))
-r=w0.workplane(offset=1).box(556,1000,701).translate((1,45,267))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,6,501))
+r=w0.sketch().arc((42,261),(37,166),(57,262)).arc((47,247),(42,262)).assemble().finalize().extrude(1000).union(w0.workplane(offset=995).moveTo(676,516).cylinder(1000,824))
\ No newline at end of file
diff --git a/test/extrude/779/779.stl b/test/extrude/779/779.stl
index d94912cee78ef65af9391c50caf4e5b01face5cd..f9374abda2f435913abf321cb428615810950f4c 100644
Binary files a/test/extrude/779/779.stl and b/test/extrude/779/779.stl differ
diff --git a/test/extrude/78/78.py b/test/extrude/78/78.py
index 33a4321765b88b1f6dad6bcc6cb8f003970d7abf..2be3125775e4d6c1c46ccb9eba0303d4b8c5dc77 100644
--- a/test/extrude/78/78.py
+++ b/test/extrude/78/78.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(722,485,485))
-r=w0.sketch().push([(228,670)]).circle(743).reset().face(w0.sketch().arc((145,887),(289,454),(176,897)).segment((145,897)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().push([(186,228)]).circle(629).push([(588,68)]).rect(506,537).reset().face(w0.sketch().segment((773,537),(907,351)).segment((1000,423)).segment((866,609)).close().assemble()).finalize().extrude(351)).translate((1,31,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(2,70,55))
+r=w0.sketch().segment((492,231),(393,231)).arc((323,260),(294,330)).segment((294,950)).segment((536,950)).close().assemble().push([(456,855)]).rect(72,107,mode='s').push([(475,742)]).rect(81,84,mode='s').push([(407,788)]).rect(49,56,mode='s').push([(383,705)]).circle(60,mode='s').finalize().extrude(346).translate((1,277,1))
diff --git a/test/extrude/78/78.stl b/test/extrude/78/78.stl
index bdcf7f96b764d6a2aca04286c19dcda77c13cdee..68b2dfe531729f00780c8160dcde5f319b725012 100644
Binary files a/test/extrude/78/78.stl and b/test/extrude/78/78.stl differ
diff --git a/test/extrude/780/780.py b/test/extrude/780/780.py
index b88755a8ffc97231833e059e7823d26711561581..6a560a09cb436a3111a8a5410f963dc92326e5a3 100644
--- a/test/extrude/780/780.py
+++ b/test/extrude/780/780.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(391,1,391))
-w1=cq.Workplane('ZX',origin=(391,173,391))
-r=w0.workplane(offset=497).moveTo(594,618).cylinder(602,477).union(w1.workplane(offset=696).moveTo(149,126).cylinder(1000,438))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,316,500))
+r=w0.sketch().segment((691,410),(961,410)).segment((960,486)).arc((1000,600),(961,711)).segment((960,785)).segment((926,786)).arc((885,566),(691,455)).close().assemble().finalize().extrude(660).union(w0.sketch().push([(160,466)]).rect(821,1000).rect(720,681,mode='s').finalize().extrude(875))
\ No newline at end of file
diff --git a/test/extrude/780/780.stl b/test/extrude/780/780.stl
index 7aae7155f236b599a29fd92161b8593404ee9d80..eade81d45c6d43d02ed9a93bbbb23c68f08924af 100644
Binary files a/test/extrude/780/780.stl and b/test/extrude/780/780.stl differ
diff --git a/test/extrude/781/781.py b/test/extrude/781/781.py
index 5b85e9d738a5fe3cd40402eb94c781b136dc373a..8bf017ec09f87e350bca55f0c1b1b7661b51cedb 100644
--- a/test/extrude/781/781.py
+++ b/test/extrude/781/781.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(356,356,178))
-r=w0.sketch().segment((1,309),(337,309)).arc((262,225),(141,206)).arc((412,104),(617,309)).segment((711,309)).segment((711,402)).segment((617,402)).arc((430,608),(160,533)).arc((262,505),(337,421)).segment((1,421)).close().assemble().finalize().extrude(66).union(w0.sketch().segment((113,272),(300,272)).segment((300,160)).segment((412,160)).segment((412,272)).segment((599,272)).segment((599,440)).segment((412,440)).segment((412,552)).segment((300,552)).segment((300,440)).segment((113,440)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,95))
+r=w0.workplane(offset=732).moveTo(365,414).box(770,1000,966).union(w0.sketch().segment((475,376),(551,375)).arc((631,326),(711,377)).segment((770,376)).segment((771,1000)).segment((475,1000)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/781/781.stl b/test/extrude/781/781.stl
index da56230b79c7bcb6bc75434c56578b7eb9a1c06e..0ac03f844ccecc0449fbc78ace430e66d0916c2b 100644
Binary files a/test/extrude/781/781.stl and b/test/extrude/781/781.stl differ
diff --git a/test/extrude/782/782.py b/test/extrude/782/782.py
index 81c9608ee436b8c47a4ee10a80964c3d703e7f2d..77f0e5cf07230269aa8a2486dcc0818bc94f62b9 100644
--- a/test/extrude/782/782.py
+++ b/test/extrude/782/782.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(409,409,409))
-w1=cq.Workplane('ZX',origin=(409,433,409))
-r=w0.workplane(offset=226).moveTo(1,285).box(775,681,775).union(w0.sketch().arc((409,397),(503,291),(645,255)).arc((515,350),(456,503)).arc((433,539),(456,574)).arc((468,622),(492,669)).arc((444,622),(409,574)).close().assemble().finalize().extrude(433)).union(w1.sketch().segment((90,622),(267,622)).segment((267,563)).arc((291,610),(279,669)).segment((775,669)).segment((775,1000)).segment((220,1000)).segment((220,716)).arc((125,704),(90,622)).assemble().finalize().extrude(243))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(457,500,501))
+w1=cq.Workplane('ZX',origin=(500,441,501))
+r=w0.sketch().arc((435,660),(495,614),(501,539)).segment((540,561)).segment((476,680)).close().assemble().finalize().extrude(206).union(w0.workplane(offset=527).moveTo(411,572).cylinder(550,640)).union(w0.sketch().segment((231,190),(406,106)).arc((415,97),(426,82)).segment((426,2)).segment((696,2)).segment((696,81)).arc((736,157),(736,240)).segment((850,241)).segment((850,527)).segment((535,526)).segment((536,396)).segment((424,397)).segment((425,345)).segment((325,390)).close().assemble().finalize().extrude(564)).union(w1.workplane(offset=355).moveTo(969,811).cylinder(790,530))
\ No newline at end of file
diff --git a/test/extrude/782/782.stl b/test/extrude/782/782.stl
index 7ee0dcdae56f5fbcf42e946af5e0cf6657b79f5f..5e86541c237bb1ad450cea32e7b2c5997c29154b 100644
Binary files a/test/extrude/782/782.stl and b/test/extrude/782/782.stl differ
diff --git a/test/extrude/783/783.py b/test/extrude/783/783.py
index 26defeccba85276285b79cf465c095b634079886..17327efaa8adc6042a90aa50eaad59624b8ec0b0 100644
--- a/test/extrude/783/783.py
+++ b/test/extrude/783/783.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(494,559,494))
-r=w0.workplane(offset=377).moveTo(1,157).cylinder(728,650).union(w0.workplane(offset=546).moveTo(916,734).box(948,1000,598)).translate((1,1,156))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(670,502,500))
+r=w0.workplane(offset=332).moveTo(296,287).cylinder(841,781).union(w0.sketch().arc((47,252),(102,198),(99,117)).arc((502,64),(536,466)).arc((716,452),(871,552)).segment((984,551)).segment((986,891)).segment((870,891)).arc((652,1000),(433,890)).segment((312,891)).segment((311,562)).arc((113,466),(47,252)).assemble().finalize().extrude(342))
\ No newline at end of file
diff --git a/test/extrude/783/783.stl b/test/extrude/783/783.stl
index b42218c6a975479c2a85cda5da0e8fa48d5a85c9..8b2f928ee349822cf7f71649ef3fbb4f98c836ff 100644
Binary files a/test/extrude/783/783.stl and b/test/extrude/783/783.stl differ
diff --git a/test/extrude/784/784.py b/test/extrude/784/784.py
index 50fdfb9a6d24cef29a86c902fe532e1ce70ac6a0..9734c0f27eb2c0f76451814b10e551cdadf849e7 100644
--- a/test/extrude/784/784.py
+++ b/test/extrude/784/784.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(404,404,106))
-r=w0.sketch().segment((1,355),(170,355)).arc((404,170),(637,355)).segment((807,355)).segment((807,452)).segment((637,452)).arc((404,637),(170,452)).segment((1,452)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,499,346))
+r=w0.workplane(offset=656).box(1000,850,810)
\ No newline at end of file
diff --git a/test/extrude/784/784.stl b/test/extrude/784/784.stl
index 4a5c393b4419b16479c5104950823751091f7feb..4aace18ca0bebdbbd75212dbfd0c150f690ed98e 100644
Binary files a/test/extrude/784/784.stl and b/test/extrude/784/784.stl differ
diff --git a/test/extrude/785/785.py b/test/extrude/785/785.py
index 168f5103ed30683289d5950d7a04fb1c04b4fe0c..4d9070891e7fe5698e5f1ace9f1ff22e058e635b 100644
--- a/test/extrude/785/785.py
+++ b/test/extrude/785/785.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(172,172,224))
-w1=cq.Workplane('ZX',origin=(172,286,172))
-r=w0.workplane(offset=1).moveTo(1,172).box(865,1000,513).union(w0.sketch().segment((524,141),(607,141)).arc((617,161),(617,141)).segment((689,141)).segment((689,482)).segment((524,482)).close().assemble().push([(560,193)]).rect(224,234,mode='s').finalize().extrude(410)).union(w1.sketch().segment((79,265),(234,265)).segment((234,420)).segment((120,420)).segment((120,410)).segment((99,410)).segment((99,420)).segment((79,420)).close().assemble().finalize().extrude(193)).translate((261,157,33))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,499,447))
+r=w0.sketch().segment((2,485),(80,485)).segment((82,596)).segment((140,594)).segment((140,486)).segment((514,485)).segment((514,175)).segment((710,175)).arc((650,326),(650,486)).segment((1000,486)).segment((1000,719)).segment((766,720)).arc((834,781),(910,825)).segment((514,824)).segment((517,721)).segment((1,720)).close().assemble().finalize().extrude(610)
\ No newline at end of file
diff --git a/test/extrude/785/785.stl b/test/extrude/785/785.stl
index 6e99dab34fac9f32473226302230ee73fdd2a078..273af185938ef9e9873d1a8100b0d2748517f304 100644
Binary files a/test/extrude/785/785.stl and b/test/extrude/785/785.stl differ
diff --git a/test/extrude/786/786.py b/test/extrude/786/786.py
index f319e6ef0eab812c17fd6b348515724818f0a593..f019b0db1dd998c771a84eca3951314e322dcb41 100644
--- a/test/extrude/786/786.py
+++ b/test/extrude/786/786.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(511,511,725))
-r=w0.sketch().segment((1,184),(592,154)).segment((613,684)).segment((32,715)).close().assemble().push([(720,776)]).rect(541,694).push([(1000,776)]).rect(551,694).finalize().extrude(83)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,499,344))
+r=w0.workplane(offset=488).moveTo(751,701).cylinder(526,635).union(w0.sketch().arc((330,364),(590,24),(465,434)).arc((215,755),(330,364)).assemble().push([(309,569)]).rect(600,720,mode='s').push([(389,309)]).circle(539,mode='s').push([(750,699)]).circle(645).finalize().extrude(580)).union(w0.workplane(offset=667).moveTo(752,976).box(535,550,835))
\ No newline at end of file
diff --git a/test/extrude/786/786.stl b/test/extrude/786/786.stl
index 48e3484bedb3d42f9eb7d2cb1079c08478623846..9b5fee0f977017eb6d10b135e4cdd06063dc4df4 100644
Binary files a/test/extrude/786/786.stl and b/test/extrude/786/786.stl differ
diff --git a/test/extrude/787/787.py b/test/extrude/787/787.py
index fd1c66fb84452d4911b2564ebd254ac5461d37f3..784a07e0a33e39717ff5e5313b16ddf054add51f 100644
--- a/test/extrude/787/787.py
+++ b/test/extrude/787/787.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(562,575,575))
-w1=cq.Workplane('YZ',origin=(652,575,575))
-r=w0.workplane(offset=530).moveTo(716,1000).cylinder(665,794).union(w1.sketch().push([(291,7)]).circle(652).push([(291,1)]).rect(626,691,mode='s').finalize().extrude(600)).translate((1,1,71))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,182))
+r=w0.workplane(offset=795).moveTo(864,421).cylinder(1000,636).union(w0.workplane(offset=821).moveTo(136,580).cylinder(1000,634))
\ No newline at end of file
diff --git a/test/extrude/787/787.stl b/test/extrude/787/787.stl
index ee71d8dabc00b937d745056da824446f6e4c28e4..ec9678d615e6a1a6a1d54d545c00df9db41cddbc 100644
Binary files a/test/extrude/787/787.stl and b/test/extrude/787/787.stl differ
diff --git a/test/extrude/788/788.py b/test/extrude/788/788.py
index 9097fe3a7def5fcc79fd5e11267537cbd8e1a8e3..97bc313c5bb618d75e84f3389ff6c37d73d111d2 100644
--- a/test/extrude/788/788.py
+++ b/test/extrude/788/788.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(424,424,136))
-r=w0.sketch().segment((1,18),(120,18)).arc((340,170),(560,18)).segment((848,18)).segment((848,805)).segment((560,805)).arc((441,831),(314,814)).arc((297,814),(289,805)).segment((1,805)).close().assemble().push([(424,412)]).rect(966,738,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,627))
+w1=cq.Workplane('YZ',origin=(46,502,502))
+r=w0.workplane(offset=416).moveTo(766,810).cylinder(671,689).union(w1.workplane(offset=507).moveTo(160,441).box(821,631,510))
\ No newline at end of file
diff --git a/test/extrude/788/788.stl b/test/extrude/788/788.stl
index 3aaa807cc9472a8c90aef8ae20a15203bc04638f..37db5ba6881d1f756ba76182b813242610edce60 100644
Binary files a/test/extrude/788/788.stl and b/test/extrude/788/788.stl differ
diff --git a/test/extrude/789/789.py b/test/extrude/789/789.py
index de37d8368b99f46f6960c91a0a3b28d54403734b..ca944c6d9e7c9b4027173cd5c2a66c9551b7fb03 100644
--- a/test/extrude/789/789.py
+++ b/test/extrude/789/789.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(623,545,545))
-w1=cq.Workplane('YZ',origin=(589,545,545))
-r=w0.sketch().segment((456,23),(489,267)).segment((689,245)).arc((334,256),(578,1)).close().assemble().finalize().extrude(112).union(w0.workplane(offset=684).moveTo(811,562).box(700,711,822)).union(w1.sketch().push([(373,895)]).rect(889,956).push([(512,1000)]).circle(578,mode='s').finalize().extrude(612))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,391,499))
+r=w0.sketch().arc((481,970),(292,596),(654,809)).arc((639,969),(481,969)).assemble().reset().face(w0.sketch().segment((686,32),(689,32)).arc((724,1),(769,32)).segment((775,30)).segment((774,46)).segment((771,47)).arc((724,82),(689,46)).segment((685,46)).close().assemble()).finalize().extrude(726)
\ No newline at end of file
diff --git a/test/extrude/789/789.stl b/test/extrude/789/789.stl
index 7571859f9fdc290340858849c30cbe19d2340254..9d4796e77fe2a9a3926f818ab8ea88402dcaf61d 100644
Binary files a/test/extrude/789/789.stl and b/test/extrude/789/789.stl differ
diff --git a/test/extrude/79/79.py b/test/extrude/79/79.py
index 4567baa89b7e3f3c8f6b188b690748fe126d044d..71bbbf9c77ed725d2672e3542c85bae0d87c60c3 100644
--- a/test/extrude/79/79.py
+++ b/test/extrude/79/79.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(384,469,469))
-r=w0.sketch().arc((12,245),(1,86),(139,150)).arc((224,118),(309,118)).arc((554,33),(586,288)).arc((256,809),(12,245)).assemble().finalize().extrude(150).union(w0.sketch().segment((394,65),(926,65)).segment((926,192)).segment((1000,192)).segment((1000,926)).segment((469,926)).segment((469,734)).segment((394,734)).segment((394,522)).segment((469,543)).segment((469,458)).segment((405,447)).segment((394,511)).close().assemble().finalize().extrude(968))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,47,12))
+r=w0.sketch().segment((3,36),(601,36)).segment((601,634)).segment((3,634)).close().assemble().finalize().extrude(286).union(w0.sketch().segment((492,252),(370,252)).segment((370,496)).segment((492,496)).segment((492,618)).segment((736,618)).segment((736,496)).segment((858,496)).segment((858,252)).segment((736,252)).segment((736,130)).segment((492,130)).close().assemble().finalize().extrude(48)).union(w0.sketch().segment((897,400),(622,400)).segment((679,362)).segment((853,362)).segment((912,338)).close().assemble().finalize().extrude(168))
diff --git a/test/extrude/79/79.stl b/test/extrude/79/79.stl
index b24e2940d89f6299d1013afe05140174a77f4ad5..debdc17c3a2cfdf00eb9d8ff35b7a85e7dbfe180 100644
Binary files a/test/extrude/79/79.stl and b/test/extrude/79/79.stl differ
diff --git a/test/extrude/790/790.py b/test/extrude/790/790.py
index df274c2803dfdbcafeb78e70ff782f009b6a07a5..dab34d38fc00d2c41846f966af74493df74063f0 100644
--- a/test/extrude/790/790.py
+++ b/test/extrude/790/790.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().segment((341,507),(494,347)).segment((993,827)).segment((840,987)).close().assemble().circle(754,mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(405,500,500))
+w1=cq.Workplane('XY',origin=(502,500,369))
+r=w0.sketch().segment((136,659),(406,420)).segment((406,197)).segment((609,197)).segment((610,421)).segment((522,422)).segment((610,531)).segment((610,540)).segment((625,541)).segment((771,705)).segment((437,1000)).close().assemble().push([(763,307)]).rect(704,724).finalize().extrude(165).union(w0.sketch().segment((420,205),(590,176)).segment((565,150)).segment((621,106)).segment((670,161)).segment((674,161)).segment((676,336)).segment((450,376)).close().assemble().finalize().extrude(361)).union(w0.workplane(offset=532).moveTo(191,36).cylinder(566,534)).union(w1.workplane(offset=763).moveTo(924,790).cylinder(1000,505))
\ No newline at end of file
diff --git a/test/extrude/790/790.stl b/test/extrude/790/790.stl
index 777ad906807360d508fe1f21a9d8aa955197ed16..988fe25f2d9a4780f2604c917e17be90b5fe38b6 100644
Binary files a/test/extrude/790/790.stl and b/test/extrude/790/790.stl differ
diff --git a/test/extrude/791/791.py b/test/extrude/791/791.py
index 6d01c1c03972f9ec6517116705838ece2d814226..f06e8438ec1cbfab15d184dcb66d105938ccb6b8 100644
--- a/test/extrude/791/791.py
+++ b/test/extrude/791/791.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().arc((634,461),(687,427),(734,401)).segment((740,401)).arc((834,387),(913,401)).segment((920,401)).segment((920,933)).segment((913,933)).arc((834,947),(740,933)).segment((734,933)).segment((674,900)).arc((414,700),(634,461)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,441,500))
+r=w0.sketch().segment((395,236),(875,235)).segment((876,310)).segment((686,310)).arc((615,275),(552,312)).segment((397,311)).close().assemble().finalize().extrude(62).union(w0.workplane(offset=664).moveTo(253,576).box(565,851,825)).union(w0.sketch().segment((165,386),(340,385)).segment((342,476)).arc((386,575),(340,669)).segment((340,765)).segment((177,765)).segment((176,680)).segment((166,681)).segment((166,670)).arc((126,576),(165,474)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/791/791.stl b/test/extrude/791/791.stl
index 2c96aa0674db7b7e4f87d00131a3f56866471b01..67a2f04be6b0431f5c9a5b0d6b1a3c5b4b3f20d6 100644
Binary files a/test/extrude/791/791.stl and b/test/extrude/791/791.stl differ
diff --git a/test/extrude/792/792.py b/test/extrude/792/792.py
index 2e011d7c4e2360911c081811bc1b2e6b8bef3568..94fe8a37f1cc1dc5863244d13b73513b7828319b 100644
--- a/test/extrude/792/792.py
+++ b/test/extrude/792/792.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(496,575,496))
-w1=cq.Workplane('YZ',origin=(486,496,496))
-r=w0.sketch().segment((50,1),(585,1)).segment((585,139)).arc((693,327),(585,515)).segment((585,565)).segment((50,565)).close().assemble().reset().face(w0.sketch().segment((782,862),(842,802)).segment((941,891)).segment((881,951)).close().assemble()).finalize().extrude(476).union(w1.sketch().arc((347,575),(327,426),(436,308)).segment((436,318)).segment((446,318)).segment((446,308)).arc((654,407),(585,624)).arc((476,555),(347,575)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,2,501))
+r=w0.sketch().arc((301,846),(101,481),(341,136)).segment((340,100)).segment((425,106)).arc((521,101),(615,115)).segment((701,122)).segment((701,156)).arc((901,520),(660,866)).segment((661,899)).segment((574,896)).arc((482,900),(386,886)).segment((300,881)).close().assemble().circle(824,mode='s').finalize().extrude(1000).union(w0.workplane(offset=1000).moveTo(495,575).cylinder(1000,599))
\ No newline at end of file
diff --git a/test/extrude/792/792.stl b/test/extrude/792/792.stl
index c07ede00b93ee086c5ee49943fe974b112a36a01..e15073a96822af9639475ddbd417533438f3118e 100644
Binary files a/test/extrude/792/792.stl and b/test/extrude/792/792.stl differ
diff --git a/test/extrude/793/793.py b/test/extrude/793/793.py
index c03a79b927f4707fed5043051db05a85c0cb3221..19bcabc0b2a5846ec86bb04e087aa3f58f74c09a 100644
--- a/test/extrude/793/793.py
+++ b/test/extrude/793/793.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(369,243,369))
-r=w0.sketch().segment((75,453),(159,453)).segment((159,180)).segment((516,180)).segment((516,453)).segment((642,453)).segment((642,790)).segment((75,790)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(148,122)]).rect(979,716).push([(811,621)]).circle(453).finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(600,501,499))
+w1=cq.Workplane('ZX',origin=(499,415,500))
+r=w0.workplane(offset=200).moveTo(355,680).cylinder(1000,605).union(w0.workplane(offset=596).moveTo(260,381).cylinder(691,595)).union(w1.workplane(offset=713).moveTo(356,860).cylinder(926,640))
\ No newline at end of file
diff --git a/test/extrude/793/793.stl b/test/extrude/793/793.stl
index 2d3794d91d670ad6d4bee1edb6ecab9f68b30bd7..8cc2d6d7630e1287fba96bf2a31585e61693f278 100644
Binary files a/test/extrude/793/793.stl and b/test/extrude/793/793.stl differ
diff --git a/test/extrude/794/794.py b/test/extrude/794/794.py
index e78c9731bd8fbfa1001ce4ecbbed25d33754c9dd..8d0a2ce6158c39a5f805515a88b164aae20c9647 100644
--- a/test/extrude/794/794.py
+++ b/test/extrude/794/794.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(641,553,553))
-r=w0.sketch().arc((299,409),(443,1),(663,365)).arc((520,752),(299,409)).assemble().push([(1000,884)]).rect(719,994).finalize().extrude(365).union(w0.sketch().segment((23,398),(288,343)).segment((288,299)).segment((674,299)).segment((674,663)).segment((531,663)).segment((553,774)).segment((432,796)).arc((443,818),(454,829)).segment((354,829)).arc((354,818),(365,807)).segment((100,862)).close().assemble().reset().face(w0.sketch().segment((354,851),(454,851)).arc((398,895),(354,851)).assemble()).finalize().extrude(520))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(484,500,501))
+r=w0.sketch().push([(144,237)]).rect(785,620).push([(876,397)]).circle(625).push([(876,399)]).rect(541,724,mode='s').finalize().extrude(307).union(w0.sketch().segment((6,650),(120,651)).segment((130,625)).segment((191,650)).segment((256,650)).segment((255,700)).segment((6,700)).close().assemble().reset().face(w0.sketch().segment((7,749),(255,750)).segment((255,805)).segment((141,805)).segment((132,826)).segment((71,806)).segment((5,805)).close().assemble()).finalize().extrude(706)).union(w0.sketch().push([(510,406)]).circle(526).push([(503,414)]).rect(517,526,mode='s').finalize().extrude(725))
\ No newline at end of file
diff --git a/test/extrude/794/794.stl b/test/extrude/794/794.stl
index 4c6786f7024b82da340f5296cc09507c72b9622b..49d7ae28ef0503253000ae13468e1c54fcb2d1a3 100644
Binary files a/test/extrude/794/794.stl and b/test/extrude/794/794.stl differ
diff --git a/test/extrude/795/795.py b/test/extrude/795/795.py
index 5f61562436d831e4493bca9092d374cbb0c68738..bf0230f59e64cb7d0f3ef8cb1c896fce09977a7d 100644
--- a/test/extrude/795/795.py
+++ b/test/extrude/795/795.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(451,451,235))
-w1=cq.Workplane('XY',origin=(451,451,253))
-r=w0.sketch().segment((442,1),(793,1)).segment((793,541)).segment((739,541)).segment((739,532)).segment((730,532)).arc((433,883),(442,424)).close().assemble().push([(523,658)]).circle(613,mode='s').reset().face(w0.sketch().segment((460,397),(586,397)).segment((586,424)).arc((523,415),(460,424)).close().assemble(),mode='s').finalize().extrude(316).union(w1.workplane(offset=726).moveTo(212,564).box(658,640,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(725,500,502))
+r=w0.workplane(offset=273).moveTo(457,241).cylinder(955,739).union(w0.workplane(offset=416).moveTo(571,737).box(569,1000,671)).union(w0.sketch().arc((700,565),(785,736),(699,905)).close().assemble().finalize().extrude(460))
\ No newline at end of file
diff --git a/test/extrude/795/795.stl b/test/extrude/795/795.stl
index 82f978b1c5f4640b562738ce7cda9ae583f9c6e2..2ffbde27108c6dc98061e2f78071d87bd84797c0 100644
Binary files a/test/extrude/795/795.stl and b/test/extrude/795/795.stl differ
diff --git a/test/extrude/796/796.py b/test/extrude/796/796.py
index 182018d76a084bc584f81b9bc4da45ca00ea9832..cc3342e1cd747559e1717dfc8413da87471786ee 100644
--- a/test/extrude/796/796.py
+++ b/test/extrude/796/796.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(898,661,661))
-w1=cq.Workplane('XY',origin=(661,661,551))
-r=w0.sketch().segment((602,594),(721,594)).arc((661,611),(602,594)).assemble().finalize().extrude(1).union(w1.sketch().push([(839,661)]).circle(907).reset().face(w1.sketch().segment((763,484),(831,484)).arc((881,467),(932,484)).segment((1000,484)).segment((1000,619)).arc((992,695),(924,661)).arc((881,670),(831,653)).segment((763,653)).close().assemble(),mode='s').finalize().extrude(881))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,435))
+r=w0.sketch().push([(716,502)]).circle(626).push([(764,439)]).rect(522,587,mode='s').finalize().extrude(126).union(w0.sketch().arc((365,492),(3,412),(377,411)).segment((540,411)).segment((542,491)).close().assemble().push([(525,417)]).circle(506,mode='s').finalize().extrude(835)).union(w0.sketch().segment((436,491),(655,491)).segment((657,242)).segment((780,243)).segment((780,491)).segment((999,490)).segment((999,510)).segment((781,510)).segment((781,761)).segment((656,761)).segment((657,510)).segment((436,511)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/796/796.stl b/test/extrude/796/796.stl
index 312d2d003b3c10c65a265d3a876bc2670c0e061a..7fd6e4bfb2047cfbb6e74177d5fc40bcdde88d1d 100644
Binary files a/test/extrude/796/796.stl and b/test/extrude/796/796.stl differ
diff --git a/test/extrude/797/797.py b/test/extrude/797/797.py
index 1af017f0cbf228e92bdda1a43c1677f7adbe5b64..155c8b114bf5fd72c58f2f6998a18239dc727ec3 100644
--- a/test/extrude/797/797.py
+++ b/test/extrude/797/797.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(331,1,331))
-r=w0.sketch().circle(754).rect(856,958,mode='s').finalize().extrude(1000).translate((424,1,424))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(622,502,502))
+r=w0.sketch().arc((311,428),(576,24),(436,487)).segment((436,686)).segment((311,686)).close().assemble().push([(378,547)]).rect(571,671,mode='s').finalize().extrude(1).union(w0.sketch().arc((263,258),(278,246),(287,237)).segment((437,236)).arc((475,207),(510,237)).segment((771,236)).segment((770,258)).segment((512,258)).arc((475,287),(436,256)).close().assemble().finalize().extrude(447)).union(w0.sketch().segment((302,695),(377,696)).segment((377,477)).segment((506,477)).segment((507,696)).segment((582,696)).segment((581,785)).segment((506,785)).segment((505,1000)).segment((377,1000)).segment((376,785)).segment((302,786)).close().assemble().finalize().extrude(775))
\ No newline at end of file
diff --git a/test/extrude/797/797.stl b/test/extrude/797/797.stl
index 54996d26dcbaba195191b9f1a4b88f859eb17149..71f5d76ea78c743d40653a9e14e53faf3f76db5f 100644
Binary files a/test/extrude/797/797.stl and b/test/extrude/797/797.stl differ
diff --git a/test/extrude/798/798.py b/test/extrude/798/798.py
index c64083231645f44fcb30e1c4602410f200fb37de..7d4a0e100420c57e041e309b723950e46b554cb9 100644
--- a/test/extrude/798/798.py
+++ b/test/extrude/798/798.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(300,114,300))
-r=w0.workplane(offset=135).moveTo(207,243).box(320,434,629).union(w0.sketch().segment((42,557),(382,547)).arc((217,598),(42,557)).assemble().reset().face(w0.sketch().arc((454,1),(557,228),(475,464)).close().assemble()).finalize().extrude(1000)).translate((1,67,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(436,499,500))
+w1=cq.Workplane('YZ',origin=(392,500,500))
+r=w0.sketch().arc((127,466),(287,292),(420,485)).segment((420,465)).close().assemble().reset().face(w0.sketch().segment((875,35),(929,35)).segment((1000,241)).segment((949,256)).close().assemble()).finalize().extrude(66).union(w0.workplane(offset=782).moveTo(276,442).cylinder(1000,755)).union(w1.sketch().segment((2,521),(186,520)).arc((489,120),(525,621)).segment((527,964)).segment((2,966)).close().assemble().finalize().extrude(352))
\ No newline at end of file
diff --git a/test/extrude/798/798.stl b/test/extrude/798/798.stl
index ec17fb5a58324d17b445304e67cb6fc221be90b3..7ff3f25b636308e900a9554a14aa84316c0cd0c9 100644
Binary files a/test/extrude/798/798.stl and b/test/extrude/798/798.stl differ
diff --git a/test/extrude/799/799.py b/test/extrude/799/799.py
index 63e6b3caad0e97415c18c6fba5a65d6b6fca239b..6087a9e05beb6b5cf5cf7ceed743b867fa453655 100644
--- a/test/extrude/799/799.py
+++ b/test/extrude/799/799.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(410,410,271))
-w1=cq.Workplane('XY',origin=(410,410,230))
-r=w0.workplane(offset=275).moveTo(320,353).cylinder(681,550).union(w0.workplane(offset=419).moveTo(320,353).cylinder(427,607)).union(w1.sketch().segment((50,124),(394,124)).segment((394,1)).segment((640,1)).segment((640,189)).arc((771,410),(640,632)).segment((640,820)).segment((394,820)).segment((394,632)).arc((361,615),(329,582)).segment((50,582)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,355,501))
+r=w0.sketch().push([(372,202)]).rect(905,905).reset().face(w0.sketch().segment((172,310),(180,310)).segment((186,310)).segment((197,310)).segment((195,320)).segment((186,322)).segment((180,320)).segment((171,320)).close().assemble(),mode='s').finalize().extrude(266).union(w0.sketch().arc((336,336),(315,80),(497,261)).segment((496,371)).segment((335,371)).close().assemble().reset().face(w0.sketch().segment((260,531),(410,512)).arc((511,475),(621,481)).segment((766,461)).segment((790,650)).arc((799,695),(804,745)).segment((830,936)).segment((679,955)).arc((579,990),(471,980)).segment((320,1000)).segment((297,809)).arc((287,765),(285,720)).close().assemble()).push([(335,590)]).circle(549,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/799/799.stl b/test/extrude/799/799.stl
index 46ac583fc93f0ad88ff1d0e89dd466c2e826dbe4..56aa3ab31a04f58c898473ac6e6c66f99fa1128e 100644
Binary files a/test/extrude/799/799.stl and b/test/extrude/799/799.stl differ
diff --git a/test/extrude/8/8.py b/test/extrude/8/8.py
index 1b1f411fb076a312627bf7ba560e11cab8e506bd..f443438240a5c924211a8fc9eb1b5f6c37b1d9d4 100644
--- a/test/extrude/8/8.py
+++ b/test/extrude/8/8.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(439,281,439))
-w1=cq.Workplane('YZ',origin=(352,439,439))
-r=w0.sketch().arc((641,369),(658,343),(658,308)).segment((755,334)).segment((737,395)).close().assemble().finalize().extrude(290).union(w0.sketch().segment((281,343),(430,1)).segment((527,45)).segment((544,71)).segment((562,62)).segment((430,369)).arc((387,369),(369,404)).arc((378,422),(378,430)).arc((387,439),(395,439)).segment((387,457)).arc((159,571),(281,343)).assemble().reset().face(w0.sketch().segment((220,553),(255,395)).segment((290,404)).segment((255,562)).close().assemble(),mode='s').finalize().extrude(360)).union(w1.sketch().push([(465,395)]).rect(1000,895).rect(755,772,mode='s').push([(693,255)]).circle(457,mode='s').finalize().extrude(965))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(38,76,34))
+r=w0.sketch().segment((792,96),(310,96)).segment((310,382)).segment((148,382)).segment((148,704)).segment((497,704)).segment((497,353)).segment((792,353)).close().assemble().reset().segment((349,467),(545,468)).segment((545,213)).segment((349,213)).close().assemble(mode='s').finalize().extrude(91)
diff --git a/test/extrude/8/8.stl b/test/extrude/8/8.stl
index 064e03f49f9bc7df5860c41faa55d8cb80996fdb..9e3f977339b7576ed8906c51198ee3d510a02508 100644
Binary files a/test/extrude/8/8.stl and b/test/extrude/8/8.stl differ
diff --git a/test/extrude/80/80.py b/test/extrude/80/80.py
index 03389f06f6f0316b503eff219ab2d1003fbc3be2..8a49f00460844b07e234f20eb93f751ddad5e584 100644
--- a/test/extrude/80/80.py
+++ b/test/extrude/80/80.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,500))
-r=w0.sketch().segment((850,540),(930,540)).segment((930,990)).segment((930,1000)).segment((850,1000)).segment((850,990)).arc((660,770),(850,540)).assemble().finalize().extrude(391).union(w0.sketch().segment((71,1),(700,1)).segment((700,241)).arc((840,451),(600,381)).segment((71,381)).close().assemble().finalize().extrude(620))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XZ',origin=(61,50,18))
+r=w0.sketch().segment((437,1),(437,710)).segment((287,710)).segment((287,1)).close().assemble().push([(425,314)]).rect(155,141,mode='s').finalize().extrude(130).translate((1,81,1))
diff --git a/test/extrude/80/80.stl b/test/extrude/80/80.stl
index b20eb0efd40888772b82ace71a0a55d10c4cd423..9e3909dbccd34d1c71223a2cdbc2dd4a95432e29 100644
Binary files a/test/extrude/80/80.stl and b/test/extrude/80/80.stl differ
diff --git a/test/extrude/800/800.py b/test/extrude/800/800.py
index 82b493a84f56cabd1d7f7f90956aa430df61d81e..45ffd9362d33ee541efbd24e53ba4938e2de38fe 100644
--- a/test/extrude/800/800.py
+++ b/test/extrude/800/800.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(680,500,500))
-r=w0.sketch().segment((640,461),(660,461)).segment((660,411)).segment((730,411)).segment((730,421)).arc((710,491),(750,550)).segment((750,730)).segment((730,730)).segment((730,830)).segment((660,830)).segment((660,730)).segment((640,730)).close().assemble().finalize().extrude(141).union(w0.sketch().segment((1,740),(191,361)).segment((271,401)).segment((371,141)).segment((730,271)).segment((730,151)).segment((1000,151)).segment((1000,580)).segment((730,580)).segment((730,441)).segment((620,740)).segment((361,640)).segment((241,860)).close().assemble().finalize().extrude(311))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,801))
+r=w0.sketch().segment((590,1),(916,2)).segment((914,375)).arc((701,385),(720,605)).segment((721,1000)).segment((634,1000)).segment((636,600)).segment((590,600)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=454).moveTo(205,571).cylinder(596,620))
\ No newline at end of file
diff --git a/test/extrude/800/800.stl b/test/extrude/800/800.stl
index 9363b9891ab1c31d524e980e07a5cffcdb3e38aa..92d701aa126b0bff8c438c019bf9f9628acf7483 100644
Binary files a/test/extrude/800/800.stl and b/test/extrude/800/800.stl differ
diff --git a/test/extrude/801/801.py b/test/extrude/801/801.py
index cd0f049eb01b721caadae35da084cadc76a9110a..3f37ca407989da646210213d06d1bb8ca93c2b9d 100644
--- a/test/extrude/801/801.py
+++ b/test/extrude/801/801.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(979,651,651))
-r=w0.sketch().segment((301,469),(1000,462)).segment((1000,832)).segment((301,839)).close().assemble().circle(804,mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(811,501,501))
+r=w0.sketch().push([(626,88)]).rect(800,677).reset().face(w0.sketch().segment((567,11),(592,10)).arc((626,1),(657,12)).segment((681,11)).segment((681,25)).arc((713,86),(680,151)).segment((680,167)).segment((655,167)).arc((626,172),(590,166)).segment((567,166)).segment((567,150)).arc((540,87),(566,27)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().segment((257,951),(256,956)).arc((435,792),(272,971)).segment((271,951)).close().assemble().finalize().extrude(211))
\ No newline at end of file
diff --git a/test/extrude/801/801.stl b/test/extrude/801/801.stl
index bc85df703f73e7c702d77c0ea3494d4ce8a0efbd..69ad2607dfb2a778061f5e526a5a7e3528a89277 100644
Binary files a/test/extrude/801/801.stl and b/test/extrude/801/801.stl differ
diff --git a/test/extrude/802/802.py b/test/extrude/802/802.py
index 66897f3618212b448780e468460dc48556eea7a3..d639dfe712f933e57862fe514456375c7781b5b6 100644
--- a/test/extrude/802/802.py
+++ b/test/extrude/802/802.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(405,382,405))
-r=w0.sketch().push([(1,560)]).circle(596).circle(500,mode='s').reset().face(w0.sketch().segment((489,168),(548,168)).arc((750,72),(941,168)).segment((1000,168)).segment((1000,465)).segment((941,465)).arc((750,560),(548,465)).segment((489,465)).close().assemble()).finalize().extrude(465).translate((1,1,191))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,795))
+w1=cq.Workplane('XY',origin=(502,502,640))
+r=w0.sketch().arc((1,125),(266,121),(76,305)).arc((91,190),(2,125)).assemble().push([(511,886)]).circle(586).finalize().extrude(1).union(w1.sketch().segment((357,100),(1000,101)).segment((1000,776)).segment((759,775)).segment((760,690)).arc((889,270),(447,301)).segment((355,302)).close().assemble().finalize().extrude(205))
\ No newline at end of file
diff --git a/test/extrude/802/802.stl b/test/extrude/802/802.stl
index 0b66349208c76b8ccc5e92d8be84e80faa08f2a3..09ab82bce889b8565d9694fb6b0e819a36379055 100644
Binary files a/test/extrude/802/802.stl and b/test/extrude/802/802.stl differ
diff --git a/test/extrude/803/803.py b/test/extrude/803/803.py
index 92e039f404a00c2a2b081cab931fefe423106543..bfe550557e50d149c66c1ed386b94fe10af54ae2 100644
--- a/test/extrude/803/803.py
+++ b/test/extrude/803/803.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(588,538,538))
-r=w0.workplane(offset=332).moveTo(600,550).cylinder(950,713).union(w0.sketch().arc((301,188),(76,1),(326,163)).segment((775,163)).segment((775,251)).arc((900,700),(763,251)).segment((301,251)).close().assemble().push([(838,469)]).rect(738,950,mode='s').push([(351,1000)]).circle(700).finalize().extrude(838))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,542))
+w1=cq.Workplane('YZ',origin=(367,500,501))
+r=w0.sketch().push([(58,694)]).rect(525,766).push([(764,212)]).circle(691).reset().face(w0.sketch().segment((740,846),(829,846)).segment((829,781)).arc((900,960),(740,846)).assemble()).finalize().extrude(1).union(w0.sketch().push([(390,316)]).circle(770).circle(631,mode='s').finalize().extrude(961)).union(w1.sketch().arc((406,440),(410,469),(411,501)).segment((412,486)).segment((405,485)).close().assemble().finalize().extrude(201))
\ No newline at end of file
diff --git a/test/extrude/803/803.stl b/test/extrude/803/803.stl
index c2a912208dc74ce5ee16a94bae87467ba7906541..77602c5c17888bfd685bb13004cc4966490301a0 100644
Binary files a/test/extrude/803/803.stl and b/test/extrude/803/803.stl differ
diff --git a/test/extrude/804/804.py b/test/extrude/804/804.py
index e6d5f6c1ad6e7377545138654259f5a3b651ec50..0c81857e42ed5661294e6403b2f162a00a6432be 100644
--- a/test/extrude/804/804.py
+++ b/test/extrude/804/804.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((527,567),(807,567)).segment((807,574)).segment((527,767)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,220))
+r=w0.sketch().segment((250,136),(611,134)).segment((611,285)).arc((640,641),(959,495)).segment((999,496)).segment((1000,690)).segment((684,691)).segment((684,700)).segment((696,699)).segment((695,811)).segment((684,811)).segment((686,840)).segment((326,840)).segment((325,835)).arc((6,694),(251,440)).close().assemble().push([(506,822)]).rect(839,525,mode='s').push([(643,695)]).rect(565,511,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/804/804.stl b/test/extrude/804/804.stl
index 69b1629d799e22f2c988c0d1f5e37f79180ad51a..82b6e3d31204e04ea23b75357bfb9e3ae7e7af0e 100644
Binary files a/test/extrude/804/804.stl and b/test/extrude/804/804.stl differ
diff --git a/test/extrude/805/805.py b/test/extrude/805/805.py
index bdb0ebc1044fc484573dff8c9fafa2f14646f75c..55d793ad83d40b0f8bfa07d1f5ae27af0ad8125b 100644
--- a/test/extrude/805/805.py
+++ b/test/extrude/805/805.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(103,213,213))
-r=w0.sketch().rect(843,1000).reset().face(w0.sketch().segment((111,394),(221,1)).segment((316,32)).segment((206,426)).close().assemble(),mode='s').finalize().extrude(442).translate((1,210,288))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,629,499))
+r=w0.sketch().push([(774,671)]).circle(725).circle(631,mode='s').finalize().extrude(240).union(w0.sketch().segment((1,315),(76,315)).segment((76,105)).segment((110,107)).segment((110,316)).segment((195,315)).segment((196,410)).segment((111,412)).segment((110,625)).segment((75,625)).segment((77,412)).segment((1,410)).close().assemble().finalize().extrude(415))
\ No newline at end of file
diff --git a/test/extrude/805/805.stl b/test/extrude/805/805.stl
index 2112e15dd46414d2abe7d10d75a2deac37db8138..3faa25982f8010e66d5e2ec3979b447040fa7e90 100644
Binary files a/test/extrude/805/805.stl and b/test/extrude/805/805.stl differ
diff --git a/test/extrude/806/806.py b/test/extrude/806/806.py
index 0382a8938c2f20ec8217a81bc9321e26d9ed5417..624acf6b602760cb70a3301b2e4e2323be5f7b07 100644
--- a/test/extrude/806/806.py
+++ b/test/extrude/806/806.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(584,870,584))
-r=w0.sketch().segment((260,121),(491,121)).arc((408,260),(491,390)).segment((260,390)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(787,926)]).circle(704).reset().face(w0.sketch().segment((741,926),(815,870)).segment((870,944)).segment((806,1000)).close().assemble(),mode='s').finalize().extrude(223))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,577))
+r=w0.workplane(offset=367).moveTo(263,501).cylinder(772,670).union(w0.sketch().segment((116,62),(511,62)).segment((512,248)).segment((302,246)).arc((405,286),(482,376)).segment((602,388)).segment((680,281)).segment((865,422)).segment((965,432)).segment((954,486)).segment((999,521)).segment((946,595)).segment((916,845)).segment((765,830)).segment((680,939)).segment((503,801)).segment((402,785)).segment((411,730)).segment((396,715)).arc((17,591),(218,246)).segment((117,247)).close().assemble().finalize().extrude(621))
\ No newline at end of file
diff --git a/test/extrude/806/806.stl b/test/extrude/806/806.stl
index 591f9732130d861df466d383da2929395df7f8cc..820df55de450257e4b2f59a5a1e7c250fd70e2de 100644
Binary files a/test/extrude/806/806.stl and b/test/extrude/806/806.stl differ
diff --git a/test/extrude/807/807.py b/test/extrude/807/807.py
index 61586ed8ec46ce80c021958fe33defa1b6690e22..16b1bc0857a6f62bfae63ad9f1efd2cfefa0dc23 100644
--- a/test/extrude/807/807.py
+++ b/test/extrude/807/807.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(439,439,293))
-w1=cq.Workplane('YZ',origin=(158,439,439))
-r=w0.sketch().segment((1,472),(46,472)).segment((46,428)).segment((248,428)).segment((248,371)).segment((270,371)).segment((270,428)).segment((472,428)).segment((472,585)).segment((270,585)).segment((270,630)).segment((248,630)).segment((248,585)).segment((124,585)).segment((124,1000)).segment((1,1000)).close().assemble().push([(697,57)]).rect(708,798).finalize().extrude(428).union(w0.workplane(offset=708).moveTo(652,439).cylinder(978,663)).union(w1.sketch().segment((237,46),(776,46)).segment((776,259)).segment((405,259)).segment((405,181)).segment((237,181)).close().assemble().finalize().extrude(596))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,430,501))
+r=w0.sketch().segment((117,436),(300,437)).arc((500,292),(702,436)).segment((886,435)).segment((885,566)).segment((701,565)).arc((501,710),(299,566)).segment((115,566)).close().assemble().finalize().extrude(121).union(w0.sketch().rect(1000,899).rect(639,790,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/807/807.stl b/test/extrude/807/807.stl
index e7656771134efccbb076bc9b589bd0864c0285e0..e3f92747e86d45fd046c1dfaac63d4f7ab548add 100644
Binary files a/test/extrude/807/807.stl and b/test/extrude/807/807.stl differ
diff --git a/test/extrude/808/808.py b/test/extrude/808/808.py
index 9326a1ebb82d20d5894499da16c79a0d7950fd40..9f645c9dd747051dc720a6a94236ad70b198fc6a 100644
--- a/test/extrude/808/808.py
+++ b/test/extrude/808/808.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,471,500))
-r=w0.sketch().segment((81,301),(690,301)).segment((690,720)).segment((81,720)).segment((81,640)).arc((1,530),(81,431)).close().assemble().finalize().extrude(520).union(w0.sketch().segment((560,281),(940,281)).segment((950,281)).arc((1000,431),(950,580)).segment((940,580)).arc((750,670),(560,580)).close().assemble().finalize().extrude(560))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,1))
+r=w0.sketch().segment((265,151),(281,150)).arc((365,121),(456,150)).segment((520,152)).segment((521,46)).segment((636,47)).segment((635,150)).segment((779,151)).segment((781,954)).segment((265,954)).segment((266,370)).arc((220,265),(265,166)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/808/808.stl b/test/extrude/808/808.stl
index 255172a162802d1b5205d990308c6304529ddeb2..76d921d7c2be124beaa18cccbd8fdcd9271d02fd 100644
Binary files a/test/extrude/808/808.stl and b/test/extrude/808/808.stl differ
diff --git a/test/extrude/809/809.py b/test/extrude/809/809.py
index c728c3b663c69e5faa3f4d72b94cc7f1402d9ad4..9a03ff0b468d5b8fd8fc560e1834ff47f907e712 100644
--- a/test/extrude/809/809.py
+++ b/test/extrude/809/809.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,500))
-w1=cq.Workplane('ZX',origin=(500,510,500))
-r=w0.sketch().segment((1,401),(221,401)).segment((221,171)).segment((261,171)).segment((261,401)).segment((481,401)).segment((481,600)).segment((261,600)).segment((261,830)).segment((221,830)).segment((221,600)).segment((1,600)).close().assemble().finalize().extrude(401).union(w0.workplane(offset=530).moveTo(241,500).cylinder(560,680)).union(w1.sketch().segment((161,600),(590,600)).segment((590,830)).segment((840,830)).segment((840,940)).segment((590,940)).segment((590,1000)).segment((161,1000)).close().assemble().push([(376,800)]).rect(730,820,mode='s').finalize().extrude(271))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,397))
+r=w0.sketch().segment((377,350),(531,336)).segment((530,357)).segment((566,356)).segment((565,330)).segment((990,287)).segment((1000,395)).segment((430,455)).arc((25,601),(375,350)).assemble().finalize().extrude(706)
\ No newline at end of file
diff --git a/test/extrude/809/809.stl b/test/extrude/809/809.stl
index d034951d3fb6aab1184488f21ebbaa1e0d330bf8..5a932f120a2497c6a440415d04d4d041ba4cc293 100644
Binary files a/test/extrude/809/809.stl and b/test/extrude/809/809.stl differ
diff --git a/test/extrude/81/81.py b/test/extrude/81/81.py
index d0b63736488b3b6a6bad63e4e12f70f9d5f0cba7..19b30ccfa4a08367cf745ccd52b16f31011f4279 100644
--- a/test/extrude/81/81.py
+++ b/test/extrude/81/81.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(544,515,515))
-w1=cq.Workplane('XY',origin=(515,515,593))
-r=w0.sketch().segment((311,331),(855,311)).segment((864,699)).segment((321,719)).close().assemble().finalize().extrude(1).union(w1.sketch().segment((631,166),(1000,166)).segment((1000,476)).segment((748,476)).arc((583,787),(631,437)).close().assemble().finalize().extrude(534))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(80,72,68))
+r=w0.sketch().segment((165,840),(165,690)).segment((205,720)).segment((567,238)).segment((631,286)).segment((270,768)).segment((310,798)).close().assemble().push([(296,671)]).rect(190,161,mode='s').finalize().extrude(220)
diff --git a/test/extrude/81/81.stl b/test/extrude/81/81.stl
index 52852f2937cc93a7b220316959d4d4d8fb6a9eea..ec45930b0a2fd4cb9acfb6cfdef46c0ff4dedb28 100644
Binary files a/test/extrude/81/81.stl and b/test/extrude/81/81.stl differ
diff --git a/test/extrude/810/810.py b/test/extrude/810/810.py
index d98ae869e8348a8278bbfb061b2d248959784cde..d1e7660d69bdaed799e300b7bf94691879feddf3 100644
--- a/test/extrude/810/810.py
+++ b/test/extrude/810/810.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(380,71,380))
-r=w0.sketch().arc((187,528),(264,388),(411,326)).segment((411,528)).close().assemble().finalize().extrude(884).union(w0.sketch().arc((280,675),(295,1),(621,590)).arc((481,760),(280,675)).assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,520,500))
+r=w0.sketch().segment((1,95),(316,96)).segment((316,182)).arc((521,85),(750,122)).segment((769,115)).segment((790,142)).arc((949,316),(980,556)).segment((1000,585)).segment((979,595)).arc((761,864),(404,864)).segment((386,869)).segment((376,854)).arc((345,836),(316,805)).segment((317,919)).segment((1,920)).close().assemble().reset().face(w0.sketch().segment((186,201),(300,202)).arc((232,285),(187,390)).close().assemble(),mode='s').reset().face(w0.sketch().arc((185,605),(232,700),(301,786)).segment((185,785)).close().assemble(),mode='s').push([(577,495)]).circle(565,mode='s').finalize().extrude(459)
\ No newline at end of file
diff --git a/test/extrude/810/810.stl b/test/extrude/810/810.stl
index c568e075fa37556723af4fc25f1926183be1e7eb..73df421e04803bacc6d76850ee058abc3126df40 100644
Binary files a/test/extrude/810/810.stl and b/test/extrude/810/810.stl differ
diff --git a/test/extrude/811/811.py b/test/extrude/811/811.py
index 5482b8269b5d08721dc5987da8fd8f0a6e7a2699..469c01e2386967a2f7eeea871e1fee85af2ae991 100644
--- a/test/extrude/811/811.py
+++ b/test/extrude/811/811.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,639,500))
-r=w0.sketch().push([(1,968)]).circle(532).push([(1,979)]).circle(522,mode='s').finalize().extrude(54).union(w0.sketch().arc((649,160),(830,1),(1000,150)).arc((830,469),(649,160)).assemble().finalize().extrude(660)).translate((1,1,33))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,631))
+w1=cq.Workplane('ZX',origin=(502,902,501))
+r=w0.workplane(offset=570).moveTo(933,351).box(602,1000,636).union(w1.sketch().segment((1,21),(417,20)).segment((416,137)).segment((667,137)).arc((998,256),(735,486)).segment((736,592)).segment((141,591)).segment((142,532)).segment((1,532)).segment((2,312)).segment((141,312)).segment((142,241)).segment((2,241)).close().assemble().finalize().extrude(535))
\ No newline at end of file
diff --git a/test/extrude/811/811.stl b/test/extrude/811/811.stl
index 042f25137d5afd7c77449022833ba02de4e5238e..8b19d0e35b8313255fb19fbd1bdc459a06677142 100644
Binary files a/test/extrude/811/811.stl and b/test/extrude/811/811.stl differ
diff --git a/test/extrude/812/812.py b/test/extrude/812/812.py
index 09b0c84366ee7cc739e62992839d9127ed68541b..fba89c3b2ce9b0fecfb779214fde637014eba36f 100644
--- a/test/extrude/812/812.py
+++ b/test/extrude/812/812.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(575,678,575))
-r=w0.sketch().segment((1,518),(70,391)).segment((587,667)).segment((518,793)).close().assemble().push([(799,277)]).rect(1000,989).push([(874,805)]).circle(851).circle(667,mode='s').finalize().extrude(368)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,350,499))
+r=w0.workplane(offset=631).moveTo(463,199).box(684,894,764).union(w0.sketch().arc((156,700),(801,469),(289,929)).arc((315,759),(156,700)).assemble().finalize().extrude(803))
\ No newline at end of file
diff --git a/test/extrude/812/812.stl b/test/extrude/812/812.stl
index 6c44ef8ec94afe25d83ef0c461bc40b3c9ddcad9..857968a5e81aa37b99777f6c5f4d0a264fbb2440 100644
Binary files a/test/extrude/812/812.stl and b/test/extrude/812/812.stl differ
diff --git a/test/extrude/813/813.py b/test/extrude/813/813.py
index 88a508846972d8b69ffd3adb9252478c25d6530b..579a31f259ad20bfc482e2361716bf8535792447 100644
--- a/test/extrude/813/813.py
+++ b/test/extrude/813/813.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(447,572,447))
-r=w0.workplane(offset=170).moveTo(764,554).box(706,554,1000).union(w0.sketch().push([(764,554)]).rect(527,929).push([(786,545)]).circle(456,mode='s').finalize().extrude(81)).union(w0.sketch().segment((1,99),(581,99)).segment((581,153)).arc((804,331),(679,581)).segment((679,313)).segment((72,313)).segment((72,563)).segment((1,563)).close().assemble().finalize().extrude(741))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(192,499,501))
+w1=cq.Workplane('ZX',origin=(501,385,501))
+r=w0.sketch().segment((347,381),(635,380)).segment((634,171)).segment((916,171)).segment((914,380)).segment((1000,381)).segment((1000,575)).segment((914,577)).segment((915,829)).segment((636,830)).segment((635,575)).segment((346,574)).close().assemble().finalize().extrude(781).union(w0.workplane(offset=653).moveTo(566,723).box(920,654,805)).union(w1.sketch().segment((196,157),(471,155)).segment((470,187)).segment((831,185)).segment((829,846)).segment((197,844)).close().assemble().finalize().extrude(116))
\ No newline at end of file
diff --git a/test/extrude/813/813.stl b/test/extrude/813/813.stl
index 50d5ae6929ad5fcc8810e106a0c2a49194f1fa3f..0102fe1cca57b3e155606eef18c503ac6662498e 100644
Binary files a/test/extrude/813/813.stl and b/test/extrude/813/813.stl differ
diff --git a/test/extrude/814/814.py b/test/extrude/814/814.py
index 745fd259b31aa45ca4491b197735f63681a3ac86..b6f9ba6d7c0bd9558933e93ebaaa0058856c1705 100644
--- a/test/extrude/814/814.py
+++ b/test/extrude/814/814.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(421,421,127))
-r=w0.sketch().segment((1,286),(18,286)).segment((18,278)).segment((43,278)).segment((43,286)).segment((60,286)).segment((177,337)).arc((169,362),(169,379)).arc((102,337),(43,328)).segment((43,698)).arc((135,681),(194,605)).arc((211,622),(219,639)).arc((152,698),(60,740)).segment((43,740)).segment((43,757)).segment((18,757)).segment((18,740)).segment((1,740)).close().assemble().push([(480,446)]).circle(463).reset().face(w0.sketch().arc((521,135),(790,152),(790,421)).arc((706,228),(521,135)).assemble()).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,566))
+r=w0.sketch().rect(1000,892).push([(591,667)]).circle(526,mode='s').finalize().extrude(373)
\ No newline at end of file
diff --git a/test/extrude/814/814.stl b/test/extrude/814/814.stl
index bcde559dfd42aebb7e54c30121ac43164f142679..275a95c768261b2e268012439a384a6f958498c6 100644
Binary files a/test/extrude/814/814.stl and b/test/extrude/814/814.stl differ
diff --git a/test/extrude/815/815.py b/test/extrude/815/815.py
index 5c4b66e25208e65a6f79b3c1b7809b7d6abb9df2..94abdb2279359c97f7cfd9fcc6b7877740d221a2 100644
--- a/test/extrude/815/815.py
+++ b/test/extrude/815/815.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(487,433,433))
-r=w0.sketch().segment((82,298),(608,28)).segment((784,352)).segment((258,636)).close().assemble().finalize().extrude(230).union(w0.sketch().push([(366,1000)]).circle(541).push([(352,312)]).circle(514).push([(595,474)]).circle(514).finalize().extrude(420)).union(w0.workplane(offset=474).moveTo(379,1).cylinder(514,676)).translate((1,1,243))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,458))
+r=w0.sketch().push([(51,96)]).circle(551).circle(517,mode='s').reset().face(w0.sketch().segment((22,530),(70,452)).segment((197,531)).arc((277,317),(501,272)).arc((967,190),(663,551)).arc((612,650),(516,717)).segment((577,897)).segment((406,958)).segment((330,731)).close().assemble()).finalize().extrude(592)
\ No newline at end of file
diff --git a/test/extrude/815/815.stl b/test/extrude/815/815.stl
index 190371f41c0789f779655ad063d506f308f6d1ca..91ebd72bc892c420171f9839cbd7d4f629d3eb40 100644
Binary files a/test/extrude/815/815.stl and b/test/extrude/815/815.stl differ
diff --git a/test/extrude/816/816.py b/test/extrude/816/816.py
index 5e85e2b5f255d4095f12c9f37730555d1a20ee91..c5e7ba49c99cd04803983e164688a4e40c2a34b3 100644
--- a/test/extrude/816/816.py
+++ b/test/extrude/816/816.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(510,510,606))
-r=w0.sketch().segment((1,292),(231,292)).arc((800,49),(292,425)).segment((292,703)).segment((1,703)).close().assemble().finalize().extrude(328).union(w0.workplane(offset=455).moveTo(927,1000).box(691,740,619))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,603,501))
+w1=cq.Workplane('ZX',origin=(500,793,499))
+r=w0.workplane(offset=304).moveTo(490,271).cylinder(894,743).union(w0.workplane(offset=485).moveTo(574,180).cylinder(530,679)).union(w1.sketch().arc((525,539),(693,441),(699,635)).arc((405,973),(526,540)).assemble().push([(339,735)]).circle(510,mode='s').finalize().extrude(336))
\ No newline at end of file
diff --git a/test/extrude/816/816.stl b/test/extrude/816/816.stl
index 0a30bd1e07b372d31810df049a66d84acedc97f4..cd8ed74b4242e17799c23c6aa1fbc36164b52af5 100644
Binary files a/test/extrude/816/816.stl and b/test/extrude/816/816.stl differ
diff --git a/test/extrude/817/817.py b/test/extrude/817/817.py
index 4c4bf54a9e030950072ab6f00d2f91e4e4565306..0b82db603e3da3ee2dfcc126aa2aff21a2e188fc 100644
--- a/test/extrude/817/817.py
+++ b/test/extrude/817/817.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(384,469,469))
-w1=cq.Workplane('ZX',origin=(469,405,469))
-r=w0.sketch().segment((203,86),(564,86)).segment((564,54)).segment((639,54)).segment((639,86)).segment((1000,86)).segment((1000,245)).segment((639,245)).segment((639,277)).segment((564,277)).segment((564,245)).segment((245,245)).arc((214,224),(203,214)).close().assemble().finalize().extrude(341).union(w1.sketch().segment((150,554),(192,554)).segment((192,384)).segment((384,384)).arc((543,309),(692,384)).segment((883,384)).segment((883,596)).segment((692,596)).arc((543,681),(384,596)).segment((192,596)).segment((150,596)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,481))
+w1=cq.Workplane('ZX',origin=(501,415,501))
+r=w0.sketch().arc((566,430),(610,397),(649,354)).arc((875,405),(726,230)).arc((741,175),(744,120)).arc((965,462),(565,430)).assemble().finalize().extrude(1000).union(w1.workplane(offset=732).moveTo(202,205).cylinder(965,700))
\ No newline at end of file
diff --git a/test/extrude/817/817.stl b/test/extrude/817/817.stl
index d493c95154d0b1166f5150b6faa6cb98f9164e0c..da922039187c38e61f4a09e7e6e4c3405c4e75da 100644
Binary files a/test/extrude/817/817.stl and b/test/extrude/817/817.stl differ
diff --git a/test/extrude/818/818.py b/test/extrude/818/818.py
index cc34fd2124af60a1895de73b2c65305b235908a4..38c6a28c9dde3586aaffcb24d39659ac05177e52 100644
--- a/test/extrude/818/818.py
+++ b/test/extrude/818/818.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(633,633,949))
-r=w0.sketch().segment((339,574),(478,500)).segment((442,750)).segment((596,772)).segment((647,398)).segment((493,376)).segment((486,464)).arc((625,265),(758,471)).segment((927,809)).segment((559,1000)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,498,524))
+r=w0.sketch().segment((208,836),(511,546)).arc((730,10),(700,585)).segment((744,636)).segment((363,999)).close().assemble().finalize().extrude(375).union(w0.sketch().segment((45,60),(48,60)).segment((50,135)).segment((200,134)).segment((199,160)).segment((45,160)).close().assemble().finalize().extrude(570))
\ No newline at end of file
diff --git a/test/extrude/818/818.stl b/test/extrude/818/818.stl
index 8d77a9e0fc9068e555e2d47ebf0e73e5ceeb7526..713facd57b9544e71380c4784ed70011426efc34 100644
Binary files a/test/extrude/818/818.stl and b/test/extrude/818/818.stl differ
diff --git a/test/extrude/819/819.py b/test/extrude/819/819.py
index 94c2edd20d507efab66fa5be9de2c63e7b1d7cef..73c685482ce8f4c8ff257b3065ffbd7d306f885c 100644
--- a/test/extrude/819/819.py
+++ b/test/extrude/819/819.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(350,22,350))
-r=w0.sketch().segment((1,322),(22,315)).arc((22,378),(29,434)).segment((8,441)).close().assemble().reset().face(w0.sketch().segment((672,266),(693,259)).segment((700,378)).segment((679,385)).arc((679,322),(672,266)).assemble()).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,500,500))
+r=w0.sketch().rect(660,1000).push([(521,210)]).circle(546,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/819/819.stl b/test/extrude/819/819.stl
index 5f322258cfc929f5c3624d251810659ae691a8c6..4196e1138827daed26c3f60a726ac782176293fb 100644
Binary files a/test/extrude/819/819.stl and b/test/extrude/819/819.stl differ
diff --git a/test/extrude/82/82.py b/test/extrude/82/82.py
index 7e86b18e89e75ad9d8dcc30c5bc39e6f81cdf7d6..b5e596874c4b8565797a655716c2dbbdb79d8516 100644
--- a/test/extrude/82/82.py
+++ b/test/extrude/82/82.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(329,329,1))
-w1=cq.Workplane('XY',origin=(329,329,438))
-r=w0.workplane(offset=102).cylinder(781,672).union(w1.workplane(offset=664).cylinder(1000,360)).translate((344,344,289))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,81))
+r=w0.sketch().segment((327,2),(675,1)).segment((676,331)).segment((676,671)).segment((676,1000)).segment((620,1000)).arc((482,935),(325,921)).segment((326,671)).segment((326,332)).close().assemble().push([(585,525)]).rect(671,602,mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/82/82.stl b/test/extrude/82/82.stl
index 3b56e94268d1411334497a46265d6afeb88e2861..4d7ed89ead9bce70aa789192c4fa4bc0b06e3b2a 100644
Binary files a/test/extrude/82/82.stl and b/test/extrude/82/82.stl differ
diff --git a/test/extrude/820/820.py b/test/extrude/820/820.py
index 10f505832ca42a7ef3f970161ce20028a802b493..107b840b76c131249ba25d0f7fc1a75f60946e3c 100644
--- a/test/extrude/820/820.py
+++ b/test/extrude/820/820.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(435,544,435))
-r=w0.sketch().segment((1,131),(338,131)).segment((338,316)).segment((348,316)).segment((348,251)).segment((577,251)).segment((577,316)).segment((870,316)).segment((870,978)).segment((262,978)).segment((262,707)).segment((1,707)).close().assemble().reset().face(w0.sketch().segment((294,707),(338,707)).segment((338,370)).segment((631,370)).segment((631,761)).segment((294,761)).close().assemble(),mode='s').push([(805,359)]).circle(446,mode='s').push([(381,12)]).rect(1000,674).finalize().extrude(218)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,290))
+r=w0.workplane(offset=712).box(1000,630,924)
\ No newline at end of file
diff --git a/test/extrude/820/820.stl b/test/extrude/820/820.stl
index 1cf5ae026896056278d58d53d2a064be9c807328..981c1cf046240f81b2582c8c7450c4d2de1a0b45 100644
Binary files a/test/extrude/820/820.stl and b/test/extrude/820/820.stl differ
diff --git a/test/extrude/821/821.py b/test/extrude/821/821.py
index de6371a5af137a932bad8511529d0eae28c29a1c..91539e1a8e92a30e382b21cedbeeecc04b3b829d 100644
--- a/test/extrude/821/821.py
+++ b/test/extrude/821/821.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).cylinder(1000,481).translate((148,148,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,356,501))
+r=w0.sketch().segment((590,850),(685,850)).segment((684,651)).segment((999,651)).segment((1000,865)).segment((994,865)).segment((995,885)).segment((591,885)).close().assemble().finalize().extrude(680).union(w0.sketch().push([(794,867)]).rect(564,555).reset().face(w0.sketch().arc((789,869),(791,861),(800,865)).arc((806,880),(789,871)).assemble(),mode='s').finalize().extrude(724)).union(w0.sketch().push([(275,381)]).circle(776).push([(273,381)]).rect(946,541,mode='s').finalize().extrude(791))
\ No newline at end of file
diff --git a/test/extrude/821/821.stl b/test/extrude/821/821.stl
index 81c508d917402a4b6cf8542dbb63559cbca98687..a538d5db80b1f57f7193a04e110e91c60ce695ee 100644
Binary files a/test/extrude/821/821.stl and b/test/extrude/821/821.stl differ
diff --git a/test/extrude/822/822.py b/test/extrude/822/822.py
index 74785b73a3bcaa985efe1db58b364bfcaebcb4d2..0e773e6e7a4ea181a155d15e739c00dac3dce29b 100644
--- a/test/extrude/822/822.py
+++ b/test/extrude/822/822.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(457,457,66))
-w1=cq.Workplane('YZ',origin=(587,457,457))
-r=w0.sketch().segment((837,891),(859,891)).segment((859,1000)).segment((837,967)).close().assemble().finalize().extrude(479).union(w0.sketch().segment((1,446),(55,327)).segment((620,544)).segment((577,663)).close().assemble().push([(707,120)]).circle(663).finalize().extrude(490)).union(w0.workplane(offset=490).moveTo(783,343).box(522,490,522)).union(w1.workplane(offset=435).moveTo(522,734).box(718,685,500)).translate((1,88,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,151,501))
+r=w0.sketch().segment((1,36),(805,36)).segment((806,185)).arc((889,826),(250,805)).segment((1,806)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/822/822.stl b/test/extrude/822/822.stl
index e306507d0017d06e6cbb785b5d20141f77065ce6..af1727d3b93bfa45b4973b6c3cce02baba48d5a3 100644
Binary files a/test/extrude/822/822.stl and b/test/extrude/822/822.stl differ
diff --git a/test/extrude/823/823.py b/test/extrude/823/823.py
index 05c6dbb282a7ec24ec290315e97ea58436d3c798..294766c1508fa1373beb39d5dd80d391255a5951 100644
--- a/test/extrude/823/823.py
+++ b/test/extrude/823/823.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,500))
-w1=cq.Workplane('YZ',origin=(650,500,500))
-r=w0.sketch().arc((111,720),(1,570),(151,461)).close().assemble().reset().face(w0.sketch().segment((121,720),(151,461)).arc((191,471),(221,491)).arc((261,421),(311,381)).arc((311,171),(431,341)).arc((600,411),(680,590)).segment((1000,590)).segment((1000,900)).segment((500,900)).segment((500,810)).arc((331,800),(221,680)).arc((181,710),(121,720)).assemble()).finalize().extrude(970).union(w1.workplane(offset=645).moveTo(231,171).cylinder(790,630))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,275))
+r=w0.sketch().push([(135,696)]).circle(634).reset().face(w0.sketch().segment((696,446),(720,417)).segment((761,450)).segment((735,477)).close().assemble()).finalize().extrude(861).union(w0.workplane(offset=707).moveTo(728,446).box(1000,511,910)).union(w0.workplane(offset=729).moveTo(728,449).box(704,1000,955))
\ No newline at end of file
diff --git a/test/extrude/823/823.stl b/test/extrude/823/823.stl
index bddbfe02771fae48bd29c57a2cb91f47441a1a60..d5360fd30e98cfad98b2996465c1033784386c96 100644
Binary files a/test/extrude/823/823.stl and b/test/extrude/823/823.stl differ
diff --git a/test/extrude/824/824.py b/test/extrude/824/824.py
index c5c4ac04a5282e92e71c2adf0454c09f3fe57cb2..7350e874fb18490bb57cc3e9962de0fff4df1526 100644
--- a/test/extrude/824/824.py
+++ b/test/extrude/824/824.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(258,485,485))
-w1=cq.Workplane('ZX',origin=(485,650,485))
-r=w0.sketch().segment((351,155),(815,155)).segment((815,712)).segment((701,712)).arc((300,722),(351,320)).close().assemble().finalize().extrude(197).union(w0.workplane(offset=428).moveTo(176,197).cylinder(598,506)).union(w1.sketch().segment((434,444),(660,444)).segment((660,475)).arc((815,722),(660,969)).segment((660,1000)).segment((434,1000)).segment((434,969)).arc((279,722),(434,475)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,346,500))
+w1=cq.Workplane('YZ',origin=(476,501,501))
+r=w0.workplane(offset=441).moveTo(574,502).box(705,665,621).union(w0.sketch().segment((440,370),(480,191)).segment((811,265)).segment((914,196)).segment((995,320)).segment((755,477)).segment((731,434)).close().assemble().finalize().extrude(434)).union(w0.sketch().segment((2,576),(141,574)).segment((142,520)).segment((200,520)).segment((201,561)).arc((376,751),(132,655)).segment((1,654)).close().assemble().reset().face(w0.sketch().segment((226,655),(301,654)).arc((266,722),(226,655)).assemble(),mode='s').finalize().extrude(779)).union(w1.sketch().push([(586,809)]).circle(691).circle(666,mode='s').finalize().extrude(301))
\ No newline at end of file
diff --git a/test/extrude/824/824.stl b/test/extrude/824/824.stl
index eba63ee7f94ba40b9d5ecb4707ad766415a8bf6b..4c354323ab0cea46b826b96aea076392691cffc8 100644
Binary files a/test/extrude/824/824.stl and b/test/extrude/824/824.stl differ
diff --git a/test/extrude/825/825.py b/test/extrude/825/825.py
index 0c8b44cecf78987eec3b7b3c091ea7d9bf8d170b..f8f1679b865a7be9e46bca1432ab73bcc36452e6 100644
--- a/test/extrude/825/825.py
+++ b/test/extrude/825/825.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(596,512,596))
-w1=cq.Workplane('XY',origin=(596,596,536))
-r=w0.sketch().segment((1,750),(120,905)).arc((37,845),(1,750)).assemble().push([(596,489)]).rect(810,952).push([(988,679)]).rect(1000,834).finalize().extrude(489).union(w1.sketch().segment((286,417),(393,417)).segment((393,382)).segment((608,382)).segment((608,417)).segment((691,417)).segment((691,810)).segment((286,810)).close().assemble().finalize().extrude(132))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,332))
+r=w0.workplane(offset=573).moveTo(212,672).box(821,711,646).union(w0.sketch().arc((432,740),(427,567),(531,422)).arc((725,3),(841,451)).arc((875,492),(900,537)).segment((899,540)).arc((916,690),(844,822)).segment((875,886)).segment((631,999)).segment((575,879)).arc((490,826),(435,746)).segment((431,746)).close().assemble().reset().face(w0.sketch().segment((426,686),(432,577)).segment((562,580)).segment((455,630)).segment((481,687)).close().assemble(),mode='s').reset().face(w0.sketch().segment((536,845),(547,821)).segment((567,854)).close().assemble(),mode='s').finalize().extrude(686)).union(w0.sketch().push([(666,642)]).rect(670,742).push([(741,666)]).circle(511,mode='s').finalize().extrude(839))
\ No newline at end of file
diff --git a/test/extrude/825/825.stl b/test/extrude/825/825.stl
index 81fa12bb98c77a5a39b57c84765e95a2607a8007..7d68662bb2332ab3f15b5dd7170418acbbd87d3b 100644
Binary files a/test/extrude/825/825.stl and b/test/extrude/825/825.stl differ
diff --git a/test/extrude/826/826.py b/test/extrude/826/826.py
index a90df58f00b80a31a70193088e49dd11856820d7..4229b20bda34b2319ec07646aee8bc92e4a58bbc 100644
--- a/test/extrude/826/826.py
+++ b/test/extrude/826/826.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,321,500))
-r=w0.sketch().push([(206,910)]).circle(731).push([(776,1)]).rect(1000,782).finalize().extrude(872).translate((1,1,26))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(580,500,500))
+r=w0.workplane(offset=419).moveTo(670,526).cylinder(661,536).union(w0.sketch().push([(411,60)]).rect(980,621).push([(424,891)]).circle(610).push([(423,889)]).rect(625,641,mode='s').push([(696,845)]).circle(635).reset().face(w0.sketch().segment((601,420),(609,420)).segment((611,262)).segment((634,261)).segment((637,225)).segment((805,225)).segment((805,261)).segment((830,261)).segment((830,585)).segment((806,585)).segment((805,620)).segment((739,620)).segment((740,625)).segment((599,626)).close().assemble()).finalize().extrude(455))
\ No newline at end of file
diff --git a/test/extrude/826/826.stl b/test/extrude/826/826.stl
index b7f10cc1b9a37d81052a41a8e3e33b370514c217..34acbccdd4878e83a84849e68dd49d262b026874 100644
Binary files a/test/extrude/826/826.stl and b/test/extrude/826/826.stl differ
diff --git a/test/extrude/827/827.py b/test/extrude/827/827.py
index 0265e30d85f4ff8693d069508a30f4cbc5097e6a..1b5474891486c98f8b83ef4546985167242e59b4 100644
--- a/test/extrude/827/827.py
+++ b/test/extrude/827/827.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.workplane(offset=667).cylinder(1000,481).translate((148,1,148))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,290,500))
+w1=cq.Workplane('YZ',origin=(311,501,501))
+r=w0.workplane(offset=538).moveTo(414,400).cylinder(575,570).union(w0.sketch().push([(248,826)]).rect(536,849).push([(236,919)]).circle(505,mode='s').finalize().extrude(925)).union(w1.sketch().arc((522,536),(556,656),(521,769)).close().assemble().finalize().extrude(191))
\ No newline at end of file
diff --git a/test/extrude/827/827.stl b/test/extrude/827/827.stl
index d27a5035dbfb19e39b8a394c4bfd12f341cf5153..ec1878749c5ca185a8bc912f4c88382acdf707f5 100644
Binary files a/test/extrude/827/827.stl and b/test/extrude/827/827.stl differ
diff --git a/test/extrude/828/828.py b/test/extrude/828/828.py
index b62b39d6364ca2daf6bbaaadf4f0473664482cbb..3a8ffda93d3ad8be213aa58754dec3e69d731a73 100644
--- a/test/extrude/828/828.py
+++ b/test/extrude/828/828.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(550,550,693))
-w1=cq.Workplane('YZ',origin=(539,550,550))
-r=w0.sketch().push([(264,1000)]).circle(649).reset().face(w0.sketch().arc((638,352),(748,1),(780,374)).arc((704,396),(638,352)).assemble()).finalize().extrude(56).union(w0.sketch().segment((341,330),(660,330)).segment((660,495)).segment((429,495)).segment((429,517)).segment((660,517)).segment((660,638)).segment((341,638)).close().assemble().finalize().extrude(122)).union(w0.sketch().arc((232,693),(319,671),(363,605)).segment((528,660)).segment((484,780)).close().assemble().finalize().extrude(221)).union(w1.workplane(offset=424).moveTo(484,687).box(769,978,802))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(171,500,500))
+r=w0.workplane(offset=651).moveTo(176,631).cylinder(801,676).union(w0.workplane(offset=831).moveTo(961,310).box(581,731,1000))
\ No newline at end of file
diff --git a/test/extrude/828/828.stl b/test/extrude/828/828.stl
index 9ee9b2810eb775a8b8ab01cc44c7d284ac004f0f..c3aebeb19b8147bc8e36a6fa7f9ffe7974988c2d 100644
Binary files a/test/extrude/828/828.stl and b/test/extrude/828/828.stl differ
diff --git a/test/extrude/829/829.py b/test/extrude/829/829.py
index 25c30fdc36ffca9023eb97c8f40a9a79225e6015..7044df3e7fbeeebbe6524ea388aed6889e010d9d 100644
--- a/test/extrude/829/829.py
+++ b/test/extrude/829/829.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(586,500,500))
-w1=cq.Workplane('YZ',origin=(394,500,500))
-r=w0.sketch().push([(548,330)]).rect(660,522).reset().face(w0.sketch().segment((596,713),(798,309)).segment((915,362)).segment((713,766)).close().assemble()).finalize().extrude(798).union(w0.sketch().segment((54,1),(543,1)).segment((543,65)).segment((713,65)).segment((713,245)).segment((543,245)).segment((543,415)).segment((713,415)).segment((713,564)).segment((862,564)).segment((862,1000)).segment((586,1000)).segment((586,596)).segment((384,596)).segment((384,511)).segment((54,511)).close().assemble().push([(724,777)]).circle(586,mode='s').finalize().extrude(947)).union(w1.sketch().arc((713,309),(947,362),(724,288)).segment((862,288)).segment((862,309)).close().assemble().finalize().extrude(75))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,355))
+w1=cq.Workplane('ZX',origin=(500,779,500))
+r=w0.sketch().arc((771,796),(580,590),(850,661)).segment((940,660)).segment((931,615)).segment((999,601)).segment((999,651)).arc((994,655),(995,660)).segment((999,661)).segment((999,795)).close().assemble().finalize().extrude(225).union(w0.workplane(offset=438).moveTo(211,240).box(919,602,626)).union(w1.sketch().segment((856,845),(855,894)).segment((861,894)).arc((690,706),(906,845)).close().assemble().finalize().extrude(155))
\ No newline at end of file
diff --git a/test/extrude/829/829.stl b/test/extrude/829/829.stl
index 284c34aa65470431bb5a2014e6ca549c7a3d8039..eb3b08b94c68013b60a80d8e2434b940ae237516 100644
Binary files a/test/extrude/829/829.stl and b/test/extrude/829/829.stl differ
diff --git a/test/extrude/83/83.py b/test/extrude/83/83.py
index dba575bd64ba766be1f286f94e45c0f0391c9244..c12292c7970fa69161e9ce7809e16c91cb04a83b 100644
--- a/test/extrude/83/83.py
+++ b/test/extrude/83/83.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1000,667,667))
-r=w0.sketch().segment((427,667),(820,481)).segment((907,667)).arc((687,714),(514,853)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(80,28,8))
+r=w0.sketch().segment((1,235),(833,235)).segment((833,696)).segment((346,696)).segment((346,1000)).segment((111,1000)).segment((111,696)).segment((1,696)).close().assemble().push([(173,566)]).rect(64,110,mode='s').push([(268,864)]).rect(93,118,mode='s').push([(555,598)]).rect(106,52,mode='s').push([(745,898)]).rect(76,55,mode='s').finalize().extrude(310)
diff --git a/test/extrude/83/83.stl b/test/extrude/83/83.stl
index 1105f23a2ba6dc0c6a1700cd47dbe78c51dd8d69..0f7a731fc1a61fb7b22876695a0fe9f7665923ee 100644
Binary files a/test/extrude/83/83.stl and b/test/extrude/83/83.stl differ
diff --git a/test/extrude/830/830.py b/test/extrude/830/830.py
index 1a3aae479e1da2394ded3637e9975459e155328e..e384fc6ee1e0f6528fcff1fd02d14339cc96f07d 100644
--- a/test/extrude/830/830.py
+++ b/test/extrude/830/830.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(256,256,1))
-r=w0.sketch().segment((452,324),(452,628)).arc((30,60),(510,579)).segment((510,324)).close().assemble().finalize().extrude(21).union(w0.workplane(offset=358).moveTo(256,334).cylinder(461,510)).union(w0.workplane(offset=628).moveTo(60,35).box(589,696,1000)).translate((1,58,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(602,502,501))
+r=w0.sketch().segment((8,596),(222,763)).segment((326,620)).segment((11,381)).arc((997,516),(7,595)).assemble().finalize().extrude(308)
\ No newline at end of file
diff --git a/test/extrude/830/830.stl b/test/extrude/830/830.stl
index 64645c61a85ebce16f209a24ce24d62c1ee08bde..ac36e1da272692ef79ae32881d33afa937d8562d 100644
Binary files a/test/extrude/830/830.stl and b/test/extrude/830/830.stl differ
diff --git a/test/extrude/831/831.py b/test/extrude/831/831.py
index 58a0223c88211c654311094bd2f51e1e3a4d3f7e..fbd33cf5da333d4fade5ae9f4cd1e1500071a561 100644
--- a/test/extrude/831/831.py
+++ b/test/extrude/831/831.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(529,746,529))
-w1=cq.Workplane('ZX',origin=(529,651,529))
-r=w0.sketch().segment((614,142),(651,142)).arc((632,208),(651,274)).segment((614,274)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((86,284),(416,284)).segment((416,887)).segment((783,887)).segment((783,1000)).segment((86,1000)).close().assemble().finalize().extrude(614)).union(w1.sketch().arc((906,58),(972,208),(906,350)).close().assemble().finalize().extrude(566))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1000,501,501))
+r=w0.sketch().segment((2,765),(30,976)).segment((1,975)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=343).moveTo(745,281).cylinder(814,755))
\ No newline at end of file
diff --git a/test/extrude/831/831.stl b/test/extrude/831/831.stl
index 7ca1ecc75728b9e17583cbf9f667081b142eb6c0..8acb504b9f902df673bb9fe921406d6233abdf77 100644
Binary files a/test/extrude/831/831.stl and b/test/extrude/831/831.stl differ
diff --git a/test/extrude/832/832.py b/test/extrude/832/832.py
index d8c06c269e67e1cd3b52dda6b99dcf4f3bd39e99..af1216332636f9cdb8e852af260823632858b1a3 100644
--- a/test/extrude/832/832.py
+++ b/test/extrude/832/832.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(455,455,183))
-r=w0.sketch().segment((1,428),(192,428)).segment((192,283)).segment((718,283)).segment((718,428)).segment((909,428)).segment((909,482)).segment((718,482)).segment((718,628)).segment((192,628)).segment((192,482)).segment((1,482)).close().assemble().reset().face(w0.sketch().segment((337,528),(401,328)).segment((573,382)).segment((510,582)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,402,501))
+r=w0.workplane(offset=301).moveTo(796,716).cylinder(901,600).union(w0.workplane(offset=405).moveTo(339,450).cylinder(690,821)).union(w0.sketch().segment((316,231),(360,232)).arc((644,60),(935,231)).segment((980,230)).segment((981,546)).segment((934,546)).arc((849,645),(731,700)).segment((701,734)).arc((697,750),(679,756)).segment((506,939)).segment((426,864)).segment((575,705)).arc((451,649),(361,544)).segment((316,547)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/832/832.stl b/test/extrude/832/832.stl
index 71af4dd80b0ef90408ff680493406e4c004f2f59..b22fd21dcddfcf647ae7333d001a0b8fa16b9406 100644
Binary files a/test/extrude/832/832.stl and b/test/extrude/832/832.stl differ
diff --git a/test/extrude/833/833.py b/test/extrude/833/833.py
index 595e1ba762f921f21aaa329f4db1a0fb975c25f7..25869a9ef5307f945c7fb9c3605b13b6c9a5bd15 100644
--- a/test/extrude/833/833.py
+++ b/test/extrude/833/833.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(95,416,416))
-w1=cq.Workplane('YZ',origin=(218,416,416))
-r=w0.sketch().segment((95,1),(124,1)).arc((397,58),(208,265)).segment((208,378)).segment((95,378)).segment((95,171)).arc((86,105),(95,39)).close().assemble().push([(208,746)]).rect(491,698).reset().face(w0.sketch().segment((246,472),(548,472)).segment((548,350)).arc((491,651),(246,472)).assemble()).finalize().extrude(350).union(w0.workplane(offset=425).moveTo(246,472).cylinder(435,453)).union(w0.sketch().segment((340,321),(444,189)).segment((595,303)).segment((378,303)).segment((378,340)).close().assemble().finalize().extrude(812)).union(w1.workplane(offset=708).moveTo(524,350).box(859,1000,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(335,500,500))
+r=w0.sketch().segment((2,175),(131,176)).segment((132,152)).segment((140,151)).segment((141,131)).segment((296,132)).segment((297,152)).segment((307,150)).segment((305,176)).segment((441,176)).segment((442,397)).segment((305,396)).segment((307,420)).segment((297,421)).segment((296,436)).segment((141,436)).segment((142,420)).segment((132,420)).segment((131,395)).segment((1,395)).close().assemble().push([(783,623)]).rect(635,845).push([(786,625)]).circle(542,mode='s').push([(943,689)]).rect(616,865).finalize().extrude(835)
\ No newline at end of file
diff --git a/test/extrude/833/833.stl b/test/extrude/833/833.stl
index a937ccd27b73873413edef56651625592e68afca..e96c3bc63f6167a3b9a9902200f146046a7ba6f2 100644
Binary files a/test/extrude/833/833.stl and b/test/extrude/833/833.stl differ
diff --git a/test/extrude/834/834.py b/test/extrude/834/834.py
index 140855aac56e265720d62a73e694c38f193817da..cfcdc7e5ac11abc6e5c74625c51dc927aece5a0c 100644
--- a/test/extrude/834/834.py
+++ b/test/extrude/834/834.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(521,521,658))
-r=w0.sketch().push([(726,439)]).circle(1000).reset().face(w0.sketch().segment((521,152),(932,152)).segment((932,343)).arc((945,439),(932,521)).segment((932,713)).segment((521,713)).segment((521,521)).arc((507,439),(521,343)).close().assemble(),mode='s').finalize().extrude(1).union(w0.workplane(offset=644).moveTo(165,754).cylinder(767,849)).translate((164,41,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(650,501,502))
+r=w0.sketch().push([(405,784)]).circle(620).reset().face(w0.sketch().segment((841,565),(895,531)).segment((999,686)).segment((944,721)).close().assemble()).finalize().extrude(197).union(w0.sketch().segment((1,175),(15,177)).segment((16,95)).segment((376,96)).segment((375,176)).segment((541,176)).segment((540,361)).arc((710,595),(521,809)).segment((520,860)).segment((291,860)).segment((290,720)).arc((277,699),(266,676)).segment((2,676)).close().assemble().push([(127,168)]).rect(526,595,mode='s').finalize().extrude(371))
\ No newline at end of file
diff --git a/test/extrude/834/834.stl b/test/extrude/834/834.stl
index fbc43950c21d339dd088dd9328acdb20c4cee0ed..0477b21a233f19ea25ef8ca013e8dd003e3db3e4 100644
Binary files a/test/extrude/834/834.stl and b/test/extrude/834/834.stl differ
diff --git a/test/extrude/835/835.py b/test/extrude/835/835.py
index 570e6ff3f7ee08eb6bc68954e64fb5f1f98dacaf..77fbb8f1f32c575d19ea79884f15f9dea4b967a8 100644
--- a/test/extrude/835/835.py
+++ b/test/extrude/835/835.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(471,500,500))
-r=w0.sketch().segment((640,251),(700,221)).segment((700,131)).segment((870,131)).segment((870,261)).segment((890,251)).segment((1000,471)).segment((940,500)).segment((990,600)).segment((870,660)).segment((870,750)).segment((700,750)).segment((700,670)).arc((1,550),(640,251)).assemble().reset().face(w0.sketch().segment((31,500),(351,161)).segment((600,401)).segment((570,411)).segment((650,560)).segment((391,840)).close().assemble(),mode='s').finalize().extrude(570)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,390,500))
+r=w0.sketch().segment((455,916),(625,559)).segment((801,645)).segment((630,1000)).close().assemble().finalize().extrude(476).union(w0.sketch().segment((205,341),(217,340)).arc((531,16),(560,465)).arc((502,475),(447,497)).arc((372,487),(306,450)).segment((307,621)).segment((207,621)).close().assemble().finalize().extrude(750))
\ No newline at end of file
diff --git a/test/extrude/835/835.stl b/test/extrude/835/835.stl
index da54f4ef98f822bd64d28f23a0afdfd75823ac58..3becc8d825099bd0415f9f325e4e8a915f7e0e7e 100644
Binary files a/test/extrude/835/835.stl and b/test/extrude/835/835.stl differ
diff --git a/test/extrude/836/836.py b/test/extrude/836/836.py
index 54ec28548cc32efd5115ec3ee06df52aa1c40a6d..568e862b3dc7cd4b6e2c3ff00dd155cf9b5389ab 100644
--- a/test/extrude/836/836.py
+++ b/test/extrude/836/836.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(511,490,490))
-w1=cq.Workplane('ZX',origin=(490,564,490))
-r=w0.sketch().segment((702,649),(702,692)).arc((415,277),(756,649)).close().assemble().finalize().extrude(352).union(w0.sketch().arc((841,639),(192,458),(872,447)).segment((904,458)).segment((862,649)).close().assemble().finalize().extrude(1000)).union(w1.sketch().push([(469,129)]).circle(660).circle(500,mode='s').push([(570,54)]).rect(522,554,mode='s').finalize().extrude(1)).translate((42,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,480,500))
+w1=cq.Workplane('YZ',origin=(296,501,500))
+r=w0.sketch().push([(327,323)]).rect(546,575).reset().face(w0.sketch().segment((309,330),(340,306)).segment((345,321)).segment((320,341)).close().assemble(),mode='s').finalize().extrude(20).union(w1.workplane(offset=711).moveTo(783,590).box(935,711,921))
\ No newline at end of file
diff --git a/test/extrude/836/836.stl b/test/extrude/836/836.stl
index 0985e716db428f50e8debdeaee6c73be367d0f56..3dfb31a2929d2237d447385cee8e5b71a5e4cf8f 100644
Binary files a/test/extrude/836/836.stl and b/test/extrude/836/836.stl differ
diff --git a/test/extrude/837/837.py b/test/extrude/837/837.py
index 478c7fae0e749a18c468a19bb56c69f6aafabeaa..c0e7415ee8441a33c84363094390e689dbb12e03 100644
--- a/test/extrude/837/837.py
+++ b/test/extrude/837/837.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(546,546,818))
-r=w0.sketch().segment((546,92),(591,92)).segment((591,564)).arc((600,600),(591,637)).segment((591,1000)).segment((546,1000)).segment((546,655)).arc((491,600),(546,546)).close().assemble().reset().face(w0.sketch().segment((546,537),(591,537)).segment((582,555)).segment((546,555)).close().assemble(),mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,590))
+w1=cq.Workplane('YZ',origin=(382,499,501))
+r=w0.sketch().segment((162,486),(500,484)).segment((499,530)).arc((362,616),(296,761)).segment((161,761)).close().assemble().finalize().extrude(376).union(w0.sketch().arc((431,290),(701,235),(846,1)).segment((904,1)).segment((904,512)).segment((981,510)).segment((979,1000)).segment((741,1000)).segment((740,660)).segment((431,660)).close().assemble().finalize().extrude(431)).union(w1.sketch().segment((935,411),(954,412)).segment((956,466)).arc((945,436),(935,411)).assemble().finalize().extrude(142))
\ No newline at end of file
diff --git a/test/extrude/837/837.stl b/test/extrude/837/837.stl
index 9e2b66016d15b041574be96303ed24f3e592e98f..8251d0b3db21cba563a77bb368451f425680a2b9 100644
Binary files a/test/extrude/837/837.stl and b/test/extrude/837/837.stl differ
diff --git a/test/extrude/838/838.py b/test/extrude/838/838.py
index 8237d39fbe36a2134fb42d994f2781936b741c0e..23c88136573d857c29a1e3ba3bcf02aaff4f69f1 100644
--- a/test/extrude/838/838.py
+++ b/test/extrude/838/838.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(318,1,318))
-r=w0.workplane(offset=298).moveTo(11,545).cylinder(357,505).union(w0.sketch().push([(585,130)]).circle(545).push([(585,135)]).rect(693,426,mode='s').finalize().extrude(1000)).translate((98,1,177))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,535,500))
+r=w0.workplane(offset=263).moveTo(735,553).box(990,745,975).union(w0.sketch().arc((486,600),(4,456),(505,511)).segment((999,510)).segment((1000,601)).close().assemble().push([(250,506)]).rect(689,951,mode='s').finalize().extrude(910))
\ No newline at end of file
diff --git a/test/extrude/838/838.stl b/test/extrude/838/838.stl
index 6103ddd7affbef48d8e9a3a147f5a7b93792dbf3..e2bd616f017a96e98ea29f28b465169e8893a189 100644
Binary files a/test/extrude/838/838.stl and b/test/extrude/838/838.stl differ
diff --git a/test/extrude/839/839.py b/test/extrude/839/839.py
index d170b319cd3f7d98b145f196d95697547cd4ffe0..83809b72ff0e739eea74659f7ad41410cd59c206 100644
--- a/test/extrude/839/839.py
+++ b/test/extrude/839/839.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().segment((14,334),(154,68)).segment((261,128)).arc((141,227),(121,387)).close().assemble().reset().face(w0.sketch().arc((407,540),(527,441),(547,281)).segment((654,334)).segment((514,600)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(785,499,501))
+r=w0.workplane(offset=107).box(951,1000,1000).union(w0.sketch().segment((30,187),(901,100)).segment((970,816)).segment((101,900)).close().assemble().finalize().extrude(716))
\ No newline at end of file
diff --git a/test/extrude/839/839.stl b/test/extrude/839/839.stl
index c09fe3716184e0d457e13252b0375d94f5776342..26e6ae6ab554804339e442aeffee0c37ac23c105 100644
Binary files a/test/extrude/839/839.stl and b/test/extrude/839/839.stl differ
diff --git a/test/extrude/84/84.py b/test/extrude/84/84.py
index aefe2ef72c202919c3059de4f38803120960095e..e6d00c13e3c6dffe1616d5bfd860b6b4e07fd33b 100644
--- a/test/extrude/84/84.py
+++ b/test/extrude/84/84.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(532,522,532))
-w1=cq.Workplane('YZ',origin=(1,532,532))
-r=w0.sketch().push([(123,830)]).rect(649,1000).push([(772,357)]).rect(989,649).finalize().extrude(883).union(w1.sketch().arc((192,575),(320,384),(458,575)).close().assemble().finalize().extrude(692))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(64,51,8))
+r=w0.sketch().segment((167,1),(657,1)).segment((657,744)).segment((167,744)).close().assemble().push([(308,126)]).circle(61,mode='s').push([(476,265)]).rect(71,105,mode='s').push([(313,96)]).circle(50,mode='s').finalize().extrude(52)
diff --git a/test/extrude/84/84.stl b/test/extrude/84/84.stl
index f22c25fd851436332ff2d86131f20d36a6538aed..13062d41da8f1829091fe2280480c6b7b3445120 100644
Binary files a/test/extrude/84/84.stl and b/test/extrude/84/84.stl differ
diff --git a/test/extrude/840/840.py b/test/extrude/840/840.py
index e4f1772740543d080fd4c6b8697817ba7680d5d2..3193fb168c9ecd84bb108b2851f42f17d52b8b5a 100644
--- a/test/extrude/840/840.py
+++ b/test/extrude/840/840.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(678,463,463))
-w1=cq.Workplane('ZX',origin=(463,603,463))
-r=w0.sketch().segment((227,409),(280,409)).segment((280,613)).segment((742,613)).segment((742,409)).segment((785,409)).segment((785,1000)).segment((227,1000)).close().assemble().finalize().extrude(323).union(w1.sketch().segment((366,65),(667,65)).segment((667,441)).segment((506,441)).arc((12,764),(366,291)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,337))
+r=w0.sketch().segment((305,599),(330,290)).segment((366,295)).segment((366,152)).segment((651,152)).segment((650,320)).segment((690,326)).segment((671,566)).segment((790,571)).segment((791,590)).segment((811,589)).segment((810,976)).segment((776,975)).segment((776,1000)).segment((621,995)).segment((620,976)).segment((606,976)).segment((605,624)).segment((564,620)).segment((564,646)).segment((430,645)).segment((431,611)).close().assemble().push([(568,157)]).rect(516,515,mode='s').finalize().extrude(622).union(w0.sketch().push([(285,97)]).circle(596).push([(355,84)]).rect(512,506,mode='s').finalize().extrude(836))
\ No newline at end of file
diff --git a/test/extrude/840/840.stl b/test/extrude/840/840.stl
index b35b675a7ec0db9f2b8e9ea9a2714d1d8390e940..a1439ad8934c01600924f6c8d4fe80bcafc3327d 100644
Binary files a/test/extrude/840/840.stl and b/test/extrude/840/840.stl differ
diff --git a/test/extrude/841/841.py b/test/extrude/841/841.py
index 41a8139e49d8d71d8189b8ae3d02846cfd0a0039..14dcc2b377eccb1b1146aff5576d0ffd15a424cc 100644
--- a/test/extrude/841/841.py
+++ b/test/extrude/841/841.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(166,414,414))
-r=w0.workplane(offset=368).moveTo(781,550).box(455,868,505).union(w0.sketch().segment((1,331),(298,199)).segment((298,141)).segment((422,141)).segment((637,51)).segment((827,488)).segment((529,620)).segment((529,678)).segment((406,678)).segment((191,769)).close().assemble().push([(414,406)]).circle(422,mode='s').finalize().extrude(802)).union(w0.sketch().segment((183,340),(282,207)).segment((331,249)).arc((455,232),(562,298)).segment((571,298)).segment((571,315)).arc((595,373),(595,439)).segment((645,480)).segment((546,612)).segment((496,571)).arc((373,587),(265,513)).segment((257,513)).segment((257,505)).arc((232,439),(232,373)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,555))
+w1=cq.Workplane('YZ',origin=(207,501,501))
+r=w0.workplane(offset=223).moveTo(406,485).cylinder(1000,689).union(w0.sketch().arc((656,506),(211,311),(690,230)).segment((796,255)).segment((731,526)).close().assemble().reset().face(w0.sketch().arc((582,445),(561,335),(631,257)).close().assemble(),mode='s').finalize().extrude(945)).union(w1.sketch().segment((720,206),(915,205)).segment((914,277)).arc((821,257),(719,276)).close().assemble().finalize().extrude(776))
\ No newline at end of file
diff --git a/test/extrude/841/841.stl b/test/extrude/841/841.stl
index 60cfbcae61b6be363c38835823270354828ee597..358c723291c9ff49b43ee021818027773f91c21f 100644
Binary files a/test/extrude/841/841.stl and b/test/extrude/841/841.stl differ
diff --git a/test/extrude/842/842.py b/test/extrude/842/842.py
index 74893400a34d00bc7e9d5a18734cc83a29009c60..983a36e6d3192154e291e89662cea1af43832ff1 100644
--- a/test/extrude/842/842.py
+++ b/test/extrude/842/842.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(490,490,602))
-r=w0.sketch().segment((633,735),(633,908)).segment((664,908)).segment((664,1000)).arc((602,878),(633,735)).assemble().finalize().extrude(266).union(w0.sketch().segment((348,653),(419,460)).arc((348,1),(664,337)).segment((735,337)).segment((735,378)).arc((429,562),(766,684)).segment((735,796)).segment((613,745)).segment((521,745)).segment((521,715)).close().assemble().finalize().extrude(399)).union(w0.workplane(offset=450).moveTo(613,531).cylinder(572,653))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(420,500,500))
+w1=cq.Workplane('YZ',origin=(305,499,501))
+r=w0.sketch().segment((141,486),(215,440)).arc((245,466),(230,430)).segment((315,380)).segment((316,102)).segment((665,101)).segment((736,1)).segment((766,20)).segment((709,102)).segment((829,101)).segment((830,450)).segment((676,451)).segment((859,755)).segment((451,999)).close().assemble().finalize().extrude(775).union(w1.sketch().segment((256,806),(261,806)).segment((260,796)).arc((285,819),(256,804)).assemble().finalize().extrude(804))
\ No newline at end of file
diff --git a/test/extrude/842/842.stl b/test/extrude/842/842.stl
index 0f4f82a503ef8ca140651553cbe51319c856cab8..90f0c44d06774855a279e0105459d2b4efc02ec5 100644
Binary files a/test/extrude/842/842.stl and b/test/extrude/842/842.stl differ
diff --git a/test/extrude/843/843.py b/test/extrude/843/843.py
index bbe4852f384c6b266cf39d4936df58e803365658..876098e77b675251a46a1e73f79d2d40d5b3eafe 100644
--- a/test/extrude/843/843.py
+++ b/test/extrude/843/843.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).cylinder(1000,721).translate((388,388,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,410))
+r=w0.sketch().segment((794,100),(956,92)).segment((999,845)).segment((834,855)).arc((965,472),(796,100)).assemble().finalize().extrude(270).union(w0.workplane(offset=704).moveTo(411,499).cylinder(910,910))
\ No newline at end of file
diff --git a/test/extrude/843/843.stl b/test/extrude/843/843.stl
index 780bc77e4721aa05289e7920bc7345ed869cc110..e716cdea58b53406e9638471d03140acd5902f83 100644
Binary files a/test/extrude/843/843.stl and b/test/extrude/843/843.stl differ
diff --git a/test/extrude/844/844.py b/test/extrude/844/844.py
index 1a0a3dc78cdea24c89c7b3b302074e30e405d5f6..79acc850011638d1e17e9a84778613adcaeada07 100644
--- a/test/extrude/844/844.py
+++ b/test/extrude/844/844.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(516,516,547))
-w1=cq.Workplane('YZ',origin=(279,516,516))
-r=w0.sketch().segment((104,753),(372,753)).segment((114,567)).segment((506,1)).segment((928,300)).segment((537,866)).segment((485,825)).segment((485,979)).segment((104,979)).close().assemble().finalize().extrude(382).union(w0.workplane(offset=547).moveTo(289,866).box(804,784,578)).union(w1.workplane(offset=583).moveTo(789,470).box(1000,547,650))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(745,500,499))
+r=w0.sketch().segment((1,541),(281,380)).segment((461,691)).segment((175,850)).close().assemble().push([(804,466)]).circle(696).finalize().extrude(5).union(w0.sketch().push([(331,355)]).rect(691,910).reset().face(w0.sketch().arc((321,275),(382,291),(330,327)).arc((260,317),(320,275)).assemble(),mode='s').finalize().extrude(182))
\ No newline at end of file
diff --git a/test/extrude/844/844.stl b/test/extrude/844/844.stl
index 431113889f931769d901ad43b35eeb0889485ee2..7a9909ddd53521dc3051fbb107316d8404789705 100644
Binary files a/test/extrude/844/844.stl and b/test/extrude/844/844.stl differ
diff --git a/test/extrude/845/845.py b/test/extrude/845/845.py
index 06b7172a43324185e44a0c69ecca2e98501ade80..1c0d50ce4ff56ecb46193d782a362037e056d0f6 100644
--- a/test/extrude/845/845.py
+++ b/test/extrude/845/845.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(722,444,444))
-r=w0.workplane(offset=166).moveTo(753,155).cylinder(1000,650).union(w0.workplane(offset=336).moveTo(1,876).cylinder(660,516)).translate((1,72,52))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(250,333,251))
+r=w0.sketch().push([(136,96)]).circle(345).push([(201,420)]).circle(331).reset().face(w0.sketch().segment((278,345),(358,271)).segment((378,291)).arc((368,370),(447,365)).segment((460,378)).segment((380,453)).close().assemble()).finalize().extrude(84)
\ No newline at end of file
diff --git a/test/extrude/845/845.stl b/test/extrude/845/845.stl
index a6a988f457b574797c4e391a8c2d6816b87491cd..d5b10d88e93e458e035197c20f3e8d1e6c493e6b 100644
Binary files a/test/extrude/845/845.stl and b/test/extrude/845/845.stl differ
diff --git a/test/extrude/846/846.py b/test/extrude/846/846.py
index 4d7986a087770a3a596fa137a61a33b50848aef2..4db001856d22698aded8985bef61341d6e32a9b4 100644
--- a/test/extrude/846/846.py
+++ b/test/extrude/846/846.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(446,446,174))
-r=w0.sketch().arc((128,401),(564,1),(728,564)).arc((319,891),(128,401)).assemble().push([(405,573)]).rect(909,573,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,490,501))
+r=w0.sketch().segment((275,541),(331,540)).segment((330,361)).segment((670,360)).segment((670,540)).segment((725,541)).segment((724,711)).segment((671,711)).segment((670,889)).segment((330,891)).segment((332,711)).segment((275,709)).close().assemble().reset().face(w0.sketch().segment((430,571),(437,565)).segment((570,680)).segment((566,686)).close().assemble(),mode='s').finalize().extrude(11).union(w0.sketch().segment((505,111),(634,112)).segment((636,570)).segment((536,570)).arc((481,686),(506,560)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/846/846.stl b/test/extrude/846/846.stl
index e2c5d81152e8fd7506590afbf0d127e7227e35f6..b09bcab74fcd099fb73e4d4d9042d0577ae1518c 100644
Binary files a/test/extrude/846/846.stl and b/test/extrude/846/846.stl differ
diff --git a/test/extrude/847/847.py b/test/extrude/847/847.py
index a061206c15229e9040301db978e452de83c102b7..473b712f68b651487d7003d263097d8ceb96d672 100644
--- a/test/extrude/847/847.py
+++ b/test/extrude/847/847.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(385,385,1))
-w1=cq.Workplane('ZX',origin=(385,155,385))
-r=w0.sketch().segment((331,378),(539,378)).arc((439,408),(331,378)).assemble().finalize().extrude(1000).union(w1.sketch().segment((124,170),(769,170)).segment((769,600)).segment((616,600)).segment((616,431)).segment((285,431)).segment((285,600)).segment((124,600)).close().assemble().finalize().extrude(854))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(541,502,501))
+r=w0.sketch().segment((111,120),(715,1)).segment((889,879)).segment((285,999)).close().assemble().finalize().extrude(414)
\ No newline at end of file
diff --git a/test/extrude/847/847.stl b/test/extrude/847/847.stl
index 84f3114a064625de6861b7ec44cbcd167347166f..20faeeef886a95baa91e9fdff2349bd4f7f392d1 100644
Binary files a/test/extrude/847/847.stl and b/test/extrude/847/847.stl differ
diff --git a/test/extrude/848/848.py b/test/extrude/848/848.py
index 38a2326cd93309dbb185ca7c15f17e2833734a9a..58b30c71499808a78bfc8885ba2f587263b4a48b 100644
--- a/test/extrude/848/848.py
+++ b/test/extrude/848/848.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(515,773,515))
-r=w0.sketch().arc((21,733),(50,733),(90,723)).arc((110,782),(149,812)).arc((159,911),(199,990)).segment((31,1000)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=372).moveTo(802,228).cylinder(802,723))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(491,500,501))
+r=w0.workplane(offset=514).box(1000,1000,524)
\ No newline at end of file
diff --git a/test/extrude/848/848.stl b/test/extrude/848/848.stl
index b9c470b57a59065472404e6f7a9820964ab8f1e2..6c7efe7c21c68bb3a770d4d01efb6f3954c9a913 100644
Binary files a/test/extrude/848/848.stl and b/test/extrude/848/848.stl differ
diff --git a/test/extrude/849/849.py b/test/extrude/849/849.py
index 26cccb4815abb795b5c0f3fa87978d3bf1d51f63..953e8e445871fe76e9979ecbe5d4bbd75c0aa0e7 100644
--- a/test/extrude/849/849.py
+++ b/test/extrude/849/849.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(370,457,457))
-w1=cq.Workplane('XY',origin=(457,457,316))
-r=w0.sketch().push([(1,685)]).circle(544).push([(435,240)]).circle(642).push([(294,305)]).circle(468,mode='s').finalize().extrude(598).union(w0.sketch().segment((577,511),(620,511)).arc((772,490),(881,381)).segment((1000,761)).segment((696,859)).close().assemble().finalize().extrude(631)).union(w1.workplane(offset=577).moveTo(479,435).cylinder(696,479)).translate((1,87,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(871,502,501))
+r=w0.workplane(offset=131).moveTo(716,142).cylinder(1000,641).union(w0.sketch().push([(316,829)]).circle(670).push([(716,141)]).circle(570).circle(546,mode='s').finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/849/849.stl b/test/extrude/849/849.stl
index f8a190a97dbc8a26dd4ab34fb41d7dddab8856dd..f724792d53b80e9f37914243fdcd75d1a4311f99 100644
Binary files a/test/extrude/849/849.stl and b/test/extrude/849/849.stl differ
diff --git a/test/extrude/85/85.py b/test/extrude/85/85.py
index 461bebb0e3ec65eaca3e34655cec69929ef6cf04..7698da25421234d9b892a9a9f3afb8ca202e2786 100644
--- a/test/extrude/85/85.py
+++ b/test/extrude/85/85.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(636,636,953))
-r=w0.sketch().segment((169,636),(673,290)).segment((963,711)).segment((552,991)).segment((552,1000)).segment((421,1000)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=472).moveTo(944,430).cylinder(963,795))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(7,46,51))
+r=w0.sketch().segment((246,700),(668,700)).segment((668,263)).segment((530,154)).segment((429,383)).segment((246,263)).close().assemble().finalize().extrude(186).union(w0.sketch().segment((493,591),(805,591)).segment((805,233)).segment((493,233)).close().assemble().finalize().extrude(141)).union(w0.workplane(offset=249).sketch().segment((560,708),(560,438)).segment((658,438)).segment((658,530)).segment((658,596)).segment((658,708)).segment((593,708)).close().assemble().finalize().extrude(147))
diff --git a/test/extrude/85/85.stl b/test/extrude/85/85.stl
index 56b37427ab0f1985fc68bf9f98f1d90278573144..4ef66fd1667bdeb90c91fb0811f4d7cd4768906f 100644
Binary files a/test/extrude/85/85.stl and b/test/extrude/85/85.stl differ
diff --git a/test/extrude/850/850.py b/test/extrude/850/850.py
index 52715542038115d686e272f98cb34d3744a0290b..eaee7d70a526cd2bb605ff57b9ea922338b174c2 100644
--- a/test/extrude/850/850.py
+++ b/test/extrude/850/850.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(903,654,654))
-r=w0.sketch().arc((541,307),(646,541),(541,782)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((605,549),(766,549)).segment((605,1000)).close().assemble().finalize().extrude(807))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,421,501))
+r=w0.sketch().segment((1,81),(546,81)).segment((547,252)).segment((420,250)).segment((511,310)).segment((464,375)).segment((286,251)).segment((1,251)).close().assemble().finalize().extrude(240).union(w0.sketch().segment((460,636),(535,636)).segment((536,185)).segment((655,116)).segment((825,405)).arc((831,405),(829,410)).segment((1000,699)).segment((631,919)).close().assemble().finalize().extrude(920))
\ No newline at end of file
diff --git a/test/extrude/850/850.stl b/test/extrude/850/850.stl
index 4d1e96c4be75f2fe67b18889f4be350f8792dc82..21f7b76ede8f4e23c78e33bb849af59129d32787 100644
Binary files a/test/extrude/850/850.stl and b/test/extrude/850/850.stl differ
diff --git a/test/extrude/851/851.py b/test/extrude/851/851.py
index f68c1915325618b96c2fb232bed9112c74ead6fd..6425ee5258c0a0a0b80a06b0ee17d03af623f054 100644
--- a/test/extrude/851/851.py
+++ b/test/extrude/851/851.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(346,507,507))
-w1=cq.Workplane('XY',origin=(507,507,420))
-r=w0.sketch().push([(235,1)]).circle(618).push([(223,26)]).circle(568,mode='s').finalize().extrude(186).union(w0.sketch().push([(377,278)]).rect(889,963).push([(766,1000)]).circle(630).finalize().extrude(334)).union(w1.sketch().arc((581,877),(692,864),(778,778)).segment((988,778)).segment((988,889)).segment((581,889)).close().assemble().finalize().extrude(963)).translate((1,1,111))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(254,332,253))
+r=w0.workplane(offset=174).moveTo(120,377).cylinder(412,372).union(w0.sketch().segment((158,200),(236,142)).segment((264,181)).segment((269,163)).arc((275,108),(311,65)).segment((332,12)).segment((505,85)).segment((485,135)).arc((484,153),(482,170)).segment((483,460)).segment((279,460)).segment((278,367)).close().assemble().finalize().extrude(236))
\ No newline at end of file
diff --git a/test/extrude/851/851.stl b/test/extrude/851/851.stl
index 497858eec936ef64ceb1989210eaab718ca9fc6a..322c075fb1fa93ffc80e492e33fa4de8545ed0eb 100644
Binary files a/test/extrude/851/851.stl and b/test/extrude/851/851.stl differ
diff --git a/test/extrude/852/852.py b/test/extrude/852/852.py
index ebb35b8f6106dc6a7de8cd655c06a5d9f8e90e27..824113b2a21c17c63044f2728d64faf77c225902 100644
--- a/test/extrude/852/852.py
+++ b/test/extrude/852/852.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,321))
-w1=cq.Workplane('YZ',origin=(471,500,500))
-r=w0.sketch().arc((171,650),(241,670),(321,650)).segment((321,950)).segment((171,950)).close().assemble().finalize().extrude(690).union(w1.sketch().segment((1,341),(161,341)).segment((840,341)).segment((1000,341)).segment((1000,680)).segment((840,680)).segment((161,680)).segment((1,680)).close().assemble().push([(700,396)]).rect(560,530,mode='s').finalize().extrude(860))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,999,501))
+r=w0.workplane(offset=1).moveTo(506,401).cylinder(1000,666).union(w0.workplane(offset=81).moveTo(466,630).cylinder(1000,635))
\ No newline at end of file
diff --git a/test/extrude/852/852.stl b/test/extrude/852/852.stl
index 2a311a08994fce0f75f7f4ccfa64ecdbf7986b58..f56a67bbe80471eb27e9721aef3673444d572e9e 100644
Binary files a/test/extrude/852/852.stl and b/test/extrude/852/852.stl differ
diff --git a/test/extrude/853/853.py b/test/extrude/853/853.py
index 4545b8c4083efc03d4d5d0cb23aaed73a81a3563..81bbbc91257ea8ec87df7793a8ae9c6d2d7d9503 100644
--- a/test/extrude/853/853.py
+++ b/test/extrude/853/853.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(381,381,261))
-r=w0.sketch().segment((411,740),(620,740)).segment((431,810)).close().assemble().reset().face(w0.sketch().segment((640,560),(690,720)).segment((640,740)).close().assemble()).finalize().extrude(1).union(w0.workplane(offset=690).moveTo(356,16).box(950,510,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,499,239))
+r=w0.workplane(offset=622).moveTo(785,694).cylinder(746,715).union(w0.sketch().arc((484,399),(54,279),(500,300)).arc((909,415),(484,399)).assemble().finalize().extrude(804)).union(w0.sketch().segment((205,96),(325,95)).segment((325,235)).arc((176,646),(205,210)).close().assemble().push([(529,695)]).circle(534).finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/853/853.stl b/test/extrude/853/853.stl
index fa79e2375a581749c14dbafef7acb074920a53f9..6e4327e40fbe5bf2d08e23597e715db396e67bd7 100644
Binary files a/test/extrude/853/853.stl and b/test/extrude/853/853.stl differ
diff --git a/test/extrude/854/854.py b/test/extrude/854/854.py
index 6eebebc683ab5309bd4df574885a7fd47d90e2e1..d89a0bef7551da242c96d946d8a81a4d97fb235f 100644
--- a/test/extrude/854/854.py
+++ b/test/extrude/854/854.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(591,885,591))
-r=w0.sketch().segment((206,329),(263,206)).segment((312,222)).segment((312,181)).segment((427,181)).segment((427,279)).segment((975,533)).segment((918,656)).segment((427,427)).segment((427,1000)).segment((312,1000)).segment((312,378)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,411))
+r=w0.workplane(offset=493).moveTo(526,253).cylinder(516,520).union(w0.sketch().arc((186,657),(3,486),(226,372)).segment((257,372)).segment((257,392)).arc((307,507),(258,621)).segment((257,770)).segment((187,770)).close().assemble().push([(835,441)]).circle(666).finalize().extrude(701))
\ No newline at end of file
diff --git a/test/extrude/854/854.stl b/test/extrude/854/854.stl
index 9723c4393687917bfec6d7df589c95bca5280fa3..c10b295f5ff12c3167c703ffdcb4014c1ba20411 100644
Binary files a/test/extrude/854/854.stl and b/test/extrude/854/854.stl differ
diff --git a/test/extrude/855/855.py b/test/extrude/855/855.py
index ce7380e89ebf5816d6feee1fa60fa51bbddd251f..84c970f1db010c0867c3b192db348b6aeb13e038 100644
--- a/test/extrude/855/855.py
+++ b/test/extrude/855/855.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(312,523,523))
-r=w0.sketch().arc((423,1),(678,12),(778,256)).arc((944,745),(489,489)).arc((1,312),(423,1)).assemble().finalize().extrude(512).union(w0.sketch().segment((512,656),(722,656)).segment((722,623)).segment((534,623)).arc((1000,933),(512,656)).assemble().push([(761,784)]).rect(556,600,mode='s').finalize().extrude(956))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,659,501))
+r=w0.sketch().arc((282,986),(286,765),(346,975)).arc((315,999),(281,986)).assemble().finalize().extrude(181).union(w0.workplane(offset=415).moveTo(681,135).cylinder(669,635))
\ No newline at end of file
diff --git a/test/extrude/855/855.stl b/test/extrude/855/855.stl
index d9c3706b3f6a04c2df78208e097c02a328f76a65..22a68b46835bad46c637aa847d4c085c9d6cbcfc 100644
Binary files a/test/extrude/855/855.stl and b/test/extrude/855/855.stl differ
diff --git a/test/extrude/856/856.py b/test/extrude/856/856.py
index 995484cc3a94675a0834cbf305d20e9d4ab68213..ff4afb8cc98ee75d8b4e71278b9e4a32666f9eb4 100644
--- a/test/extrude/856/856.py
+++ b/test/extrude/856/856.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,596))
-w1=cq.Workplane('ZX',origin=(495,546,495))
-r=w0.sketch().push([(142,788)]).rect(798,899).push([(142,783)]).rect(657,506,mode='s').push([(566,450)]).rect(1000,849).finalize().extrude(193).union(w0.sketch().arc((445,465),(516,415),(526,334)).arc((576,334),(627,344)).segment((627,314)).segment((667,314)).arc((687,203),(788,142)).segment((758,142)).segment((758,1)).segment((869,1)).segment((869,142)).segment((849,142)).arc((939,203),(970,314)).segment((1000,314)).segment((1000,576)).segment((627,576)).segment((627,556)).arc((516,556),(445,465)).assemble().finalize().extrude(687)).union(w1.sketch().push([(253,122)]).circle(546).push([(248,137)]).rect(526,546,mode='s').finalize().extrude(284))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(311,405,312))
+w1=cq.Workplane('YZ',origin=(299,311,311))
+r=w0.sketch().push([(237,100)]).circle(410).reset().face(w0.sketch().arc((275,150),(175,88),(289,70)).segment((315,69)).segment((314,116)).segment((302,116)).segment((302,157)).segment((274,156)).close().assemble(),mode='s').finalize().extrude(125).union(w0.sketch().arc((237,427),(144,261),(302,364)).segment((509,364)).segment((509,621)).segment((238,621)).close().assemble().finalize().extrude(230)).union(w1.sketch().push([(349,209)]).circle(342).push([(343,222)]).circle(314,mode='s').finalize().extrude(432))
\ No newline at end of file
diff --git a/test/extrude/856/856.stl b/test/extrude/856/856.stl
index 3f40d0a8a23a5599526ddfc971118e7644960e81..8815f343f964e8d761d59044740f2de49e07beda 100644
Binary files a/test/extrude/856/856.stl and b/test/extrude/856/856.stl differ
diff --git a/test/extrude/857/857.py b/test/extrude/857/857.py
index f9fd0f4f7517ae92990962083e20a2f77090d557..18e7fae0c68a0162c0f44b8ab3f5219749cdcc11 100644
--- a/test/extrude/857/857.py
+++ b/test/extrude/857/857.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,304,506))
-r=w0.sketch().segment((1,122),(566,122)).segment((566,223)).arc((1000,304),(677,606)).arc((263,879),(102,415)).segment((1,415)).close().assemble().finalize().extrude(919)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(466,500,502))
+w1=cq.Workplane('ZX',origin=(501,646,500))
+r=w0.sketch().segment((220,41),(225,42)).arc((231,55),(241,40)).segment((251,41)).segment((252,1)).segment((714,2)).segment((716,41)).segment((779,40)).segment((781,601)).segment((221,601)).close().assemble().push([(345,380)]).circle(551,mode='s').finalize().extrude(726).union(w1.workplane(offset=438).moveTo(866,446).cylinder(626,635))
\ No newline at end of file
diff --git a/test/extrude/857/857.stl b/test/extrude/857/857.stl
index d096344e6021835e091d7dab6da5f6a09290aa1c..c98470055cab1f8f68299ecb1f7efeb1236f715a 100644
Binary files a/test/extrude/857/857.stl and b/test/extrude/857/857.stl differ
diff --git a/test/extrude/858/858.py b/test/extrude/858/858.py
index f6c5ac90ea7cdf4e442ce604713d950ab71f3d14..047a6af5548a1385458db9ae4280f9c7426aade3 100644
--- a/test/extrude/858/858.py
+++ b/test/extrude/858/858.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(532,299,532))
-r=w0.sketch().push([(299,894)]).circle(702).reset().face(w0.sketch().segment((320,139),(809,1)).segment((936,447)).segment((819,469)).segment((819,692)).segment((809,692)).segment((809,479)).segment((437,575)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,221,500))
+r=w0.sketch().segment((1,497),(407,495)).segment((405,241)).segment((1000,240)).segment((1000,761)).segment((1,761)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/858/858.stl b/test/extrude/858/858.stl
index fd0cc62bbea8f8b7e6aa10f107d6bea6846871e0..18696667f5db786390a58f7b3ab8c2985c3176b8 100644
Binary files a/test/extrude/858/858.stl and b/test/extrude/858/858.stl differ
diff --git a/test/extrude/859/859.py b/test/extrude/859/859.py
index 893311f9260422fd77967ab70fad9d5624f13479..b6ee73d74e67dbf6625a87f22128ce43e5f1f5e7 100644
--- a/test/extrude/859/859.py
+++ b/test/extrude/859/859.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().segment((287,467),(294,441)).segment((307,441)).arc((327,454),(314,467)).segment((314,474)).arc((247,221),(287,467)).assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,499,824))
+r=w0.sketch().segment((610,19),(980,19)).segment((980,258)).arc((790,193),(610,284)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((635,115),(709,114)).segment((710,233)).arc((726,305),(731,374)).arc((741,425),(714,464)).arc((709,469),(709,480)).segment((710,704)).segment((634,704)).segment((633,600)).arc((19,353),(634,115)).assemble().push([(123,964)]).circle(536).finalize().extrude(375))
\ No newline at end of file
diff --git a/test/extrude/859/859.stl b/test/extrude/859/859.stl
index e06e6db2d6bb6a05ef6d87f7d28d9f5ec0bcb9d0..b872b34a48b029fedd80bc36006fa0f1a7c4b432 100644
Binary files a/test/extrude/859/859.stl and b/test/extrude/859/859.stl differ
diff --git a/test/extrude/86/86.py b/test/extrude/86/86.py
index 95bd705005e0ec010f22b9cf986755fa85ee651f..ce7734e668ef66a915bad6e64cdf98a84b53c920 100644
--- a/test/extrude/86/86.py
+++ b/test/extrude/86/86.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().circle(860).push([(500,607)]).circle(680,mode='s').finalize().extrude(1).translate((195,1,195))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,689))
+r=w0.sketch().arc((390,487),(400,456),(410,430)).segment((410,595)).segment((540,595)).segment((495,406)).segment((431,407)).arc((457,380),(485,365)).segment((400,11)).segment((430,2)).segment((514,362)).arc((581,367),(635,405)).segment((525,405)).segment((576,595)).segment((654,596)).segment((655,430)).arc((674,486),(670,541)).arc((712,695),(631,830)).segment((665,990)).segment((635,999)).segment((600,850)).arc((317,769),(391,486)).assemble().finalize().extrude(121)
\ No newline at end of file
diff --git a/test/extrude/86/86.stl b/test/extrude/86/86.stl
index 1779b060f6d7f0dee2fbf553ab2a5a253f8a65b8..2ef41b132e9f18f27b2dd8a0ffb77c731e514737 100644
Binary files a/test/extrude/86/86.stl and b/test/extrude/86/86.stl differ
diff --git a/test/extrude/860/860.py b/test/extrude/860/860.py
index cf978c1792af1228d73e0b8e34247cea961967e3..221ded94efc45f76b5cdb50e76607a7a54f9b801 100644
--- a/test/extrude/860/860.py
+++ b/test/extrude/860/860.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(266,266,334))
-r=w0.sketch().push([(1,197)]).circle(428).push([(637,266)]).rect(377,1000).finalize().extrude(121).translate((162,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,440))
+r=w0.sketch().segment((366,2),(851,1)).segment((851,709)).segment((437,709)).segment((437,616)).segment((366,617)).close().assemble().reset().face(w0.sketch().segment((426,116),(484,116)).segment((486,100)).segment((611,101)).segment((611,117)).segment((669,116)).segment((671,290)).segment((609,290)).segment((609,300)).segment((486,300)).segment((486,292)).segment((426,291)).close().assemble(),mode='s').finalize().extrude(100).union(w0.workplane(offset=763).moveTo(154,845).box(506,811,1000))
\ No newline at end of file
diff --git a/test/extrude/860/860.stl b/test/extrude/860/860.stl
index 02fedb6e1c26aff7d94ec8ea9de82a369fe74f4b..ef53d20050884dde9ec29c877e4f5e3d8de9a849 100644
Binary files a/test/extrude/860/860.stl and b/test/extrude/860/860.stl differ
diff --git a/test/extrude/861/861.py b/test/extrude/861/861.py
index 82fe291ec4dcbe9cc4cdd44d8c40b90886ec2feb..0eed4747b5f9392a5a43a9f87971d9089a427a94 100644
--- a/test/extrude/861/861.py
+++ b/test/extrude/861/861.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(352,352,769))
-w1=cq.Workplane('YZ',origin=(195,352,352))
-r=w0.workplane(offset=29).moveTo(519,1).cylinder(1000,464).union(w0.sketch().push([(408,445)]).circle(722).reset().face(w0.sketch().segment((251,288),(316,288)).arc((408,260),(500,288)).segment((565,288)).segment((565,343)).arc((602,445),(565,556)).segment((565,612)).segment((500,612)).arc((408,639),(316,612)).segment((251,612)).segment((251,556)).arc((223,445),(251,343)).close().assemble(),mode='s').finalize().extrude(112)).union(w1.sketch().push([(339,204)]).rect(695,889).reset().face(w1.sketch().segment((278,232),(343,232)).segment((343,316)).arc((352,343),(343,380)).segment((343,464)).segment((278,464)).segment((278,380)).arc((269,343),(278,316)).close().assemble(),mode='s').finalize().extrude(84)).translate((1,112,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,266,500))
+r=w0.sketch().segment((445,230),(696,227)).arc((721,216),(749,225)).segment((1000,222)).segment((1000,260)).segment((751,265)).arc((720,280),(694,266)).segment((445,271)).close().assemble().finalize().extrude(761).union(w0.sketch().arc((2,660),(185,675),(22,755)).arc((16,705),(2,661)).assemble().finalize().extrude(784)).union(w0.workplane(offset=734).moveTo(271,490).cylinder(970,766))
\ No newline at end of file
diff --git a/test/extrude/861/861.stl b/test/extrude/861/861.stl
index e09b0b6837aa842d1b54bcf07f21540699d23e31..4f87fdc4b53e5a4836f94e59086cde8618446dd4 100644
Binary files a/test/extrude/861/861.stl and b/test/extrude/861/861.stl differ
diff --git a/test/extrude/862/862.py b/test/extrude/862/862.py
index b97cb64de9da3f48cb00eff113234b9ddb4ed97d..0083144eba9191384d58376278bb9c2cc0966d9a 100644
--- a/test/extrude/862/862.py
+++ b/test/extrude/862/862.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(379,379,73))
-r=w0.sketch().push([(61,1)]).rect(456,473).push([(44,39)]).rect(405,396,mode='s').reset().face(w0.sketch().segment((56,14),(65,5)).segment((90,22)).segment((73,31)).close().assemble(),mode='s').finalize().extrude(957).union(w0.workplane(offset=690).moveTo(711,779).cylinder(1000,405))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,581))
+r=w0.workplane(offset=237).moveTo(350,306).box(950,540,1000).union(w0.sketch().segment((2,617),(21,467)).segment((551,536)).segment((530,685)).close().assemble().reset().face(w0.sketch().arc((822,705),(960,807),(995,980)).close().assemble()).finalize().extrude(556)).union(w0.sketch().segment((185,21),(517,20)).segment((516,192)).arc((326,327),(515,457)).segment((516,590)).segment((186,591)).close().assemble().push([(210,36)]).rect(512,511,mode='s').finalize().extrude(870))
\ No newline at end of file
diff --git a/test/extrude/862/862.stl b/test/extrude/862/862.stl
index a3c8af0a8dcab8bb73962bff04a13d9716a5ab18..7ebda2d408692eb01f037f8f2990ac48b8faffe5 100644
Binary files a/test/extrude/862/862.stl and b/test/extrude/862/862.stl differ
diff --git a/test/extrude/863/863.py b/test/extrude/863/863.py
index b31737a807131e0d271579f6510c90b238e4fde7..c77588bb7fcb6cb0dac7fea087b6f372bc76338f 100644
--- a/test/extrude/863/863.py
+++ b/test/extrude/863/863.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(341,421,421))
-r=w0.sketch().segment((341,620),(630,580)).segment((640,680)).segment((351,680)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=670).moveTo(341,291).cylinder(920,640)).union(w0.workplane(offset=710).moveTo(510,665).box(840,630,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,346))
+r=w0.sketch().segment((340,301),(382,301)).segment((360,16)).segment((595,1)).segment((660,876)).segment((576,884)).segment((574,1000)).segment((341,999)).close().assemble().finalize().extrude(814)
\ No newline at end of file
diff --git a/test/extrude/863/863.stl b/test/extrude/863/863.stl
index 7ebffc701715b73ec6979562c51a54e99b5b82cf..23ad4188bd295f253404d59e22a55a22ed4ce71c 100644
Binary files a/test/extrude/863/863.stl and b/test/extrude/863/863.stl differ
diff --git a/test/extrude/864/864.py b/test/extrude/864/864.py
index 4367573eb9256f2e10ea6d0019627b5b3318befc..9426c012a316747b8f0b16a4f7da329f2fb2f73f 100644
--- a/test/extrude/864/864.py
+++ b/test/extrude/864/864.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(425,909,425))
-w1=cq.Workplane('YZ',origin=(319,425,425))
-r=w0.workplane(offset=183).moveTo(924,213).cylinder(909,682).union(w1.workplane(offset=712).moveTo(273,1).cylinder(1000,758)).translate((46,62,334))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(586,500,501))
+r=w0.workplane(offset=282).moveTo(541,382).cylinder(941,617).union(w0.sketch().segment((412,1),(665,2)).segment((667,510)).arc((455,997),(411,472)).close().assemble().finalize().extrude(776))
\ No newline at end of file
diff --git a/test/extrude/864/864.stl b/test/extrude/864/864.stl
index 20aa9295d39a5cf69fe7f49e783fd9f46563af69..e0c70814df7cfa6f563bd0836cb62a34947aa24d 100644
Binary files a/test/extrude/864/864.stl and b/test/extrude/864/864.stl differ
diff --git a/test/extrude/865/865.py b/test/extrude/865/865.py
index 7991c0ccd6042beebbcd9a155a9efcb14c93f273..7e66227db78f7b4915730cd466b9c5f85efd8f7a 100644
--- a/test/extrude/865/865.py
+++ b/test/extrude/865/865.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.workplane(offset=667).cylinder(1000,347).translate((1,14,14))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,1,501))
+r=w0.workplane(offset=1000).box(562,560,1000)
\ No newline at end of file
diff --git a/test/extrude/865/865.stl b/test/extrude/865/865.stl
index c84a97184baa43e5d141cafaa994f1b9a1982f9f..7b5ea6a2e2441830d28eca89bb95815b344a6db9 100644
Binary files a/test/extrude/865/865.stl and b/test/extrude/865/865.stl differ
diff --git a/test/extrude/866/866.py b/test/extrude/866/866.py
index 87c043b6b101c11f127583832b04af1366904de4..71b6632d651ec66cc3d2f221a2cd0340ebf94f76 100644
--- a/test/extrude/866/866.py
+++ b/test/extrude/866/866.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(292,88,292))
-w1=cq.Workplane('XY',origin=(292,292,1))
-r=w0.workplane(offset=636).moveTo(156,292).cylinder(981,467).union(w1.sketch().push([(292,161)]).rect(544,1000).push([(408,345)]).rect(311,302,mode='s').finalize().extrude(903)).translate((1,48,20))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,644,499))
+w1=cq.Workplane('ZX',origin=(499,285,500))
+r=w0.sketch().segment((445,506),(445,561)).arc((19,200),(575,206)).arc((461,335),(444,505)).assemble().reset().face(w0.sketch().segment((190,685),(569,685)).arc((716,726),(861,686)).segment((1000,685)).segment((1000,995)).segment((189,995)).close().assemble()).finalize().extrude(654).union(w1.sketch().push([(297,304)]).rect(1000,584).push([(307,274)]).rect(515,514,mode='s').finalize().extrude(415))
\ No newline at end of file
diff --git a/test/extrude/866/866.stl b/test/extrude/866/866.stl
index 8befd3e7a58721ec89d281602c6bce272c6871b5..ac23d6c0a1294cab941ab18d4085bc97aebfc877 100644
Binary files a/test/extrude/866/866.stl and b/test/extrude/866/866.stl differ
diff --git a/test/extrude/867/867.py b/test/extrude/867/867.py
index 7ae9dc1e2ad279941fd1b9588496e256d8d9cbaf..2b98828d19b9fed1ffec7c81cd0b045d95cd7ded 100644
--- a/test/extrude/867/867.py
+++ b/test/extrude/867/867.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,306))
-w1=cq.Workplane('ZX',origin=(334,154,334))
-r=w0.workplane(offset=1).moveTo(1,334).cylinder(1000,598).union(w1.sketch().arc((376,681),(667,556),(764,265)).arc((931,834),(376,681)).assemble().finalize().extrude(487)).translate((264,1,194))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(361,500,501))
+r=w0.sketch().segment((1,551),(100,271)).segment((135,282)).segment((37,565)).close().assemble().push([(713,678)]).rect(557,604).push([(710,661)]).circle(521,mode='s').push([(973,678)]).rect(554,606).finalize().extrude(780)
\ No newline at end of file
diff --git a/test/extrude/867/867.stl b/test/extrude/867/867.stl
index 7aa6c3b23c021585d920302d98f7bcff410891a0..48f81d72e6a129f732e0ec64044da0f308eb9c6b 100644
Binary files a/test/extrude/867/867.stl and b/test/extrude/867/867.stl differ
diff --git a/test/extrude/868/868.py b/test/extrude/868/868.py
index 0d280cee8ad39743025edb48526d13007d5e7f56..08e070e8372d8d5ce965ed131a94a0ddda544f60 100644
--- a/test/extrude/868/868.py
+++ b/test/extrude/868/868.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(542,542,615))
-w1=cq.Workplane('ZX',origin=(542,698,542))
-r=w0.workplane(offset=423).moveTo(331,514).cylinder(780,789).union(w0.workplane(offset=647).moveTo(560,643).cylinder(753,817)).union(w1.sketch().segment((349,441),(377,441)).segment((377,624)).arc((468,725),(377,826)).segment((377,1000)).segment((349,1000)).segment((349,826)).arc((258,725),(349,624)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,526,501))
+w1=cq.Workplane('XY',origin=(500,500,841))
+r=w0.sketch().segment((771,836),(915,597)).segment((950,616)).segment((810,855)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((47,420),(60,330)).segment((545,430)).segment((531,516)).close().assemble().finalize().extrude(976)).union(w1.workplane(offset=558).moveTo(277,131).cylinder(617,630))
\ No newline at end of file
diff --git a/test/extrude/868/868.stl b/test/extrude/868/868.stl
index cc2bdc2217758923a07178a8dc8db9247988d938..534a9800e1736bc160d1b26a4ef42700b406c3fe 100644
Binary files a/test/extrude/868/868.stl and b/test/extrude/868/868.stl differ
diff --git a/test/extrude/869/869.py b/test/extrude/869/869.py
index 216eacee0fe34e332b74a065b4bedd7bf644f37d..5da1e3e559b7f04ea76f4fb30c50ec2c5277cb85 100644
--- a/test/extrude/869/869.py
+++ b/test/extrude/869/869.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(290,290,1))
-r=w0.sketch().circle(757).rect(757,1000,mode='s').finalize().extrude(879).translate((468,468,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,507,502))
+w1=cq.Workplane('XY',origin=(501,501,530))
+r=w0.sketch().push([(80,185)]).rect(512,870).push([(820,896)]).circle(605).finalize().extrude(227).union(w0.workplane(offset=671).moveTo(485,521).box(551,890,840)).union(w1.sketch().arc((530,446),(667,166),(596,471)).arc((470,706),(530,445)).assemble().finalize().extrude(789))
\ No newline at end of file
diff --git a/test/extrude/869/869.stl b/test/extrude/869/869.stl
index e46dc11e28f520e3fc701efb2701a5261209f3e7..90429ac6b6d8102fa9485f8da4a3f2b1025b0da0 100644
Binary files a/test/extrude/869/869.stl and b/test/extrude/869/869.stl differ
diff --git a/test/extrude/87/87.py b/test/extrude/87/87.py
index 00585ace8bfab619368a646c935e6efca6bc38a5..815bfa79c6e4185783bbc62016524eb99aa1b8dd 100644
--- a/test/extrude/87/87.py
+++ b/test/extrude/87/87.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,667))
-r=w0.workplane(offset=1).cylinder(1000,547).translate((214,214,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,605,501))
+r=w0.sketch().segment((16,395),(311,397)).arc((361,147),(571,1)).arc((726,206),(974,252)).arc((899,560),(606,676)).segment((605,999)).segment((16,1000)).close().assemble().finalize().extrude(284)
\ No newline at end of file
diff --git a/test/extrude/87/87.stl b/test/extrude/87/87.stl
index d6be3100e960cc99dbdb9fff671b2c28a2d6863e..7ac0ac34dbabe313f962edf10fc3a0d127159918 100644
Binary files a/test/extrude/87/87.stl and b/test/extrude/87/87.stl differ
diff --git a/test/extrude/870/870.py b/test/extrude/870/870.py
index 796593f7bb1252f778d4e72d03ddc60a1f35b6a5..900bfee475c07f2aaf1f2eb86a44a1aca96fb06b 100644
--- a/test/extrude/870/870.py
+++ b/test/extrude/870/870.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(612,495,495))
-r=w0.sketch().arc((25,271),(424,95),(377,530)).arc((1,659),(25,271)).assemble().finalize().extrude(260).union(w0.workplane(offset=442).moveTo(830,759).box(1000,859,600))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(435,500,500))
+r=w0.sketch().arc((439,674),(479,803),(441,940)).close().assemble().finalize().extrude(230).union(w0.sketch().segment((1,60),(581,60)).segment((580,384)).arc((993,655),(505,725)).segment((2,724)).close().assemble().push([(331,216)]).circle(545,mode='s').push([(734,596)]).circle(685,mode='s').finalize().extrude(900))
\ No newline at end of file
diff --git a/test/extrude/870/870.stl b/test/extrude/870/870.stl
index 57ba71d2e8bdf2c74b3050687b7106f9155b3671..4803935df48592b49e4e7ec48a632a20ce29dc51 100644
Binary files a/test/extrude/870/870.stl and b/test/extrude/870/870.stl differ
diff --git a/test/extrude/871/871.py b/test/extrude/871/871.py
index b0ccfaecedb2fa4bbfbb1ef7ea1ea006f0ac8765..1f20725de7490298415aa8d770dc25405b38e5b0 100644
--- a/test/extrude/871/871.py
+++ b/test/extrude/871/871.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(579,579,869))
-r=w0.sketch().segment((597,886),(667,1000)).arc((387,658),(807,772)).close().assemble().push([(579,246)]).circle(685).finalize().extrude(1).union(w0.workplane(offset=527).moveTo(728,746).box(720,930,685))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(646,499,500))
+w1=cq.Workplane('ZX',origin=(500,599,498))
+r=w0.sketch().arc((381,345),(604,300),(430,445)).arc((20,575),(379,344)).assemble().finalize().extrude(213).union(w1.workplane(offset=700).moveTo(675,553).box(689,625,900))
\ No newline at end of file
diff --git a/test/extrude/871/871.stl b/test/extrude/871/871.stl
index c2876d66677220b0237a170573d39892e9436828..47f84e8fca59019ec3fa06edb370fb80161aa74f 100644
Binary files a/test/extrude/871/871.stl and b/test/extrude/871/871.stl differ
diff --git a/test/extrude/872/872.py b/test/extrude/872/872.py
index 6ad07d845c2fa8a437d5e62bb66320eebd429af1..35d2f61c5e638ecb15389bc3400366fb69841964 100644
--- a/test/extrude/872/872.py
+++ b/test/extrude/872/872.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(511,266,511))
-w1=cq.Workplane('XY',origin=(511,511,184))
-r=w0.sketch().arc((113,796),(429,623),(409,980)).segment((409,796)).close().assemble().reset().face(w0.sketch().segment((419,439),(511,1)).segment((908,83)).segment((817,521)).close().assemble()).finalize().extrude(1000).union(w1.workplane(offset=577).moveTo(1000,358).box(551,694,643))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,686,501))
+r=w0.sketch().segment((166,1),(834,1)).segment((836,655)).segment((587,656)).segment((586,1000)).segment((420,1000)).segment((421,657)).segment((167,654)).close().assemble().finalize().extrude(126)
\ No newline at end of file
diff --git a/test/extrude/872/872.stl b/test/extrude/872/872.stl
index bcb5f13982edbd6cf9db669ba6fad30c6d5ee2f9..9d0ca1204026f72d36a393ef8a770c17d1f8d42a 100644
Binary files a/test/extrude/872/872.stl and b/test/extrude/872/872.stl differ
diff --git a/test/extrude/873/873.py b/test/extrude/873/873.py
index 575d77b69e2e3e740ea697fc7979e30e1679e739..3e215b7acb42f2a98ac86451c8a07824b235c26e 100644
--- a/test/extrude/873/873.py
+++ b/test/extrude/873/873.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(338,338,1))
-r=w0.workplane(offset=548).moveTo(401,569).cylinder(758,380).union(w0.sketch().segment((43,453),(127,453)).arc((390,274),(663,443)).arc((674,443),(685,432)).segment((685,527)).segment((663,527)).segment((663,579)).segment((685,579)).segment((685,685)).segment((674,685)).arc((653,716),(632,758)).arc((527,727),(527,832)).arc((295,842),(127,685)).segment((43,685)).close().assemble().reset().face(w0.sketch().arc((737,432),(832,548),(748,674)).segment((748,685)).segment((737,685)).segment((737,579)).segment((758,579)).segment((758,527)).segment((737,527)).close().assemble()).finalize().extrude(811)).union(w0.workplane(offset=669).moveTo(64,33).cylinder(1000,558)).translate((157,188,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(696,501,500))
+r=w0.sketch().segment((1,32),(1000,31)).segment((999,970)).segment((25,970)).arc((21,905),(1,840)).close().assemble().push([(19,300)]).rect(515,510,mode='s').push([(500,205)]).circle(606,mode='s').finalize().extrude(112)
\ No newline at end of file
diff --git a/test/extrude/873/873.stl b/test/extrude/873/873.stl
index 7c475f58142df8306d4a559bfb174d0ab8bd66d4..a1f5ec1c33e6ba272dd40de8a571c1682aee73fc 100644
Binary files a/test/extrude/873/873.stl and b/test/extrude/873/873.stl differ
diff --git a/test/extrude/874/874.py b/test/extrude/874/874.py
index 8d428cffadb8103937c55747ea59556b2a12cdac..f32fedf2126f94cf56d91475a72a3771c15ef27b 100644
--- a/test/extrude/874/874.py
+++ b/test/extrude/874/874.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,407).translate((74,1,74))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,761,501))
+r=w0.sketch().segment((140,856),(166,854)).arc((156,864),(141,856)).assemble().finalize().extrude(1).union(w0.sketch().segment((90,407),(166,407)).segment((166,1)).segment((910,1)).segment((911,481)).segment((257,481)).segment((256,999)).segment((91,1000)).close().assemble().push([(894,395)]).rect(521,509,mode='s').finalize().extrude(106))
\ No newline at end of file
diff --git a/test/extrude/874/874.stl b/test/extrude/874/874.stl
index 5131319f7e96096216edb83ed2555bb07dc8611f..b56a136d63013df42768c0f95a6fa559ba0832b6 100644
Binary files a/test/extrude/874/874.stl and b/test/extrude/874/874.stl differ
diff --git a/test/extrude/875/875.py b/test/extrude/875/875.py
index 35a946e00b8d7b1dd6df87ffc4a49ae0ea6ef026..495e465504a23d65703083f3c6e2cd7efb33c401 100644
--- a/test/extrude/875/875.py
+++ b/test/extrude/875/875.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(870,574,574))
-w1=cq.Workplane('YZ',origin=(800,574,574))
-r=w0.sketch().segment((653,305),(687,288)).segment((696,331)).arc((540,270),(679,340)).close().assemble().finalize().extrude(1).union(w1.sketch().segment((392,922),(757,922)).arc((644,1000),(514,1000)).segment((514,957)).segment((479,957)).segment((479,983)).arc((435,957),(392,922)).assemble().finalize().extrude(44))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,400,501))
+r=w0.workplane(offset=335).moveTo(559,793).box(886,716,829).union(w0.sketch().segment((332,716),(366,716)).arc((555,584),(749,715)).segment((786,714)).segment((784,869)).segment((750,870)).arc((556,1000),(367,871)).segment((330,870)).close().assemble().finalize().extrude(746)).union(w0.workplane(offset=764).moveTo(361,273).box(790,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/875/875.stl b/test/extrude/875/875.stl
index 3887d47a770895b4ef540b67e121f87c1e61272c..11cfb2c450c39bd9006a3e38320e2d0203082808 100644
Binary files a/test/extrude/875/875.stl and b/test/extrude/875/875.stl differ
diff --git a/test/extrude/876/876.py b/test/extrude/876/876.py
index 3c4b6a8ce264b631be3a414409efea938c466781..f15898705e00a898bcbc289453234b9b4274449f 100644
--- a/test/extrude/876/876.py
+++ b/test/extrude/876/876.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(603,663,603))
-w1=cq.Workplane('YZ',origin=(807,603,603))
-r=w0.sketch().segment((675,194),(687,194)).segment((687,1)).segment((771,1)).segment((771,194)).segment((783,194)).segment((783,242)).segment((771,242)).segment((771,422)).segment((687,422)).segment((687,242)).segment((675,242)).close().assemble().reset().face(w0.sketch().segment((687,49),(711,25)).segment((759,121)).segment((735,133)).close().assemble(),mode='s').finalize().extrude(109).union(w0.sketch().arc((434,133),(458,242),(434,338)).close().assemble().finalize().extrude(976)).union(w1.workplane(offset=801).moveTo(633,470).box(759,699,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,1,501))
+r=w0.sketch().segment((460,201),(464,800)).segment((466,441)).arc((536,321),(461,200)).assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/876/876.stl b/test/extrude/876/876.stl
index 9194a23321239876244ada34119a9e22886de5f3..a755118e8ce3ae19da2b33d14438b81a14c19814 100644
Binary files a/test/extrude/876/876.stl and b/test/extrude/876/876.stl differ
diff --git a/test/extrude/877/877.py b/test/extrude/877/877.py
index 717366b2162e8de3209e0c547f5988c9c1385b06..0e33801dfb8bb8ccd0fcfc86fd829a7e865bc77f 100644
--- a/test/extrude/877/877.py
+++ b/test/extrude/877/877.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(589,882,589))
-r=w0.sketch().rect(918,1000).reset().face(w0.sketch().segment((553,671),(612,500)).segment((624,506)).segment((565,677)).close().assemble(),mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(491,500,500))
+r=w0.sketch().segment((492,17),(571,2)).segment((621,235)).segment((546,252)).close().assemble().finalize().extrude(350).union(w0.sketch().arc((382,785),(346,597),(472,450)).segment((641,450)).segment((659,845)).segment((660,1000)).segment((381,1000)).close().assemble().finalize().extrude(676))
\ No newline at end of file
diff --git a/test/extrude/877/877.stl b/test/extrude/877/877.stl
index 0a28f28f9147253271a4c0b420fb423ab2e7e2c4..f16ede07370a2573537953e868d200e042f7aeea 100644
Binary files a/test/extrude/877/877.stl and b/test/extrude/877/877.stl differ
diff --git a/test/extrude/878/878.py b/test/extrude/878/878.py
index a0dca1ae006594e8b5ab74d2c2c0d88113ccc574..af324ae3ce37b610a69d851a36c40120e10edf2b 100644
--- a/test/extrude/878/878.py
+++ b/test/extrude/878/878.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(474,369,474))
-r=w0.sketch().segment((1,590),(401,590)).segment((401,621)).segment((264,621)).segment((264,811)).segment((401,811)).segment((401,1000)).segment((1,1000)).close().assemble().reset().face(w0.sketch().segment((432,853),(485,811)).segment((495,811)).segment((495,800)).segment((695,611)).segment((706,632)).segment((548,779)).arc((527,790),(516,821)).segment((453,874)).close().assemble()).push([(874,22)]).circle(548).finalize().extrude(685).translate((53,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(361,325,326))
+w1=cq.Workplane('XY',origin=(326,326,489))
+r=w0.sketch().push([(209,144)]).circle(469).push([(177,116)]).circle(404,mode='s').finalize().extrude(203).union(w1.sketch().arc((369,570),(375,544),(400,540)).segment((387,540)).segment((388,553)).segment((385,552)).segment((383,570)).segment((397,568)).segment((398,559)).segment((404,559)).segment((404,542)).arc((407,576),(375,575)).arc((375,568),(368,568)).assemble().finalize().extrude(489))
\ No newline at end of file
diff --git a/test/extrude/878/878.stl b/test/extrude/878/878.stl
index 2f6623846a99b34b439de90623a8d9db55848bef..6bf2c6c7f794b2b35666e1c64baa43790216c639 100644
Binary files a/test/extrude/878/878.stl and b/test/extrude/878/878.stl differ
diff --git a/test/extrude/879/879.py b/test/extrude/879/879.py
index bb448f1d68c2f0ed1678845d5eb526bc37a508c7..370d7851d6f4694a5dae60df3871d31089a46e39 100644
--- a/test/extrude/879/879.py
+++ b/test/extrude/879/879.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(386,480,480))
-r=w0.sketch().segment((1,677),(157,376)).segment((625,615)).segment((480,917)).segment((407,875)).segment((407,1000)).segment((344,1000)).segment((344,844)).close().assemble().finalize().extrude(147).union(w0.sketch().push([(834,84)]).circle(605).circle(500,mode='s').finalize().extrude(428)).union(w0.workplane(offset=740).moveTo(485,625).box(802,563,1000)).translate((1,1,42))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(551,499,501))
+r=w0.sketch().segment((2,651),(220,594)).segment((276,805)).segment((57,865)).close().assemble().push([(496,240)]).circle(607).push([(771,575)]).rect(750,510).finalize().extrude(211).union(w0.workplane(offset=592).moveTo(845,646).cylinder(686,656))
\ No newline at end of file
diff --git a/test/extrude/879/879.stl b/test/extrude/879/879.stl
index 1bccb77eaa38fb7e18725567e07b01c4fb2d2db8..663eab7ae9e428b4f7b2f761011f9fbf51856eef 100644
Binary files a/test/extrude/879/879.stl and b/test/extrude/879/879.stl differ
diff --git a/test/extrude/88/88.py b/test/extrude/88/88.py
index 8b805c0645888a8c2810ba1ee964710c1a429a12..8c45a25b02bd8f296fab5b5292be8d46a14450da 100644
--- a/test/extrude/88/88.py
+++ b/test/extrude/88/88.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(314,444,314))
-r=w0.workplane(offset=1).cylinder(941,905).union(w0.sketch().rect(1000,834).push([(279,503)]).circle(362,mode='s').push([(314,113)]).circle(362,mode='s').finalize().extrude(693)).translate((592,27,592))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,332))
+r=w0.sketch().segment((222,1),(781,2)).segment((780,556)).arc((760,735),(781,916)).segment((781,999)).segment((220,999)).close().assemble().push([(636,262)]).circle(579,mode='s').finalize().extrude(846)
\ No newline at end of file
diff --git a/test/extrude/88/88.stl b/test/extrude/88/88.stl
index 0aac73887b667e3c325955602732af0e7ea431ba..ac69a2697757dd67c2cfef007e2394fc0187b9cb 100644
Binary files a/test/extrude/88/88.stl and b/test/extrude/88/88.stl differ
diff --git a/test/extrude/880/880.py b/test/extrude/880/880.py
index 8446e3962099f798f0fcccb19c6285d4f5394014..0ecfdb1f98e78c7601c9675fca2c19a4ba3f57d4 100644
--- a/test/extrude/880/880.py
+++ b/test/extrude/880/880.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(223,223,440))
-r=w0.workplane(offset=1).box(1000,409,666).translate((278,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,326,500))
+r=w0.sketch().segment((1,329),(695,132)).arc((705,175),(720,215)).arc((692,420),(895,431)).segment((896,505)).segment((935,646)).segment((156,870)).close().assemble().finalize().extrude(265).union(w0.workplane(offset=488).moveTo(593,408).box(1000,936,526)).union(w0.workplane(offset=794).moveTo(592,243).box(1000,505,1000))
\ No newline at end of file
diff --git a/test/extrude/880/880.stl b/test/extrude/880/880.stl
index 913c39616b9e8f806c93119293636516e8b99922..2ff4a992135560527d72be6777a9f4030115af0e 100644
Binary files a/test/extrude/880/880.stl and b/test/extrude/880/880.stl differ
diff --git a/test/extrude/881/881.py b/test/extrude/881/881.py
index 648625beb93be2d3a57b6663a8e142d4ceddddfd..1f5212bcc657446fc29bc9a81e76feaa0fac419d 100644
--- a/test/extrude/881/881.py
+++ b/test/extrude/881/881.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(421,500,500))
-r=w0.sketch().arc((1,341),(111,201),(281,121)).arc((1000,570),(201,810)).arc((91,740),(1,620)).segment((61,620)).segment((131,700)).arc((91,510),(131,321)).segment((111,341)).close().assemble().finalize().extrude(670)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,426,500))
+r=w0.sketch().rect(1000,1000).push([(964,679)]).circle(529,mode='s').finalize().extrude(650)
\ No newline at end of file
diff --git a/test/extrude/881/881.stl b/test/extrude/881/881.stl
index 9f74575a1cb4bd4cb5467432e2b23b9f719f3f30..551cec137a61683d10f218ba18b7b2caa0aac722 100644
Binary files a/test/extrude/881/881.stl and b/test/extrude/881/881.stl differ
diff --git a/test/extrude/882/882.py b/test/extrude/882/882.py
index 347319c23fb7e96cf64562c21ec4d05f43d87a6f..bd73434e0c7b583ca133fbd0e1a43d33a535c5f4 100644
--- a/test/extrude/882/882.py
+++ b/test/extrude/882/882.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(301,417,417))
-w1=cq.Workplane('YZ',origin=(709,417,417))
-r=w0.sketch().arc((1,642),(26,667),(59,684)).segment((59,667)).arc((68,692),(84,725)).segment((1,725)).close().assemble().finalize().extrude(242).union(w0.workplane(offset=480).moveTo(417,288).box(1000,958,542)).union(w1.sketch().push([(713,634)]).rect(659,784).push([(659,692)]).rect(534,451,mode='s').push([(650,734)]).circle(442,mode='s').push([(817,650)]).circle(426,mode='s').finalize().extrude(93))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,499,1))
+r=w0.workplane(offset=719).moveTo(261,321).cylinder(938,759).union(w0.sketch().segment((740,919),(739,940)).arc((835,684),(973,919)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/882/882.stl b/test/extrude/882/882.stl
index 5dbeb5b7bf3aa4638928f43271296834fe4f21b2..38b6c34ed0546b8e98ba19e4c02448b1a63197aa 100644
Binary files a/test/extrude/882/882.stl and b/test/extrude/882/882.stl differ
diff --git a/test/extrude/883/883.py b/test/extrude/883/883.py
index d60805e19cf7258aa7f4c883ec4475fda6fb0c74..7ecaec291ca2df9475aa45e795f660655fd0c9eb 100644
--- a/test/extrude/883/883.py
+++ b/test/extrude/883/883.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,481))
-w1=cq.Workplane('XY',origin=(500,500,441))
-r=w0.sketch().push([(615,431)]).rect(930,900).push([(610,426)]).rect(820,650,mode='s').finalize().extrude(451).union(w0.sketch().segment((1,401),(161,261)).arc((381,441),(650,361)).arc((660,391),(650,421)).arc((640,461),(590,461)).segment((630,510)).segment((341,770)).close().assemble().finalize().extrude(600)).union(w1.sketch().segment((580,341),(1000,341)).segment((1000,580)).segment((580,580)).segment((580,461)).arc((570,431),(580,401)).close().assemble().finalize().extrude(580))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(486,500,500))
+r=w0.workplane(offset=258).moveTo(499,400).box(811,880,986).union(w0.sketch().arc((346,769),(371,776),(346,785)).arc((351,774),(345,769)).assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/883/883.stl b/test/extrude/883/883.stl
index c31bcd5993c818f17c315c17e0b80509889a927e..2cfa264ff8f61dcdcbaec8343985d42942899061 100644
Binary files a/test/extrude/883/883.stl and b/test/extrude/883/883.stl differ
diff --git a/test/extrude/884/884.py b/test/extrude/884/884.py
index 8157ead23060b2280ab7212292d1fcecb40a93c9..5da8dc72ca744d4e289798048f110ed098c88603 100644
--- a/test/extrude/884/884.py
+++ b/test/extrude/884/884.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(600,500,500))
-r=w0.sketch().segment((481,1),(520,1)).segment((520,201)).arc((800,500),(520,800)).segment((520,1000)).segment((481,1000)).segment((481,800)).arc((201,500),(481,201)).close().assemble().finalize().extrude(301)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,241))
+r=w0.sketch().push([(66,313)]).rect(630,794).reset().face(w0.sketch().segment((315,390),(405,390)).segment((461,140)).segment((1000,262)).segment((910,667)).segment((472,566)).segment((470,599)).segment((315,601)).close().assemble()).push([(941,713)]).rect(561,565).finalize().extrude(461).union(w0.sketch().arc((341,636),(540,675),(621,861)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/884/884.stl b/test/extrude/884/884.stl
index ee59e0c7da88c135caaa29ce61cd866e270ca446..bd1177c0da988e9572dc0b48b715253edbad33fa 100644
Binary files a/test/extrude/884/884.stl and b/test/extrude/884/884.stl differ
diff --git a/test/extrude/885/885.py b/test/extrude/885/885.py
index 3ef40c73adf14411a12ad6e918016c4afdf6cbb7..88a9aebeabc2fb4454b09c098b88133268e7a23a 100644
--- a/test/extrude/885/885.py
+++ b/test/extrude/885/885.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(461,421,461))
-r=w0.sketch().push([(560,555)]).rect(800,950).reset().face(w0.sketch().segment((411,630),(421,540)).segment((550,550)).segment((550,640)).close().assemble(),mode='s').finalize().extrude(1).union(w0.sketch().arc((610,401),(201,301),(620,331)).segment((630,331)).segment((630,401)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(425,501,501))
+r=w0.sketch().segment((17,400),(30,400)).segment((30,131)).segment((985,131)).segment((986,869)).segment((31,869)).segment((31,550)).segment((17,549)).close().assemble().reset().face(w0.sketch().segment((880,680),(886,680)).arc((911,666),(940,680)).segment((941,700)).segment((885,701)).segment((879,700)).close().assemble(),mode='s').finalize().extrude(77).union(w0.sketch().segment((162,295),(195,436)).segment((236,426)).segment((196,265)).arc((485,674),(160,296)).assemble().push([(330,475)]).circle(579,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/885/885.stl b/test/extrude/885/885.stl
index 4785db291980516c2dcb166929f3cd34ec98d046..32a4da49448b408654c01f42b2981d315e6624c8 100644
Binary files a/test/extrude/885/885.stl and b/test/extrude/885/885.stl differ
diff --git a/test/extrude/886/886.py b/test/extrude/886/886.py
index 5c158e3f8ade9b31d91e93a20b305491522ac1a1..225a731b500aee7365c2f83f0f8bd44806aaff65 100644
--- a/test/extrude/886/886.py
+++ b/test/extrude/886/886.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(409,468,409))
-r=w0.sketch().push([(1,131)]).rect(775,752).push([(7,131)]).rect(645,586,mode='s').reset().face(w0.sketch().segment((385,634),(586,634)).segment((586,480)).segment((1000,480)).segment((1000,858)).segment((385,858)).close().assemble()).finalize().extrude(291)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,436))
+r=w0.sketch().segment((540,312),(550,312)).segment((551,315)).segment((679,316)).arc((769,290),(861,311)).segment((864,310)).segment((864,315)).segment((1000,315)).segment((1000,681)).segment((866,679)).arc((776,704),(680,681)).segment((549,680)).segment((551,475)).segment((541,475)).close().assemble().finalize().extrude(262).union(w0.sketch().push([(260,500)]).circle(760).reset().face(w0.sketch().segment((196,560),(310,429)).segment((326,441)).segment((205,570)).close().assemble(),mode='s').finalize().extrude(869))
\ No newline at end of file
diff --git a/test/extrude/886/886.stl b/test/extrude/886/886.stl
index 7b7c4414c973a76066e2074f2600a8aa7d17648a..ebf602e643327f05687f402fc31d61818b209a1f 100644
Binary files a/test/extrude/886/886.stl and b/test/extrude/886/886.stl differ
diff --git a/test/extrude/887/887.py b/test/extrude/887/887.py
index a812b8dc7ab3f8ad3fc2799a28b23c79c919b8ff..7e29d13b7b9337dde5c52dcef5ae656c8bce53ed 100644
--- a/test/extrude/887/887.py
+++ b/test/extrude/887/887.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(341,500,500))
-r=w0.sketch().segment((1,321),(71,321)).segment((71,191)).segment((590,191)).segment((720,1)).segment((1000,191)).segment((910,321)).segment((970,321)).segment((970,870)).segment((900,870)).segment((900,1000)).segment((71,1000)).segment((71,870)).segment((1,870)).close().assemble().finalize().extrude(830)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,427,500))
+r=w0.sketch().segment((1,400),(165,402)).arc((501,156),(836,400)).segment((1000,400)).segment((1000,599)).segment((835,599)).arc((502,845),(165,601)).segment((1,600)).close().assemble().reset().face(w0.sketch().segment((370,260),(629,260)).segment((629,441)).arc((641,501),(631,560)).segment((630,741)).segment((372,740)).segment((371,562)).arc((360,502),(371,441)).close().assemble(),mode='s').finalize().extrude(649)
\ No newline at end of file
diff --git a/test/extrude/887/887.stl b/test/extrude/887/887.stl
index 27baba7c547a7bf54c2a93f8225b195ff78246a1..5593d19a8c07a4183a787a477c21077592b9e874 100644
Binary files a/test/extrude/887/887.stl and b/test/extrude/887/887.stl differ
diff --git a/test/extrude/888/888.py b/test/extrude/888/888.py
index ff64553088e40952ba7cdd72353dddf3bb925cb5..55c395453c58d81f5fd23511f264d9e3b7e55bb0 100644
--- a/test/extrude/888/888.py
+++ b/test/extrude/888/888.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(590,462,590))
-r=w0.workplane(offset=705).moveTo(590,821).cylinder(821,1000).union(w0.workplane(offset=725).moveTo(526,1).cylinder(859,641)).translate((51,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,725))
+r=w0.sketch().arc((306,505),(307,522),(321,517)).arc((286,541),(307,507)).assemble().finalize().extrude(1).union(w0.sketch().segment((143,327),(452,3)).segment((680,226)).segment((806,181)).segment((840,288)).segment((701,332)).segment((501,542)).arc((172,975),(262,437)).close().assemble().finalize().extrude(263)).union(w0.workplane(offset=564).moveTo(721,270).box(1000,966,626))
\ No newline at end of file
diff --git a/test/extrude/888/888.stl b/test/extrude/888/888.stl
index 8ccf888cee52fee695d53025ac9441afebbd4753..6d7f3f6a702e75329a20b4a13c4eff084984774c 100644
Binary files a/test/extrude/888/888.stl and b/test/extrude/888/888.stl differ
diff --git a/test/extrude/889/889.py b/test/extrude/889/889.py
index d0e6aff697a0e8d403cbba576db177a7c47f0cae..ace77cec6c2d6751e1e842e3cd62d46fa2ea5cec 100644
--- a/test/extrude/889/889.py
+++ b/test/extrude/889/889.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.workplane(offset=667).box(441,454,1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(411,499,501))
+r=w0.workplane(offset=459).moveTo(854,439).cylinder(586,646).union(w0.sketch().segment((1,821),(116,820)).segment((116,585)).segment((276,584)).arc((355,451),(511,411)).segment((486,546)).segment((686,580)).arc((592,791),(356,784)).segment((355,889)).segment((321,890)).segment((321,906)).segment((2,904)).close().assemble().reset().face(w0.sketch().segment((719,96),(966,95)).segment((966,196)).arc((969,240),(964,282)).segment((964,381)).segment((849,380)).segment((855,360)).segment((720,337)).segment((721,280)).arc((711,240),(719,196)).close().assemble()).finalize().extrude(771))
\ No newline at end of file
diff --git a/test/extrude/889/889.stl b/test/extrude/889/889.stl
index 3c49406c8409bcf1b0a1feae9110b5958e77ee10..968ae2be44517a6608460910a55fdd62400c216a 100644
Binary files a/test/extrude/889/889.stl and b/test/extrude/889/889.stl differ
diff --git a/test/extrude/89/89.py b/test/extrude/89/89.py
index f0470a8cbc313c3c797349a50e313e0687d21964..cce44ecec9d3169b94d03619ddd0c5b318365986 100644
--- a/test/extrude/89/89.py
+++ b/test/extrude/89/89.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(398,398,398))
-w1=cq.Workplane('YZ',origin=(675,398,398))
-r=w0.workplane(offset=182).moveTo(49,482).box(543,711,831).union(w0.sketch().segment((494,699),(807,699)).segment((807,13)).segment((663,13)).arc((663,1),(675,1)).segment((1000,1)).segment((1000,831)).segment((675,831)).close().assemble().finalize().extrude(13)).union(w0.workplane(offset=615).moveTo(121,290).cylinder(831,723)).union(w1.workplane(offset=139).moveTo(194,242).cylinder(916,470)).translate((37,1,206))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,820))
+r=w0.workplane(offset=179).moveTo(653,187).box(1000,774,1000).union(w0.sketch().segment((1,506),(77,505)).segment((37,377)).segment((506,225)).segment((550,370)).arc((606,430),(634,507)).segment((721,506)).segment((720,670)).segment((644,669)).segment((684,804)).segment((216,951)).segment((171,806)).arc((117,745),(86,671)).segment((1,671)).close().assemble().push([(490,256)]).rect(509,529,mode='s').finalize().extrude(276))
\ No newline at end of file
diff --git a/test/extrude/89/89.stl b/test/extrude/89/89.stl
index 9f636dd1af88dd77a744222e14e5605d919618da..343f6efb36b0aaaa3215817987252980146ee1f4 100644
Binary files a/test/extrude/89/89.stl and b/test/extrude/89/89.stl differ
diff --git a/test/extrude/890/890.py b/test/extrude/890/890.py
index 228df2a730cbcd8d955ffad8cc397f2230d727ce..9bb3aa698c8a56fb33f837c71ded48dbfa1523a2 100644
--- a/test/extrude/890/890.py
+++ b/test/extrude/890/890.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(463,248,463))
-r=w0.workplane(offset=527).moveTo(291,527).cylinder(592,828).union(w0.sketch().segment((12,334),(517,334)).arc((592,248),(688,205)).segment((688,1)).segment((796,1)).segment((796,205)).arc((1000,463),(796,721)).segment((796,925)).segment((688,925)).segment((688,721)).arc((527,613),(484,441)).segment((12,441)).close().assemble().reset().face(w0.sketch().segment((667,484),(742,388)).segment((817,441)).segment((731,538)).close().assemble(),mode='s').finalize().extrude(893)).translate((1,1,75))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,821))
+r=w0.sketch().segment((1,231),(196,232)).segment((197,215)).segment((220,217)).segment((221,231)).segment((415,232)).segment((415,760)).segment((220,761)).segment((221,771)).segment((196,771)).segment((197,760)).segment((2,760)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((56,371),(614,371)).segment((615,467)).segment((935,466)).segment((936,454)).segment((1000,455)).segment((999,786)).segment((936,786)).segment((935,552)).segment((615,549)).segment((616,640)).segment((56,640)).close().assemble().push([(967,621)]).rect(567,511,mode='s').finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/890/890.stl b/test/extrude/890/890.stl
index 27be0cb79b606f65accc43d2c35d14703bd5e778..009318758b85c890f79cd518366ea1958a982dd8 100644
Binary files a/test/extrude/890/890.stl and b/test/extrude/890/890.stl differ
diff --git a/test/extrude/891/891.py b/test/extrude/891/891.py
index c4d6670297c80a590aab5206a84dc143fff177d8..20d36b68523b30eede77682860735ebaa34c94ff 100644
--- a/test/extrude/891/891.py
+++ b/test/extrude/891/891.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,720,500))
-r=w0.sketch().segment((301,1000),(341,870)).segment((381,960)).close().assemble().finalize().extrude(61).union(w0.sketch().arc((660,1),(700,141),(660,271)).close().assemble().finalize().extrude(131))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,499,340))
+r=w0.workplane(offset=330).moveTo(830,856).box(511,761,841).union(w0.workplane(offset=364).moveTo(327,285).cylinder(776,662)).union(w0.sketch().segment((300,16),(355,15)).segment((355,561)).segment((302,561)).segment((301,285)).arc((315,287),(301,281)).segment((301,261)).arc((311,256),(300,247)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/891/891.stl b/test/extrude/891/891.stl
index aa7dab6681a07e0031c88e272d950a4f091d6e68..c6da77337b12ef0923234c1b7f97f16486489bee 100644
Binary files a/test/extrude/891/891.stl and b/test/extrude/891/891.stl differ
diff --git a/test/extrude/892/892.py b/test/extrude/892/892.py
index 37bc5828cc4a7f79a05f2ec221160f384f47d12d..973e9da1374dd539f896d0549568d96bdfa69cd4 100644
--- a/test/extrude/892/892.py
+++ b/test/extrude/892/892.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(406,456,456))
-r=w0.sketch().push([(14,140)]).circle(646).reset().face(w0.sketch().segment((1,77),(14,77)).segment((26,203)).segment((14,203)).close().assemble(),mode='s').reset().face(w0.sketch().segment((482,254),(709,254)).segment((709,380)).arc((810,595),(1000,456)).arc((975,861),(595,697)).segment((482,697)).close().assemble()).push([(899,836)]).rect(482,507,mode='s').finalize().extrude(368).union(w0.workplane(offset=551).moveTo(633,747).cylinder(646,671)).translate((1,177,51))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,690))
+r=w0.sketch().segment((27,541),(157,471)).segment((232,606)).segment((440,506)).segment((491,616)).segment((287,710)).segment((381,885)).segment((172,999)).arc((176,956),(172,910)).arc((236,671),(27,541)).assemble().finalize().extrude(116).union(w0.sketch().segment((287,142),(482,142)).arc((969,231),(517,432)).segment((286,432)).close().assemble().finalize().extrude(172))
\ No newline at end of file
diff --git a/test/extrude/892/892.stl b/test/extrude/892/892.stl
index 79ad9401bced1718a330b3cd9be45d4131b9619e..fc538e0d1c5decde4dd391e09d82a8a3ea14ea58 100644
Binary files a/test/extrude/892/892.stl and b/test/extrude/892/892.stl differ
diff --git a/test/extrude/893/893.py b/test/extrude/893/893.py
index 93eac2d75d59a90c2f6f0ee3a42394157be0a282..9a3c581734e9798de78af1c651da5872a06b6b7e 100644
--- a/test/extrude/893/893.py
+++ b/test/extrude/893/893.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(371,445,371))
-r=w0.sketch().segment((1,519),(38,519)).arc((68,497),(97,482)).segment((97,16)).segment((349,16)).segment((349,645)).segment((260,645)).segment((260,674)).segment((223,674)).arc((193,697),(156,711)).segment((156,726)).segment((105,726)).segment((105,711)).arc((68,697),(38,674)).segment((1,674)).close().assemble().push([(612,330)]).rect(630,1000).finalize().extrude(223)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,2))
+r=w0.sketch().arc((435,430),(535,470),(561,571)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/893/893.stl b/test/extrude/893/893.stl
index 142bf7cb7f718f4f160a57dd58fb00888a452f23..6b82acb968f38264d035048579b93d5859644fd9 100644
Binary files a/test/extrude/893/893.stl and b/test/extrude/893/893.stl differ
diff --git a/test/extrude/894/894.py b/test/extrude/894/894.py
index c16e1635dc1f9029404c7ab6548e6439115d3fce..025ab563bf9128bc7c085e3440b3c8f299e40bc5 100644
--- a/test/extrude/894/894.py
+++ b/test/extrude/894/894.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(483,426,426))
-w1=cq.Workplane('XY',origin=(426,426,437))
-r=w0.sketch().segment((724,1),(920,1)).segment((920,35)).arc((816,81),(920,139)).segment((920,277)).segment((724,277)).close().assemble().finalize().extrude(943).union(w1.sketch().push([(139,208)]).rect(1000,977).rect(518,701,mode='s').finalize().extrude(839))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,635))
+w1=cq.Workplane('ZX',origin=(500,915,499))
+r=w0.sketch().arc((119,394),(25,114),(321,45)).segment((556,45)).segment((556,350)).arc((940,445),(554,546)).segment((556,645)).segment((119,645)).close().assemble().finalize().extrude(369).union(w0.sketch().push([(939,930)]).circle(559).reset().face(w0.sketch().segment((925,940),(931,915)).segment((960,931)).segment((945,955)).close().assemble(),mode='s').finalize().extrude(739)).union(w1.sketch().segment((171,469),(205,469)).segment((204,411)).segment((581,410)).segment((579,416)).arc((621,386),(664,365)).arc((649,349),(634,340)).arc((594,350),(589,309)).arc((139,729),(746,794)).arc((649,776),(564,711)).segment((205,710)).segment((205,496)).segment((170,495)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/894/894.stl b/test/extrude/894/894.stl
index ab8b193954f712bcfa6837af4602b60a8a1c7355..77dedba02b6836c19a3077e6935caf243f8f55ad 100644
Binary files a/test/extrude/894/894.stl and b/test/extrude/894/894.stl differ
diff --git a/test/extrude/895/895.py b/test/extrude/895/895.py
index c6afe2dda0544ec1ae90058d86353bfddccb3b0b..1aaa87973380d9e66c9c2ecf99b9400cdeffa979 100644
--- a/test/extrude/895/895.py
+++ b/test/extrude/895/895.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(493,493,243))
-w1=cq.Workplane('ZX',origin=(493,736,493))
-r=w0.workplane(offset=747).moveTo(633,559).box(949,537,1000).union(w1.sketch().arc((633,126),(647,185),(647,251)).segment((633,251)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(711,500,500))
+r=w0.sketch().segment((1,450),(95,285)).segment((280,395)).arc((377,307),(505,322)).segment((894,319)).segment((896,536)).segment((954,521)).segment((999,690)).segment((910,714)).segment((885,631)).segment((481,631)).segment((480,589)).arc((400,601),(330,571)).segment((299,626)).close().assemble().finalize().extrude(82)
\ No newline at end of file
diff --git a/test/extrude/895/895.stl b/test/extrude/895/895.stl
index 82ced685003c2889bf58e23e65ca217e9df9fb4d..8482ea1d6f2e2b9deeaba12ea3039750774ee41f 100644
Binary files a/test/extrude/895/895.stl and b/test/extrude/895/895.stl differ
diff --git a/test/extrude/896/896.py b/test/extrude/896/896.py
index c5fbf795ef2a46af12dcbfdfbbc76288c7792d3c..c64303ae86a52791f476a159445df8e43fe87e43 100644
--- a/test/extrude/896/896.py
+++ b/test/extrude/896/896.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(351,351,23))
-r=w0.sketch().segment((1,242),(30,242)).arc((140,1),(387,103)).segment((570,147)).segment((548,242)).segment((701,242)).segment((701,555)).segment((468,555)).segment((431,716)).segment((132,643)).segment((154,555)).segment((1,555)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,230))
+r=w0.sketch().arc((310,539),(342,435),(420,365)).segment((420,217)).segment((569,217)).segment((570,366)).arc((681,535),(570,705)).segment((570,850)).segment((421,850)).segment((422,800)).arc((185,745),(310,540)).assemble().push([(290,75)]).circle(575).push([(506,941)]).rect(881,621).rect(520,560,mode='s').push([(643,932)]).rect(536,557,mode='s').finalize().extrude(455).union(w0.sketch().arc((670,227),(681,322),(779,320)).arc((261,799),(671,225)).assemble().push([(497,535)]).circle(602,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/896/896.stl b/test/extrude/896/896.stl
index ce1a7aa9fcd11640633ef622c75aa314e9e1fe8a..0919e66ad57d05599e66bc6637d903473dfbba78 100644
Binary files a/test/extrude/896/896.stl and b/test/extrude/896/896.stl differ
diff --git a/test/extrude/897/897.py b/test/extrude/897/897.py
index 07716370e3fe3d2f821c40acf3a13b5210fe120d..931c019b7b6f5be6e01a7460e3a9e5ad6f60dd80 100644
--- a/test/extrude/897/897.py
+++ b/test/extrude/897/897.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().circle(953).push([(540,634)]).circle(720,mode='s').finalize().extrude(1).translate((288,288,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,335))
+w1=cq.Workplane('YZ',origin=(606,500,500))
+r=w0.sketch().segment((411,161),(639,161)).segment((639,357)).segment((715,297)).segment((715,415)).segment((796,416)).segment((714,481)).segment((411,327)).close().assemble().finalize().extrude(1000).union(w0.workplane(offset=834).moveTo(520,541).cylinder(1000,801)).union(w1.workplane(offset=285).moveTo(540,383).box(660,1000,931))
\ No newline at end of file
diff --git a/test/extrude/897/897.stl b/test/extrude/897/897.stl
index f6a6890c83a04b39876a5bb4dd143c171fc4e20a..8e51789479989faa3d76c728c064a2688e653d05 100644
Binary files a/test/extrude/897/897.stl and b/test/extrude/897/897.stl differ
diff --git a/test/extrude/898/898.py b/test/extrude/898/898.py
index eb40863ffeea5bd1dedb94240ec082a20a5c35b6..69457c791f0f28313929281bfac9887a8d865d68 100644
--- a/test/extrude/898/898.py
+++ b/test/extrude/898/898.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(550,550,820))
-r=w0.sketch().segment((190,811),(289,811)).segment((604,487)).segment((730,613)).segment((532,811)).segment((775,811)).segment((775,892)).segment((514,892)).arc((487,802),(460,892)).segment((451,892)).segment((343,1000)).segment((235,892)).segment((190,892)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((343,334),(676,163)).segment((910,613)).segment((577,784)).close().assemble().finalize().extrude(190)).union(w0.sketch().segment((379,100),(586,100)).arc((577,136),(586,163)).segment((379,163)).close().assemble().finalize().extrude(253))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,715))
+r=w0.sketch().segment((141,1),(309,1)).segment((310,315)).arc((810,321),(620,784)).arc((480,999),(411,753)).arc((356,714),(309,660)).segment((311,675)).segment((140,674)).close().assemble().finalize().extrude(66)
\ No newline at end of file
diff --git a/test/extrude/898/898.stl b/test/extrude/898/898.stl
index 1ba73b05a8f7666083ae3333b0c984f6053fcd61..9958fb64c486c5f1a4b131ad305cc916110c4f94 100644
Binary files a/test/extrude/898/898.stl and b/test/extrude/898/898.stl differ
diff --git a/test/extrude/899/899.py b/test/extrude/899/899.py
index 0a68cfcae482845a92bc9df5cb5f7805c480dae1..f0d3eb928f0efea14668390755fdb401acac06a4 100644
--- a/test/extrude/899/899.py
+++ b/test/extrude/899/899.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,570,500))
-w1=cq.Workplane('XY',origin=(500,500,441))
-r=w0.sketch().segment((141,1),(580,1)).segment((580,281)).arc((840,431),(790,720)).segment((790,750)).segment((760,750)).arc((700,780),(640,800)).segment((640,1000)).segment((491,1000)).segment((491,800)).segment((540,800)).arc((371,670),(351,451)).segment((141,451)).close().assemble().push([(595,540)]).rect(630,540,mode='s').finalize().extrude(191).union(w1.sketch().arc((610,730),(580,670),(620,720)).arc((610,710),(610,730)).assemble().finalize().extrude(770))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(42,500,502))
+r=w0.sketch().segment((2,11),(11,10)).arc((195,406),(631,335)).arc((641,550),(445,626)).segment((445,640)).segment((1,640)).close().assemble().finalize().extrude(651).union(w0.workplane(offset=960).moveTo(759,895).box(984,691,1000))
\ No newline at end of file
diff --git a/test/extrude/899/899.stl b/test/extrude/899/899.stl
index d78fe0697539a8a6f9c6b392dbae31290c06b574..76099b14dd9a64643a2620a794b0bcf7e068619c 100644
Binary files a/test/extrude/899/899.stl and b/test/extrude/899/899.stl differ
diff --git a/test/extrude/9/9.py b/test/extrude/9/9.py
index 5dea6dacb6e0913bc547c43b9fd6edc2499e4a3a..de431700626b0acb5fd59d7e27f49b0e51173bc1 100644
--- a/test/extrude/9/9.py
+++ b/test/extrude/9/9.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(419,291,419))
-w1=cq.Workplane('XY',origin=(419,419,814))
-r=w0.sketch().push([(1,59)]).circle(582).reset().face(w0.sketch().segment((245,605),(291,198)).segment((1000,280)).segment((954,675)).close().assemble()).finalize().extrude(675).union(w1.sketch().segment((547,373),(675,373)).arc((744,315),(814,373)).segment((942,373)).segment((942,408)).segment((814,408)).arc((744,466),(675,408)).segment((547,408)).close().assemble().finalize().extrude(13)).translate((105,1,164))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(31,9,15))
+r=w0.sketch().segment((1000,420),(329,420)).segment((328,920)).segment((1000,920)).close().assemble().finalize().extrude(171).union(w0.workplane(offset=42).sketch().segment((333,812),(48,802)).segment((49,769)).segment((117,772)).segment((192,744)).segment((219,712)).segment((322,712)).segment((347,749)).segment((394,759)).segment((476,774)).segment((488,806)).segment((418,830)).close().assemble().finalize().extrude(100))
diff --git a/test/extrude/9/9.stl b/test/extrude/9/9.stl
index 5dd8cafcd0850d2a1848d801885edfba7d534b29..9150cf46b43ad157cad2e5e08727f245ea76404a 100644
Binary files a/test/extrude/9/9.stl and b/test/extrude/9/9.stl differ
diff --git a/test/extrude/90/90.py b/test/extrude/90/90.py
index 29185d77394c0a65490c00e12e787b9868d129de..f7d78d844d9c30c132a75d5e1d83bbe069a94cfe 100644
--- a/test/extrude/90/90.py
+++ b/test/extrude/90/90.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(527,527,527))
-r=w0.sketch().arc((527,1),(688,22),(753,173)).arc((334,495),(527,1)).assemble().reset().face(w0.sketch().segment((431,527),(441,495)).segment((484,506)).segment((474,538)).close().assemble(),mode='s').push([(678,296)]).rect(549,560,mode='s').push([(345,1000)]).circle(592).reset().face(w0.sketch().segment((517,570),(828,570)).segment((828,646)).arc((764,656),(699,678)).segment((517,678)).close().assemble()).finalize().extrude(538)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(375,501,501))
+r=w0.workplane(offset=617).moveTo(248,133).box(996,516,736).union(w0.workplane(offset=626).moveTo(761,634).cylinder(749,741))
\ No newline at end of file
diff --git a/test/extrude/90/90.stl b/test/extrude/90/90.stl
index 98916a74b6d52af4d93374f329f645a20f1e9a48..436d041b1b7c562f62bd48afb5fecedd99591bb2 100644
Binary files a/test/extrude/90/90.stl and b/test/extrude/90/90.stl differ
diff --git a/test/extrude/900/900.py b/test/extrude/900/900.py
index 3b584ee22d57a3d1c640f139154a3026029a7a79..7f65e52d7550e013cb61191998a54f42dd5e641e 100644
--- a/test/extrude/900/900.py
+++ b/test/extrude/900/900.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.workplane(offset=667).cylinder(1000,580).translate((247,1,247))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,715,500))
+w1=cq.Workplane('XY',origin=(501,500,600))
+r=w0.sketch().segment((441,2),(600,1)).segment((600,366)).arc((602,711),(441,407)).close().assemble().push([(557,535)]).rect(815,621,mode='s').finalize().extrude(385).union(w1.workplane(offset=333).moveTo(970,316).cylinder(836,531))
\ No newline at end of file
diff --git a/test/extrude/900/900.stl b/test/extrude/900/900.stl
index 8ab6c5eb9517d535ba0a4dff9ec11d0317cbbafd..bf20ddc0baa6a5eb7ef4e76e50008bf1759540a8 100644
Binary files a/test/extrude/900/900.stl and b/test/extrude/900/900.stl differ
diff --git a/test/extrude/901/901.py b/test/extrude/901/901.py
index ca47531540fed9c2e1b771dd1183bd464f518bc6..333546378367a4ae49c3d1894a111c7b21bc9c9f 100644
--- a/test/extrude/901/901.py
+++ b/test/extrude/901/901.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(343,15,343))
-r=w0.sketch().segment((152,186),(275,186)).segment((275,1)).segment((412,1)).segment((412,186)).segment((535,186)).segment((535,500)).segment((412,500)).segment((412,685)).segment((275,685)).segment((275,500)).segment((152,500)).close().assemble().push([(206,268)]).circle(377,mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,500,765))
+r=w0.sketch().push([(500,477)]).circle(921).push([(499,479)]).rect(1000,966,mode='s').finalize().extrude(1).union(w0.sketch().segment((127,396),(151,395)).segment((151,1)).segment((285,1)).segment((285,999)).segment((150,1000)).segment((150,520)).segment((132,559)).segment((125,560)).close().assemble().finalize().extrude(295))
\ No newline at end of file
diff --git a/test/extrude/901/901.stl b/test/extrude/901/901.stl
index e71cbc91736f9e2359b7102a3d004d0f791bb6f0..c8ff148ba928d71cd9e259a8605eaf44a074474b 100644
Binary files a/test/extrude/901/901.stl and b/test/extrude/901/901.stl differ
diff --git a/test/extrude/902/902.py b/test/extrude/902/902.py
index 11c8f71ff7c336df3d7523a62be19ff29099f39d..127494026da8cac80bd35eafb3af1f1e603f3b76 100644
--- a/test/extrude/902/902.py
+++ b/test/extrude/902/902.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=667).cylinder(1000,580).translate((247,247,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(740,501,502))
+r=w0.sketch().segment((531,611),(540,611)).arc((746,502),(949,610)).segment((960,611)).segment((961,626)).arc((994,751),(959,875)).segment((960,891)).segment((951,890)).arc((745,1000),(541,890)).segment((531,890)).segment((530,876)).arc((495,750),(529,627)).close().assemble().finalize().extrude(17).union(w0.sketch().segment((5,2),(550,1)).segment((550,381)).segment((6,381)).segment((5,307)).segment((190,305)).segment((192,247)).segment((7,246)).close().assemble().finalize().extrude(450))
\ No newline at end of file
diff --git a/test/extrude/902/902.stl b/test/extrude/902/902.stl
index 072a67d533235107ddb9cd2fba0b4eec390083af..f43e910e7bec6d2558e5eec8a919de9bd4393627 100644
Binary files a/test/extrude/902/902.stl and b/test/extrude/902/902.stl differ
diff --git a/test/extrude/903/903.py b/test/extrude/903/903.py
index a74b89f2df6fd1829fb7ace846529851fabfb09f..86e450f241e08d152d8d23d13af61955a8282f10 100644
--- a/test/extrude/903/903.py
+++ b/test/extrude/903/903.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().segment((245,179),(278,112)).segment((811,390)).segment((778,467)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(756,889)]).circle(1000).circle(689,mode='s').push([(534,290)]).circle(689).finalize().extrude(623))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(615,502,502))
+r=w0.sketch().push([(357,322)]).circle(615).push([(292,305)]).circle(520,mode='s').finalize().extrude(1).union(w0.sketch().segment((140,620),(171,600)).segment((377,985)).segment((346,999)).close().assemble().push([(525,71)]).circle(571).reset().face(w0.sketch().arc((629,740),(696,590),(636,436)).arc((859,596),(630,741)).assemble()).finalize().extrude(784))
\ No newline at end of file
diff --git a/test/extrude/903/903.stl b/test/extrude/903/903.stl
index ca60ed090f5659afd83cc07f9b623a97d22869f7..6f20ea2e7a502b4b9d2b4dd45aee55f3a10faa5b 100644
Binary files a/test/extrude/903/903.stl and b/test/extrude/903/903.stl differ
diff --git a/test/extrude/904/904.py b/test/extrude/904/904.py
index 9b9be7fc6bce344cc481892a984f10b3270ff0e6..9927a0b736cf13827324f6113746ee1f9b5456c7 100644
--- a/test/extrude/904/904.py
+++ b/test/extrude/904/904.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(511,511,511))
-w1=cq.Workplane('YZ',origin=(521,511,511))
-r=w0.sketch().push([(200,954)]).rect(827,643).reset().face(w0.sketch().segment((164,918),(205,908)).segment((235,990)).segment((195,1000)).close().assemble(),mode='s').push([(337,1000)]).circle(521,mode='s').finalize().extrude(409).union(w0.sketch().push([(383,271)]).rect(867,643).reset().face(w0.sketch().arc((969,1),(980,52),(969,103)).close().assemble()).finalize().extrude(847)).union(w1.sketch().segment((174,623),(276,623)).arc((337,551),(419,531)).segment((419,633)).segment((633,633)).segment((633,623)).segment((653,623)).segment((653,694)).segment((745,694)).segment((745,959)).segment((521,959)).segment((521,755)).arc((388,806),(276,715)).segment((174,715)).close().assemble().finalize().extrude(174))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,466))
+r=w0.sketch().arc((326,241),(350,25),(482,202)).arc((601,988),(325,241)).assemble().push([(502,603)]).circle(816,mode='s').finalize().extrude(191).union(w0.sketch().segment((237,135),(331,16)).segment((337,6)).segment((342,1)).segment((357,16)).segment((507,72)).segment((487,116)).segment((523,142)).segment((432,265)).segment((427,275)).segment((422,271)).segment((417,277)).segment((400,266)).segment((257,206)).segment((272,166)).close().assemble().finalize().extrude(876))
\ No newline at end of file
diff --git a/test/extrude/904/904.stl b/test/extrude/904/904.stl
index 29f9b5866011dcf3e0e789c454758b11c34e2330..2d1a8da6ca4c5364ea73f79c4e9430f1c2176b5b 100644
Binary files a/test/extrude/904/904.stl and b/test/extrude/904/904.stl differ
diff --git a/test/extrude/905/905.py b/test/extrude/905/905.py
index 1d13f148e9f6442e396212e026f3adacd64b6a63..efeadeb82a82e93fc5a53d1fe53818bf689fe7c8 100644
--- a/test/extrude/905/905.py
+++ b/test/extrude/905/905.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(436,436,307))
-w1=cq.Workplane('YZ',origin=(365,436,436))
-r=w0.workplane(offset=430).moveTo(271,442).box(553,518,448).union(w0.sketch().push([(119,1)]).circle(589).reset().face(w0.sketch().segment((459,788),(553,706)).arc((589,882),(753,918)).segment((671,1000)).close().assemble()).reset().face(w0.sketch().segment((647,612),(730,530)).segment((941,741)).segment((859,824)).arc((824,647),(647,612)).assemble()).finalize().extrude(765)).union(w1.sketch().arc((318,412),(177,72),(459,307)).arc((600,342),(683,471)).arc((706,459),(741,448)).arc((824,483),(918,448)).arc((929,800),(612,659)).arc((365,647),(318,412)).assemble().finalize().extrude(1)).translate((36,154,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,236,500))
+r=w0.sketch().arc((40,804),(119,329),(591,224)).segment((1000,223)).segment((1000,684)).segment((340,664)).segment((339,531)).segment((205,530)).segment((205,664)).segment((44,659)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/905/905.stl b/test/extrude/905/905.stl
index a5268decd14e61bcd691ce9172a14066519503f7..4aee1a04e07c1ef4d66d974a3bdb483ff4fba1db 100644
Binary files a/test/extrude/905/905.stl and b/test/extrude/905/905.stl differ
diff --git a/test/extrude/906/906.py b/test/extrude/906/906.py
index 416ec4e5de4494b9856588242d516e7b63cd4832..ccd0356550916e10c667daa79b7661107efb8121 100644
--- a/test/extrude/906/906.py
+++ b/test/extrude/906/906.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(383,383,75))
-r=w0.sketch().push([(50,143)]).rect(951,840).push([(1,248)]).rect(531,433,mode='s').finalize().extrude(840).union(w0.sketch().segment((494,396),(963,396)).segment((963,507)).segment((1000,519)).segment((963,593)).segment((963,803)).segment((877,803)).segment((852,852)).segment((741,803)).segment((494,803)).close().assemble().push([(735,599)]).rect(470,519,mode='s').finalize().extrude(1000)).translate((44,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,500))
+r=w0.workplane(offset=265).moveTo(275,889).box(850,719,969).union(w0.sketch().segment((281,2),(305,2)).segment((306,117)).arc((375,147),(420,207)).arc((895,407),(380,366)).arc((347,386),(307,396)).segment((304,514)).segment((282,515)).segment((282,396)).arc((151,257),(281,115)).close().assemble().finalize().extrude(964))
\ No newline at end of file
diff --git a/test/extrude/906/906.stl b/test/extrude/906/906.stl
index 175d6d6b3c53920f069d39cea22ffd05f2b84f5e..078805a9e6dd77330739e0e9ae3b21fe1c50c2cf 100644
Binary files a/test/extrude/906/906.stl and b/test/extrude/906/906.stl differ
diff --git a/test/extrude/907/907.py b/test/extrude/907/907.py
index 08e9bb6d1578caf648ac12e841d7b2defba4fb10..6cca732846d4293f51627ec37cb58aae3bd6a228 100644
--- a/test/extrude/907/907.py
+++ b/test/extrude/907/907.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,667,334))
-r=w0.workplane(offset=1).cylinder(1000,554).translate((221,1,221))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,426))
+w1=cq.Workplane('ZX',origin=(499,405,501))
+r=w0.sketch().arc((356,770),(281,321),(585,654)).segment((586,631)).segment((515,631)).segment((515,776)).segment((582,775)).segment((635,929)).segment((611,941)).segment((611,900)).segment((546,899)).segment((546,964)).segment((436,1000)).close().assemble().finalize().extrude(650).union(w1.workplane(offset=299).moveTo(464,677).box(530,854,906))
\ No newline at end of file
diff --git a/test/extrude/907/907.stl b/test/extrude/907/907.stl
index 433e6db69431b0537e22d66b71f9c3a953ed586d..e8959605241bf762b8501915a40c8a98205078d2 100644
Binary files a/test/extrude/907/907.stl and b/test/extrude/907/907.stl differ
diff --git a/test/extrude/908/908.py b/test/extrude/908/908.py
index 5cd1a8fb2a3716a1e56fa06b771ce7023ba95f29..00026955313f5de1276ebeffee7e82155283a72c 100644
--- a/test/extrude/908/908.py
+++ b/test/extrude/908/908.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(368,368,659))
-r=w0.workplane(offset=77).moveTo(374,273).cylinder(949,570).union(w0.sketch().rect(823,1000).reset().face(w0.sketch().segment((260,311),(260,425)).arc((248,368),(260,311)).assemble(),mode='s').reset().face(w0.sketch().arc((311,260),(368,248),(425,260)).close().assemble(),mode='s').reset().face(w0.sketch().segment((311,475),(425,475)).arc((368,488),(311,475)).assemble(),mode='s').reset().face(w0.sketch().arc((475,311),(488,368),(475,425)).close().assemble(),mode='s').finalize().extrude(1)).translate((45,133,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(755,501,500))
+r=w0.sketch().arc((476,461),(676,341),(670,111)).segment((999,111)).segment((1000,506)).segment((525,506)).arc((502,480),(476,459)).assemble().finalize().extrude(1).union(w0.workplane(offset=247).moveTo(306,606).box(751,730,1000)).union(w0.workplane(offset=342).moveTo(305,603).box(1000,1000,815))
\ No newline at end of file
diff --git a/test/extrude/908/908.stl b/test/extrude/908/908.stl
index 4dd2b1ce6b30b214a1fb8a99ae345ad75a13555d..d2f97b59e1eb12cde50a84a474732b9eb379361b 100644
Binary files a/test/extrude/908/908.stl and b/test/extrude/908/908.stl differ
diff --git a/test/extrude/909/909.py b/test/extrude/909/909.py
index 7282ed29402340f9d1946dfad6489b85d610d255..f2e360854f844a42d71006ff20aae1e98417c986 100644
--- a/test/extrude/909/909.py
+++ b/test/extrude/909/909.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(575,460,575))
-r=w0.sketch().push([(874,495)]).circle(851).push([(879,500)]).rect(839,1000,mode='s').finalize().extrude(610).union(w0.sketch().arc((219,690),(196,782),(231,885)).arc((1,793),(219,690)).assemble().push([(770,862)]).circle(633).finalize().extrude(805))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,312,500))
+r=w0.sketch().segment((1,260),(425,260)).segment((425,415)).segment((756,415)).segment((755,936)).segment((211,934)).segment((211,755)).segment((2,755)).close().assemble().reset().face(w0.sketch().segment((97,440),(165,442)).segment((166,346)).segment((261,345)).segment((261,440)).segment((330,440)).segment((331,570)).segment((262,571)).segment((260,664)).segment((167,666)).segment((165,571)).segment((96,571)).close().assemble(),mode='s').reset().face(w0.sketch().segment((640,285),(711,67)).segment((999,160)).segment((930,375)).close().assemble()).finalize().extrude(880)
\ No newline at end of file
diff --git a/test/extrude/909/909.stl b/test/extrude/909/909.stl
index 22ed8f76555b6ba4af7c402f16a1b119259e4a22..ba440c2c55c2b694e6fa5f236ebd09575ee2249e 100644
Binary files a/test/extrude/909/909.stl and b/test/extrude/909/909.stl differ
diff --git a/test/extrude/91/91.py b/test/extrude/91/91.py
index dcb6e615d7efddaf71e5b7768c342657d258762f..e501ef2ff0fc26f32e924ed2f53778f67a7fd038 100644
--- a/test/extrude/91/91.py
+++ b/test/extrude/91/91.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(476,340,476))
-w1=cq.Workplane('YZ',origin=(195,476,476))
-r=w0.sketch().arc((30,302),(88,185),(195,127)).segment((224,1)).segment((331,20)).segment((311,146)).arc((389,205),(418,302)).close().assemble().reset().face(w0.sketch().segment((30,350),(418,350)).arc((224,515),(30,350)).assemble()).push([(651,680)]).circle(748).finalize().extrude(127).union(w1.workplane(offset=738).moveTo(825,772).box(748,719,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(529,499,500))
+r=w0.sketch().arc((35,678),(945,269),(51,714)).segment((61,688)).segment((40,685)).segment((40,679)).close().assemble().finalize().extrude(445)
\ No newline at end of file
diff --git a/test/extrude/91/91.stl b/test/extrude/91/91.stl
index 345a2f76f5ecf38d7ae64a22eecd2da81a16b9c5..a109af480b642c1537f74f06328464c2cdc86b91 100644
Binary files a/test/extrude/91/91.stl and b/test/extrude/91/91.stl differ
diff --git a/test/extrude/910/910.py b/test/extrude/910/910.py
index d95f794b4070c53b7e1a188f39750189168fd9a0..10d41eaecfe43004528c549a1ed7118048c44297 100644
--- a/test/extrude/910/910.py
+++ b/test/extrude/910/910.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,730))
-w1=cq.Workplane('XY',origin=(500,500,550))
-r=w0.sketch().segment((1,261),(920,141)).segment((1000,740)).segment((81,860)).close().assemble().reset().face(w0.sketch().segment((301,251),(540,251)).segment((540,371)).arc((600,600),(371,550)).segment((301,550)).close().assemble(),mode='s').finalize().extrude(31).union(w1.workplane(offset=570).cylinder(640,570)).translate((71,71,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(499,515,500))
+r=w0.sketch().segment((455,240),(544,242)).segment((544,282)).arc((724,501),(545,720)).segment((545,760)).segment((456,759)).segment((456,720)).arc((275,500),(455,280)).close().assemble().finalize().extrude(1).union(w0.sketch().rect(1000,680).push([(540,441)]).circle(504,mode='s').finalize().extrude(984))
\ No newline at end of file
diff --git a/test/extrude/910/910.stl b/test/extrude/910/910.stl
index 353bdbf9dc689f8b75cf89af794e11c623caad99..c2ac3e8ca53156dbac4aec432f77522115128c6a 100644
Binary files a/test/extrude/910/910.stl and b/test/extrude/910/910.stl differ
diff --git a/test/extrude/911/911.py b/test/extrude/911/911.py
index 32bd8359e1ff46d5b12d1852c041ff592cf749c8..81216b6b2f6f2a25fcb514dae0212753e34c0b96 100644
--- a/test/extrude/911/911.py
+++ b/test/extrude/911/911.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(446,338,446))
-r=w0.sketch().segment((522,1),(522,142)).segment((826,142)).arc((251,359),(750,1)).close().assemble().finalize().extrude(348).union(w0.workplane(offset=598).moveTo(93,712).box(522,1000,750))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,277,500))
+r=w0.workplane(offset=363).moveTo(61,490).cylinder(776,516).union(w0.sketch().segment((525,461),(954,461)).arc((949,499),(955,540)).segment((525,540)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/911/911.stl b/test/extrude/911/911.stl
index c4abc545e6f316fb4c92ee79139e294ab1d32ae1..27fd19df5fbcc62047cb0ee5130badffc20b7170 100644
Binary files a/test/extrude/911/911.stl and b/test/extrude/911/911.stl differ
diff --git a/test/extrude/912/912.py b/test/extrude/912/912.py
index b34633d24c6bafdae25a491243fc971a931801a3..6268dcdc169c0adac2e315357d63ccabb56f6de7 100644
--- a/test/extrude/912/912.py
+++ b/test/extrude/912/912.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(451,451,276))
-w1=cq.Workplane('XY',origin=(451,451,525))
-r=w0.sketch().push([(625,588)]).circle(575).circle(550,mode='s').finalize().extrude(1).union(w0.workplane(offset=457).moveTo(438,600).cylinder(463,638)).union(w1.workplane(offset=725).moveTo(263,132).box(675,488,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(557,499,502))
+r=w0.sketch().segment((1,504),(282,476)).segment((301,629)).arc((305,665),(305,706)).segment((327,860)).segment((47,891)).segment((25,740)).arc((16,702),(15,661)).close().assemble().push([(944,167)]).circle(554).finalize().extrude(386)
\ No newline at end of file
diff --git a/test/extrude/912/912.stl b/test/extrude/912/912.stl
index 4e680f1af49be7d1c611ed0c50b34580bfc81d88..7c520cfcef651ab2cb67a59024e7e9f74581b30d 100644
Binary files a/test/extrude/912/912.stl and b/test/extrude/912/912.stl differ
diff --git a/test/extrude/913/913.py b/test/extrude/913/913.py
index 83a83fb87bf1c434403e9cdee55e717fb0f17f10..c5866f0fef07d06d6c65dbf049c2e62eaa4c00da 100644
--- a/test/extrude/913/913.py
+++ b/test/extrude/913/913.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(426,426,139))
-r=w0.sketch().arc((277,214),(299,192),(309,171)).segment((309,214)).close().assemble().finalize().extrude(458).union(w0.sketch().segment((1,628),(44,628)).arc((107,607),(160,628)).segment((182,628)).arc((214,469),(320,352)).arc((639,107),(819,469)).arc((660,926),(203,756)).segment((160,756)).arc((107,777),(44,756)).segment((1,756)).close().assemble().finalize().extrude(543)).union(w0.workplane(offset=713).moveTo(102,22).box(500,681,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(698,502,501))
+r=w0.sketch().push([(428,475)]).rect(588,791).reset().face(w0.sketch().segment((427,336),(431,330)).segment((436,336)).arc((442,342),(441,350)).segment((446,357)).segment((442,361)).segment((437,357)).arc((427,351),(426,341)).close().assemble(),mode='s').finalize().extrude(115).union(w0.workplane(offset=423).moveTo(35,327).box(572,723,657)).union(w0.sketch().segment((478,466),(522,466)).segment((548,435)).segment((582,468)).segment((637,466)).arc((998,616),(607,642)).arc((581,668),(562,697)).segment((478,698)).close().assemble().finalize().extrude(422))
\ No newline at end of file
diff --git a/test/extrude/913/913.stl b/test/extrude/913/913.stl
index 8bd2d6f7f9eeb277494db40616d324d948cf2344..08d3980131623700fa48cbe23310e6685ad03874 100644
Binary files a/test/extrude/913/913.stl and b/test/extrude/913/913.stl differ
diff --git a/test/extrude/914/914.py b/test/extrude/914/914.py
index 5310d54f10181ab3f3e52eda8f0222e51e0a46c4..f22f2f36a2cfd566aa85aa126249254f491acdd5 100644
--- a/test/extrude/914/914.py
+++ b/test/extrude/914/914.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,364,506))
-r=w0.sketch().arc((334,495),(1000,566),(334,516)).arc((1,475),(334,495)).assemble().finalize().extrude(778)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(591,500,500))
+r=w0.sketch().segment((2,530),(701,42)).segment((999,471)).segment((301,960)).close().assemble().circle(685,mode='s').finalize().extrude(316)
\ No newline at end of file
diff --git a/test/extrude/914/914.stl b/test/extrude/914/914.stl
index d245e8c5709a2996539f8c5723cfd587a4953c03..3f69603a56fdab19fa8d39b07ac4006c16e87828 100644
Binary files a/test/extrude/914/914.stl and b/test/extrude/914/914.stl differ
diff --git a/test/extrude/915/915.py b/test/extrude/915/915.py
index deb74edaad7f2a03deb0353c190f51284b76f3c6..cd1444e19f20e372f6239befac75b46eeca8cc97 100644
--- a/test/extrude/915/915.py
+++ b/test/extrude/915/915.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(511,511,562))
-r=w0.workplane(offset=281).moveTo(521,704).cylinder(969,623).union(w0.workplane(offset=602).moveTo(516,704).box(521,531,694)).union(w0.sketch().arc((205,684),(225,592),(266,511)).arc((490,1),(755,500)).arc((776,888),(399,1000)).arc((500,949),(521,837)).arc((643,745),(602,602)).arc((511,623),(419,613)).arc((388,664),(388,715)).arc((317,735),(266,786)).segment((266,684)).close().assemble().finalize().extrude(867))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(561,500,502))
+w1=cq.Workplane('XY',origin=(501,500,256))
+r=w0.workplane(offset=471).moveTo(267,516).cylinder(560,610).union(w0.sketch().segment((1,700),(47,420)).segment((61,422)).arc((381,350),(306,666)).segment((290,746)).close().assemble().push([(894,570)]).circle(535).finalize().extrude(645)).union(w1.workplane(offset=575).moveTo(376,902).box(659,695,650))
\ No newline at end of file
diff --git a/test/extrude/915/915.stl b/test/extrude/915/915.stl
index efe0ced406c9f55854a272a8c252dbdded72f58f..40b90cda6e395ef379a3b6acc8afbb4e2ab83b37 100644
Binary files a/test/extrude/915/915.stl and b/test/extrude/915/915.stl differ
diff --git a/test/extrude/916/916.py b/test/extrude/916/916.py
index f6125c8d28c621a6d4be9fc83d592a79c256a230..5457a48f64c18fc68b0ad125b6df227d0fa0e5ab 100644
--- a/test/extrude/916/916.py
+++ b/test/extrude/916/916.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(344,344,63))
-w1=cq.Workplane('XY',origin=(344,344,1))
-r=w0.workplane(offset=657).moveTo(162,152).box(667,1000,969).union(w1.sketch().arc((521,740),(105,199),(584,677)).arc((677,844),(521,740)).assemble().finalize().extrude(906)).translate((1,5,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(709,502,500))
+r=w0.sketch().segment((391,347),(667,347)).arc((890,186),(766,432)).segment((764,761)).segment((766,849)).segment((391,850)).segment((391,761)).arc((326,595),(392,432)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=259).moveTo(577,595).box(1000,1000,985)).union(w0.sketch().arc((186,730),(248,47),(840,386)).segment((941,386)).arc((936,465),(969,542)).segment((969,804)).segment((505,804)).arc((436,815),(362,805)).segment((187,805)).close().assemble().push([(788,566)]).rect(686,811,mode='s').finalize().extrude(776))
\ No newline at end of file
diff --git a/test/extrude/916/916.stl b/test/extrude/916/916.stl
index abf637b9bbda10334f2a55d066c0746b3b6838e2..6dfc16783ef67cae93c46510b664185a9aaf2855 100644
Binary files a/test/extrude/916/916.stl and b/test/extrude/916/916.stl differ
diff --git a/test/extrude/917/917.py b/test/extrude/917/917.py
index 83baf03eb14c6053791bc36b0620d72a1f09a430..b82ffbd85bbf9d690962f55af3b9e4eb940d43df 100644
--- a/test/extrude/917/917.py
+++ b/test/extrude/917/917.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(311,311,81))
-r=w0.sketch().push([(604,380)]).rect(874,357).push([(397,374)]).rect(323,323,mode='s').finalize().extrude(93).union(w0.workplane(offset=656).moveTo(1,311).cylinder(1000,575)).translate((264,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(342,500,499))
+r=w0.sketch().segment((12,646),(825,645)).segment((825,736)).segment((824,1000)).segment((12,999)).close().assemble().push([(681,704)]).rect(551,561,mode='s').finalize().extrude(551).union(w0.workplane(offset=663).moveTo(695,312).box(1000,1000,826))
\ No newline at end of file
diff --git a/test/extrude/917/917.stl b/test/extrude/917/917.stl
index 2cb8ad938f75572886eefb7a806ec8443dc5a158..422993479b78b1280ea8ecd0913e9c25f8b650cf 100644
Binary files a/test/extrude/917/917.stl and b/test/extrude/917/917.stl differ
diff --git a/test/extrude/918/918.py b/test/extrude/918/918.py
index 7b89ff7a4fab24a84bd8de4cb8f56fddcaddda84..d3d7b1e0b0a77f61c798f1d7cb746badecc7998c 100644
--- a/test/extrude/918/918.py
+++ b/test/extrude/918/918.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(566,289,289))
-w1=cq.Workplane('ZX',origin=(289,239,289))
-r=w0.workplane(offset=1).moveTo(289,168).box(1000,573,865).union(w1.workplane(offset=353).moveTo(516,552).cylinder(417,325))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,181,502))
+r=w0.workplane(offset=759).moveTo(621,385).cylinder(1000,881).union(w0.workplane(offset=820).moveTo(257,868).box(1000,755,1000))
\ No newline at end of file
diff --git a/test/extrude/918/918.stl b/test/extrude/918/918.stl
index 2cccb5b7b14bdafbaeabbb078bd70a5601826774..f89a7909c711aaba6e126b161a6e98bace95858a 100644
Binary files a/test/extrude/918/918.stl and b/test/extrude/918/918.stl differ
diff --git a/test/extrude/919/919.py b/test/extrude/919/919.py
index 0c974eeac3a42e8abfc9254c211d5ff997826bfc..45c6be067c7d62974b0da605849a871e60179c3d 100644
--- a/test/extrude/919/919.py
+++ b/test/extrude/919/919.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(257,510,257))
-r=w0.workplane(offset=1).box(1000,495,770).translate((1,1,244))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,502,651))
+r=w0.sketch().arc((280,591),(291,594),(302,605)).arc((316,585),(341,576)).arc((295,437),(386,315)).segment((385,305)).segment((407,307)).arc((461,297),(516,306)).segment((535,305)).segment((534,315)).arc((626,462),(535,611)).segment((536,621)).segment((514,619)).arc((462,630),(406,620)).segment((391,619)).arc((386,647),(367,666)).arc((599,291),(280,590)).assemble().finalize().extrude(1).union(w0.sketch().segment((346,735),(755,511)).arc((606,726),(346,736)).assemble().finalize().extrude(232)).union(w0.sketch().push([(460,460)]).rect(731,741).push([(460,463)]).rect(540,646,mode='s').finalize().extrude(851))
\ No newline at end of file
diff --git a/test/extrude/919/919.stl b/test/extrude/919/919.stl
index ec6bffdf216e4be7093386f2932709980da9b706..7ba7d66635b32822ca98fe1348752910bcdb6825 100644
Binary files a/test/extrude/919/919.stl and b/test/extrude/919/919.stl differ
diff --git a/test/extrude/92/92.py b/test/extrude/92/92.py
index 9734e39027ea83d62c5c308a58d7583248f0b2e9..0c70561ff074caf14e3f368aeeae3207a6a5db25 100644
--- a/test/extrude/92/92.py
+++ b/test/extrude/92/92.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(550,550,385))
-r=w0.sketch().segment((319,45),(440,1)).segment((638,495)).segment((517,550)).close().assemble().finalize().extrude(660).union(w0.sketch().segment((199,352),(715,352)).segment((715,517)).arc((813,1000),(319,923)).segment((199,923)).close().assemble().finalize().extrude(879))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,465))
+w1=cq.Workplane('ZX',origin=(500,675,502))
+r=w0.sketch().push([(805,482)]).rect(740,721).circle(556,mode='s').push([(858,631)]).rect(784,519).finalize().extrude(630).union(w0.sketch().segment((525,227),(884,225)).segment((886,764)).segment((755,766)).segment((756,784)).segment((674,786)).segment((676,765)).segment((525,764)).close().assemble().finalize().extrude(661)).union(w0.sketch().segment((676,650),(685,629)).arc((674,581),(715,554)).segment((725,530)).segment((756,546)).segment((746,564)).arc((756,616),(715,642)).segment((710,666)).close().assemble().finalize().extrude(760)).union(w1.sketch().segment((257,1),(612,1)).segment((610,192)).segment((746,190)).segment((745,286)).segment((609,285)).segment((610,541)).segment((255,540)).close().assemble().finalize().extrude(41))
\ No newline at end of file
diff --git a/test/extrude/92/92.stl b/test/extrude/92/92.stl
index 9004fcfec5e874ae31115a1b694310c058ddd5e5..75821e1be180af95fd6a44447443ffc3340bac43 100644
Binary files a/test/extrude/92/92.stl and b/test/extrude/92/92.stl differ
diff --git a/test/extrude/920/920.py b/test/extrude/920/920.py
index 04a73020e1e57179af1ce4f69ae36172187135bb..007bb2fc42d4d0b38f372ea0dbc344fb916b45a0 100644
--- a/test/extrude/920/920.py
+++ b/test/extrude/920/920.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().segment((367,600),(494,600)).arc((421,660),(367,734)).close().assemble().reset().face(w0.sketch().segment((840,600),(967,600)).segment((967,734)).arc((913,660),(840,600)).assemble()).finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,470,500))
+r=w0.sketch().push([(475,166)]).circle(586).circle(546,mode='s').finalize().extrude(31).union(w0.workplane(offset=766).moveTo(499,749).cylinder(1000,670))
\ No newline at end of file
diff --git a/test/extrude/920/920.stl b/test/extrude/920/920.stl
index d0bcea3d8ffdb015aa0a7430e83bc8cc5c485d33..d8408e3eb6594428d0325d1c7227ef5eb4bdcc64 100644
Binary files a/test/extrude/920/920.stl and b/test/extrude/920/920.stl differ
diff --git a/test/extrude/921/921.py b/test/extrude/921/921.py
index 9748758b6d1a03072d3adc0e31a6c18c3090acfe..37b8b7383783eba9a86856950530d0c2d117cc29 100644
--- a/test/extrude/921/921.py
+++ b/test/extrude/921/921.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(401,401,624))
-w1=cq.Workplane('YZ',origin=(409,401,401))
-r=w0.workplane(offset=101).moveTo(544,445).box(896,680,1000).union(w0.sketch().arc((65,1),(145,105),(65,209)).close().assemble().finalize().extrude(552)).union(w1.sketch().segment((41,409),(89,409)).segment((89,337)).segment((361,337)).arc((441,313),(528,337)).segment((800,337)).segment((800,608)).segment((528,608)).arc((441,632),(361,608)).segment((89,608)).segment((89,552)).segment((41,552)).close().assemble().push([(445,473)]).rect(632,433,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,1,501))
+r=w0.sketch().segment((240,380),(632,245)).segment((759,621)).segment((370,756)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/921/921.stl b/test/extrude/921/921.stl
index 3e29c58f30c58f3fcf16e189ad29026121e73222..ab11fbedb412e103d8aeee07a556c0a4b325005f 100644
Binary files a/test/extrude/921/921.stl and b/test/extrude/921/921.stl differ
diff --git a/test/extrude/922/922.py b/test/extrude/922/922.py
index e6d305a57eff2e7c46c8c70b301a101b102b36f2..938117f4279545a286e2e7850049cf7ac234f8e3 100644
--- a/test/extrude/922/922.py
+++ b/test/extrude/922/922.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(236,161,161))
-r=w0.sketch().rect(1000,379).push([(274,240)]).rect(202,219,mode='s').push([(429,68)]).circle(169,mode='s').finalize().extrude(1).translate((1,340,30))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,307))
+w1=cq.Workplane('XY',origin=(502,501,226))
+r=w0.sketch().push([(364,616)]).rect(1000,781).reset().face(w0.sketch().segment((317,196),(676,195)).segment((676,276)).segment((391,275)).arc((295,306),(316,201)).close().assemble()).finalize().extrude(195).union(w0.sketch().segment((735,796),(904,795)).segment((904,896)).arc((821,854),(735,896)).close().assemble().finalize().extrude(1000)).union(w1.sketch().push([(715,265)]).circle(659).push([(689,116)]).rect(516,512,mode='s').finalize().extrude(910))
\ No newline at end of file
diff --git a/test/extrude/922/922.stl b/test/extrude/922/922.stl
index c1b5436a924d7d6cba3f2c38dc7e135e2aa68450..3db1eadb320f49b5188b3e3ba4373fb9057f1235 100644
Binary files a/test/extrude/922/922.stl and b/test/extrude/922/922.stl differ
diff --git a/test/extrude/923/923.py b/test/extrude/923/923.py
index ef654d1287b4d6ed1afae7b81e12da3c7e80b542..17ab9388f9f91ad7161c0d8bcc753b8055a04568 100644
--- a/test/extrude/923/923.py
+++ b/test/extrude/923/923.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,580,500))
-r=w0.workplane(offset=421).moveTo(491,441).box(900,560,660).union(w0.sketch().arc((291,291),(520,181),(630,411)).segment((610,411)).segment((610,451)).arc((530,510),(431,520)).arc((421,570),(401,610)).segment((600,610)).arc((600,580),(610,550)).segment((610,730)).segment((780,730)).segment((780,411)).arc((1000,640),(720,800)).segment((720,830)).segment((311,830)).segment((311,690)).arc((1,500),(291,291)).assemble().finalize().extrude(361))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,770))
+r=w0.sketch().segment((68,800),(123,352)).arc((68,46),(352,168)).segment((596,197)).segment((566,430)).arc((959,701),(507,857)).close().assemble().push([(122,183)]).rect(541,512,mode='s').finalize().extrude(1).union(w0.sketch().segment((392,680),(425,655)).arc((505,472),(690,397)).segment((690,335)).segment((700,336)).segment((701,397)).arc((745,402),(796,411)).segment((826,393)).segment((870,457)).arc((921,515),(955,586)).segment((1000,650)).segment((965,676)).arc((885,860),(700,934)).segment((700,994)).segment((690,994)).segment((691,934)).arc((650,935),(617,925)).segment((625,926)).segment((627,916)).arc((791,422),(586,900)).segment((585,926)).segment((591,925)).segment((565,941)).segment((522,875)).arc((471,815),(436,744)).close().assemble().finalize().extrude(276))
\ No newline at end of file
diff --git a/test/extrude/923/923.stl b/test/extrude/923/923.stl
index ab681e349a0fb22b3986abd000636c1d334f59ae..1435fc08ea810a5a324e30b342fc2fcde5519c43 100644
Binary files a/test/extrude/923/923.stl and b/test/extrude/923/923.stl differ
diff --git a/test/extrude/924/924.py b/test/extrude/924/924.py
index 06a49409b501a5c765611320cd9826b656e80b1d..235cc64af0a1952d16953c67f1a164172026ea2c 100644
--- a/test/extrude/924/924.py
+++ b/test/extrude/924/924.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,271))
-r=w0.sketch().segment((1,690),(31,670)).arc((281,51),(920,241)).segment((960,221)).segment((1000,311)).segment((970,331)).arc((720,950),(81,760)).segment((41,780)).close().assemble().push([(680,820)]).rect(560,540,mode='s').finalize().extrude(960)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,2))
+r=w0.sketch().segment((210,230),(790,232)).segment((790,771)).segment((310,770)).arc((266,725),(210,696)).close().assemble().reset().face(w0.sketch().segment((336,581),(350,535)).arc((351,462),(386,395)).segment((395,350)).segment((430,360)).arc((541,352),(631,410)).segment((665,420)).segment((650,465)).arc((651,540),(616,606)).segment((606,651)).segment((571,640)).arc((460,651),(371,591)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/924/924.stl b/test/extrude/924/924.stl
index 7ea6b13d5568bc5e9a66e79c86b8a32d40ff424c..832ec4db7228c422ae281262f039aec91faa1897 100644
Binary files a/test/extrude/924/924.stl and b/test/extrude/924/924.stl differ
diff --git a/test/extrude/925/925.py b/test/extrude/925/925.py
index 71009d61bf0c218cfc8ec704d6d6c1aa0a9bfc17..85377ce7f9634c61a3f1a701baa5f2aa26eb3c2c 100644
--- a/test/extrude/925/925.py
+++ b/test/extrude/925/925.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(667,1000,667))
-r=w0.sketch().arc((580,554),(694,647),(754,780)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,805,501))
+r=w0.workplane(offset=196).moveTo(2,234).box(504,515,1000).union(w0.sketch().segment((376,655),(452,470)).segment((600,530)).segment((521,431)).segment((890,145)).segment((1000,290)).segment((660,552)).segment((956,664)).segment((886,856)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/925/925.stl b/test/extrude/925/925.stl
index f4749e39b6f470013df7636b6a12e6ef67f54b10..7245eae5e030a92a428573e824666ef9ef095cdd 100644
Binary files a/test/extrude/925/925.stl and b/test/extrude/925/925.stl differ
diff --git a/test/extrude/926/926.py b/test/extrude/926/926.py
index c948c8cfec3f25616ac3be51647b5bbaadfa3208..f9cecfe2b9aa2e292c033717dd60ba3357ca8a5a 100644
--- a/test/extrude/926/926.py
+++ b/test/extrude/926/926.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(490,457,457))
-r=w0.sketch().segment((251,989),(262,631)).arc((229,1),(837,186)).segment((674,186)).segment((674,544)).segment((555,544)).segment((555,663)).segment((663,663)).segment((663,1000)).close().assemble().finalize().extrude(403)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,919))
+r=w0.sketch().segment((361,322),(685,319)).segment((685,841)).arc((550,884),(470,1000)).segment((361,999)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((46,1),(925,2)).segment((924,407)).segment((956,410)).segment((934,540)).segment((925,535)).segment((925,770)).segment((46,771)).close().assemble().finalize().extrude(147))
\ No newline at end of file
diff --git a/test/extrude/926/926.stl b/test/extrude/926/926.stl
index 492487bea42d27c3632ef661fff372ff1008de8a..7f96eeefbb9ee9e82537a541617d1c704bcd7ae1 100644
Binary files a/test/extrude/926/926.stl and b/test/extrude/926/926.stl differ
diff --git a/test/extrude/927/927.py b/test/extrude/927/927.py
index 3b96b28a3097e23115eef88a13e43a02993b26e9..d0c747b7f66ec5374cb0c0c604bce5aeb318fc3d 100644
--- a/test/extrude/927/927.py
+++ b/test/extrude/927/927.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(334,334,1))
-r=w0.workplane(offset=354).cylinder(374,401).union(w0.workplane(offset=667).cylinder(1000,441)).translate((108,108,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,506,500))
+r=w0.workplane(offset=451).moveTo(42,750).box(580,640,600).union(w0.workplane(offset=545).moveTo(977,500).box(546,1000,590))
\ No newline at end of file
diff --git a/test/extrude/927/927.stl b/test/extrude/927/927.stl
index 8e660933570cea01a54cde9bc775773c3592d42f..fc19aed58c2c810e5d2ea4c05cb5cdca63a8ba37 100644
Binary files a/test/extrude/927/927.stl and b/test/extrude/927/927.stl differ
diff --git a/test/extrude/928/928.py b/test/extrude/928/928.py
index 5ae6b3781347b864056664d6179f73bbe279ffdb..e6d646dfe4e83193cdb6ae1f743321ae7b8c7388 100644
--- a/test/extrude/928/928.py
+++ b/test/extrude/928/928.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(321,500,500))
-r=w0.sketch().segment((31,341),(331,1)).segment((590,231)).segment((590,201)).segment((970,201)).segment((970,1000)).segment((590,1000)).segment((590,720)).segment((580,720)).arc((411,451),(91,401)).close().assemble().push([(431,391)]).circle(540,mode='s').push([(780,600)]).rect(520,640,mode='s').finalize().extrude(860)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(503,500,702))
+w1=cq.Workplane('XY',origin=(501,501,537))
+r=w0.sketch().segment((265,656),(666,658)).arc((993,538),(677,677)).segment((266,676)).close().assemble().finalize().extrude(450).union(w0.sketch().push([(477,666)]).circle(566).push([(854,418)]).rect(676,918).finalize().extrude(451)).union(w1.sketch().arc((201,552),(212,526),(227,506)).segment((227,462)).segment((272,462)).arc((322,430),(376,422)).segment((376,266)).segment((822,266)).segment((821,531)).segment((566,532)).arc((587,631),(551,727)).segment((551,777)).segment((527,778)).segment((527,532)).segment((376,531)).segment((376,508)).segment((301,506)).segment((301,792)).arc((286,785),(272,777)).segment((226,777)).segment((225,727)).arc((216,717),(211,701)).arc((1,636),(200,551)).assemble().finalize().extrude(267))
\ No newline at end of file
diff --git a/test/extrude/928/928.stl b/test/extrude/928/928.stl
index 9d290ad4e6e43871cdcf4d378033aa316f3ddca3..e7acbca59908a359b22f6e7ce4a7d481d6928ea5 100644
Binary files a/test/extrude/928/928.stl and b/test/extrude/928/928.stl differ
diff --git a/test/extrude/929/929.py b/test/extrude/929/929.py
index 73ade51a766a783235c7821c6b042981f98908aa..b7ee1b0cdef3826cce6e85e6467475f3450e5e72 100644
--- a/test/extrude/929/929.py
+++ b/test/extrude/929/929.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(489,489,489))
-r=w0.sketch().push([(100,111)]).rect(640,756).push([(442,111)]).rect(628,756).push([(605,535)]).circle(535).push([(872,24)]).circle(605).finalize().extrude(1).union(w0.workplane(offset=437).moveTo(204,1000).box(919,628,593)).union(w0.workplane(offset=727).moveTo(605,535).cylinder(965,500)).translate((93,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(511,501,500))
+r=w0.sketch().push([(426,940)]).circle(560).push([(627,583)]).rect(895,684).push([(629,586)]).rect(626,561,mode='s').finalize().extrude(7).union(w0.workplane(offset=738).moveTo(316,141).cylinder(975,641))
\ No newline at end of file
diff --git a/test/extrude/929/929.stl b/test/extrude/929/929.stl
index 11f7190b2bee5468cd899e8dfed770b7c0fc16c1..cc3cc8257b14663496d9d255d5bea6603e55016b 100644
Binary files a/test/extrude/929/929.stl and b/test/extrude/929/929.stl differ
diff --git a/test/extrude/93/93.py b/test/extrude/93/93.py
index 7f3fa432e88127b2f9027e883e52cd222ca01d35..e64481daef907626d918d1328981f15a5873892a 100644
--- a/test/extrude/93/93.py
+++ b/test/extrude/93/93.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(533,299,533))
-r=w0.workplane(offset=715).moveTo(870,27).cylinder(896,572).union(w0.sketch().push([(650,896)]).rect(585,896).push([(643,981)]).rect(546,546,mode='s').finalize().extrude(961)).union(w0.sketch().push([(79,559)]).circle(728).push([(53,624)]).circle(572,mode='s').push([(1,222)]).circle(572).push([(1000,196)]).circle(715).finalize().extrude(1000)).translate((13,1,117))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,306,501))
+r=w0.sketch().push([(218,706)]).rect(547,1000).reset().face(w0.sketch().segment((221,715),(231,704)).segment((236,719)).segment((226,725)).close().assemble(),mode='s').finalize().extrude(420).union(w0.workplane(offset=736).moveTo(605,202).cylinder(970,700))
\ No newline at end of file
diff --git a/test/extrude/93/93.stl b/test/extrude/93/93.stl
index a87ba4c7497567c2aa541ca0b1f9b7d950033dbc..5d23d1bf9fa3708f4a021e2baf59f74580a68c92 100644
Binary files a/test/extrude/93/93.stl and b/test/extrude/93/93.stl differ
diff --git a/test/extrude/930/930.py b/test/extrude/930/930.py
index 915d1dc935d395cda10366f255e712d0c0453456..c19a0ef5d2b5d3a2e370e243ea3679341c315dc2 100644
--- a/test/extrude/930/930.py
+++ b/test/extrude/930/930.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(818,546,546))
-r=w0.sketch().arc((92,401),(555,255),(673,728)).segment((1000,728)).segment((1000,791)).segment((619,791)).arc((573,827),(519,855)).arc((491,846),(482,864)).arc((419,882),(355,882)).arc((382,837),(401,791)).segment((337,791)).segment((337,728)).segment((437,728)).segment((619,600)).segment((410,319)).segment((255,428)).arc((174,401),(92,401)).assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,685,500))
+w1=cq.Workplane('ZX',origin=(501,736,501))
+r=w0.workplane(offset=457).moveTo(553,131).box(735,760,586).union(w1.sketch().segment((312,112),(690,111)).segment((691,297)).arc((825,554),(691,816)).segment((691,999)).segment((311,999)).segment((311,816)).arc((175,556),(311,295)).close().assemble().finalize().extrude(30))
\ No newline at end of file
diff --git a/test/extrude/930/930.stl b/test/extrude/930/930.stl
index 1bab356280e73c981107e5005c17719ef3f8812c..5560e2ec5d6b540b8a6d657a13efd636dbed7d4b 100644
Binary files a/test/extrude/930/930.stl and b/test/extrude/930/930.stl differ
diff --git a/test/extrude/931/931.py b/test/extrude/931/931.py
index 24d43b7eeab4f643d67ff38f9585093b42f4649b..f7c916d72c970f7b30fce5b3f84ff50bf1b73df5 100644
--- a/test/extrude/931/931.py
+++ b/test/extrude/931/931.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(591,524,524))
-w1=cq.Workplane('ZX',origin=(524,572,524))
-r=w0.sketch().segment((439,534),(781,534)).arc((772,305),(1000,277)).arc((886,410),(886,591)).arc((848,581),(810,562)).segment((810,829)).segment((439,829)).close().assemble().finalize().extrude(819).union(w1.sketch().arc((638,534),(248,296),(657,505)).arc((724,562),(638,534)).assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,566,501))
+r=w0.sketch().segment((650,40),(705,40)).arc((784,191),(861,41)).segment((1000,42)).segment((1000,570)).segment((650,570)).close().assemble().finalize().extrude(295).union(w0.workplane(offset=537).moveTo(166,795).cylinder(570,666))
\ No newline at end of file
diff --git a/test/extrude/931/931.stl b/test/extrude/931/931.stl
index 0a77863bb14db1ae9436ec68f2659fd77ff43a2c..7b82e643dd4733b32fd24c2a5bfa327aa117d174 100644
Binary files a/test/extrude/931/931.stl and b/test/extrude/931/931.stl differ
diff --git a/test/extrude/932/932.py b/test/extrude/932/932.py
index c0e86c3d0b66733f58821f7bd7ff2d0919cad63b..8010c5b0540e797058daf71d9fd55772a9621e67 100644
--- a/test/extrude/932/932.py
+++ b/test/extrude/932/932.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(491,500,500))
-w1=cq.Workplane('ZX',origin=(500,1,500))
-r=w0.sketch().arc((560,81),(1000,321),(590,620)).arc((660,570),(720,520)).segment((800,510)).segment((750,121)).segment((660,131)).arc((610,91),(560,81)).assemble().finalize().extrude(281).union(w1.sketch().push([(840,620)]).circle(610).push([(790,540)]).circle(510,mode='s').finalize().extrude(840))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,501,2))
+r=w0.sketch().segment((415,401),(526,402)).arc((585,501),(525,601)).segment((415,601)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/932/932.stl b/test/extrude/932/932.stl
index ddd259544665a1b2e0156b3e3ab7814a3a2b62a1..cf9595e53e1bc6d96223e93cca3d4399e3af04d2 100644
Binary files a/test/extrude/932/932.stl and b/test/extrude/932/932.stl differ
diff --git a/test/extrude/933/933.py b/test/extrude/933/933.py
index e66c30538afc08f1bb83a567f0a709fdec2e8eba..7e099a4f5a02bfd2145205dcd33cc7f055164603 100644
--- a/test/extrude/933/933.py
+++ b/test/extrude/933/933.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(95,369,369))
-r=w0.sketch().segment((340,746),(378,746)).segment((359,755)).segment((369,783)).segment((397,764)).segment((387,746)).segment((689,746)).segment((689,840)).segment((340,840)).close().assemble().finalize().extrude(284).union(w0.workplane(offset=684).moveTo(67,1).box(406,576,1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,266))
+w1=cq.Workplane('ZX',origin=(502,163,502))
+r=w0.sketch().arc((956,790),(955,806),(971,811)).arc((810,915),(956,791)).assemble().push([(910,828)]).rect(552,545,mode='s').finalize().extrude(346).union(w1.sketch().arc((441,456),(282,47),(631,316)).segment((889,316)).segment((890,1000)).segment((441,999)).close().assemble().finalize().extrude(387))
\ No newline at end of file
diff --git a/test/extrude/933/933.stl b/test/extrude/933/933.stl
index c4a77ea68307d23bdda1970c139dcb7833183d4e..f8cd05b96236265ade1eaa9cb1d25722d2056a50 100644
Binary files a/test/extrude/933/933.stl and b/test/extrude/933/933.stl differ
diff --git a/test/extrude/934/934.py b/test/extrude/934/934.py
index 1b7702c50b001dd8d2809494601065533a0b10eb..96d5135dcd1f962025d0bf1c98fe0163e2a01e9c 100644
--- a/test/extrude/934/934.py
+++ b/test/extrude/934/934.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(452,463,463))
-r=w0.sketch().segment((409,205),(710,22)).segment((785,173)).arc((839,184),(871,205)).segment((979,98)).segment((1000,119)).segment((957,173)).segment((527,517)).arc((506,431),(506,334)).close().assemble().finalize().extrude(388).union(w0.sketch().push([(270,592)]).circle(807).circle(646,mode='s').reset().face(w0.sketch().segment((710,807),(742,1)).segment((764,1)).segment((742,807)).close().assemble()).finalize().extrude(549)).translate((1,75,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(117,500,502))
+w1=cq.Workplane('YZ',origin=(166,500,500))
+r=w0.workplane(offset=888).moveTo(266,516).cylinder(1000,765).union(w1.workplane(offset=736).moveTo(688,245).box(1000,551,969))
\ No newline at end of file
diff --git a/test/extrude/934/934.stl b/test/extrude/934/934.stl
index cbd236394d087a2bb0bec734cf07c1565b243781..3ce83290d8a5905239036a57b25e8abd6042acea 100644
Binary files a/test/extrude/934/934.stl and b/test/extrude/934/934.stl differ
diff --git a/test/extrude/935/935.py b/test/extrude/935/935.py
index 5af649dea3271d7fd53d3cacef156c4f2dddedd9..ea6bf124469280fc053268cd4326b03fb893be25 100644
--- a/test/extrude/935/935.py
+++ b/test/extrude/935/935.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(341,485,341))
-r=w0.workplane(offset=11).moveTo(341,619).cylinder(1000,403).union(w0.sketch().segment((104,114),(423,1)).segment((578,434)).segment((258,557)).close().assemble().finalize().extrude(712)).translate((1,5,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,845,502))
+r=w0.workplane(offset=155).moveTo(501,336).cylinder(1000,835).union(w0.sketch().arc((651,929),(660,964),(650,999)).close().assemble().finalize().extrude(225))
\ No newline at end of file
diff --git a/test/extrude/935/935.stl b/test/extrude/935/935.stl
index d3151aaccc0ff8a456159db0ee9e5f1f1ffc824c..2e038440392ac2e1573c24060fa0fbc4a019ef66 100644
Binary files a/test/extrude/935/935.stl and b/test/extrude/935/935.stl differ
diff --git a/test/extrude/936/936.py b/test/extrude/936/936.py
index 0b0b9e69eb21b2c122dc58d79e1d99c89178870c..d107f01b4a545026acd850d1fa8fe604fede001d 100644
--- a/test/extrude/936/936.py
+++ b/test/extrude/936/936.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(500,461,500))
-r=w0.sketch().segment((31,241),(690,1)).segment((970,760)).segment((311,1000)).close().assemble().circle(620,mode='s').finalize().extrude(590)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,409))
+r=w0.workplane(offset=557).moveTo(561,707).cylinder(611,794).union(w0.workplane(offset=593).moveTo(500,149).box(1000,794,686))
\ No newline at end of file
diff --git a/test/extrude/936/936.stl b/test/extrude/936/936.stl
index 83456d9fe6f999a9667f951b54f7a116ca327e63..5266ad89522dfe06cf282f2fcb77a46c96c27af3 100644
Binary files a/test/extrude/936/936.stl and b/test/extrude/936/936.stl differ
diff --git a/test/extrude/937/937.py b/test/extrude/937/937.py
index c7145a416cf7b2a4737b57cc081d59b544024c78..0702d3a5f14095cb92d498b3e8d3c4f0710328bc 100644
--- a/test/extrude/937/937.py
+++ b/test/extrude/937/937.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(576,576,849))
-r=w0.sketch().push([(1,193)]).circle(685).reset().face(w0.sketch().segment((576,110),(603,110)).segment((603,152)).arc((754,316),(603,480)).segment((603,521)).segment((576,521)).segment((576,480)).arc((425,316),(576,152)).close().assemble()).finalize().extrude(28).union(w0.sketch().push([(767,877)]).circle(767).push([(1000,343)]).circle(836).finalize().extrude(234)).translate((109,1,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(393,502,502))
+r=w0.sketch().segment((169,352),(268,354)).arc((805,165),(339,484)).arc((249,489),(171,538)).close().assemble().reset().face(w0.sketch().arc((170,811),(308,867),(448,810)).segment((447,1000)).segment((169,999)).close().assemble()).push([(233,895)]).rect(572,512,mode='s').finalize().extrude(727)
\ No newline at end of file
diff --git a/test/extrude/937/937.stl b/test/extrude/937/937.stl
index 30de43745209d2b584cdb3f1062e159f0dfc575a..975787ee641dda2e869377b01d439c7721edd421 100644
Binary files a/test/extrude/937/937.stl and b/test/extrude/937/937.stl differ
diff --git a/test/extrude/938/938.py b/test/extrude/938/938.py
index 72777279874e8d7a404c872fbbba19b0ece07233..58cd8348bded266a30ba6639440dca187499b161 100644
--- a/test/extrude/938/938.py
+++ b/test/extrude/938/938.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(489,489,741))
-r=w0.workplane(offset=234).moveTo(290,630).cylinder(1000,556).union(w0.sketch().segment((119,452),(467,452)).segment((467,489)).arc((475,534),(467,586)).segment((467,822)).segment((119,822)).close().assemble().finalize().extrude(1)).union(w0.workplane(offset=245).moveTo(637,378).cylinder(978,711))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,110))
+r=w0.workplane(offset=449).moveTo(170,310).cylinder(607,670).union(w0.sketch().arc((276,861),(465,754),(685,744)).segment((684,715)).segment((1000,717)).segment((999,859)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/938/938.stl b/test/extrude/938/938.stl
index 2489fa541ff0ac5e1ec85542d59a08a0e16c745e..b1d542712ad5fbafc8f1e80a641dd5b6af85c0fb 100644
Binary files a/test/extrude/938/938.stl and b/test/extrude/938/938.stl differ
diff --git a/test/extrude/939/939.py b/test/extrude/939/939.py
index fcee14ba2fb4fe6eeac8efb0b5d3665599ad206b..6910ca2a84ba14891e9d538af036447a45333522 100644
--- a/test/extrude/939/939.py
+++ b/test/extrude/939/939.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().segment((241,401),(407,247)).segment((427,267)).segment((261,421)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(276,502,501))
+r=w0.sketch().segment((690,2),(1000,1)).arc((730,392),(1000,780)).segment((701,780)).arc((2,645),(692,461)).close().assemble().push([(367,636)]).circle(775,mode='s').finalize().extrude(841).union(w0.sketch().push([(367,636)]).circle(735).reset().face(w0.sketch().segment((131,621),(471,621)).arc((512,600),(545,620)).segment((601,620)).segment((601,651)).segment((556,651)).arc((510,694),(462,652)).segment((131,651)).close().assemble(),mode='s').finalize().extrude(955))
\ No newline at end of file
diff --git a/test/extrude/939/939.stl b/test/extrude/939/939.stl
index fef501e752cb9b8003fd0fdb10ce5a15e0cd0060..c3aec2a331195d5b924f0ee0c41b2e690e690263 100644
Binary files a/test/extrude/939/939.stl and b/test/extrude/939/939.stl differ
diff --git a/test/extrude/94/94.py b/test/extrude/94/94.py
index efd5114931a4cdc231550dcb2e6cc60860156d4e..61e261d04a07c1fd3c771552c0138cf0ddf950ae 100644
--- a/test/extrude/94/94.py
+++ b/test/extrude/94/94.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(495,495,385))
-r=w0.sketch().arc((1,737),(879,100),(286,1000)).arc((89,923),(1,737)).assemble().finalize().extrude(715)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(21,501,500))
+r=w0.sketch().segment((220,45),(242,1)).segment((491,106)).arc((541,180),(631,191)).arc((446,995),(515,171)).close().assemble().reset().face(w0.sketch().segment((116,527),(551,192)).segment((900,645)).segment((470,981)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/94/94.stl b/test/extrude/94/94.stl
index c99c90b738f89ac57927c44834620f2f82ebddce..9d4ad9e550323687d8697e7bf34d1fbd8c709df8 100644
Binary files a/test/extrude/94/94.stl and b/test/extrude/94/94.stl differ
diff --git a/test/extrude/940/940.py b/test/extrude/940/940.py
index 8af0f44bca9c49b93ccd334ed3c6cf4729e6292f..0fa88b46b8b3dd1c6b6a1eb5101a9c26f24618e1 100644
--- a/test/extrude/940/940.py
+++ b/test/extrude/940/940.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.workplane(offset=667).cylinder(1000,367).translate((1,34,34))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,570))
+r=w0.workplane(offset=314).moveTo(295,770).cylinder(873,599).union(w0.sketch().arc((350,634),(161,356),(370,89)).arc((784,105),(690,513)).arc((644,569),(585,615)).arc((679,735),(664,889)).segment((664,863)).segment((434,865)).segment((434,893)).segment((659,893)).arc((350,953),(350,634)).assemble().reset().face(w0.sketch().segment((470,54),(671,54)).segment((669,191)).arc((579,114),(470,81)).close().assemble(),mode='s').finalize().extrude(733))
\ No newline at end of file
diff --git a/test/extrude/940/940.stl b/test/extrude/940/940.stl
index cd8625603e53f42c10f469560c3230aac9e6a69e..11fe7986282f70103198a59fa451d2e8120b13e5 100644
Binary files a/test/extrude/940/940.stl and b/test/extrude/940/940.stl differ
diff --git a/test/extrude/941/941.py b/test/extrude/941/941.py
index fa94f65bd6da64e30ddf96d2ac5ab820be932c62..9c14ce70fa6076ff83605283fb94829ce624d6f9 100644
--- a/test/extrude/941/941.py
+++ b/test/extrude/941/941.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(477,477,467))
-w1=cq.Workplane('ZX',origin=(477,382,477))
-r=w0.sketch().push([(363,258)]).circle(610).push([(686,667)]).circle(743).finalize().extrude(153).union(w0.workplane(offset=591).moveTo(567,415).box(1000,867,705)).union(w0.sketch().segment((505,401),(553,210)).segment((677,239)).segment((629,401)).close().assemble().finalize().extrude(819)).union(w1.sketch().segment((591,77),(657,77)).segment((657,1)).segment((715,1)).segment((715,77)).segment((781,77)).segment((781,163)).segment((715,163)).segment((715,239)).segment((657,239)).segment((657,163)).segment((591,163)).close().assemble().finalize().extrude(115))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(266,500,502))
+r=w0.sketch().rect(1000,1000).reset().face(w0.sketch().segment((325,400),(345,372)).segment((451,442)).segment((496,411)).segment((585,530)).segment((579,535)).segment((675,600)).segment((655,631)).segment((550,560)).segment((506,590)).segment((415,471)).segment((420,466)).close().assemble(),mode='s').push([(485,21)]).rect(520,541,mode='s').push([(661,830)]).circle(547,mode='s').finalize().extrude(970)
\ No newline at end of file
diff --git a/test/extrude/941/941.stl b/test/extrude/941/941.stl
index ad7fddc841951628451531fa843436fe568abd24..7aaac68e2db47b6f0bfbd5fef40ad79c567757a8 100644
Binary files a/test/extrude/941/941.stl and b/test/extrude/941/941.stl differ
diff --git a/test/extrude/942/942.py b/test/extrude/942/942.py
index b7bb5bfaa12ea02c0af32c3761dad9efa4a60e47..5b005bfb48dbf376ce2e65dcea846146b5fdf90c 100644
--- a/test/extrude/942/942.py
+++ b/test/extrude/942/942.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(329,1,329))
-r=w0.sketch().push([(438,500)]).circle(938).push([(781,641)]).circle(485,mode='s').finalize().extrude(500).union(w0.sketch().push([(157,95)]).circle(875).push([(313,438)]).circle(376,mode='s').finalize().extrude(969)).union(w0.sketch().segment((79,157),(719,157)).segment((719,422)).arc((735,547),(719,657)).segment((719,922)).segment((79,922)).segment((79,657)).arc((63,547),(79,422)).close().assemble().finalize().extrude(1000)).translate((452,1,390))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,475))
+r=w0.sketch().segment((301,276),(461,275)).segment((462,242)).segment((941,241)).segment((941,760)).segment((460,759)).segment((459,516)).segment((300,515)).close().assemble().finalize().extrude(25).union(w0.workplane(offset=763).moveTo(230,511).cylinder(1000,670))
\ No newline at end of file
diff --git a/test/extrude/942/942.stl b/test/extrude/942/942.stl
index 9a2107e29eca276caa72d594434f04ed5ab631fe..7a3917e7cdf0cd8601b763d47c3ddb6d8aec6a03 100644
Binary files a/test/extrude/942/942.stl and b/test/extrude/942/942.stl differ
diff --git a/test/extrude/943/943.py b/test/extrude/943/943.py
index 209b6fed007cd032bbedc7457d9f07ede1f17476..5c76d98b9dff1a7064e20a7205b2d32b6f52ae3d 100644
--- a/test/extrude/943/943.py
+++ b/test/extrude/943/943.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(411,500,500))
-r=w0.sketch().segment((1,780),(161,41)).segment((181,41)).arc((441,371),(830,191)).segment((1000,221)).segment((840,960)).close().assemble().finalize().extrude(690)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,775))
+r=w0.workplane(offset=227).moveTo(591,741).cylinder(1000,761).union(w0.workplane(offset=310).moveTo(470,399).box(1000,1000,880))
\ No newline at end of file
diff --git a/test/extrude/943/943.stl b/test/extrude/943/943.stl
index 642f420abce108b0b854784727ec568580cca57e..846efe5699e43ae77c2c0e1276cf6dcbc967f52e 100644
Binary files a/test/extrude/943/943.stl and b/test/extrude/943/943.stl differ
diff --git a/test/extrude/944/944.py b/test/extrude/944/944.py
index 41e296ab0122de506a0c66bac62546395180e09b..04db33e0a86f573b629f70e1bf3bf88331896921 100644
--- a/test/extrude/944/944.py
+++ b/test/extrude/944/944.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(889,596,596))
-r=w0.sketch().push([(344,142)]).circle(647).push([(808,1000)]).circle(697).circle(617,mode='s').finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,950))
+r=w0.sketch().segment((417,210),(655,210)).arc((670,291),(725,355)).segment((417,355)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(500,571)]).rect(1000,941).push([(17,595)]).circle(516,mode='s').finalize().extrude(347))
\ No newline at end of file
diff --git a/test/extrude/944/944.stl b/test/extrude/944/944.stl
index 4bdca6bc0f3dd3c431b5ca75b29d88ca9d0ba5db..f27ec770ce7c5909b6d79910195d327ef216a54d 100644
Binary files a/test/extrude/944/944.stl and b/test/extrude/944/944.stl differ
diff --git a/test/extrude/945/945.py b/test/extrude/945/945.py
index 8322a423a13558e1ee8340423d1c36f537c78d58..2018cd93e8e66fdbfe7c135f5e8cdbe7b00b17c8 100644
--- a/test/extrude/945/945.py
+++ b/test/extrude/945/945.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(451,451,181))
-r=w0.sketch().segment((1,379),(244,46)).segment((613,307)).segment((784,307)).segment((784,433)).segment((901,523)).segment((811,649)).segment((811,775)).segment((721,775)).segment((658,856)).segment((532,775)).segment((199,775)).segment((199,595)).segment((118,595)).segment((118,469)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,670,501))
+r=w0.sketch().push([(155,661)]).circle(656).push([(974,211)]).circle(526).finalize().extrude(156)
\ No newline at end of file
diff --git a/test/extrude/945/945.stl b/test/extrude/945/945.stl
index d4c3e8a82bf1304c29fdd42d940d147c563a395f..2301708a71c5f416a5e89f385d88300c0118a911 100644
Binary files a/test/extrude/945/945.stl and b/test/extrude/945/945.stl differ
diff --git a/test/extrude/946/946.py b/test/extrude/946/946.py
index 55914a4aa3352ce430f6762b4a097da1da2bb65f..49aa70b8cfecd984aa16cfd046ac29d3e4a91326 100644
--- a/test/extrude/946/946.py
+++ b/test/extrude/946/946.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(924,619,619))
-r=w0.sketch().segment((642,375),(664,375)).arc((748,367),(825,375)).segment((855,375)).segment((855,390)).arc((1000,619),(855,847)).segment((855,863)).segment((825,863)).arc((748,870),(664,863)).segment((642,863)).segment((642,847)).arc((489,619),(642,390)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=436).moveTo(283,535).box(710,664,985))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(550,501,500))
+r=w0.sketch().segment((86,276),(90,276)).arc((132,27),(167,276)).segment((500,276)).segment((499,420)).segment((87,420)).close().assemble().reset().face(w0.sketch().segment((616,156),(745,156)).segment((746,117)).segment((764,116)).segment((766,157)).segment((900,157)).segment((901,221)).segment((766,220)).segment((765,257)).segment((745,256)).segment((744,222)).segment((616,222)).close().assemble()).finalize().extrude(47).union(w0.workplane(offset=622).moveTo(958,795).box(586,859,745)).union(w0.sketch().push([(397,490)]).circle(555).reset().face(w0.sketch().segment((357,460),(396,461)).arc((402,455),(406,461)).segment((437,462)).segment((436,522)).segment((355,520)).close().assemble(),mode='s').finalize().extrude(850))
\ No newline at end of file
diff --git a/test/extrude/946/946.stl b/test/extrude/946/946.stl
index f581b20def0211905834a00613ad8ec707ac1599..19307a5c77e978c454c13eba56d51c7881e8d8ab 100644
Binary files a/test/extrude/946/946.stl and b/test/extrude/946/946.stl differ
diff --git a/test/extrude/947/947.py b/test/extrude/947/947.py
index b73f7389ad3d6645087a20bf478a9b76db818285..82689d307f3dcdad7d39f069e57702b5499d2e9b 100644
--- a/test/extrude/947/947.py
+++ b/test/extrude/947/947.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(391,391,342))
-r=w0.workplane(offset=415).cylinder(440,1000).union(w0.sketch().segment((342,1),(440,1)).segment((440,147)).arc((635,391),(440,635)).segment((440,781)).segment((342,781)).segment((342,635)).arc((147,391),(342,147)).close().assemble().finalize().extrude(488)).translate((610,610,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(502,565,501))
+r=w0.sketch().arc((819,679),(885,831),(821,981)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=717).moveTo(312,304).box(895,1000,935))
\ No newline at end of file
diff --git a/test/extrude/947/947.stl b/test/extrude/947/947.stl
index db986ea32027442055277cf81c6c1bc992158269..0f9223e42ec21ff6b751e3d75780d1c23184558d 100644
Binary files a/test/extrude/947/947.stl and b/test/extrude/947/947.stl differ
diff --git a/test/extrude/948/948.py b/test/extrude/948/948.py
index 38a6c33fae18428c79fa390c9fc17d285d0ed150..52f9286bc6cb018d79f6031e482aec4f04d9d9e9 100644
--- a/test/extrude/948/948.py
+++ b/test/extrude/948/948.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(349,23,349))
-r=w0.sketch().arc((356,8),(667,112),(667,430)).arc((45,556),(356,8)).assemble().reset().face(w0.sketch().segment((1,319),(119,319)).arc((134,260),(171,208)).arc((216,438),(423,549)).arc((230,541),(119,393)).segment((1,393)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,510,500))
+w1=cq.Workplane('YZ',origin=(564,500,501))
+r=w0.workplane(offset=336).moveTo(386,485).cylinder(831,585).union(w0.workplane(offset=653).moveTo(655,824).box(900,849,805)).union(w1.sketch().segment((511,146),(766,145)).segment((766,360)).segment((790,362)).segment((790,856)).segment((731,854)).segment((731,626)).segment((509,625)).close().assemble().finalize().extrude(1))
\ No newline at end of file
diff --git a/test/extrude/948/948.stl b/test/extrude/948/948.stl
index 8628e446b3654c154ffa01909fe266e81a9f9878..9c24c3e1b7fc94329c6c07f3bcb89101836a07b8 100644
Binary files a/test/extrude/948/948.stl and b/test/extrude/948/948.stl differ
diff --git a/test/extrude/949/949.py b/test/extrude/949/949.py
index 4bd85c86dc0ea01dfffa0d6d3d2486f9ddd309bd..e7a2c30734c5694d6b06061db1dd8301f9cba653 100644
--- a/test/extrude/949/949.py
+++ b/test/extrude/949/949.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,281))
-r=w0.sketch().segment((660,1),(660,51)).arc((620,121),(660,201)).segment((660,241)).arc((590,121),(660,1)).assemble().reset().face(w0.sketch().arc((790,1),(860,121),(790,241)).segment((790,191)).arc((820,121),(790,51)).close().assemble()).finalize().extrude(710).union(w0.sketch().segment((21,500),(451,481)).segment((451,590)).segment((530,590)).segment((810,451)).segment((840,520)).segment((700,590)).segment((890,590)).segment((890,630)).segment((870,630)).arc((780,1000),(700,630)).segment((630,630)).segment((351,770)).segment((321,710)).segment((31,720)).close().assemble().finalize().extrude(940))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(16,500,501))
+r=w0.sketch().segment((207,201),(899,201)).arc((6,575),(970,671)).segment((206,671)).close().assemble().reset().face(w0.sketch().arc((996,426),(1000,501),(995,575)).close().assemble()).finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/949/949.stl b/test/extrude/949/949.stl
index 17736e3c98980c39375beb513451ce680b88d97b..2c2de3af6178b0f2c245fca424bc711bfc114d41 100644
Binary files a/test/extrude/949/949.stl and b/test/extrude/949/949.stl differ
diff --git a/test/extrude/95/95.py b/test/extrude/95/95.py
index a553d87a32e3398ea1d37a1ab89841b6e5694788..3d9573431dca8aed80b16035c43c96893cbf9f28 100644
--- a/test/extrude/95/95.py
+++ b/test/extrude/95/95.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(451,316,451))
-w1=cq.Workplane('XY',origin=(451,451,343))
-r=w0.workplane(offset=590).moveTo(271,410).box(523,586,730).union(w0.sketch().segment((352,1),(757,1)).segment((757,460)).segment((406,460)).arc((352,901),(352,460)).close().assemble().finalize().extrude(757)).union(w0.workplane(offset=726).moveTo(266,415).box(694,919,1000)).union(w1.workplane(offset=604).moveTo(415,199).cylinder(757,613))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(530,501,500))
+w1=cq.Workplane('YZ',origin=(635,499,502))
+r=w0.sketch().push([(501,616)]).circle(636).push([(425,515)]).rect(512,511,mode='s').finalize().extrude(1).union(w0.sketch().segment((335,351),(665,352)).segment((665,575)).arc((671,615),(665,660)).segment((665,879)).segment((337,880)).segment((335,661)).arc((330,616),(336,575)).close().assemble().finalize().extrude(971)).union(w1.sketch().segment((557,121),(639,121)).segment((639,170)).segment((629,172)).segment((631,175)).segment((640,176)).segment((640,341)).segment((610,341)).arc((596,322),(580,340)).segment((556,340)).close().assemble().finalize().extrude(681))
\ No newline at end of file
diff --git a/test/extrude/95/95.stl b/test/extrude/95/95.stl
index adfff39d5c59bb8a0018284de5e77f50796c5e8c..da1b7c1d278026daff99ac34d36b4b07649a6b5d 100644
Binary files a/test/extrude/95/95.stl and b/test/extrude/95/95.stl differ
diff --git a/test/extrude/950/950.py b/test/extrude/950/950.py
index 3b55485f4f107730422b1b1f36d302f98b418a54..919c8046091bcb3e0d279616c141bf5d18793554 100644
--- a/test/extrude/950/950.py
+++ b/test/extrude/950/950.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(523,523,460))
-w1=cq.Workplane('YZ',origin=(595,523,523))
-r=w0.sketch().push([(734,528)]).rect(1000,730).rect(676,712,mode='s').finalize().extrude(388).union(w1.sketch().segment((289,379),(352,379)).arc((424,343),(505,334)).segment((505,280)).segment((559,280)).segment((559,343)).arc((595,361),(622,379)).segment((775,379)).segment((775,451)).segment((685,451)).arc((487,766),(298,451)).segment((289,451)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,981))
+r=w0.sketch().segment((1,316),(375,190)).segment((376,27)).segment((616,26)).segment((615,117)).segment((794,55)).segment((1000,684)).segment((615,800)).segment((615,974)).segment((376,975)).segment((375,879)).segment((201,941)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/950/950.stl b/test/extrude/950/950.stl
index 1216839146aada7eed47e752c1b85d8d62f599f4..6ec5cc5fcbce7ea6cabadc6885e7fa7507a9072c 100644
Binary files a/test/extrude/950/950.stl and b/test/extrude/950/950.stl differ
diff --git a/test/extrude/951/951.py b/test/extrude/951/951.py
index 0e5f5525fd49ce1544cd1f328f02b70236e06162..3bea8acfe8b2f10be0b0acbf721b696fe6dd024a 100644
--- a/test/extrude/951/951.py
+++ b/test/extrude/951/951.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(321,411,411))
-r=w0.sketch().segment((291,71),(381,71)).segment((381,41)).segment((660,41)).segment((660,71)).segment((750,71)).segment((750,530)).segment((660,530)).segment((660,560)).segment((381,560)).segment((381,530)).segment((291,530)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((321,481),(321,500)).segment((361,500)).arc((91,690),(341,481)).close().assemble().finalize().extrude(381)).union(w0.sketch().push([(221,590)]).circle(461).rect(451,431,mode='s').finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,601,501))
+w1=cq.Workplane('YZ',origin=(590,501,501))
+r=w0.sketch().segment((286,539),(479,541)).segment((480,446)).segment((520,445)).segment((522,540)).segment((746,541)).segment((745,556)).segment((521,557)).segment((519,655)).segment((481,656)).segment((482,556)).segment((287,556)).close().assemble().finalize().extrude(51).union(w0.sketch().segment((226,526),(331,525)).segment((329,335)).segment((671,335)).segment((671,525)).segment((774,526)).segment((776,571)).segment((669,572)).segment((669,764)).segment((331,766)).segment((331,569)).segment((226,571)).close().assemble().push([(440,54)]).rect(551,605).finalize().extrude(466)).union(w1.sketch().arc((840,430),(849,501),(841,570)).close().assemble().finalize().extrude(910))
\ No newline at end of file
diff --git a/test/extrude/951/951.stl b/test/extrude/951/951.stl
index 0e488c9bc09f8c6851a7d2c8dd251a21786bec2a..9c9ac9368034e49c852116863acda69e37d8d960 100644
Binary files a/test/extrude/951/951.stl and b/test/extrude/951/951.stl differ
diff --git a/test/extrude/952/952.py b/test/extrude/952/952.py
index b265061d46a214b440c824e1215987c92f54b8a2..75fceb19fa407806c434a0faa41ea1967b4a2fee 100644
--- a/test/extrude/952/952.py
+++ b/test/extrude/952/952.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(672,351,351))
-r=w0.workplane(offset=27).moveTo(612,657).cylinder(1000,418).union(w0.sketch().segment((113,76),(240,76)).segment((240,1)).arc((508,583),(113,76)).assemble().finalize().extrude(98))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(616,501,501))
+r=w0.workplane(offset=192).moveTo(379,494).box(1000,1000,1000).union(w0.sketch().segment((415,441),(429,441)).arc((654,300),(876,440)).segment((890,440)).segment((891,481)).arc((901,545),(890,606)).segment((890,647)).segment((874,645)).arc((655,786),(431,646)).segment((417,645)).segment((415,606)).arc((405,545),(416,480)).close().assemble().finalize().extrude(885))
\ No newline at end of file
diff --git a/test/extrude/952/952.stl b/test/extrude/952/952.stl
index e74472dafb057c343c6700043f2a037cf6acf7dc..874c25b02285e8cec987b30a8d90f71749a5cf4c 100644
Binary files a/test/extrude/952/952.stl and b/test/extrude/952/952.stl differ
diff --git a/test/extrude/953/953.py b/test/extrude/953/953.py
index e857db1993eb009e9e0a3ed9017129370db29a4e..0297e7ffb4b0e2ed21766cf0d454e5ebc0fe24b7 100644
--- a/test/extrude/953/953.py
+++ b/test/extrude/953/953.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(371,500,500))
-r=w0.sketch().segment((1,630),(131,500)).segment((101,131)).segment((181,131)).segment((181,61)).segment((590,31)).segment((610,1)).segment((640,21)).segment((840,11)).segment((850,231)).segment((1000,371)).segment((870,500)).segment((910,940)).segment((411,970)).segment((391,1000)).segment((361,980)).segment((161,990)).segment((151,770)).close().assemble().finalize().extrude(760)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,504,501))
+w1=cq.Workplane('ZX',origin=(500,620,500))
+r=w0.workplane(offset=248).moveTo(676,206).cylinder(1000,580).union(w0.sketch().segment((195,440),(296,440)).segment((296,455)).arc((451,655),(296,856)).segment((296,876)).segment((196,875)).segment((195,856)).arc((35,656),(196,456)).close().assemble().reset().face(w0.sketch().segment((196,545),(196,761)).arc((125,655),(195,545)).assemble(),mode='s').reset().face(w0.sketch().arc((295,591),(325,486),(347,596)).arc((355,690),(296,761)).close().assemble(),mode='s').push([(745,705)]).rect(939,731).finalize().extrude(996)).union(w1.workplane(offset=521).moveTo(247,657).box(831,864,540))
\ No newline at end of file
diff --git a/test/extrude/953/953.stl b/test/extrude/953/953.stl
index 2b280e26d46ba46a5203875c754f56f4961bedf1..aa9fa9590ba449a2e013971f80dc60e168ffff64 100644
Binary files a/test/extrude/953/953.stl and b/test/extrude/953/953.stl differ
diff --git a/test/extrude/954/954.py b/test/extrude/954/954.py
index 29962d2ce890730eeafdcb2553f0b1707ae81de8..0781ee8f1468858b444d2e8473dd8e34dc7a364b 100644
--- a/test/extrude/954/954.py
+++ b/test/extrude/954/954.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(734,477,477))
-r=w0.workplane(offset=215).moveTo(838,591).cylinder(1000,591).union(w0.sketch().segment((1,315),(144,315)).arc((324,229),(505,315)).segment((648,315)).segment((648,638)).segment((505,638)).arc((324,724),(144,638)).segment((1,638)).close().assemble().finalize().extrude(286))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(779,502,501))
+r=w0.workplane(offset=220).moveTo(466,726).cylinder(1000,776).union(w0.workplane(offset=295).moveTo(537,268).box(1000,1000,911))
\ No newline at end of file
diff --git a/test/extrude/954/954.stl b/test/extrude/954/954.stl
index 47b416e98b83a0e31315546c490630003c78a39a..27bc9506d62882b7ce5c57362b6afa2cbc32f9ab 100644
Binary files a/test/extrude/954/954.stl and b/test/extrude/954/954.stl differ
diff --git a/test/extrude/955/955.py b/test/extrude/955/955.py
index 504234cda2c04804f6be3688b7f7b15254c5581f..ca9b792197e7466258dab0338f9163ca6a82d0aa 100644
--- a/test/extrude/955/955.py
+++ b/test/extrude/955/955.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(205,463,463))
-r=w0.sketch().segment((259,1),(270,1)).segment((345,420)).arc((259,807),(334,409)).close().assemble().finalize().extrude(495).union(w0.sketch().arc((377,764),(656,721),(796,474)).segment((1000,474)).segment((1000,796)).segment((946,796)).arc((774,925),(603,796)).segment((377,796)).close().assemble().finalize().extrude(968))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,500,410))
+r=w0.sketch().segment((81,221),(86,220)).arc((500,2),(915,222)).segment((921,222)).segment((921,225)).arc((1000,501),(919,776)).segment((920,779)).segment((915,780)).arc((501,1000),(87,780)).segment((81,780)).segment((82,776)).arc((2,502),(80,226)).close().assemble().finalize().extrude(686)
\ No newline at end of file
diff --git a/test/extrude/955/955.stl b/test/extrude/955/955.stl
index dc3475cb6e18cd349fe934519b3e05d84c5f7e08..763d7ab0516051475ce38615a55e1b4baf00eda8 100644
Binary files a/test/extrude/955/955.stl and b/test/extrude/955/955.stl differ
diff --git a/test/extrude/956/956.py b/test/extrude/956/956.py
index 1070ae137d19dcd67c51723b4066c54bbd1877ac..c9b194cdeffd664a8ef97649c1f16f7e000b1121 100644
--- a/test/extrude/956/956.py
+++ b/test/extrude/956/956.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(251,313,313))
-r=w0.workplane(offset=32).moveTo(363,1).cylinder(875,550).union(w0.sketch().segment((26,575),(301,463)).segment((426,750)).segment((151,863)).close().assemble().finalize().extrude(1000)).translate((156,1,237))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,661,500))
+r=w0.sketch().arc((359,399),(275,34),(580,250)).arc((556,450),(360,399)).assemble().push([(435,850)]).circle(650).push([(721,439)]).circle(589).finalize().extrude(186).union(w0.sketch().segment((550,320),(621,321)).segment((621,355)).segment((629,360)).segment((625,375)).segment((619,375)).segment((620,626)).segment((549,626)).close().assemble().finalize().extrude(254))
\ No newline at end of file
diff --git a/test/extrude/956/956.stl b/test/extrude/956/956.stl
index 42d8594d1a638b9274364d9c38e8701f79b90316..5d26df8f81847f585b5ddd072ea815e5558c23f5 100644
Binary files a/test/extrude/956/956.stl and b/test/extrude/956/956.stl differ
diff --git a/test/extrude/957/957.py b/test/extrude/957/957.py
index 0320823d39a2c1c4f266d692bc4f687b044abbcb..3b42bfde87a047838c77fc48ca5bee6c34e0a781 100644
--- a/test/extrude/957/957.py
+++ b/test/extrude/957/957.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(281,391,391))
-r=w0.sketch().segment((261,181),(271,181)).arc((351,51),(491,101)).segment((500,101)).segment((520,151)).segment((510,161)).arc((431,281),(291,231)).segment((281,231)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=695).moveTo(391,461).cylinder(1000,670))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(661,501,500))
+w1=cq.Workplane('YZ',origin=(910,502,501))
+r=w0.sketch().segment((390,80),(1000,82)).segment((999,700)).segment((681,701)).arc((51,744),(392,210)).close().assemble().push([(697,390)]).circle(560,mode='s').finalize().extrude(1).union(w1.workplane(offset=258).moveTo(357,565).cylinder(985,630))
\ No newline at end of file
diff --git a/test/extrude/957/957.stl b/test/extrude/957/957.stl
index dd5795fcf1d18022cc9adb17563ff28cd69de890..afaf99386093b7ff21f6a33890d10112aee21b02 100644
Binary files a/test/extrude/957/957.stl and b/test/extrude/957/957.stl differ
diff --git a/test/extrude/958/958.py b/test/extrude/958/958.py
index 073223b02d0910995c1f218077a4439f86a3e7d9..61881ba667d62fc8a3027286d55953d8b373b388 100644
--- a/test/extrude/958/958.py
+++ b/test/extrude/958/958.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(701,616,616))
-w1=cq.Workplane('YZ',origin=(898,616,616))
-r=w0.sketch().segment((428,530),(428,855)).segment((556,855)).segment((556,966)).arc((351,701),(556,428)).segment((556,530)).close().assemble().reset().face(w0.sketch().arc((676,428),(889,701),(676,966)).segment((676,855)).segment((804,855)).segment((804,530)).segment((676,530)).close().assemble()).finalize().extrude(863).union(w1.sketch().segment((283,189),(727,189)).segment((727,360)).arc((778,1000),(283,582)).close().assemble().push([(462,804)]).circle(641,mode='s').finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(499,499,85))
+r=w0.sketch().segment((346,1),(575,2)).segment((655,1)).segment((656,376)).segment((575,377)).segment((576,999)).segment((346,999)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/958/958.stl b/test/extrude/958/958.stl
index 9c523ac8935fadbbdacb4d5b984ec21abaa13ff0..03165fd3051a63760745a9b85ea5be59d8bdc9ff 100644
Binary files a/test/extrude/958/958.stl and b/test/extrude/958/958.stl differ
diff --git a/test/extrude/959/959.py b/test/extrude/959/959.py
index 7cbc3ab760d168cc38b6d0961537d4b3c90ea043..d9e468b1bb22f26107846fa43eb825e36fa80133 100644
--- a/test/extrude/959/959.py
+++ b/test/extrude/959/959.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(463,463,538))
-w1=cq.Workplane('XY',origin=(463,463,731))
-r=w0.sketch().arc((871,570),(914,688),(871,817)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=619).moveTo(151,76).cylinder(774,613)).union(w1.sketch().segment((366,624),(624,624)).segment((624,753)).segment((635,753)).arc((656,860),(753,914)).segment((764,914)).segment((785,903)).segment((785,946)).segment((624,946)).segment((624,1000)).segment((366,1000)).close().assemble().finalize().extrude(141)).translate((1,75,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(384,500,500))
+r=w0.sketch().push([(128,515)]).rect(694,1000).reset().face(w0.sketch().arc((360,435),(450,50),(681,375)).arc((606,841),(361,436)).assemble()).finalize().extrude(400).union(w0.sketch().segment((145,676),(329,376)).arc((195,51),(505,220)).segment((970,509)).segment((665,1000)).close().assemble().finalize().extrude(829))
\ No newline at end of file
diff --git a/test/extrude/959/959.stl b/test/extrude/959/959.stl
index eb188794c2110b0a732708e9072d93a1a7598d31..ab5e6eea0297dc2ede7240ad1c8c7a44f6f1e766 100644
Binary files a/test/extrude/959/959.stl and b/test/extrude/959/959.stl differ
diff --git a/test/extrude/96/96.py b/test/extrude/96/96.py
index 80b96f013a8ac727d1b8ab9ed747db5faa5132c7..f83443cad3bf00a83c99f0b1254bfdea8928058a 100644
--- a/test/extrude/96/96.py
+++ b/test/extrude/96/96.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(667,667,1000))
-r=w0.sketch().arc((614,540),(720,667),(614,794)).segment((614,780)).arc((707,667),(614,554)).close().assemble().finalize().extrude(1)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(461,499,499))
+r=w0.sketch().arc((76,559),(79,215),(409,139)).arc((600,99),(709,259)).arc((998,304),(720,399)).segment((719,495)).segment((763,519)).segment((744,559)).segment((700,539)).segment((520,541)).arc((460,604),(380,644)).arc((139,900),(74,559)).assemble().push([(197,711)]).rect(825,573,mode='s').finalize().extrude(578)
\ No newline at end of file
diff --git a/test/extrude/96/96.stl b/test/extrude/96/96.stl
index 0c322fa54a2c22078f1e57f35396ba071dbf09cd..99e7d32a462c8070cd1c888d3fd1e291642bc558 100644
Binary files a/test/extrude/96/96.stl and b/test/extrude/96/96.stl differ
diff --git a/test/extrude/960/960.py b/test/extrude/960/960.py
index 482e7a4151b46f56fa2bdba350cad51520df5fe4..e1db82c300624e0220a203ce06644c847c61f6d9 100644
--- a/test/extrude/960/960.py
+++ b/test/extrude/960/960.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(485,444,485))
-r=w0.sketch().arc((197,773),(1,485),(341,567)).segment((413,567)).segment((413,918)).segment((197,918)).close().assemble().reset().face(w0.sketch().segment((372,125),(547,125)).segment((547,207)).segment((794,310)).segment((701,537)).segment((701,907)).segment((650,907)).segment((650,516)).segment((444,434)).segment((372,434)).close().assemble()).push([(866,758)]).rect(732,578).finalize().extrude(464).union(w0.sketch().push([(434,722)]).circle(537).reset().face(w0.sketch().segment((619,444),(794,52)).segment((1000,145)).segment((825,537)).close().assemble()).finalize().extrude(598))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(1,501,500))
+r=w0.workplane(offset=1000).box(610,891,1000)
\ No newline at end of file
diff --git a/test/extrude/960/960.stl b/test/extrude/960/960.stl
index 96bf6f16284d85b8d462c1448ad3d4f32e87fcb1..658e3e5fd7c1ae509d0a3817f79e562b9473361c 100644
Binary files a/test/extrude/960/960.stl and b/test/extrude/960/960.stl differ
diff --git a/test/extrude/961/961.py b/test/extrude/961/961.py
index 4c32b9aa9d59ccda1225419d324bc8ae23e7d07d..f378092dd8b33a04428c47e1db9d5f77f7561044 100644
--- a/test/extrude/961/961.py
+++ b/test/extrude/961/961.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-r=w0.sketch().rect(694,867).push([(374,241)]).circle(441,mode='s').finalize().extrude(1000).translate((1,14,101))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,577))
+r=w0.sketch().segment((146,130),(225,131)).segment((227,151)).segment((331,151)).segment((331,22)).segment((281,21)).segment((286,1)).segment((794,132)).segment((855,131)).segment((855,1000)).segment((146,1000)).close().assemble().finalize().extrude(351)
\ No newline at end of file
diff --git a/test/extrude/961/961.stl b/test/extrude/961/961.stl
index d38ec7de4a2e7dd8e22b143764db83a8f98c0141..5d99f22aedb02f43a90eddd9f2ad8e3eb8fe3cb6 100644
Binary files a/test/extrude/961/961.stl and b/test/extrude/961/961.stl differ
diff --git a/test/extrude/962/962.py b/test/extrude/962/962.py
index b96f2ce1d79ed68624f05e5bc444ac001a0beaaa..cc65be826c5450450bb071c8ae8fa3adfd42607f 100644
--- a/test/extrude/962/962.py
+++ b/test/extrude/962/962.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(90,260,260))
-r=w0.sketch().segment((75,134),(127,1)).segment((149,8)).segment((149,68)).arc((467,519),(75,134)).assemble().finalize().extrude(393).union(w0.sketch().push([(260,168)]).rect(1000,726).rect(586,519,mode='s').finalize().extrude(608))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(282,335,335))
+r=w0.workplane(offset=288).moveTo(319,235).box(438,595,429).union(w0.sketch().push([(126,42)]).circle(375).reset().face(w0.sketch().segment((331,413),(388,411)).arc((448,398),(508,411)).segment((565,412)).segment((564,464)).arc((584,531),(564,602)).segment((565,654)).segment((508,654)).arc((449,667),(389,655)).segment((331,654)).segment((332,600)).arc((312,530),(331,465)).close().assemble()).finalize().extrude(534))
\ No newline at end of file
diff --git a/test/extrude/962/962.stl b/test/extrude/962/962.stl
index 936674a79d222bd7a07747c3888d1667a204c24e..5b64e18d6f0d6fe29d92d63e1aa83b51f54184b5 100644
Binary files a/test/extrude/962/962.stl and b/test/extrude/962/962.stl differ
diff --git a/test/extrude/963/963.py b/test/extrude/963/963.py
index e550af0ec8e473825eade154c1fd9e3855daa3eb..0c16879cab30d7aafc341e2cd32fc613346b4c84 100644
--- a/test/extrude/963/963.py
+++ b/test/extrude/963/963.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(431,500,500))
-r=w0.sketch().segment((1,361),(31,361)).arc((500,11),(970,361)).segment((1000,361)).segment((1000,491)).arc((910,530),(840,590)).arc((241,451),(650,910)).arc((640,940),(640,970)).arc((261,930),(31,640)).segment((1,640)).close().assemble().finalize().extrude(650)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,1))
+r=w0.sketch().segment((191,190),(810,191)).arc((761,499),(810,811)).segment((192,810)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
diff --git a/test/extrude/963/963.stl b/test/extrude/963/963.stl
index f6385b0d2402ca76b5d96bd56a7c690b7eba5ee7..0a88eddba77f4cb3d4eb230b6ce08bd03f829972 100644
Binary files a/test/extrude/963/963.stl and b/test/extrude/963/963.stl differ
diff --git a/test/extrude/964/964.py b/test/extrude/964/964.py
index 9694ea1d6e9b94baffeee8342c27c4525696f23f..0c1d745cd5bb491b719689f5cf36e7ff72dee107 100644
--- a/test/extrude/964/964.py
+++ b/test/extrude/964/964.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,381))
-r=w0.sketch().segment((1,51),(580,51)).segment((590,21)).segment((800,51)).segment((820,51)).segment((1000,71)).segment((890,980)).segment((840,980)).segment((471,930)).segment((530,500)).segment((1,500)).close().assemble().finalize().extrude(740)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(791,501,500))
+r=w0.sketch().segment((85,516),(252,516)).arc((459,200),(824,281)).segment((825,300)).segment((846,301)).arc((905,601),(694,826)).segment((696,821)).segment((670,819)).arc((410,579),(86,705)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=606).moveTo(582,510).box(666,749,710))
\ No newline at end of file
diff --git a/test/extrude/964/964.stl b/test/extrude/964/964.stl
index 2aae2ab23c8ebbd91bb3610fcb5340aeca5395b8..7059f00e1c1a0b0db53824efdcb12b71157354b7 100644
Binary files a/test/extrude/964/964.stl and b/test/extrude/964/964.stl differ
diff --git a/test/extrude/965/965.py b/test/extrude/965/965.py
index 5b8bc32006d3a1277336416a83c8c86d58d974ca..4c3c7a0c787fde0951a21e62b739edac2e154590 100644
--- a/test/extrude/965/965.py
+++ b/test/extrude/965/965.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,514).translate((1,181,181))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(267,350,268))
+r=w0.sketch().push([(220,82)]).circle(348).circle(329,mode='s').push([(188,444)]).circle(292).reset().face(w0.sketch().segment((263,353),(297,334)).segment((396,515)).segment((361,534)).close().assemble()).finalize().extrude(101)
\ No newline at end of file
diff --git a/test/extrude/965/965.stl b/test/extrude/965/965.stl
index 53f566670087bc323382b0540d9ba4f53bcd416f..3b88ac3f0921991e995e4b2f3fe685c7fc8df8db 100644
Binary files a/test/extrude/965/965.stl and b/test/extrude/965/965.stl differ
diff --git a/test/extrude/966/966.py b/test/extrude/966/966.py
index 3e731b1d23580d3d23a61feb25c0dc5542049489..a804c1274941d153cb27160bd642d9249dc5a7a0 100644
--- a/test/extrude/966/966.py
+++ b/test/extrude/966/966.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(383,544,383))
-w1=cq.Workplane('ZX',origin=(383,593,383))
-r=w0.sketch().push([(1,223)]).circle(618).reset().face(w0.sketch().segment((112,692),(371,445)).segment((445,531)).segment((186,778)).close().assemble()).reset().face(w0.sketch().segment((605,149),(716,149)).segment((716,100)).segment((1000,100)).segment((1000,519)).segment((605,519)).close().assemble()).finalize().extrude(211).union(w1.workplane(offset=174).moveTo(482,248).cylinder(803,531)).translate((13,1,235))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(385,500,499))
+w1=cq.Workplane('ZX',origin=(501,430,501))
+r=w0.workplane(offset=307).moveTo(406,679).cylinder(885,795).union(w0.sketch().arc((225,431),(380,730),(705,664)).arc((269,949),(226,431)).assemble().finalize().extrude(758)).union(w1.sketch().segment((20,665),(245,665)).arc((271,590),(310,526)).segment((311,520)).segment((322,519)).arc((526,430),(730,519)).segment((855,519)).segment((855,805)).segment((788,804)).arc((579,994),(309,905)).segment((310,964)).segment((21,964)).close().assemble().finalize().extrude(968))
\ No newline at end of file
diff --git a/test/extrude/966/966.stl b/test/extrude/966/966.stl
index 7d5bb9e1180cd361377d413a14093ec6cf8efd7a..cb68699296d7bd1af560352f8287cb363e871239 100644
Binary files a/test/extrude/966/966.stl and b/test/extrude/966/966.stl differ
diff --git a/test/extrude/967/967.py b/test/extrude/967/967.py
index 308d63baeef9d02b543e351f45d0afdedd05b8e9..87d572efabc64120f2db2c5ba28475e7a4c836da 100644
--- a/test/extrude/967/967.py
+++ b/test/extrude/967/967.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().arc((254,174),(327,187),(381,234)).arc((381,247),(387,247)).arc((394,414),(254,494)).close().assemble().reset().face(w0.sketch().segment((287,274),(341,267)).segment((354,394)).segment((301,401)).close().assemble(),mode='s').finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,441))
+w1=cq.Workplane('ZX',origin=(500,616,501))
+r=w0.workplane(offset=358).moveTo(332,602).box(540,606,785).union(w0.workplane(offset=611).moveTo(669,167).cylinder(719,666)).union(w1.sketch().segment((307,335),(341,335)).segment((342,255)).segment((421,255)).arc((565,171),(716,255)).segment((815,255)).segment((816,337)).segment((846,337)).segment((846,520)).segment((816,521)).segment((815,596)).segment((340,596)).segment((341,521)).segment((306,520)).close().assemble().finalize().extrude(886))
\ No newline at end of file
diff --git a/test/extrude/967/967.stl b/test/extrude/967/967.stl
index f958f04e1c1a69579241069f736ea9dcf09876b9..b0681cc5840303c4e0dde48691f2051362fb9a81 100644
Binary files a/test/extrude/967/967.stl and b/test/extrude/967/967.stl differ
diff --git a/test/extrude/968/968.py b/test/extrude/968/968.py
index d1e166741ed1d4e872696a81748d6cb1180a20cd..3c1bf56084b638b1bc6da3981a91ab678b9e5f4e 100644
--- a/test/extrude/968/968.py
+++ b/test/extrude/968/968.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(334,1,334))
-r=w0.sketch().segment((307,321),(347,314)).segment((361,347)).arc((341,354),(321,354)).close().assemble().finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,580))
+r=w0.sketch().segment((292,456),(355,380)).segment((385,406)).arc((786,302),(695,706)).segment((636,766)).segment((595,726)).segment((617,721)).segment((616,715)).arc((540,706),(477,672)).segment((481,689)).segment((421,689)).segment((421,635)).arc((441,651),(466,665)).arc((414,611),(386,542)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=711).moveTo(211,534).box(640,776,921))
\ No newline at end of file
diff --git a/test/extrude/968/968.stl b/test/extrude/968/968.stl
index a6139210f5008e819751d901ef65865e1f8cb13a..8f3cb3d7d53b300cbc5c5dd24eb842363894446c 100644
Binary files a/test/extrude/968/968.stl and b/test/extrude/968/968.stl differ
diff --git a/test/extrude/969/969.py b/test/extrude/969/969.py
index a8f050447ab2414d07951a8bc7f7044fa8348682..6a38f48aa59d608c247b4943ac10079b2f04895b 100644
--- a/test/extrude/969/969.py
+++ b/test/extrude/969/969.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(319,432,432))
-w1=cq.Workplane('XY',origin=(432,432,160))
-r=w0.sketch().segment((1,614),(376,523)).segment((398,591)).segment((432,591)).segment((432,614)).segment((637,614)).segment((637,671)).segment((648,671)).segment((648,614)).segment((852,614)).segment((852,591)).segment((864,591)).segment((864,886)).segment((637,886)).segment((614,966)).segment((466,921)).segment((466,909)).segment((92,1000)).close().assemble().reset().face(w0.sketch().segment((466,886),(478,886)).segment((466,898)).close().assemble(),mode='s').push([(693,24)]).circle(591).push([(688,18)]).rect(466,648,mode='s').reset().face(w0.sketch().segment((580,523),(603,535)).segment((580,535)).close().assemble()).finalize().extrude(796).union(w1.sketch().segment((205,432),(444,432)).segment((444,421)).arc((330,648),(205,432)).assemble().finalize().extrude(171)).translate((1,1,137))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,1000,501))
+r=w0.sketch().segment((830,395),(856,396)).segment((855,410)).arc((845,405),(829,395)).assemble().finalize().extrude(1).union(w0.sketch().segment((171,326),(620,326)).segment((626,326)).segment((625,331)).arc((644,431),(624,524)).segment((625,531)).segment((620,530)).arc((395,676),(170,530)).segment((171,525)).arc((145,431),(171,331)).close().assemble().finalize().extrude(330))
\ No newline at end of file
diff --git a/test/extrude/969/969.stl b/test/extrude/969/969.stl
index eb4b0a3caa1ff776ec5ed22a44d3028af2d6ab00..b8a6fd0b3450beb1ff8239a0dadfc5edde48b5d8 100644
Binary files a/test/extrude/969/969.stl and b/test/extrude/969/969.stl differ
diff --git a/test/extrude/97/97.py b/test/extrude/97/97.py
index 1dc423c6337a0e0503e18bb79c67a4bdf72ec732..a46605beb2321164863c5213336db26c4690002a 100644
--- a/test/extrude/97/97.py
+++ b/test/extrude/97/97.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(538,642,538))
-r=w0.sketch().segment((67,378),(585,378)).segment((585,472)).segment((350,472)).segment((350,1000)).segment((152,1000)).segment((152,519)).segment((208,519)).segment((208,425)).segment((105,425)).segment((105,472)).segment((67,472)).close().assemble().finalize().extrude(1).union(w0.sketch().arc((585,171),(604,142),(623,124)).segment((623,152)).segment((632,152)).segment((632,124)).arc((1000,255),(736,538)).arc((303,491),(585,171)).assemble().reset().face(w0.sketch().segment((538,378),(548,378)).arc((566,416),(595,453)).segment((538,453)).close().assemble(),mode='s').finalize().extrude(868))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,502,611))
+r=w0.sketch().segment((132,41),(172,42)).segment((171,17)).segment((476,15)).arc((690,280),(371,166)).segment((421,166)).segment((422,120)).segment((172,121)).segment((172,101)).segment((130,101)).close().assemble().push([(546,175)]).circle(536,mode='s').push([(670,805)]).circle(695).finalize().extrude(225).union(w0.sketch().segment((355,849),(361,421)).segment((395,421)).segment((396,147)).segment((870,146)).segment((871,660)).segment((810,661)).segment((804,860)).close().assemble().push([(410,180)]).rect(510,510,mode='s').finalize().extrude(551))
\ No newline at end of file
diff --git a/test/extrude/97/97.stl b/test/extrude/97/97.stl
index 4d5040460d08fad19d323f94c278868976206f1a..b6a9a6e8c73e0735930993b8fd465859536d43f9 100644
Binary files a/test/extrude/97/97.stl and b/test/extrude/97/97.stl differ
diff --git a/test/extrude/970/970.py b/test/extrude/970/970.py
index 426c9f0d56c15c5ed6703bf7d92c6c51620a1826..58374399548d5d4934f8ad49773edf7c1cdb3cfd 100644
--- a/test/extrude/970/970.py
+++ b/test/extrude/970/970.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(164,355,355))
-r=w0.sketch().segment((19,192),(364,192)).segment((364,464)).segment((364,473)).segment((364,755)).segment((19,755)).segment((19,473)).segment((19,464)).close().assemble().finalize().extrude(92).union(w0.workplane(offset=678).moveTo(646,1).cylinder(1000,401)).translate((1,1,46))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,166))
+r=w0.workplane(offset=527).moveTo(745,699).cylinder(554,585).union(w0.sketch().segment((11,370),(155,1)).segment((689,205)).segment((570,511)).arc((963,575),(799,933)).arc((644,994),(554,858)).arc((494,714),(530,570)).close().assemble().reset().face(w0.sketch().arc((668,744),(764,605),(775,773)).arc((718,743),(670,743)).assemble(),mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/970/970.stl b/test/extrude/970/970.stl
index a4ace643ef3429d496a35a9444af90a1f3a96839..9ba3ad71ebbb594515ff8706a78e82f97a1f363c 100644
Binary files a/test/extrude/970/970.stl and b/test/extrude/970/970.stl differ
diff --git a/test/extrude/971/971.py b/test/extrude/971/971.py
index 9f383f58f61c89e6e35b0071d37175b24be68e5c..9082fed81df026a69b8c0ca17cad69d468ed6657 100644
--- a/test/extrude/971/971.py
+++ b/test/extrude/971/971.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(697,562,562))
-r=w0.sketch().push([(450,798)]).circle(888).reset().face(w0.sketch().segment((484,136),(674,1)).segment((787,158)).arc((865,214),(888,304)).segment((1000,461)).segment((798,596)).segment((697,439)).arc((618,383),(596,293)).close().assemble()).finalize().extrude(282)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(279,273,279))
+w1=cq.Workplane('YZ',origin=(202,279,279))
+r=w0.workplane(offset=220).moveTo(4,442).cylinder(398,281).union(w0.sketch().push([(234,254)]).circle(297).reset().face(w0.sketch().segment((512,329),(555,476)).segment((512,489)).close().assemble()).finalize().extrude(409)).union(w1.workplane(offset=211).moveTo(265,234).cylinder(411,293))
\ No newline at end of file
diff --git a/test/extrude/971/971.stl b/test/extrude/971/971.stl
index dd92e2a7b181f8d3d91eba069795fb3289ba7235..a4c89aa470a7f265c8beb45c59f740c50c7a46d4 100644
Binary files a/test/extrude/971/971.stl and b/test/extrude/971/971.stl differ
diff --git a/test/extrude/972/972.py b/test/extrude/972/972.py
index 3d873781dc62368c47f79e7f1df5e76b6c8ec550..f5b8feae501f2319369dabfe96f0d70cfb158839 100644
--- a/test/extrude/972/972.py
+++ b/test/extrude/972/972.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(633,529,529))
-w1=cq.Workplane('YZ',origin=(759,529,529))
-r=w0.sketch().push([(598,805)]).circle(701).push([(868,317)]).rect(1000,1000).finalize().extrude(139).union(w1.sketch().arc((70,678),(1,403),(277,472)).segment((345,472)).segment((345,483)).segment((759,483)).segment((759,943)).segment((323,943)).segment((70,943)).close().assemble().finalize().extrude(587))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,756,501))
+r=w0.workplane(offset=244).moveTo(657,96).cylinder(1000,596).union(w0.sketch().segment((250,490),(451,491)).segment((501,575)).segment((596,514)).segment((595,706)).arc((580,710),(595,715)).segment((595,999)).segment((252,1000)).close().assemble().finalize().extrude(181))
\ No newline at end of file
diff --git a/test/extrude/972/972.stl b/test/extrude/972/972.stl
index 81cfb47c555affd310d845d13cd0c1b97738618a..d1e3bee4fb4a40af54d3404397ddebb23be05668 100644
Binary files a/test/extrude/972/972.stl and b/test/extrude/972/972.stl differ
diff --git a/test/extrude/973/973.py b/test/extrude/973/973.py
index 53a555ddfb9133a02010deeabb6d5241f4eee5e2..b539b066b6b1dde329e2b4a46b04f13e3c09af0e 100644
--- a/test/extrude/973/973.py
+++ b/test/extrude/973/973.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(554,554,768))
-r=w0.sketch().segment((278,732),(393,732)).arc((456,670),(536,670)).segment((536,750)).segment((411,750)).segment((411,795)).segment((536,795)).segment((536,884)).arc((456,875),(393,813)).segment((278,813)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((447,108),(706,108)).segment((706,402)).segment((831,402)).segment((831,1000)).segment((456,1000)).segment((456,545)).segment((447,545)).close().assemble().finalize().extrude(670))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,646))
+r=w0.workplane(offset=222).moveTo(882,430).box(735,1000,1000).union(w0.sketch().segment((555,795),(615,795)).arc((706,734),(790,794)).segment((851,796)).segment((850,861)).segment((789,859)).arc((705,920),(615,861)).segment((556,859)).close().assemble().finalize().extrude(660)).union(w0.sketch().segment((1,731),(520,372)).segment((590,470)).segment((71,834)).close().assemble().push([(82,527)]).rect(601,520).finalize().extrude(771))
\ No newline at end of file
diff --git a/test/extrude/973/973.stl b/test/extrude/973/973.stl
index 0b911134dffeecf91e4125f9ba38be152bc5928e..c8138e61c3d5ce7822cd29ae72ed658715a36508 100644
Binary files a/test/extrude/973/973.stl and b/test/extrude/973/973.stl differ
diff --git a/test/extrude/974/974.py b/test/extrude/974/974.py
index 0d9e2e9c00ec222e34c4e2fd10e48f5c87b0c741..42f23190783a29468b3b99f9f8cb5eebaa3af2a9 100644
--- a/test/extrude/974/974.py
+++ b/test/extrude/974/974.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(859,538,538))
-w1=cq.Workplane('ZX',origin=(538,491,538))
-r=w0.sketch().segment((152,472),(378,472)).segment((378,444)).segment((698,444)).segment((698,67)).segment((708,67)).segment((708,444)).segment((925,444)).segment((925,1000)).segment((378,1000)).segment((378,821)).segment((152,821)).close().assemble().finalize().extrude(1).union(w1.sketch().push([(915,397)]).rect(727,896).push([(915,402)]).rect(670,698,mode='s').finalize().extrude(387))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(76,501,502))
+w1=cq.Workplane('YZ',origin=(106,500,500))
+r=w0.sketch().push([(499,438)]).rect(1000,1000).rect(919,1000,mode='s').rect(740,786).finalize().extrude(1000).union(w0.sketch().push([(207,889)]).circle(609).circle(515,mode='s').finalize().extrude(1000)).union(w1.sketch().segment((211,415),(231,417)).arc((500,165),(770,416)).segment((791,415)).segment((789,462)).segment((770,461)).arc((499,706),(231,460)).segment((211,461)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/974/974.stl b/test/extrude/974/974.stl
index 618273083470f5315d528a1a9fc9ba5d0a0a927c..8dd44808a35d6c9c30306e89cadc4c72b0ad1350 100644
Binary files a/test/extrude/974/974.stl and b/test/extrude/974/974.stl differ
diff --git a/test/extrude/975/975.py b/test/extrude/975/975.py
index 4c8689a77b98bfb3938c2d8053bd37d71106f028..d64f456d291937f9f18dcca709ab695e0753f5e3 100644
--- a/test/extrude/975/975.py
+++ b/test/extrude/975/975.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(405,251,405))
-w1=cq.Workplane('YZ',origin=(500,405,405))
-r=w0.workplane(offset=185).moveTo(310,453).cylinder(845,465).union(w0.workplane(offset=257).moveTo(203,435).box(1000,941,703)).union(w1.sketch().segment((382,322),(500,322)).arc((726,168),(941,322)).segment((1000,322)).segment((1000,500)).segment((952,500)).arc((857,608),(726,655)).arc((584,893),(584,608)).arc((536,560),(500,500)).segment((382,500)).close().assemble().finalize().extrude(1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,1000,501))
+r=w0.sketch().segment((176,481),(276,265)).segment((826,520)).segment((725,734)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/975/975.stl b/test/extrude/975/975.stl
index 1922b03447ee6b383be2954e3e91071918dd085c..29e90042c22628a8f97a7a9d246d2364e2a46b7f 100644
Binary files a/test/extrude/975/975.stl and b/test/extrude/975/975.stl differ
diff --git a/test/extrude/976/976.py b/test/extrude/976/976.py
index 0588f8feca5cf7f94db81a640bdf13392b97e6c2..5f709cc9977bdf2f3dd5961d336ef805922e70a0 100644
--- a/test/extrude/976/976.py
+++ b/test/extrude/976/976.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(345,426,345))
-r=w0.workplane(offset=18).moveTo(334,426).cylinder(1000,667).union(w0.sketch().push([(185,104)]).circle(391).reset().face(w0.sketch().segment((357,816),(736,300)).segment((770,334)).segment((391,851)).close().assemble()).finalize().extrude(1)).union(w0.workplane(offset=592).moveTo(185,104).cylinder(839,610)).translate((162,57,81))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,412,500))
+r=w0.sketch().segment((277,243),(277,271)).segment((282,271)).arc((12,123),(297,248)).segment((296,241)).close().assemble().finalize().extrude(171).union(w0.workplane(offset=360).moveTo(745,720).cylinder(781,756)).union(w0.workplane(offset=756).moveTo(748,556).box(565,521,1000))
\ No newline at end of file
diff --git a/test/extrude/976/976.stl b/test/extrude/976/976.stl
index c34385ffef4d883ec62887e13cd0658978bdf648..e1bd312851fe4660c6312be79d936b7726c1bba0 100644
Binary files a/test/extrude/976/976.stl and b/test/extrude/976/976.stl differ
diff --git a/test/extrude/977/977.py b/test/extrude/977/977.py
index 75858ee50dcc653a48b51827e667889d8e711013..485a021331ce60a0cc6702b3f79dc3a17366810d 100644
--- a/test/extrude/977/977.py
+++ b/test/extrude/977/977.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(620,416,416))
-r=w0.sketch().circle(568).push([(533,439)]).circle(445,mode='s').finalize().extrude(1).union(w0.workplane(offset=349).box(1000,848,550)).translate((1,153,153))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,736,501))
+r=w0.sketch().segment((301,376),(320,377)).segment((320,85)).segment((1000,85)).segment((1000,375)).segment((775,375)).segment((776,914)).segment((301,914)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=600).moveTo(308,448).box(1000,915,699))
\ No newline at end of file
diff --git a/test/extrude/977/977.stl b/test/extrude/977/977.stl
index 325fa1206e0bb663f75a0c7e8b623bd5773fbbf9..bdc00c9de4234e27acf7d2fde85673e8d68b67af 100644
Binary files a/test/extrude/977/977.stl and b/test/extrude/977/977.stl differ
diff --git a/test/extrude/978/978.py b/test/extrude/978/978.py
index d9c3b277092cad928edefa09fe5e68d77a24f839..d46ec1c69bc9ee60633ad4a71ea55a999b4106f4 100644
--- a/test/extrude/978/978.py
+++ b/test/extrude/978/978.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(643,490,490))
-r=w0.sketch().push([(317,730)]).rect(898,908).push([(195,597)]).rect(511,643,mode='s').finalize().extrude(103).union(w0.sketch().segment((1,439),(11,439)).arc((184,134),(348,439)).segment((388,439)).segment((388,470)).segment((327,470)).arc((184,531),(32,470)).segment((1,470)).close().assemble().push([(184,327)]).circle(572,mode='s').reset().face(w0.sketch().arc((847,246),(796,62),(949,184)).segment((980,184)).segment((980,317)).arc((1000,368),(980,419)).segment((980,551)).segment((847,551)).segment((847,419)).arc((827,368),(847,317)).close().assemble()).finalize().extrude(562))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(515,502,502))
+r=w0.sketch().arc((367,706),(22,442),(445,535)).segment((541,520)).segment((575,700)).segment((376,734)).close().assemble().finalize().extrude(236).union(w0.workplane(offset=616).moveTo(869,370).cylinder(730,630))
\ No newline at end of file
diff --git a/test/extrude/978/978.stl b/test/extrude/978/978.stl
index eb9b7dace78c9439623596f09a6a27c68b28cb02..51468fa89554843453a631d0cd4992cf8cd47726 100644
Binary files a/test/extrude/978/978.stl and b/test/extrude/978/978.stl differ
diff --git a/test/extrude/979/979.py b/test/extrude/979/979.py
index 04d91a0168067fcf922ae89c4a0309d4e70f498b..7a4f9afeeb74a259a1dff07c2ee450b56a87215c 100644
--- a/test/extrude/979/979.py
+++ b/test/extrude/979/979.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(334,464,464))
-w1=cq.Workplane('XY',origin=(464,464,621))
-r=w0.sketch().segment((1,362),(158,362)).segment((158,242)).segment((334,242)).segment((556,38)).segment((750,242)).segment((843,242)).segment((843,343)).segment((926,436)).segment((843,519)).segment((843,686)).segment((658,686)).segment((445,889)).segment((251,686)).segment((158,686)).segment((158,584)).segment((94,510)).segment((1,510)).close().assemble().reset().face(w0.sketch().arc((408,242),(500,223),(593,242)).close().assemble(),mode='s').reset().face(w0.sketch().segment((408,686),(593,686)).arc((500,704),(408,686)).assemble(),mode='s').finalize().extrude(1000).union(w1.workplane(offset=593).moveTo(209,500).box(769,889,722))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(267,500,500))
+r=w0.sketch().push([(521,401)]).circle(520).push([(523,400)]).rect(526,530,mode='s').finalize().extrude(755).union(w0.sketch().push([(66,694)]).rect(630,850).reset().face(w0.sketch().segment((387,130),(656,132)).segment((655,674)).segment((581,676)).segment((579,870)).segment((449,871)).segment((451,430)).segment((385,430)).close().assemble()).push([(950,541)]).rect(599,1000).finalize().extrude(974))
\ No newline at end of file
diff --git a/test/extrude/979/979.stl b/test/extrude/979/979.stl
index 34c5a4675a0bbcdf7f36a78f3f47e17ed92010fb..5d91b2d57ef35864b2d530d8e6019812bf5a929d 100644
Binary files a/test/extrude/979/979.stl and b/test/extrude/979/979.stl differ
diff --git a/test/extrude/98/98.py b/test/extrude/98/98.py
index 8fa15413a61fbfd3d512d687911c76aa75ef976e..63c5bdf8bfb55c024bd291ae5e7d1a342f99e33f 100644
--- a/test/extrude/98/98.py
+++ b/test/extrude/98/98.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,740))
-r=w0.sketch().segment((1,361),(11,341)).segment((1000,640)).segment((990,660)).close().assemble().finalize().extrude(11)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,277,499))
+r=w0.sketch().push([(190,651)]).circle(689).push([(724,369)]).rect(1000,916).finalize().extrude(895).union(w0.sketch().push([(415,559)]).circle(587).reset().face(w0.sketch().segment((356,605),(366,585)).segment((361,584)).segment((361,536)).segment((391,536)).arc((395,531),(405,525)).segment((430,490)).segment((474,527)).segment((466,541)).segment((466,591)).segment((436,590)).arc((431,595),(421,596)).segment((395,635)).close().assemble(),mode='s').finalize().extrude(950))
\ No newline at end of file
diff --git a/test/extrude/98/98.stl b/test/extrude/98/98.stl
index 36ec28e99f437dfd9327c64453e7f20c0b5a2ae1..dda8b898a98e782c9090074bbc5acfa6029d6fd8 100644
Binary files a/test/extrude/98/98.stl and b/test/extrude/98/98.stl differ
diff --git a/test/extrude/980/980.py b/test/extrude/980/980.py
index 783b7ab1e904ef8a5c91b10e218f73f87c728e85..1186e6d659500f1a3ea7b3e0d4166ff14c61737a 100644
--- a/test/extrude/980/980.py
+++ b/test/extrude/980/980.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(500,500,580))
-w1=cq.Workplane('XY',origin=(500,500,580))
-r=w0.sketch().segment((141,650),(221,580)).segment((221,660)).segment((231,660)).segment((231,570)).segment((381,421)).segment((211,181)).segment((471,1)).segment((710,351)).segment((650,391)).segment((860,620)).segment((461,1000)).close().assemble().push([(461,261)]).circle(640,mode='s').finalize().extrude(820).union(w1.sketch().segment((401,770),(451,770)).segment((451,361)).segment((600,361)).segment((600,520)).arc((650,640),(600,750)).segment((600,910)).segment((401,910)).close().assemble().finalize().extrude(21))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,502,397))
+r=w0.workplane(offset=317).moveTo(623,192).box(1000,879,866).union(w0.workplane(offset=791).moveTo(268,526).box(916,1000,1000))
\ No newline at end of file
diff --git a/test/extrude/980/980.stl b/test/extrude/980/980.stl
index 8efe85eb79463af19cc4cf89482a14e6587102ee..24cc9c5ad9ac3d1054376f10068381d2f989176a 100644
Binary files a/test/extrude/980/980.stl and b/test/extrude/980/980.stl differ
diff --git a/test/extrude/981/981.py b/test/extrude/981/981.py
index b2a0809d680e554569a4d6351a3e087d640b3a76..e7b9dff4575737975fdfdaae04f6063b16dca8c9 100644
--- a/test/extrude/981/981.py
+++ b/test/extrude/981/981.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(267,267,1))
-w1=cq.Workplane('XY',origin=(267,267,112))
-r=w0.workplane(offset=600).moveTo(56,79).box(667,1000,933).union(w1.workplane(offset=145).moveTo(401,789).box(822,334,512)).translate((12,155,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(231,500,501))
+r=w0.sketch().segment((131,2),(559,1)).segment((562,580)).segment((456,580)).segment((456,621)).segment((131,619)).close().assemble().push([(345,311)]).circle(691,mode='s').reset().face(w0.sketch().segment((569,879),(871,879)).arc((721,940),(572,881)).assemble()).finalize().extrude(366).union(w0.sketch().segment((235,814),(476,816)).segment((476,1000)).segment((317,1000)).segment((262,939)).segment((250,955)).segment((295,1000)).segment((235,1000)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/981/981.stl b/test/extrude/981/981.stl
index bb6be428de1b965c4287b375ba618ec230bfac2a..f7ccacbb1531898f858238e4c339bdd55742425b 100644
Binary files a/test/extrude/981/981.stl and b/test/extrude/981/981.stl differ
diff --git a/test/extrude/982/982.py b/test/extrude/982/982.py
index 603dcfd077897d0c4f367170b2a5e548b54bb041..f0035c6c15591d02c230304f3b1969fd0a1975d5 100644
--- a/test/extrude/982/982.py
+++ b/test/extrude/982/982.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(349,349,475))
-r=w0.sketch().push([(164,304)]).rect(586,1000).push([(467,475)]).circle(534).finalize().extrude(1).union(w0.sketch().segment((356,415),(356,674)).arc((68,549),(356,415)).assemble().finalize().extrude(452))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(501,486,501))
+w1=cq.Workplane('ZX',origin=(501,580,501))
+r=w0.sketch().segment((360,576),(491,510)).segment((546,615)).segment((415,676)).arc((127,760),(360,576)).assemble().reset().face(w0.sketch().segment((260,614),(276,616)).arc((300,595),(330,585)).segment((261,624)).close().assemble(),mode='s').finalize().extrude(16).union(w1.sketch().push([(816,236)]).circle(582).push([(815,233)]).rect(520,656,mode='s').finalize().extrude(920))
\ No newline at end of file
diff --git a/test/extrude/982/982.stl b/test/extrude/982/982.stl
index d2376d329e6640e2edc4b4f23700e65b9c187431..24425b0178aca29a95fd5522586ae1c5ec98c540 100644
Binary files a/test/extrude/982/982.stl and b/test/extrude/982/982.stl differ
diff --git a/test/extrude/983/983.py b/test/extrude/983/983.py
index bb4eb69cbd59ca28d1a419774fac3073a42cb67c..76582608733839db52904734a3bf8eeda4ad7fb0 100644
--- a/test/extrude/983/983.py
+++ b/test/extrude/983/983.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(700,500,500))
-r=w0.sketch().segment((111,111),(271,1)).segment((570,431)).segment((770,431)).segment((770,570)).segment((670,570)).segment((890,890)).segment((730,1000)).segment((431,570)).segment((231,570)).segment((231,431)).segment((331,431)).close().assemble().finalize().extrude(91)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(301,500,501))
+r=w0.workplane(offset=677).moveTo(821,863).box(850,526,854).union(w0.sketch().segment((26,936),(26,946)).segment((40,944)).arc((55,949),(62,940)).arc((36,999),(25,935)).assemble().push([(847,279)]).rect(576,1000).finalize().extrude(905))
\ No newline at end of file
diff --git a/test/extrude/983/983.stl b/test/extrude/983/983.stl
index 07918e29e15ebd01efadf71420c8ab906870a530..a861dd98ae016defa7229d7d01e2fc0b14feaaea 100644
Binary files a/test/extrude/983/983.stl and b/test/extrude/983/983.stl differ
diff --git a/test/extrude/984/984.py b/test/extrude/984/984.py
index 5d7a3975b54fd94cea3e2be770efcb22c9d18ec6..39f3247e33ff93749fb20232da75e9c66339de42 100644
--- a/test/extrude/984/984.py
+++ b/test/extrude/984/984.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(598,510,510))
-r=w0.sketch().arc((491,569),(549,530),(549,452)).segment((1000,452)).segment((1000,961)).segment((491,961)).close().assemble().finalize().extrude(1).union(w0.sketch().push([(168,261)]).rect(804,912).push([(168,265)]).circle(549,mode='s').finalize().extrude(89)).union(w0.sketch().push([(471,510)]).circle(726).circle(608,mode='s').finalize().extrude(843))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,500,276))
+r=w0.sketch().arc((226,80),(501,1),(774,81)).close().assemble().reset().face(w0.sketch().segment((226,920),(775,920)).arc((500,1000),(227,920)).assemble()).finalize().extrude(950)
\ No newline at end of file
diff --git a/test/extrude/984/984.stl b/test/extrude/984/984.stl
index 07c7037f6cdb10a70af6ea4c74dc3de58b5fceec..5f65e974c521c8fdd0b827adddb49187de91062e 100644
Binary files a/test/extrude/984/984.stl and b/test/extrude/984/984.stl differ
diff --git a/test/extrude/985/985.py b/test/extrude/985/985.py
index ed6c9297313ed254bba5e96a9d4b1f391b84ec9c..5ce34a600f2e863a3cbb2a464d280231daa3ace9 100644
--- a/test/extrude/985/985.py
+++ b/test/extrude/985/985.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(491,500,500))
-r=w0.workplane(offset=361).moveTo(640,361).cylinder(780,630).union(w0.sketch().segment((820,530),(870,530)).segment((870,670)).arc((940,760),(870,850)).segment((870,1000)).segment((820,1000)).segment((820,850)).arc((750,760),(820,670)).close().assemble().finalize().extrude(780)).union(w0.sketch().segment((61,231),(221,311)).segment((211,91)).segment((241,81)).segment((161,41)).arc((311,1),(451,71)).segment((710,61)).segment((740,500)).segment((231,530)).segment((231,451)).arc((111,371),(61,231)).assemble().finalize().extrude(810))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(326,501,500))
+r=w0.workplane(offset=510).moveTo(532,920).cylinder(521,544).union(w0.workplane(offset=514).moveTo(351,385).cylinder(525,851)).union(w0.sketch().segment((506,70),(874,71)).segment((875,171)).arc((999,420),(875,666)).segment((875,766)).segment((505,764)).segment((506,666)).arc((380,421),(506,170)).close().assemble().finalize().extrude(856))
\ No newline at end of file
diff --git a/test/extrude/985/985.stl b/test/extrude/985/985.stl
index d97e466113e438f57190ea1f96af3a0d681aa44f..ac4809cf9c849c20cf221c21dcf5d179a7bae39f 100644
Binary files a/test/extrude/985/985.stl and b/test/extrude/985/985.stl differ
diff --git a/test/extrude/986/986.py b/test/extrude/986/986.py
index 1acf2b3ff2c793876aad8f561757c42b6a772122..ba6b4e38f4e08ea37189393a2055156fa6f74d82 100644
--- a/test/extrude/986/986.py
+++ b/test/extrude/986/986.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(455,728,455))
-r=w0.workplane(offset=183).cylinder(1000,546).union(w0.sketch().segment((328,1),(582,1)).segment((582,782)).segment((573,782)).segment((573,909)).segment((328,909)).close().assemble().push([(473,146)]).circle(482,mode='s').finalize().extrude(55)).translate((92,1,92))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,470))
+r=w0.sketch().segment((791,396),(961,690)).arc((22,366),(998,556)).segment((876,346)).close().assemble().reset().face(w0.sketch().arc((506,411),(537,422),(567,441)).arc((317,902),(506,412)).assemble(),mode='s').finalize().extrude(565)
\ No newline at end of file
diff --git a/test/extrude/986/986.stl b/test/extrude/986/986.stl
index 65499ca133c590e0f80b916632c3869d5dc359ee..2d6f9e7eaef22ddc7ab374b8d1bc118fb819ba55 100644
Binary files a/test/extrude/986/986.stl and b/test/extrude/986/986.stl differ
diff --git a/test/extrude/987/987.py b/test/extrude/987/987.py
index 3a4a704bb9a9e5c802dca186d3450d274b1ae1f3..6dbbc9f231caee44c9d814f7ef3fffe6c52d3c85 100644
--- a/test/extrude/987/987.py
+++ b/test/extrude/987/987.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(506,334,506))
-r=w0.sketch().segment((273,1),(818,1)).segment((818,606)).segment((778,606)).arc((425,1000),(273,506)).close().assemble().reset().face(w0.sketch().segment((334,213),(405,213)).segment((415,203)).segment((415,213)).segment((576,213)).segment((576,304)).segment((506,304)).segment((495,304)).segment((334,304)).close().assemble(),mode='s').finalize().extrude(839)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,174,499))
+r=w0.sketch().arc((5,219),(99,155),(200,203)).arc((180,268),(186,340)).arc((55,355),(5,235)).arc((20,235),(5,219)).assemble().finalize().extrude(820).union(w0.sketch().segment((794,470),(951,471)).arc((556,714),(980,519)).segment((981,651)).segment((796,651)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/987/987.stl b/test/extrude/987/987.stl
index 43d4d9356b33432fbf877e489557bb4770a8fdb3..32ce74add72374536af6168e540c55379d89ec6b 100644
Binary files a/test/extrude/987/987.stl and b/test/extrude/987/987.stl differ
diff --git a/test/extrude/988/988.py b/test/extrude/988/988.py
index 8d5645745c7d79aa18cebf6dc16b0d01cc4cda0d..51f35d18ac6a4d84adcfd934677ec92e6fa9a05b 100644
--- a/test/extrude/988/988.py
+++ b/test/extrude/988/988.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(570,570,583))
-r=w0.sketch().segment((39,621),(64,621)).arc((216,557),(368,621)).segment((393,621)).segment((393,646)).arc((418,697),(431,760)).arc((924,1000),(380,937)).segment((368,937)).arc((216,1000),(64,937)).segment((39,937)).segment((39,899)).arc((1,772),(39,646)).close().assemble().push([(924,153)]).circle(785).finalize().extrude(557).translate((1,64,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,501,316))
+r=w0.workplane(offset=512).moveTo(404,927).box(696,647,526).union(w0.workplane(offset=686).moveTo(500,252).cylinder(869,750))
\ No newline at end of file
diff --git a/test/extrude/988/988.stl b/test/extrude/988/988.stl
index c4b128abeb73af1094656ae8534093c80ce88893..9fc5d9ef542a313ee3c7ae49522d54c63a2e5efb 100644
Binary files a/test/extrude/988/988.stl and b/test/extrude/988/988.stl differ
diff --git a/test/extrude/989/989.py b/test/extrude/989/989.py
index db3b8220a552f1f04961a6de3b45f55b9652b65a..ba3e640a28fafc0bea10536347e832ac763d8dc8 100644
--- a/test/extrude/989/989.py
+++ b/test/extrude/989/989.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(1,334,334))
-w1=cq.Workplane('YZ',origin=(68,334,334))
-r=w0.sketch().push([(263,115)]).rect(648,848).push([(220,272)]).rect(505,344,mode='s').finalize().extrude(1000).union(w1.workplane(offset=562).moveTo(505,753).cylinder(791,391))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,171,500))
+r=w0.sketch().push([(391,727)]).rect(1000,1000).push([(611,925)]).rect(530,520,mode='s').push([(455,26)]).rect(531,551).finalize().extrude(765).union(w0.sketch().push([(856,235)]).circle(610).push([(941,264)]).rect(511,536,mode='s').finalize().extrude(1000))
\ No newline at end of file
diff --git a/test/extrude/989/989.stl b/test/extrude/989/989.stl
index 2e38281f88ab02ed44eb53b632a8dbd19bb39520..5b02bff3064d459edd2fbde9595676e3cd89cd8f 100644
Binary files a/test/extrude/989/989.stl and b/test/extrude/989/989.stl differ
diff --git a/test/extrude/99/99.py b/test/extrude/99/99.py
index 7dbe3f9af9d727d95b8b4abc486f2aff6188fce9..cced305c5c7e98949e2184b4a5d6884f90e94372 100644
--- a/test/extrude/99/99.py
+++ b/test/extrude/99/99.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(361,500,500))
-r=w0.sketch().segment((171,500),(181,491)).segment((191,520)).segment((181,520)).close().assemble().finalize().extrude(311).union(w0.workplane(offset=411).moveTo(820,720).box(520,980,680)).union(w0.sketch().segment((191,491),(391,491)).arc((570,510),(491,680)).segment((491,1000)).segment((191,1000)).close().assemble().reset().face(w0.sketch().segment((351,111),(391,111)).arc((431,71),(481,31)).segment((481,11)).segment((570,1)).segment((371,291)).segment((351,291)).close().assemble()).finalize().extrude(980))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(989,502,500))
+r=w0.sketch().segment((2,375),(776,375)).segment((774,211)).segment((1000,606)).segment((681,789)).segment((681,744)).segment((210,744)).close().assemble().finalize().extrude(1)
\ No newline at end of file
diff --git a/test/extrude/99/99.stl b/test/extrude/99/99.stl
index 77a3dfa1d8579640ad39af94645515e4e6d6e323..bb807d1071f30fd50e7a949031ed0b5eec2dd7f0 100644
Binary files a/test/extrude/99/99.stl and b/test/extrude/99/99.stl differ
diff --git a/test/extrude/990/990.py b/test/extrude/990/990.py
index 6f442284cd558a802941f5425c8d2d98dded2280..834315afed6f573b8c0243ecb28941e47d0982ba 100644
--- a/test/extrude/990/990.py
+++ b/test/extrude/990/990.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(656,517,517))
-r=w0.workplane(offset=372).moveTo(613,828).cylinder(807,527).union(w0.sketch().arc((141,592),(33,259),(366,323)).segment((678,323)).segment((678,742)).segment((141,742)).close().assemble().reset().face(w0.sketch().segment((1,388),(44,388)).arc((119,313),(227,323)).segment((141,323)).segment((141,538)).arc((76,517),(44,452)).segment((1,452)).close().assemble(),mode='s').finalize().extrude(270)).union(w0.workplane(offset=398).moveTo(812,372).box(1000,592,753))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(501,500,1))
+r=w0.workplane(offset=1000).box(620,779,1000)
\ No newline at end of file
diff --git a/test/extrude/990/990.stl b/test/extrude/990/990.stl
index 6463bcfdcdd8865e7cf28f6169b0b7831dea8e58..8c6ac53771b6879b5425a563ddc0b20b9bb8949d 100644
Binary files a/test/extrude/990/990.stl and b/test/extrude/990/990.stl differ
diff --git a/test/extrude/991/991.py b/test/extrude/991/991.py
index e8fba8f7b6ef36a4c020c7d4b0ca60577d606435..c25a877cf8e5e0441401e2850d51c5bb226eca97 100644
--- a/test/extrude/991/991.py
+++ b/test/extrude/991/991.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(667,334,334))
-r=w0.workplane(offset=1).cylinder(1000,627).translate((1,294,294))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,657,501))
+r=w0.sketch().segment((456,365),(612,365)).segment((611,286)).segment((845,286)).segment((844,365)).segment((999,365)).segment((1000,855)).segment((846,856)).segment((845,935)).segment((611,935)).segment((611,855)).segment((455,854)).close().assemble().finalize().extrude(1).union(w0.sketch().segment((16,331),(41,311)).arc((45,105),(245,106)).segment((270,81)).segment((275,87)).segment((256,111)).arc((250,317),(45,316)).segment((21,335)).close().assemble().finalize().extrude(690))
\ No newline at end of file
diff --git a/test/extrude/991/991.stl b/test/extrude/991/991.stl
index c56ed1eab2951091fdf4e8f73a1ad0233a43e517..7825c0b27197bcf2d6ee31bc2769c70df90336db 100644
Binary files a/test/extrude/991/991.stl and b/test/extrude/991/991.stl differ
diff --git a/test/extrude/992/992.py b/test/extrude/992/992.py
index cb44c62a18dcefb1f85f7ba1987103dfc9843dd2..52f1be4d7afd92eff7d9fed490ed354c11972e4a 100644
--- a/test/extrude/992/992.py
+++ b/test/extrude/992/992.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(427,427,337))
-r=w0.sketch().segment((247,776),(328,427)).segment((749,552)).segment((668,875)).close().assemble().reset().face(w0.sketch().segment((346,364),(391,185)).segment((812,301)).segment((758,489)).close().assemble()).finalize().extrude(570).union(w0.workplane(offset=521).moveTo(328,1).box(1000,471,615))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,501,580))
+r=w0.sketch().arc((676,256),(674,360),(780,345)).arc((376,700),(676,256)).assemble().finalize().extrude(1).union(w0.workplane(offset=711).moveTo(196,445).cylinder(921,526))
\ No newline at end of file
diff --git a/test/extrude/992/992.stl b/test/extrude/992/992.stl
index 9c05dd19f2bdae6214f9214ac2773bbd2291d6ef..30e4a0bfab7dd2f3393ed20ca0153731b893743c 100644
Binary files a/test/extrude/992/992.stl and b/test/extrude/992/992.stl differ
diff --git a/test/extrude/993/993.py b/test/extrude/993/993.py
index 5c222984a2b1c44bbc9a49ec0a7e3a0c7eb0f1a5..8678d780b28b29ef6f60cf5634bb90d5f7338580 100644
--- a/test/extrude/993/993.py
+++ b/test/extrude/993/993.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(116,116,1))
-r=w0.workplane(offset=235).box(788,1000,355).translate((279,385,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(752,500,502))
+w1=cq.Workplane('YZ',origin=(822,501,501))
+r=w0.sketch().segment((317,836),(477,836)).segment((476,806)).segment((675,805)).segment((675,834)).segment((836,835)).segment((835,971)).segment((676,971)).segment((675,999)).segment((477,1000)).segment((477,970)).segment((315,971)).close().assemble().finalize().extrude(1).union(w1.sketch().segment((268,202),(267,207)).arc((286,3),(276,207)).segment((276,203)).close().assemble().finalize().extrude(67))
\ No newline at end of file
diff --git a/test/extrude/993/993.stl b/test/extrude/993/993.stl
index a7aba19926f0de0b89044f6933e5a921eee692cf..6753d51d2b934d61ad42fb856a4b7acd6dfe3c5b 100644
Binary files a/test/extrude/993/993.stl and b/test/extrude/993/993.stl differ
diff --git a/test/extrude/994/994.py b/test/extrude/994/994.py
index 9b91b2209bf84bd2e6ea26a46d3461726c94e583..1bc5d8f2c1c9d39b13363838950a8398f13e2264 100644
--- a/test/extrude/994/994.py
+++ b/test/extrude/994/994.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(398,398,182))
-r=w0.sketch().arc((133,831),(109,350),(543,555)).arc((434,639),(482,771)).arc((446,795),(410,831)).segment((519,831)).segment((519,1000)).segment((133,1000)).close().assemble().push([(615,1)]).circle(603).finalize().extrude(266).union(w0.workplane(offset=681).moveTo(266,591).cylinder(964,507)).translate((1,205,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,166))
+w1=cq.Workplane('YZ',origin=(1,500,502))
+r=w0.sketch().arc((456,390),(402,351),(471,362)).arc((990,575),(455,391)).assemble().finalize().extrude(1000).union(w1.workplane(offset=840).moveTo(610,290).cylinder(1000,550))
\ No newline at end of file
diff --git a/test/extrude/994/994.stl b/test/extrude/994/994.stl
index 2f447d75ada90a91a2f90de4c27bbd1e27091891..449abe6996f8497e2ed96b21cf33dc69e1a50479 100644
Binary files a/test/extrude/994/994.stl and b/test/extrude/994/994.stl differ
diff --git a/test/extrude/995/995.py b/test/extrude/995/995.py
index 1922233dd4197d663af5c74ea5db96adb4f3ba7c..ce0a8efc79697874193de4617009ed52a05f9966 100644
--- a/test/extrude/995/995.py
+++ b/test/extrude/995/995.py
@@ -1,4 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(410,410,410))
-w1=cq.Workplane('XY',origin=(410,410,427))
-r=w0.sketch().segment((1,656),(124,656)).segment((124,664)).segment((124,730)).segment((1,730)).close().assemble().finalize().extrude(1).union(w0.workplane(offset=615).moveTo(713,468).box(623,1000,820)).union(w1.workplane(offset=562).moveTo(394,132).cylinder(713,484))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('ZX',origin=(500,600,500))
+w1=cq.Workplane('ZX',origin=(500,487,500))
+r=w0.sketch().segment((320,511),(386,510)).segment((385,450)).arc((417,451),(441,461)).segment((392,531)).segment((405,540)).segment((454,471)).arc((427,614),(320,511)).assemble().finalize().extrude(900).union(w1.sketch().arc((645,385),(681,480),(645,581)).close().assemble().finalize().extrude(15))
\ No newline at end of file
diff --git a/test/extrude/995/995.stl b/test/extrude/995/995.stl
index a6c28bd20d96c64b0365c457351a6235de4f1b14..94a6f3530867abf1c76d27160a86a417f9038a17 100644
Binary files a/test/extrude/995/995.stl and b/test/extrude/995/995.stl differ
diff --git a/test/extrude/996/996.py b/test/extrude/996/996.py
index 7f958e62f789bf0b609c4c484b3bd7cc9cb69c14..a7597f3f79575946d81aa3f8537eda60dcf5e17e 100644
--- a/test/extrude/996/996.py
+++ b/test/extrude/996/996.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(439,439,457))
-w1=cq.Workplane('ZX',origin=(439,194,439))
-r=w0.workplane(offset=299).moveTo(689,229).box(816,614,720).union(w0.workplane(offset=308).moveTo(693,229).cylinder(702,536)).union(w1.sketch().segment((168,369),(255,369)).arc((465,1),(667,369)).segment((711,369)).segment((711,798)).segment((168,798)).close().assemble().finalize().extrude(1000))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(500,499,292))
+r=w0.workplane(offset=535).moveTo(27,446).cylinder(571,524).union(w0.sketch().segment((980,579),(1000,509)).arc((996,546),(980,580)).assemble().finalize().extrude(924))
\ No newline at end of file
diff --git a/test/extrude/996/996.stl b/test/extrude/996/996.stl
index e4c6a039227c3546fe14337acf0cff3af171f654..821ba33fc111fcfeb0e405d370ec578fe11d164c 100644
Binary files a/test/extrude/996/996.stl and b/test/extrude/996/996.stl differ
diff --git a/test/extrude/997/997.py b/test/extrude/997/997.py
index 3a97e1127380bd124af731b9623b4a0d3979f297..98926ceff859517381c8f8aff94abfc0fe4027cd 100644
--- a/test/extrude/997/997.py
+++ b/test/extrude/997/997.py
@@ -1,3 +1,4 @@
-import cadquery as cq
-w0=cq.Workplane('XY',origin=(420,420,312))
-r=w0.workplane(offset=460).moveTo(55,150).cylinder(500,730).union(w0.sketch().push([(68,136)]).circle(636).reset().face(w0.sketch().segment((109,55),(244,28)).segment((244,82)).segment((150,109)).arc((1,204),(109,55)).assemble(),mode='s').reset().face(w0.sketch().segment((608,906),(649,865)).arc((1000,582),(838,1000)).arc((770,865),(636,932)).close().assemble()).finalize().extrude(622)).translate((256,161,1))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(351,501,500))
+w1=cq.Workplane('ZX',origin=(500,340,501))
+r=w0.workplane(offset=420).moveTo(296,452).cylinder(660,511).union(w0.sketch().segment((350,177),(716,1)).segment((876,335)).segment((510,510)).segment((436,355)).arc((141,422),(375,235)).close().assemble().finalize().extrude(724)).union(w1.sketch().arc((949,591),(1000,699),(949,811)).close().assemble().finalize().extrude(801))
\ No newline at end of file
diff --git a/test/extrude/997/997.stl b/test/extrude/997/997.stl
index b074a4e7f22d978b6948814181c8930618eb9c3b..699046c3922dc0c74034f2754b530db2b3c2e8d4 100644
--- a/test/extrude/997/997.stl
+++ b/test/extrude/997/997.stl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9b708d8e6e79a377b36ab1ab1c65738388ff90a5aab251b8186b6e431fe29176
-size 106884
+oid sha256:82d3415cccfb8b4713e3cfbee8a9ed91421ef1b28a99d9e3711ce6df24089ade
+size 55684
diff --git a/test/extrude/998/998.py b/test/extrude/998/998.py
index 9ea01fde9a1c2a398a81686e52acf371a4a970bc..98394a625e4abdac5f036150e403c66a5a9d12d2 100644
--- a/test/extrude/998/998.py
+++ b/test/extrude/998/998.py
@@ -1,4 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('YZ',origin=(290,412,412))
-w1=cq.Workplane('XY',origin=(412,412,505))
-r=w0.workplane(offset=239).moveTo(729,34).box(599,589,757).union(w0.sketch().segment((94,365),(94,412)).arc((38,589),(113,757)).arc((290,580),(393,804)).arc((515,468),(169,356)).segment((169,346)).segment((113,346)).arc((552,458),(337,860)).arc((234,879),(141,823)).arc((1,608),(94,365)).assemble().finalize().extrude(1000)).union(w1.workplane(offset=220).moveTo(258,132).box(533,524,795))
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('YZ',origin=(377,501,501))
+r=w0.sketch().push([(525,709)]).circle(605).circle(581,mode='s').finalize().extrude(721).union(w0.sketch().segment((1,349),(100,295)).segment((105,295)).segment((347,171)).segment((494,451)).segment((525,461)).segment((515,490)).segment((561,575)).segment((459,631)).segment((460,637)).segment((456,632)).segment((217,761)).segment((67,480)).segment((35,465)).segment((46,437)).close().assemble().push([(976,805)]).circle(525).finalize().extrude(755))
\ No newline at end of file
diff --git a/test/extrude/998/998.stl b/test/extrude/998/998.stl
index 33f47a8a5b3b3c7ac1c8eb1748b9e2620b389593..d1bde26580b58a590f71c4ffc8ba4141fd69e69a 100644
Binary files a/test/extrude/998/998.stl and b/test/extrude/998/998.stl differ
diff --git a/test/extrude/999/999.py b/test/extrude/999/999.py
index 8ec96b16c5eea94593851fcd67feb6251fac8546..3b8894549b6eecb42b85d97f935c5512df9dfe7c 100644
--- a/test/extrude/999/999.py
+++ b/test/extrude/999/999.py
@@ -1,3 +1,3 @@
-import cadquery as cq
-w0=cq.Workplane('ZX',origin=(538,313,538))
-r=w0.sketch().arc((581,656),(1,538),(592,452)).segment((592,355)).segment((839,355)).segment((839,517)).segment((957,506)).arc((968,431),(979,506)).segment((989,624)).segment((839,635)).segment((839,817)).segment((592,817)).segment((592,656)).close().assemble().push([(968,758)]).rect(753,613).finalize().extrude(1000)
\ No newline at end of file
+import cadquery as cq
+w0=cq.Workplane('XY',origin=(502,501,650))
+r=w0.sketch().push([(201,196)]).rect(620,661).reset().face(w0.sketch().segment((321,1),(506,1)).segment((505,77)).arc((416,40),(320,76)).close().assemble()).push([(645,526)]).circle(646).finalize().extrude(195).union(w0.sketch().push([(680,840)]).circle(661).circle(606,mode='s').finalize().extrude(349)).union(w0.sketch().segment((520,235),(585,185)).segment((651,270)).segment((655,270)).segment((656,281)).segment((701,337)).segment((860,336)).segment((860,620)).segment((631,622)).segment((631,382)).segment((605,346)).segment((596,346)).segment((595,336)).close().assemble().finalize().extrude(365))
\ No newline at end of file
diff --git a/test/extrude/999/999.stl b/test/extrude/999/999.stl
index ebdb9654f696528f75de6ed88bf2d76fa6358063..1584e821f2d8bc2fb59315f72c34e4ad866837b7 100644
Binary files a/test/extrude/999/999.stl and b/test/extrude/999/999.stl differ