diff --git a/qasm.xcodeproj/project.pbxproj b/qasm.xcodeproj/project.pbxproj
index f99b8e1..cd6b39e 100644
--- a/qasm.xcodeproj/project.pbxproj
+++ b/qasm.xcodeproj/project.pbxproj
@@ -91,9 +91,7 @@
 		2F5E55F3237CBECB0091163D /* httpclient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = httpclient.cpp; sourceTree = "<group>"; };
 		2F5E55F4237CBECB0091163D /* pallogger.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pallogger.cpp; sourceTree = "<group>"; };
 		2F5E55F5237CBECB0091163D /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
-		2F5E5665237CC26F0091163D /* main.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = main.s; sourceTree = "<group>"; };
 		2F5E5667237CC26F0091163D /* qatools */ = {isa = PBXFileReference; lastKnownFileType = file; path = qatools; sourceTree = "<group>"; };
-		2F5E5668237CC26F0091163D /* testfile.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = testfile.s; sourceTree = "<group>"; };
 		2F5E566A237CC26F0091163D /* tool.macs.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = tool.macs.s; sourceTree = "<group>"; };
 		2F5E566B237CC26F0091163D /* qatools.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qatools.s; sourceTree = "<group>"; };
 		2F5E566C237CC26F0091163D /* qatools.1.s */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.asm; path = qatools.1.s; sourceTree = "<group>"; };
@@ -323,9 +321,7 @@
 		2F5E5664237CC26F0091163D /* src */ = {
 			isa = PBXGroup;
 			children = (
-				2F5E5665237CC26F0091163D /* main.s */,
 				2F5E5666237CC26F0091163D /* obj */,
-				2F5E5668237CC26F0091163D /* testfile.s */,
 				2F5E5669237CC26F0091163D /* tools */,
 				2F5E566F237CC26F0091163D /* asm */,
 				2F5E5679237CC26F0091163D /* merlin_convert.s */,
diff --git a/qasm.xcodeproj/xcshareddata/xcschemes/qasm.xcscheme b/qasm.xcodeproj/xcshareddata/xcschemes/qasm.xcscheme
index ccf7624..df13c13 100644
--- a/qasm.xcodeproj/xcshareddata/xcschemes/qasm.xcscheme
+++ b/qasm.xcodeproj/xcshareddata/xcschemes/qasm.xcscheme
@@ -36,6 +36,12 @@
             ReferencedContainer = "container:qasm.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = ""
+            isEnabled = "NO">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <Testables>
       </Testables>
    </TestAction>
@@ -61,7 +67,7 @@
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "&quot;${PROJECT_DIR}/src/main.s&quot;"
+            argument = "&quot;${PROJECT_DIR}/testdata/3001-runfile.s&quot;"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>
diff --git a/testdata/3001-lroathe.S b/testdata/3001-runfile.S
similarity index 91%
rename from testdata/3001-lroathe.S
rename to testdata/3001-runfile.S
index bfd0932..bfa0b61 100644
--- a/testdata/3001-lroathe.S
+++ b/testdata/3001-runfile.S
@@ -68,25 +68,9 @@ _LFT        ds      1       ;Window edge   0..39
 *==========================================================
 * Program Entry
 
-                            ;Issue #26 - This should start at the ORG in the linkscript, not at the last ORG in the DUM sections.
-START                       
-
-                            ; PUT current issue here, so it's the first thing assembled.
-                            ; The rest below are unit tests to make sure future changes don't break existing code!
-
-
-                            ; START OF TESTS KNOWN TO HAVE PASSED IN PREVIOUS BUILDS
-
-                            ; --- Test all instructions in all their modes, with as many variants as possible ---
-
-
-
-
-                            ;adc (ZP,x)
-            adc     (0,x)   
-
-
-            adc     ($80,x) 
+START
+            adc     (0,x)
+            adc     ($80,x)
             adc     (_tmp,x) 
             adc     (_tmp+0,x) 
             adc     (_tmp+$10,x) 
@@ -103,10 +87,7 @@ START
             adc     #$1111  
             adc     $1111   
 
-                            ; --- Other tests that have proven helpful ---
-
-                            ; Tests regarding issues with math and zp,x
-            sta     TSTADDR+dum0 
+			sta     TSTADDR+dum0
             sta     TSTADDR+_num1+dum0 
             sta     TSTADDR+_num1+dum0,x 
 
@@ -153,11 +134,7 @@ GetKey      ldx     $C000
 myQuit                      
             jmp     DOSWARM 
 
-                            ; --- Tests used when addressing issues opened against Merlin32 ---
-
-                            ;Issue #26 (lroathe) - ORG in DUM section is ignored, but can't mess up code ORG
-
-            org     $2000   
+			org     $2000
 
             lda     _LFT    
             ldx     #_LFT