diff --git a/tests/test_checks.py b/tests/test_checks.py
index e4b9891..c3e895f 100644
--- a/tests/test_checks.py
+++ b/tests/test_checks.py
@@ -33,14 +33,18 @@ def job_file_generator(
     if header_extra is not None:
         header += header_extra
 
-    if program is None:
-        program = """'A comment
-COMMAND\n"""
+
+    if program is not None:
+        if not program.startswith("'"):
+            program = """'A comment COMMAND\n""" + program
+        if not program.endswith("\n"):
+            program = program + "\n"
+    else:
+        program = """'A comment COMMAND\n"""
 
     job = header + nop + program + end
     return job
 
-
 # ===========
 # CHECK_W1
 # ===========
@@ -52,8 +56,15 @@ def test_check_w1():
     assert result is None
 
 
-def test_check_w1_errors():
-    job_string = job_file_generator("COMMAND")
+def test_check_w1_error():
+    job_string = """/JOB
+//NAME TEST
+///FOLDERNAME MAIN
+NOP
+CALL JOB:TRIGGER_RESET
+END
+
+"""
     job = JobFile(job_string)
     result = check_w1(job, "W", "1")
 
@@ -69,7 +80,7 @@ def test_check_w1_errors():
 # CHECK_W2
 # ===========
 def test_check_w2():
-    job_string = job_file_generator(program = "SETREG MREG#", foldername = "TWINCAT_KOMMUNIKATION")
+    job_string = job_file_generator(program = "SETREG MREG#\n", foldername = "TWINCAT_KOMMUNIKATION")
     job = JobFile(job_string)
     result = check_w2(job, "W", "1")
 
@@ -77,7 +88,7 @@ def test_check_w2():
 
 
 def test_check_w2_error():
-    job_string = job_file_generator(program = "SETREG MREG#")
+    job_string = job_file_generator(program = "SETREG MREG#\n")
     job = JobFile(job_string)
     result = check_w2(job, "W", "2")
 
@@ -108,7 +119,7 @@ def test_check_w3_error_1():
 
     assert result[0] == "W"
     assert result[1] == "3"
-    assert result[2] == 5
+    assert result[2] == 6
     assert result[3] == "The command SET USERFRAME does not exist"
 
 
@@ -120,13 +131,16 @@ def test_check_w3_error_2():
 
     assert result[0] == "W"
     assert result[1] == "3"
-    assert result[2] == 5
+    assert result[2] == 6
     assert result[3] == "The command SET USERFRAME does not exist"
-####################################################################################
-############################refactor checkpoint#####################################
-####################################################################################
+    
+                                                
+
 def test_check_w3_error_3():
-    job = JobFile("w3_error_3.JBI")
+    program ='''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
+SET USERFRAME\n'''
+    job_string = job_file_generator(program, foldername = "STANDARD")
+    job = JobFile(job_string)
     result = check_w3(job, "W", "3")
 
     assert result[0] == "W"
@@ -139,7 +153,10 @@ def test_check_w3_error_3():
 
 
 def test_check_w3_error_4():
-    job = JobFile("w3_error_4.JBI")
+    program ='''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
+SET USERFRAME\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w3(job, "W", "3")
 
     assert result[0] == "W"
@@ -154,25 +171,32 @@ def test_check_w3_error_4():
 # ===========
 # CHECK_W4
 # ===========
-def test_check_w4():
-    job = JobFile("w4_pass.JBI")
-    result = check_w4(job, "W", "4")
 
+def test_check_w4():
+    program = '''CALL JOB:SET_TCPON ARGF5
+TCPON TL#(5)\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
+    result = check_w4(job, "W", "3")
     assert result is None
 
 
 def test_check_w4_error_1():
-    job = JobFile("w4_error_1.JBI")
+    program = '''TCPON TL#(5)\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
     assert result[0][1] == "4"
-    assert result[0][2] == 7
+    assert result[0][2] == 6
     assert result[0][3].startswith("When a TCPON command")
 
 
 def test_check_w4_error_2():
-    job = JobFile("w4_error_2.JBI")
+    program = '''CALL JOB:SET_TCPON ARGF5\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
@@ -182,7 +206,10 @@ def test_check_w4_error_2():
 
 
 def test_check_w4_error_3():
-    job = JobFile("w4_error_3.JBI")
+    program = '''TCPON TL#(5)
+CALL JOB:SET_TCPON ARGF5\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
@@ -192,7 +219,10 @@ def test_check_w4_error_3():
 
 
 def test_check_w4_error_4():
-    job = JobFile("w4_error_4.JBI")
+    program = '''CALL JOB:SET_TCPON ARGF5
+TCPON TL#(6)\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
@@ -202,7 +232,11 @@ def test_check_w4_error_4():
 
 
 def test_check_w4_error_5():
-    job = JobFile("w4_error_5.JBI")
+    program = '''CALL JOB:SET_TCPON ARGF5
+Another line
+TCPON TL#(5)\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
@@ -212,7 +246,13 @@ def test_check_w4_error_5():
 
 
 def test_check_w4_error_6():
-    job = JobFile("w4_error_6.JBI")
+    program = '''CALL JOB:SET_TCPON ARGF5
+TCPON TL#(5)
+Another line
+CALL JOB:SET_TCPON ARGF5
+TCPON TL#(6)\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
@@ -222,7 +262,12 @@ def test_check_w4_error_6():
 
 
 def test_check_w4_error_7():
-    job = JobFile("w4_error_7.JBI")
+    program = '''CALL JOB:SET_TCPON ARGF5
+TCPON TL#(5)
+CALL JOB:SET_TCPON ARGF6
+TCPON TL#(7))\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
@@ -232,7 +277,12 @@ def test_check_w4_error_7():
 
 
 def test_check_w4_error_8():
-    job = JobFile("w4_error_8.JBI")
+    program = '''CALL JOB:SET_TCPON ARGF6
+TCPON TL#(7)
+CALL JOB:SET_TCPON ARGF5
+TCPON TL#(5)\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
@@ -242,7 +292,13 @@ def test_check_w4_error_8():
 
 
 def test_check_w4_error_9():
-    job = JobFile("w4_error_9.JBI")
+    program = '''CALL JOB:SET_TCPON ARGF6
+TCPON TL#(7)
+Anotherline
+CALL JOB:SET_TCPON ARGF5
+TCPON TL#(5)\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
@@ -252,7 +308,13 @@ def test_check_w4_error_9():
 
 
 def test_check_w4_error_10():
-    job = JobFile("w4_error_10.JBI")
+    program = '''CALL JOB:SET_TCPON ARGF6
+TCPON TL#(7)
+Anotherline
+CALL JOB:SET_TCPON ARGF5
+TCPON TL#(9)\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w4(job, "W", "4")
 
     assert result[0][0] == "W"
@@ -270,14 +332,21 @@ def test_check_w4_error_10():
 # CHECK_W5
 # ===========
 def test_check_w5():
-    job = JobFile("w5_pass.JBI")
+    program = '''CALL JOB:TRIGGER_RESET
+ANOTHER LINE
+CALL JOB:TRIGGER_RESET\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w5(job, "W", "5")
 
     assert result is None
 
 
 def test_check_w5_error_1():
-    job = JobFile("w5_error_1.JBI")
+    program = '''CALL JOB:TRIGGER_RESET
+ANOTHER LINE\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w5(job, "W", "5")
 
     assert result[0] == "W"
@@ -287,7 +356,10 @@ def test_check_w5_error_1():
 
 
 def test_check_w5_error_2():
-    job = JobFile("w5_error_2.JBI")
+    program = '''ANOTHER LINE
+CALL JOB:TRIGGER_RESET\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w5(job, "W", "5")
 
     assert result[0] == "W"
@@ -297,7 +369,11 @@ def test_check_w5_error_2():
 
 
 def test_check_w5_error_3():
-    job = JobFile("w5_error_3.JBI")
+    program = '''ANOTHER LINE
+CALL JOB:TRIGGER_RESET
+CALL JOB:TRIGGER_RESET\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w5(job, "W", "5")
 
     assert result[0] == "W"
@@ -310,14 +386,26 @@ def test_check_w5_error_3():
 # CHECK_W6
 # ===========
 def test_check_w6():
-    job = JobFile("w6_pass.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+ARCON
+ANOTHER LINE
+ARCOF
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
+END\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
 
     assert result is None
 
 
 def test_check_w6_error_1():
-    job = JobFile("w6_error_1.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+ARCON
+ANOTHER LINE
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
 
     assert result[0][0] == "W"
@@ -327,7 +415,12 @@ def test_check_w6_error_1():
 
 
 def test_check_w6_error_2():
-    job = JobFile("w6_error_2.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+ARCON
+ANOTHER LINE
+ARCOF\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
 
     assert result[0][0] == "W"
@@ -337,7 +430,12 @@ def test_check_w6_error_2():
 
 
 def test_check_w6_error_3():
-    job = JobFile("w6_error_3.JBI")
+    program = '''ARCON
+ANOTHER LINE
+ARCOF
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
 
     assert result[0][0] == "W"
@@ -347,7 +445,12 @@ def test_check_w6_error_3():
 
 
 def test_check_w6_error_4():
-    job = JobFile("w6_error_4.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+ANOTHER LINE
+ARCOF
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
 
     assert result[0][0] == "W"
@@ -357,9 +460,13 @@ def test_check_w6_error_4():
 
 
 def test_check_w6_error_5():
-    job = JobFile("w6_error_5.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+ANOTHER LINE
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
-
+    
     assert result[0][0] == "W"
     assert result[0][1] == "6"
     assert result[0][2] == 6
@@ -372,7 +479,11 @@ def test_check_w6_error_5():
 
 
 def test_check_w6_error_6():
-    job = JobFile("w6_error_6.JBI")
+    program = '''ARCON
+ANOTHER LINE
+ARCOF\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
 
     assert result[0][0] == "W"
@@ -387,7 +498,13 @@ def test_check_w6_error_6():
 
 
 def test_check_w6_error_7():
-    job = JobFile("w6_error_7.JBI")
+    program = '''ARCON
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+ANOTHER LINE
+ARCOF
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
 
     assert result[0][0] == "W"
@@ -397,7 +514,13 @@ def test_check_w6_error_7():
 
 
 def test_check_w6_error_8():
-    job = JobFile("w6_error_8.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+ARCON
+ANOTHER LINE
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
+ARCOF\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
 
     assert result[0][0] == "W"
@@ -407,7 +530,13 @@ def test_check_w6_error_8():
 
 
 def test_check_w6_error_9():
-    job = JobFile("w6_error_9.JBI")
+    program = '''ARCON
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+ANOTHER LINE
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
+ARCOF\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w6(job, "W", "6")
 
     assert result[0][0] == "W"
@@ -425,14 +554,19 @@ def test_check_w6_error_9():
 # CHECK_W7
 # ===========
 def test_check_w7():
-    job = JobFile("w7_pass.JBI")
+    program = '''CALL JOB:SET_IDS_FULL
+CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w7(job, "W", "7")
 
     assert result is None
 
 
 def test_check_w7_error_1():
-    job = JobFile("w7_error_1.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w7(job, "W", "7")
 
     assert result[0] == "W"
@@ -442,7 +576,10 @@ def test_check_w7_error_1():
 
 
 def test_check_w7_error_2():
-    job = JobFile("w7_error_2.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
+CALL JOB:SET_IDS_FULL\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w7(job, "W", "7")
 
     assert result[0] == "W"
@@ -455,14 +592,36 @@ def test_check_w7_error_2():
 # CHECK_W8
 # ===========
 def test_check_w8():
-    job = JobFile("w8_pass.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
+CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
+CALL JOB:TRIGGER ARGF"UI_START"
+CALL JOB:TRIGGER ARGF"UI_STOP"
+CALL JOB:TRIGGER ARGF"TRIG_EIN"
+CALL JOB:TRIGGER ARGF"TRIG_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result is None
 
+def test_check_w8_2():
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
+CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
+    result = check_w8(job, "W", "8")
+
+    assert result is None
 
+#########################################################################
 def test_check_w8_error_1():
-    job = JobFile("w8_error_1.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -474,7 +633,9 @@ def test_check_w8_error_1():
 
 
 def test_check_w8_error_2():
-    job = JobFile("w8_error_2.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -486,9 +647,11 @@ def test_check_w8_error_2():
 
 
 def test_check_w8_error_3():
-    job = JobFile("w8_error_3.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"UI_START"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
-
+    
     assert result[0][0] == "W"
     assert result[0][1] == "8"
     assert result[0][2] == 6
@@ -498,7 +661,9 @@ def test_check_w8_error_3():
 
 
 def test_check_w8_error_4():
-    job = JobFile("w8_error_4.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"TRIG_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -510,7 +675,9 @@ def test_check_w8_error_4():
 
 
 def test_check_w8_error_5():
-    job = JobFile("w8_error_5.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -522,7 +689,9 @@ def test_check_w8_error_5():
 
 
 def test_check_w8_error_6():
-    job = JobFile("w8_error_6.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -534,7 +703,9 @@ def test_check_w8_error_6():
 
 
 def test_check_w8_error_7():
-    job = JobFile("w8_error_7.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"UI_STOP"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -546,7 +717,9 @@ def test_check_w8_error_7():
 
 
 def test_check_w8_error_8():
-    job = JobFile("w8_error_8.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"TRIG_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -558,7 +731,10 @@ def test_check_w8_error_8():
 
 
 def test_check_w8_error_9():
-    job = JobFile("w8_error_9.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
+CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -577,7 +753,10 @@ def test_check_w8_error_9():
 
 
 def test_check_w8_error_10():
-    job = JobFile("w8_error_10.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -596,7 +775,10 @@ def test_check_w8_error_10():
 
 
 def test_check_w8_error_11():
-    job = JobFile("w8_error_11.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"UI_STOP"
+CALL JOB:TRIGGER ARGF"UI_START"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -615,7 +797,10 @@ def test_check_w8_error_11():
 
 
 def test_check_w8_error_12():
-    job = JobFile("w8_error_12.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"TRIG_AUS"
+CALL JOB:TRIGGER ARGF"TRIG_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -634,7 +819,11 @@ def test_check_w8_error_12():
 
 
 def test_check_w8_error_13():
-    job = JobFile("w8_error_13.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
+CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -646,7 +835,11 @@ def test_check_w8_error_13():
 
 
 def test_check_w8_error_14():
-    job = JobFile("w8_error_14.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
+CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -658,7 +851,10 @@ def test_check_w8_error_14():
 
 
 def test_check_w8_error_15():
-    job = JobFile("w8_error_15.JBI")
+    program = '''CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
+CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"\n'''
+    job_string = job_file_generator(program, foldername = "MAIN")
+    job = JobFile(job_string)
     result = check_w8(job, "W", "8")
 
     assert result[0][0] == "W"
@@ -676,8 +872,3 @@ def test_check_w8_error_15():
     )
 
 
-def test_check_w8_2():
-    job = JobFile("w8_pass_2.JBI")
-    result = check_w8(job, "W", "8")
-
-    assert result is None
diff --git a/tests/w3_error_3.JBI b/tests/w3_error_3.JBI
deleted file mode 100644
index 61c0f7c..0000000
--- a/tests/w3_error_3.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME STANDARD
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-SET USERFRAME
-END
diff --git a/tests/w3_error_4.JBI b/tests/w3_error_4.JBI
deleted file mode 100644
index 69796d4..0000000
--- a/tests/w3_error_4.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-SET USERFRAME
-END
diff --git a/tests/w4_error_1.JBI b/tests/w4_error_1.JBI
deleted file mode 100644
index e166257..0000000
--- a/tests/w4_error_1.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-
-TCPON TL#(5)
-END
diff --git a/tests/w4_error_10.JBI b/tests/w4_error_10.JBI
deleted file mode 100644
index 156c360..0000000
--- a/tests/w4_error_10.JBI
+++ /dev/null
@@ -1,11 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_TCPON ARGF6
-TCPON TL#(7)
-Anotherline
-CALL JOB:SET_TCPON ARGF5
-TCPON TL#(9)
-END
diff --git a/tests/w4_error_2.JBI b/tests/w4_error_2.JBI
deleted file mode 100644
index 15a9866..0000000
--- a/tests/w4_error_2.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_TCPON ARGF5
-END
diff --git a/tests/w4_error_3.JBI b/tests/w4_error_3.JBI
deleted file mode 100644
index f889d11..0000000
--- a/tests/w4_error_3.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-TCPON TL#(5)
-CALL JOB:SET_TCPON ARGF5
-END
diff --git a/tests/w4_error_4.JBI b/tests/w4_error_4.JBI
deleted file mode 100644
index 921f1d0..0000000
--- a/tests/w4_error_4.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_TCPON ARGF5
-TCPON TL#(6)
-END
diff --git a/tests/w4_error_5.JBI b/tests/w4_error_5.JBI
deleted file mode 100644
index 865e4b8..0000000
--- a/tests/w4_error_5.JBI
+++ /dev/null
@@ -1,9 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_TCPON ARGF5
-Another line
-TCPON TL#(5)
-END
diff --git a/tests/w4_error_6.JBI b/tests/w4_error_6.JBI
deleted file mode 100644
index bf2cbfc..0000000
--- a/tests/w4_error_6.JBI
+++ /dev/null
@@ -1,11 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_TCPON ARGF5
-TCPON TL#(5)
-Another line
-CALL JOB:SET_TCPON ARGF5
-TCPON TL#(6)
-END
diff --git a/tests/w4_error_7.JBI b/tests/w4_error_7.JBI
deleted file mode 100644
index 8d16a4a..0000000
--- a/tests/w4_error_7.JBI
+++ /dev/null
@@ -1,10 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_TCPON ARGF5
-TCPON TL#(5)
-CALL JOB:SET_TCPON ARGF6
-TCPON TL#(7)
-END
diff --git a/tests/w4_error_8.JBI b/tests/w4_error_8.JBI
deleted file mode 100644
index 69f436c..0000000
--- a/tests/w4_error_8.JBI
+++ /dev/null
@@ -1,10 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_TCPON ARGF6
-TCPON TL#(7)
-CALL JOB:SET_TCPON ARGF5
-TCPON TL#(5)
-END
diff --git a/tests/w4_error_9.JBI b/tests/w4_error_9.JBI
deleted file mode 100644
index 7364659..0000000
--- a/tests/w4_error_9.JBI
+++ /dev/null
@@ -1,11 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_TCPON ARGF6
-TCPON TL#(7)
-Anotherline
-CALL JOB:SET_TCPON ARGF5
-TCPON TL#(5)
-END
diff --git a/tests/w4_pass.JBI b/tests/w4_pass.JBI
deleted file mode 100644
index b8dbf54..0000000
--- a/tests/w4_pass.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_TCPON ARGF5
-TCPON TL#(5)
-END
diff --git a/tests/w5_error_1.JBI b/tests/w5_error_1.JBI
deleted file mode 100644
index 46f67a9..0000000
--- a/tests/w5_error_1.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER_RESET
-ANOTHER LINE
-END
diff --git a/tests/w5_error_2.JBI b/tests/w5_error_2.JBI
deleted file mode 100644
index be4b3c3..0000000
--- a/tests/w5_error_2.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-ANOTHER LINE
-CALL JOB:TRIGGER_RESET
-END
diff --git a/tests/w5_error_3.JBI b/tests/w5_error_3.JBI
deleted file mode 100644
index 7425d2d..0000000
--- a/tests/w5_error_3.JBI
+++ /dev/null
@@ -1,9 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-ANOTHER LINE
-CALL JOB:TRIGGER_RESET
-CALL JOB:TRIGGER_RESET
-END
diff --git a/tests/w5_pass.JBI b/tests/w5_pass.JBI
deleted file mode 100644
index b926ba6..0000000
--- a/tests/w5_pass.JBI
+++ /dev/null
@@ -1,9 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER_RESET
-ANOTHER LINE
-CALL JOB:TRIGGER_RESET
-END
diff --git a/tests/w6_error_1.JBI b/tests/w6_error_1.JBI
deleted file mode 100644
index 7b27178..0000000
--- a/tests/w6_error_1.JBI
+++ /dev/null
@@ -1,10 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-ARCON
-ANOTHER LINE
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-END
diff --git a/tests/w6_error_2.JBI b/tests/w6_error_2.JBI
deleted file mode 100644
index 706de98..0000000
--- a/tests/w6_error_2.JBI
+++ /dev/null
@@ -1,10 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-ARCON
-ANOTHER LINE
-ARCOF
-END
diff --git a/tests/w6_error_3.JBI b/tests/w6_error_3.JBI
deleted file mode 100644
index 22e126d..0000000
--- a/tests/w6_error_3.JBI
+++ /dev/null
@@ -1,10 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-ARCON
-ANOTHER LINE
-ARCOF
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-END
diff --git a/tests/w6_error_4.JBI b/tests/w6_error_4.JBI
deleted file mode 100644
index ef8e32d..0000000
--- a/tests/w6_error_4.JBI
+++ /dev/null
@@ -1,10 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-ANOTHER LINE
-ARCOF
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-END
diff --git a/tests/w6_error_5.JBI b/tests/w6_error_5.JBI
deleted file mode 100644
index 34ea1f6..0000000
--- a/tests/w6_error_5.JBI
+++ /dev/null
@@ -1,9 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-ANOTHER LINE
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-END
diff --git a/tests/w6_error_6.JBI b/tests/w6_error_6.JBI
deleted file mode 100644
index ab82ac3..0000000
--- a/tests/w6_error_6.JBI
+++ /dev/null
@@ -1,9 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-ARCON
-ANOTHER LINE
-ARCOF
-END
diff --git a/tests/w6_error_7.JBI b/tests/w6_error_7.JBI
deleted file mode 100644
index c96bac5..0000000
--- a/tests/w6_error_7.JBI
+++ /dev/null
@@ -1,11 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-ARCON
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-ANOTHER LINE
-ARCOF
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-END
diff --git a/tests/w6_error_8.JBI b/tests/w6_error_8.JBI
deleted file mode 100644
index 33e59fd..0000000
--- a/tests/w6_error_8.JBI
+++ /dev/null
@@ -1,11 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-ARCON
-ANOTHER LINE
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-ARCOF
-END
diff --git a/tests/w6_error_9.JBI b/tests/w6_error_9.JBI
deleted file mode 100644
index 9ed11a7..0000000
--- a/tests/w6_error_9.JBI
+++ /dev/null
@@ -1,11 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-ARCON
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-ANOTHER LINE
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-ARCOF
-END
diff --git a/tests/w6_pass.JBI b/tests/w6_pass.JBI
deleted file mode 100644
index ad03805..0000000
--- a/tests/w6_pass.JBI
+++ /dev/null
@@ -1,11 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-ARCON
-ANOTHER LINE
-ARCOF
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-END
diff --git a/tests/w7_error_1.JBI b/tests/w7_error_1.JBI
deleted file mode 100644
index 5a24b85..0000000
--- a/tests/w7_error_1.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-END
diff --git a/tests/w7_error_2.JBI b/tests/w7_error_2.JBI
deleted file mode 100644
index cec8bb8..0000000
--- a/tests/w7_error_2.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-CALL JOB:SET_IDS_FULL
-END
diff --git a/tests/w7_pass.JBI b/tests/w7_pass.JBI
deleted file mode 100644
index 4df72ac..0000000
--- a/tests/w7_pass.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:SET_IDS_FULL
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-END
diff --git a/tests/w8_error_1.JBI b/tests/w8_error_1.JBI
deleted file mode 100644
index 5a24b85..0000000
--- a/tests/w8_error_1.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-END
diff --git a/tests/w8_error_10.JBI b/tests/w8_error_10.JBI
deleted file mode 100644
index bf15517..0000000
--- a/tests/w8_error_10.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-END
diff --git a/tests/w8_error_11.JBI b/tests/w8_error_11.JBI
deleted file mode 100644
index 007d99f..0000000
--- a/tests/w8_error_11.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"UI_STOP"
-CALL JOB:TRIGGER ARGF"UI_START"
-END
diff --git a/tests/w8_error_12.JBI b/tests/w8_error_12.JBI
deleted file mode 100644
index 044c85b..0000000
--- a/tests/w8_error_12.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"TRIG_AUS"
-CALL JOB:TRIGGER ARGF"TRIG_EIN"
-END
diff --git a/tests/w8_error_13.JBI b/tests/w8_error_13.JBI
deleted file mode 100644
index e9ec344..0000000
--- a/tests/w8_error_13.JBI
+++ /dev/null
@@ -1,9 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-END
diff --git a/tests/w8_error_14.JBI b/tests/w8_error_14.JBI
deleted file mode 100644
index 44155fd..0000000
--- a/tests/w8_error_14.JBI
+++ /dev/null
@@ -1,9 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-END
diff --git a/tests/w8_error_15.JBI b/tests/w8_error_15.JBI
deleted file mode 100644
index d2de1c5..0000000
--- a/tests/w8_error_15.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-END
diff --git a/tests/w8_error_2.JBI b/tests/w8_error_2.JBI
deleted file mode 100644
index e772a2e..0000000
--- a/tests/w8_error_2.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-END
diff --git a/tests/w8_error_3.JBI b/tests/w8_error_3.JBI
deleted file mode 100644
index 719a380..0000000
--- a/tests/w8_error_3.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"UI_START"
-END
diff --git a/tests/w8_error_4.JBI b/tests/w8_error_4.JBI
deleted file mode 100644
index 3d8b826..0000000
--- a/tests/w8_error_4.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"TRIG_EIN"
-END
diff --git a/tests/w8_error_5.JBI b/tests/w8_error_5.JBI
deleted file mode 100644
index 2a976f9..0000000
--- a/tests/w8_error_5.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
-END
diff --git a/tests/w8_error_6.JBI b/tests/w8_error_6.JBI
deleted file mode 100644
index 50e008e..0000000
--- a/tests/w8_error_6.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-END
diff --git a/tests/w8_error_7.JBI b/tests/w8_error_7.JBI
deleted file mode 100644
index 3491fdc..0000000
--- a/tests/w8_error_7.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"UI_STOP"
-END
diff --git a/tests/w8_error_8.JBI b/tests/w8_error_8.JBI
deleted file mode 100644
index 92f85c4..0000000
--- a/tests/w8_error_8.JBI
+++ /dev/null
@@ -1,7 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"TRIG_AUS"
-END
diff --git a/tests/w8_error_9.JBI b/tests/w8_error_9.JBI
deleted file mode 100644
index 5703061..0000000
--- a/tests/w8_error_9.JBI
+++ /dev/null
@@ -1,8 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-END
diff --git a/tests/w8_pass.JBI b/tests/w8_pass.JBI
deleted file mode 100644
index 0d3a42f..0000000
--- a/tests/w8_pass.JBI
+++ /dev/null
@@ -1,14 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-CALL JOB:TRIGGER ARGF"UI_START"
-CALL JOB:TRIGGER ARGF"UI_STOP"
-CALL JOB:TRIGGER ARGF"TRIG_EIN"
-CALL JOB:TRIGGER ARGF"TRIG_AUS"
-END
diff --git a/tests/w8_pass_2.JBI b/tests/w8_pass_2.JBI
deleted file mode 100644
index 85efb4f..0000000
--- a/tests/w8_pass_2.JBI
+++ /dev/null
@@ -1,10 +0,0 @@
-/JOB
-//NAME TEST
-///FOLDERNAME MAIN
-NOP
-'A comment
-CALL JOB:TRIGGER ARGF"PROGRAMM_EIN"
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_EIN"
-CALL JOB:TRIGGER ARGF"SCHWEISSEN_AUS"
-CALL JOB:TRIGGER ARGF"PROGRAMM_AUS"
-END