diff --git a/xcode/OpenSCAD.xcodeproj/project.pbxproj b/xcode/OpenSCAD.xcodeproj/project.pbxproj
index 418fa3fc..9535d40b 100644
--- a/xcode/OpenSCAD.xcodeproj/project.pbxproj
+++ b/xcode/OpenSCAD.xcodeproj/project.pbxproj
@@ -9,6 +9,7 @@
 /* Begin PBXBuildFile section */
 		E0034E2019AA8409009F0BD0 /* dummy.c in Sources */ = {isa = PBXBuildFile; fileRef = E0034E1F19AA8409009F0BD0 /* dummy.c */; };
 		E018B43619AA8AA1004C9DF7 /* dummy.c in Sources */ = {isa = PBXBuildFile; fileRef = E0034E1F19AA8409009F0BD0 /* dummy.c */; };
+		E0ED6EC71A50B0F3007E979A /* Test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E0ED6EC51A50B0F3007E979A /* Test.cpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -262,6 +263,10 @@
 		E0BD020A1979C2D90020CC1B /* FontListDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FontListDialog.h; sourceTree = "<group>"; };
 		E0BD020B1979C2D90020CC1B /* FreetypeRenderer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FreetypeRenderer.cc; sourceTree = "<group>"; };
 		E0BD020C1979C2D90020CC1B /* FreetypeRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FreetypeRenderer.h; sourceTree = "<group>"; };
+		E0ED6EC51A50B0F3007E979A /* Test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Test.cpp; path = ../Test.cpp; sourceTree = "<group>"; };
+		E0ED6EC61A50B0F3007E979A /* Test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Test.h; path = ../Test.h; sourceTree = "<group>"; };
+		E0F8E5411A5B02AB004723C5 /* cgalutils-polyhedron.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "cgalutils-polyhedron.cc"; sourceTree = "<group>"; };
+		E0FCDD621A27B96C0024E633 /* clipper-utils.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "clipper-utils.cc"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXGroup section */
@@ -276,6 +281,8 @@
 		E022640517C307FA00499974 = {
 			isa = PBXGroup;
 			children = (
+				E0ED6EC51A50B0F3007E979A /* Test.cpp */,
+				E0ED6EC61A50B0F3007E979A /* Test.h */,
 				E018B43719AA8B2D004C9DF7 /* dummy sources */,
 				E05FBE6A17C30A05004F525B /* src */,
 				E056783C19AA721200F5650C /* Products */,
@@ -328,11 +335,13 @@
 				E05FBE8817C30A05004F525B /* CGALRenderer.cc */,
 				E05FBE8917C30A05004F525B /* CGALRenderer.h */,
 				E091574D19AA58C900D699E9 /* cgalutils-tess.cc */,
+				E0F8E5411A5B02AB004723C5 /* cgalutils-polyhedron.cc */,
 				E05FBE8A17C30A05004F525B /* cgalutils.cc */,
 				E05FBE8B17C30A05004F525B /* cgalutils.h */,
 				E05FBE8C17C30A05004F525B /* cgalworker.cc */,
 				E05FBE8D17C30A05004F525B /* cgalworker.h */,
 				E091574E19AA58C900D699E9 /* clipper-utils.h */,
+				E0FCDD621A27B96C0024E633 /* clipper-utils.cc */,
 				E05FBE8E17C30A05004F525B /* CocoaUtils.h */,
 				E05FBE8F17C30A05004F525B /* CocoaUtils.mm */,
 				E05FBE9017C30A05004F525B /* color.cc */,
@@ -661,6 +670,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				E0034E2019AA8409009F0BD0 /* dummy.c in Sources */,
+				E0ED6EC71A50B0F3007E979A /* Test.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/xcode/OpenSCAD.xcodeproj/xcshareddata/xcschemes/OpenSCAD.app.xcscheme b/xcode/OpenSCAD.xcodeproj/xcshareddata/xcschemes/OpenSCAD.app.xcscheme
index 34ad778b..4779571b 100644
--- a/xcode/OpenSCAD.xcodeproj/xcshareddata/xcschemes/OpenSCAD.app.xcscheme
+++ b/xcode/OpenSCAD.xcodeproj/xcshareddata/xcschemes/OpenSCAD.app.xcscheme
@@ -60,13 +60,41 @@
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "../openscad/cube.scad"
+            argument = "minkowskitest.scad -o out.png --debug=cgalutils"
             isEnabled = "NO">
          </CommandLineArgument>
          <CommandLineArgument
-            argument = "falsetest.scad -o out.echo"
+            argument = "import-hullcrash_off.scad -o out.png --debug=cgalutils"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "issue1090.scad -o out.png --render"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "issue1105C.scad -o out.stl"
             isEnabled = "YES">
          </CommandLineArgument>
+         <CommandLineArgument
+            argument = "degenerate.scad -o out.png --debug=cgalutils --render=cgal"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "import-out.scad"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "issue1069.scad -o out.png --debug=cgalutils"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "testdata/scad/3D/features/cube-tests.scad -o out.png --preview"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "issue803-performance.scad"
+            isEnabled = "NO">
+         </CommandLineArgument>
       </CommandLineArguments>
       <AdditionalOptions>
       </AdditionalOptions>
diff --git a/xcode/OpenSCAD.xcodeproj/xcshareddata/xcschemes/openscad_nogui.xcscheme b/xcode/OpenSCAD.xcodeproj/xcshareddata/xcschemes/openscad_nogui.xcscheme
index f230c7fa..4e34982a 100644
--- a/xcode/OpenSCAD.xcodeproj/xcshareddata/xcschemes/openscad_nogui.xcscheme
+++ b/xcode/OpenSCAD.xcodeproj/xcshareddata/xcschemes/openscad_nogui.xcscheme
@@ -58,6 +58,16 @@
             ReferencedContainer = "container:OpenSCAD.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "testdata/scad/bugs/issue1061.scad -o out.png --render=cgal"
+            isEnabled = "NO">
+         </CommandLineArgument>
+         <CommandLineArgument
+            argument = "testdata/scad/misc/empty-shape-tests.scad.csg --enable=text -o out.png --enable=text --render"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>