diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/filecheck.check b/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/filecheck.check
index e037339..5268a58 100644
--- a/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/filecheck.check
+++ b/tests/integration/tests/check_commands/CHECK/two_strings/01-positive_match/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK: hello1
-; CHECK: hello2
+CHECK: hello1
+CHECK: hello2
diff --git a/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/filecheck.check b/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/filecheck.check
index e037339..5268a58 100644
--- a/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/filecheck.check
+++ b/tests/integration/tests/check_commands/CHECK/two_strings/02-positive_match-one-line-between/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK: hello1
-; CHECK: hello2
+CHECK: hello1
+CHECK: hello2
diff --git a/tests/integration/tests/examples/hello-world/hello-world-regex.check b/tests/integration/tests/examples/hello-world/hello-world-regex.check
index 5c4fa5e..eb609f4 100644
--- a/tests/integration/tests/examples/hello-world/hello-world-regex.check
+++ b/tests/integration/tests/examples/hello-world/hello-world-regex.check
@@ -1 +1 @@
-; CHECK: {{^Hello world$}}
+CHECK: {{^Hello world$}}
diff --git a/tests/integration/tests/examples/hello-world/hello-world.check b/tests/integration/tests/examples/hello-world/hello-world.check
index 9d1d2a4..bfa0e48 100644
--- a/tests/integration/tests/examples/hello-world/hello-world.check
+++ b/tests/integration/tests/examples/hello-world/hello-world.check
@@ -1,2 +1,2 @@
-; CHECK: Hello world
+CHECK: Hello world
 
diff --git a/tests/integration/tests/examples/lit-and-filecheck/01-pass.c b/tests/integration/tests/examples/lit-and-filecheck/01-pass.c
index bea6365..396dc2b 100644
--- a/tests/integration/tests/examples/lit-and-filecheck/01-pass.c
+++ b/tests/integration/tests/examples/lit-and-filecheck/01-pass.c
@@ -1,6 +1,6 @@
 /**
-; RUN: gcc "%s" -o %S/hello-world-1 && %S/hello-world-1 | %FILECHECK_EXEC %s
-; CHECK: Hello world
+RUN: gcc "%s" -o %S/hello-world-1 && %S/hello-world-1 | %FILECHECK_EXEC %s
+CHECK: Hello world
  */
 
 #include <stdio.h>
diff --git a/tests/integration/tests/examples/lit-and-filecheck/02-fail.c b/tests/integration/tests/examples/lit-and-filecheck/02-fail.c
index ef9c2ce..3ac6af9 100644
--- a/tests/integration/tests/examples/lit-and-filecheck/02-fail.c
+++ b/tests/integration/tests/examples/lit-and-filecheck/02-fail.c
@@ -1,6 +1,6 @@
 /**
-; RUN: gcc "%s" -o %S/hello-world-2 && %S/hello-world-2 | %FILECHECK_EXEC %s; test $? = 1
-; CHECK: Wrong line
+RUN: gcc "%s" -o %S/hello-world-2 && %S/hello-world-2 | %FILECHECK_EXEC %s; test $? = 1
+CHECK: Wrong line
  */
 
 #include <stdio.h>
diff --git a/tests/integration/tests/examples/options/--check-prefix/--check-prefix.itest b/tests/integration/tests/examples/options/--check-prefix/--check-prefix.itest
index 2d3165a..9fc3947 100644
--- a/tests/integration/tests/examples/options/--check-prefix/--check-prefix.itest
+++ b/tests/integration/tests/examples/options/--check-prefix/--check-prefix.itest
@@ -1,4 +1,4 @@
-; RUN: printf "String1" | %FILECHECK_EXEC "%s" --check-prefix STRING1
-; RUN: printf "String2" | %FILECHECK_EXEC "%s" --check-prefix STRING2
-; STRING1: String1
-; STRING2: String2
+RUN: printf "String1" | %FILECHECK_EXEC "%s" --check-prefix STRING1
+RUN: printf "String2" | %FILECHECK_EXEC "%s" --check-prefix STRING2
+STRING1: String1
+STRING2: String2
diff --git a/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest b/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest
index 7ddf1fc..67ef28d 100644
--- a/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest
+++ b/tests/integration/tests/invalid_input/01_empty_invocation/sample.itest
@@ -1,3 +1,3 @@
-; RUN: %expect_exit 2 %FILECHECK_EXEC | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
+RUN: %expect_exit 2 %FILECHECK_EXEC | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 
-; CHECK: <check-file> not specified
+CHECK: <check-file> not specified
diff --git a/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest b/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest
index 305c447..1fe89ec 100644
--- a/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest
+++ b/tests/integration/tests/invalid_input/02_check_file_does_not_exist/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %expect_exit 2 %FILECHECK_EXEC "file/does/not/exist" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
+RUN: %expect_exit 2 %FILECHECK_EXEC "file/does/not/exist" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 
-; CHECK: Could not open check file 'file/does/not/exist': No such file or directory
-; CHECK-EMPTY:
+CHECK: Could not open check file 'file/does/not/exist': No such file or directory
+CHECK-EMPTY:
diff --git a/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest b/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest
index 147e5a6..b022fd4 100644
--- a/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest
+++ b/tests/integration/tests/invalid_input/03_empty_check_file/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
+RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 
-; CHECK: error: no check strings found with prefix 'CHECK:'
-; CHECK-EMPTY
+CHECK: error: no check strings found with prefix 'CHECK:'
+CHECK-EMPTY
diff --git a/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest b/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest
index 147e5a6..b022fd4 100644
--- a/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest
+++ b/tests/integration/tests/invalid_input/04_nonempty_check_file_but_no_checks/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
+RUN: %printf "" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --match-full-lines
 
-; CHECK: error: no check strings found with prefix 'CHECK:'
-; CHECK-EMPTY
+CHECK: error: no check strings found with prefix 'CHECK:'
+CHECK-EMPTY
diff --git a/tests/integration/tests/invalid_input/05_one_newline_symbol_input/filecheck.check b/tests/integration/tests/invalid_input/05_one_newline_symbol_input/filecheck.check
index 8eb16b3..7ec6b44 100644
--- a/tests/integration/tests/invalid_input/05_one_newline_symbol_input/filecheck.check
+++ b/tests/integration/tests/invalid_input/05_one_newline_symbol_input/filecheck.check
@@ -1 +1 @@
-; CHECK-NOT: {{.+}}
+CHECK-NOT: {{.+}}
diff --git a/tests/integration/tests/invalid_input/06_empty_input_file/filecheck.check b/tests/integration/tests/invalid_input/06_empty_input_file/filecheck.check
index 8eb16b3..7ec6b44 100644
--- a/tests/integration/tests/invalid_input/06_empty_input_file/filecheck.check
+++ b/tests/integration/tests/invalid_input/06_empty_input_file/filecheck.check
@@ -1 +1 @@
-; CHECK-NOT: {{.+}}
+CHECK-NOT: {{.+}}
diff --git a/tests/integration/tests/invalid_input/06_empty_input_file/sample.itest b/tests/integration/tests/invalid_input/06_empty_input_file/sample.itest
index f1d536b..aa88980 100644
--- a/tests/integration/tests/invalid_input/06_empty_input_file/sample.itest
+++ b/tests/integration/tests/invalid_input/06_empty_input_file/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s"
+RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s"
 
-; CHECK: FileCheck error: '-' is empty.
-; CHECK: FileCheck command line:  {{.*}}.check{{$}}
+CHECK: FileCheck error: '-' is empty.
+CHECK: FileCheck command line:  {{.*}}.check{{$}}
diff --git a/tests/integration/tests/options/--check-prefix/01_positive/sample.itest b/tests/integration/tests/options/--check-prefix/01_positive/sample.itest
index feec768..488baf2 100644
--- a/tests/integration/tests/options/--check-prefix/01_positive/sample.itest
+++ b/tests/integration/tests/options/--check-prefix/01_positive/sample.itest
@@ -1,3 +1,3 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING1
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING2
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING3
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING1
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING2
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix STRING3
diff --git a/tests/integration/tests/options/--check-prefix/02_negative/sample.itest b/tests/integration/tests/options/--check-prefix/02_negative/sample.itest
index 2a81b7b..65b58e7 100644
--- a/tests/integration/tests/options/--check-prefix/02_negative/sample.itest
+++ b/tests/integration/tests/options/--check-prefix/02_negative/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix FOO | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix FOO | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:error: no check strings found with prefix 'FOO:'
-; CHECK-EMPTY:
+CHECK:error: no check strings found with prefix 'FOO:'
+CHECK-EMPTY:
diff --git a/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest b/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest
index e773f87..0b7c90b 100644
--- a/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest
+++ b/tests/integration/tests/options/--check-prefix/03_malformed_prefix/sample.itest
@@ -1,4 +1,4 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix "GARBAGE1.23.4.2" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 2 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix "GARBAGE1.23.4.2" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:Supplied check-prefix is invalid! Prefixes must be unique and start with a letter and contain only alphanumeric characters, hyphens and underscores
-; CHECK-EMPTY:
+CHECK:Supplied check-prefix is invalid! Prefixes must be unique and start with a letter and contain only alphanumeric characters, hyphens and underscores
+CHECK-EMPTY:
diff --git a/tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.check b/tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.check
index 2b01e8f..a6eb963 100644
--- a/tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.check
+++ b/tests/integration/tests/options/--check-prefix/04_common_suffix/filecheck.check
@@ -1,4 +1,4 @@
-; CHECK: string 1
-; OTHER-CHECK: string 2
-; ANOTHER-CHECK: string 3
-; YET_ANOTHER-CHECK: string 4
+CHECK: string 1
+OTHER-CHECK: string 2
+ANOTHER-CHECK: string 3
+YET_ANOTHER-CHECK: string 4
diff --git a/tests/integration/tests/options/--check-prefix/04_common_suffix/sample.itest b/tests/integration/tests/options/--check-prefix/04_common_suffix/sample.itest
index 123a804..743d7ad 100644
--- a/tests/integration/tests/options/--check-prefix/04_common_suffix/sample.itest
+++ b/tests/integration/tests/options/--check-prefix/04_common_suffix/sample.itest
@@ -1,8 +1,8 @@
-; RUN: %cat "%S/filecheck.1.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK
-; RUN: %cat "%S/filecheck.2.input" | %expect_exit 1  %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK
+RUN: %cat "%S/filecheck.1.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK
+RUN: %cat "%S/filecheck.2.input" | %expect_exit 1  %FILECHECK_EXEC "%S/filecheck.check" --check-prefix CHECK
 
-; RUN: %cat "%S/filecheck.2.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK
-; RUN: %cat "%S/filecheck.3.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK
+RUN: %cat "%S/filecheck.2.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK
+RUN: %cat "%S/filecheck.3.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix OTHER-CHECK
 
-; RUN: %cat "%S/filecheck.3.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK
-; RUN: %cat "%S/filecheck.4.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK
+RUN: %cat "%S/filecheck.3.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK
+RUN: %cat "%S/filecheck.4.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --check-prefix ANOTHER-CHECK
diff --git a/tests/integration/tests/options/--help/sample.itest b/tests/integration/tests/options/--help/sample.itest
index f4ed767..93c738d 100644
--- a/tests/integration/tests/options/--help/sample.itest
+++ b/tests/integration/tests/options/--help/sample.itest
@@ -1,19 +1,19 @@
-; RUN: %expect_exit 0 %FILECHECK_EXEC --help | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %expect_exit 0 %FILECHECK_EXEC --help | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:{{^USAGE: [Ff]ile[Cc]heck.* \[options\] <check-file>$}}
-; CHECK-EMPTY:
-; CHECK-NEXT:OPTIONS:
-; CHECK-EMPTY:
+CHECK:{{^USAGE: [Ff]ile[Cc]heck.* \[options\] <check-file>$}}
+CHECK-EMPTY:
+CHECK-NEXT:OPTIONS:
+CHECK-EMPTY:
 
 ; FileCheck C++ prints options without -- but with - only.
 ; FileCheck.py is made consistent so below we use regex matches to accomodate
 ; for both - and -- versions.
-; CHECK:General options:
-; CHECK-EMPTY:
-; CHECK:{{^  --?match-full-lines             - Require all positive matches to cover an entire input line.$}}
-; CHECK-NEXT:{{^                                   ?Allows leading and trailing whitespace if --strict-whitespace$}}
-; CHECK-NEXT:{{^                                   ?is not also passed.$}}
-; CHECK-NEXT:{{^  --?strict-whitespace            - Do not treat all horizontal whitespace as equivalent$}}
+CHECK:General options:
+CHECK-EMPTY:
+CHECK:{{^  --?match-full-lines             - Require all positive matches to cover an entire input line.$}}
+CHECK-NEXT:{{^                                   ?Allows leading and trailing whitespace if --strict-whitespace$}}
+CHECK-NEXT:{{^                                   ?is not also passed.$}}
+CHECK-NEXT:{{^  --?strict-whitespace            - Do not treat all horizontal whitespace as equivalent$}}
 
-; CHECK:{{Generic [Oo]ptions:}}
-; CHECK-EMPTY:
+CHECK:{{Generic [Oo]ptions:}}
+CHECK-EMPTY:
diff --git a/tests/integration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/filecheck.check b/tests/integration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/filecheck.check
index 56f71d2..c2487b1 100644
--- a/tests/integration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/filecheck.check
+++ b/tests/integration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/filecheck.check
@@ -1 +1 @@
-; CHECK: string 1
+CHECK: string 1
diff --git a/tests/integration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/sample.itest b/tests/integration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/sample.itest
index f6683a3..900a2d4 100644
--- a/tests/integration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/sample.itest
+++ b/tests/integration/tests/options/--implicit-check-not/01_basic_implicit_check_not_hit/sample.itest
@@ -1,8 +1,8 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
-; CHECK:-implicit-check-not='error'
-; CHECK:                     ^
-; CHECK:<stdin>:1:1: note: found here
-; CHECK:error
-; CHECK:^~~~~
+CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
+CHECK:-implicit-check-not='error'
+CHECK:                     ^
+CHECK:<stdin>:1:1: note: found here
+CHECK:error
+CHECK:^~~~~
diff --git a/tests/integration/tests/options/--implicit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/filecheck.check b/tests/integration/tests/options/--implicit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/filecheck.check
index 56f71d2..c2487b1 100644
--- a/tests/integration/tests/options/--implicit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/filecheck.check
+++ b/tests/integration/tests/options/--implicit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/filecheck.check
@@ -1 +1 @@
-; CHECK: string 1
+CHECK: string 1
diff --git a/tests/integration/tests/options/--implicit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/sample.itest b/tests/integration/tests/options/--implicit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/sample.itest
index 07e4c62..1642654 100644
--- a/tests/integration/tests/options/--implicit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/sample.itest
+++ b/tests/integration/tests/options/--implicit-check-not/02_implicit_check_not_has_lower_priority_than_normal_check/sample.itest
@@ -1,8 +1,8 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input
-; CHECK:; CHECK: string 1
-; CHECK:         ^
-; CHECK:<stdin>:1:1: note: scanning from here
-; CHECK:error
-; CHECK:^
+CHECK:{{^.*}}filecheck.check:1:8: error: CHECK: expected string not found in input
+CHECK:CHECK: string 1
+CHECK:       ^
+CHECK:<stdin>:1:1: note: scanning from here
+CHECK:error
+CHECK:^
diff --git a/tests/integration/tests/options/--implicit-check-not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/filecheck.check b/tests/integration/tests/options/--implicit-check-not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/filecheck.check
index 0390d34..550434d 100644
--- a/tests/integration/tests/options/--implicit-check-not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/filecheck.check
+++ b/tests/integration/tests/options/--implicit-check-not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/filecheck.check
@@ -1,2 +1,2 @@
-; CHECK-NOT: error
-; CHECK: string 1
+CHECK-NOT: error
+CHECK: string 1
diff --git a/tests/integration/tests/options/--implicit-check-not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/sample.itest b/tests/integration/tests/options/--implicit-check-not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/sample.itest
index f6683a3..900a2d4 100644
--- a/tests/integration/tests/options/--implicit-check-not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/sample.itest
+++ b/tests/integration/tests/options/--implicit-check-not/03_implicit_check_not_has_higher_priority_than_normal_check_not_check/sample.itest
@@ -1,8 +1,8 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not error | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
-; CHECK:-implicit-check-not='error'
-; CHECK:                     ^
-; CHECK:<stdin>:1:1: note: found here
-; CHECK:error
-; CHECK:^~~~~
+CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
+CHECK:-implicit-check-not='error'
+CHECK:                     ^
+CHECK:<stdin>:1:1: note: found here
+CHECK:error
+CHECK:^~~~~
diff --git a/tests/integration/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/filecheck.check b/tests/integration/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/filecheck.check
index 624167a..045be94 100644
--- a/tests/integration/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/filecheck.check
+++ b/tests/integration/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/filecheck.check
@@ -1 +1 @@
-; CHECK:Foo
+CHECK:Foo
diff --git a/tests/integration/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/sample.itest b/tests/integration/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/sample.itest
index fba542d..0084e14 100644
--- a/tests/integration/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/sample.itest
+++ b/tests/integration/tests/options/--implicit-check-not/04_implicit_check_not_match_behavior/sample.itest
@@ -1,18 +1,18 @@
-; RUN: %printf "someerrorsome\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix CHECK-BEFORE
+RUN: %printf "someerrorsome\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix CHECK-BEFORE
 
-; CHECK-BEFORE:command line:1:22: error: CHECK-NOT: excluded string found in input
-; CHECK-BEFORE:-implicit-check-not='error'
-; CHECK-BEFORE:                     ^
-; CHECK-BEFORE:<stdin>:1:5: note: found here
-; CHECK-BEFORE:someerrorsome
-; CHECK-BEFORE:    ^~~~~
+CHECK-BEFORE:command line:1:22: error: CHECK-NOT: excluded string found in input
+CHECK-BEFORE:-implicit-check-not='error'
+CHECK-BEFORE:                     ^
+CHECK-BEFORE:<stdin>:1:5: note: found here
+CHECK-BEFORE:someerrorsome
+CHECK-BEFORE:    ^~~~~
 
-; RUN: %printf "Foo\nsomeerrorsome" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix CHECK-AFTER
+RUN: %printf "Foo\nsomeerrorsome" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "error" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix CHECK-AFTER
 
-; CHECK-AFTER:command line:1:22: error: CHECK-NOT: excluded string found in input
-; CHECK-AFTER:-implicit-check-not='error'
-; CHECK-AFTER:                     ^
-; CHECK-AFTER:<stdin>:2:5: note: found here
-; CHECK-AFTER:someerrorsome
-; CHECK-AFTER:    ^~~~~
+CHECK-AFTER:command line:1:22: error: CHECK-NOT: excluded string found in input
+CHECK-AFTER:-implicit-check-not='error'
+CHECK-AFTER:                     ^
+CHECK-AFTER:<stdin>:2:5: note: found here
+CHECK-AFTER:someerrorsome
+CHECK-AFTER:    ^~~~~
 
diff --git a/tests/integration/tests/options/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/filecheck.check b/tests/integration/tests/options/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/filecheck.check
index 624167a..045be94 100644
--- a/tests/integration/tests/options/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/filecheck.check
+++ b/tests/integration/tests/options/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/filecheck.check
@@ -1 +1 @@
-; CHECK:Foo
+CHECK:Foo
diff --git a/tests/integration/tests/options/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/sample.itest b/tests/integration/tests/options/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/sample.itest
index fd40d58..d4d1681 100644
--- a/tests/integration/tests/options/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/sample.itest
+++ b/tests/integration/tests/options/--implicit-check-not/05_implicit_check_not_extra_whitespace_behavior/sample.itest
@@ -1,21 +1,21 @@
-; RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error "
-; RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace
-; RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines
-; RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines
+RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error "
+RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace
+RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines
+RUN: %printf "error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines
 
-; RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error "
-; RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace
-; RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines
-; RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines
+RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error "
+RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace
+RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines
+RUN: %printf "error \nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines
 
-; RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
-; RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
-; RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
-; RUN: %printf " error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines
+RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %printf " error\nFoo" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %printf " error\nFoo" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not " error " --strict-whitespace --match-full-lines
 
-; CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
-; CHECK:-implicit-check-not=' error '
-; CHECK:                     ^
-; CHECK:<stdin>:1:1: note: found here
-; CHECK: error
-; CHECK:^~~~~~
+CHECK:command line:1:22: error: CHECK-NOT: excluded string found in input
+CHECK:-implicit-check-not=' error '
+CHECK:                     ^
+CHECK:<stdin>:1:1: note: found here
+CHECK: error
+CHECK:^~~~~~
diff --git a/tests/integration/tests/options/--implicit-check-not/06_multiple_check_not_args/filecheck.check b/tests/integration/tests/options/--implicit-check-not/06_multiple_check_not_args/filecheck.check
index cea2eba..3a04338 100644
--- a/tests/integration/tests/options/--implicit-check-not/06_multiple_check_not_args/filecheck.check
+++ b/tests/integration/tests/options/--implicit-check-not/06_multiple_check_not_args/filecheck.check
@@ -1 +1 @@
-; CHECK:Hello
+CHECK:Hello
diff --git a/tests/integration/tests/options/--implicit-check-not/06_multiple_check_not_args/sample.itest b/tests/integration/tests/options/--implicit-check-not/06_multiple_check_not_args/sample.itest
index 1a2d68f..fd91adb 100644
--- a/tests/integration/tests/options/--implicit-check-not/06_multiple_check_not_args/sample.itest
+++ b/tests/integration/tests/options/--implicit-check-not/06_multiple_check_not_args/sample.itest
@@ -1,26 +1,26 @@
-; RUN: %printf "foo1\nfoo\nfoo\nHello" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "foo1" --implicit-check-not "foo2" --implicit-check-not "foo3" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix FOO1
+RUN: %printf "foo1\nfoo\nfoo\nHello" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "foo1" --implicit-check-not "foo2" --implicit-check-not "foo3" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix FOO1
 
-; FOO1:command line:1:22: error: CHECK-NOT: excluded string found in input
-; FOO1:-implicit-check-not='foo1'
-; FOO1:                     ^
-; FOO1:<stdin>:1:1: note: found here
-; FOO1:foo1
-; FOO1:^~~~
+FOO1:command line:1:22: error: CHECK-NOT: excluded string found in input
+FOO1:-implicit-check-not='foo1'
+FOO1:                     ^
+FOO1:<stdin>:1:1: note: found here
+FOO1:foo1
+FOO1:^~~~
 
-; RUN: %printf "foo\nfoo2\nfoo\nHello" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "foo1" --implicit-check-not "foo2" --implicit-check-not "foo3" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix FOO2
+RUN: %printf "foo\nfoo2\nfoo\nHello" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "foo1" --implicit-check-not "foo2" --implicit-check-not "foo3" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix FOO2
 
-; FOO2:command line:1:22: error: CHECK-NOT: excluded string found in input
-; FOO2:-implicit-check-not='foo2'
-; FOO2:                     ^
-; FOO2:<stdin>:2:1: note: found here
-; FOO2:foo2
-; FOO2:^~~~
+FOO2:command line:1:22: error: CHECK-NOT: excluded string found in input
+FOO2:-implicit-check-not='foo2'
+FOO2:                     ^
+FOO2:<stdin>:2:1: note: found here
+FOO2:foo2
+FOO2:^~~~
 
-; RUN: %printf "foo\nfoo\nfoo3\nHello" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "foo1" --implicit-check-not "foo2" --implicit-check-not "foo3" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix FOO3
+RUN: %printf "foo\nfoo\nfoo3\nHello" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --implicit-check-not "foo1" --implicit-check-not "foo2" --implicit-check-not "foo3" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix FOO3
 
-; FOO3:command line:1:22: error: CHECK-NOT: excluded string found in input
-; FOO3:-implicit-check-not='foo3'
-; FOO3:                     ^
-; FOO3:<stdin>:3:1: note: found here
-; FOO3:foo3
-; FOO3:^~~~
+FOO3:command line:1:22: error: CHECK-NOT: excluded string found in input
+FOO3:-implicit-check-not='foo3'
+FOO3:                     ^
+FOO3:<stdin>:3:1: note: found here
+FOO3:foo3
+FOO3:^~~~
diff --git a/tests/integration/tests/options/--implicit-check-not/07_is_case_insensitive_match/filecheck.check b/tests/integration/tests/options/--implicit-check-not/07_is_case_insensitive_match/filecheck.check
index cea2eba..3a04338 100644
--- a/tests/integration/tests/options/--implicit-check-not/07_is_case_insensitive_match/filecheck.check
+++ b/tests/integration/tests/options/--implicit-check-not/07_is_case_insensitive_match/filecheck.check
@@ -1 +1 @@
-; CHECK:Hello
+CHECK:Hello
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/filecheck.check b/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/filecheck.check
index e77c7fc..bbe59cc 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/filecheck.check
+++ b/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/filecheck.check
@@ -1 +1 @@
-; CHECK-NOT: hello world
+CHECK-NOT: hello world
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest
index 35fa95e..21c7290 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest
+++ b/tests/integration/tests/options/--match-full-lines/CHECK-NOT/01_option_has_no_effect/sample.itest
@@ -1,10 +1,10 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines | %FILECHECK_TESTER_EXEC %s --match-full-lines --strict-whitespace
 
-; CHECK:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
-; CHECK:; CHECK-NOT: hello world
-; CHECK:             ^
-; CHECK:{{^<stdin>:.:.: note: found here$}}
-; CHECK:hello world hello world
-; CHECK:^~~~~~~~~~~
-; CHECK-EMPTY:
+CHECK:{{^.*}}filecheck.check:1:12: error: CHECK-NOT: excluded string found in input{{$}}
+CHECK:CHECK-NOT: hello world
+CHECK:           ^
+CHECK:{{^<stdin>:.:.: note: found here$}}
+CHECK:hello world hello world
+CHECK:^~~~~~~~~~~
+CHECK-EMPTY:
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/filecheck.check b/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/filecheck.check
index ebce48c..e6e71a1 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/filecheck.check
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/filecheck.check
@@ -1 +1 @@
-; CHECK: hello world
+CHECK: hello world
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest
index 79dfb00..3d63d6a 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/01_matching_substring_is_rejected_when_full_match_enabled/sample.itest
@@ -1,12 +1,13 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace --check-prefix=OPTION
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace --check-prefix=OPTION
 
-; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
-; OPTION:; CHECK: hello world
-; OPTION:         ^
-; OPTION:{{^<stdin>:.*:.*: note: scanning from here$}}
-; OPTION:{{^hello world hello world}}
-; TODO: FileCheck C++ puts caret below 'd' while I assume the correct behavior
-; TODO: is to put it between d and h. Matching both behaviors below:
-; OPTION:{{^          ( )?\^?$}}
-; OPTION-EMPTY:
+OPTION:{{^.*}}filecheck.check:1:8: error: CHECK: expected string not found in input{{$}}
+OPTION:CHECK: hello world
+OPTION:       ^
+OPTION:{{^<stdin>:.*:.*: note: scanning from here$}}
+OPTION:{{^hello world hello world}}
+
+TODO: FileCheck C++ puts caret below 'd' while I assume the correct behavior
+TODO: is to put it between d and h. Matching both behaviors below:
+OPTION:{{^          ( )?\^?$}}
+OPTION-EMPTY:
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/filecheck.check b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/filecheck.check
index ebce48c..e6e71a1 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/filecheck.check
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/01_when_no_strict_whitespace_then_leading_whitespace_is_ignored/filecheck.check
@@ -1 +1 @@
-; CHECK: hello world
+CHECK: hello world
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/filecheck.check b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/filecheck.check
index 054a7a2..defb7a7 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/filecheck.check
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/01_string/filecheck.check
@@ -1 +1 @@
-; CHECK:hello world
+CHECK:hello world
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/filecheck.check b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/filecheck.check
index d7b2862..f4f89e7 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/filecheck.check
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/02_regex/filecheck.check
@@ -1 +1 @@
-; CHECK:{{^hello world$}}
+CHECK:{{^hello world$}}
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/filecheck.check b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/filecheck.check
index ebce48c..e6e71a1 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/filecheck.check
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/filecheck.check
@@ -1 +1 @@
-; CHECK: hello world
+CHECK: hello world
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/sample.itest
index c48f704..8a60272 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/sample.itest
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/03_string_negative/sample.itest
@@ -1,11 +1,12 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
 
-; TODO: Is this FileCheck bug? (caret is -1 wrong and therefore position is either 9 or 10)
-; CHECK:{{^.*filecheck.check:1:(9|10): error: CHECK: expected string not found in input$}}
-; CHECK:; CHECK: hello world
-; TODO: Is this FileCheck bug? (caret is -1 wrong)
-; CHECK:{{.*^}}
-; CHECK:{{<stdin>:.:.: note: scanning from here}}
-; CHECK:hello world
-; CHECK:^
-; CHECK-EMPTY
+TODO: Is this FileCheck bug? (caret is -1 wrong and therefore position is either 9 or 10)
+CHECK:{{^.*filecheck.check:1:(7|8): error: CHECK: expected string not found in input$}}
+CHECK:CHECK: hello world
+
+TODO: Is this FileCheck bug? (caret is -1 wrong)
+CHECK:{{.*^}}
+CHECK:{{<stdin>:.:.: note: scanning from here}}
+CHECK:hello world
+CHECK:^
+CHECK-EMPTY
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/filecheck.check b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/filecheck.check
index d99f163..f6936be 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/filecheck.check
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/filecheck.check
@@ -1 +1 @@
-; CHECK: {{^hello world$}}
+CHECK: {{^hello world$}}
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/sample.itest
index 0acc88c..6aa9b6b 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/sample.itest
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/02_when_strict_whitespace_is_also_specified/02_when_strict_whitespace_then_leading_whitespace_is_not_ignored/04_regex_negative/sample.itest
@@ -1,12 +1,12 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --strict-whitespace
 
-; TODO: Is this FileCheck bug? (caret is -1 wrong and therefore position is either 9 or 10)
-; CHECK:{{^.*filecheck.check:1:(9|10): error: CHECK: expected string not found in input$}}
-; TODO: Improve regex match:
-; CHECK:{{; CHECK: ...hello world...}}
-; TODO: Is this FileCheck bug? (caret is -1 wrong)
-; CHECK:{{.*^}}
-; CHECK:{{<stdin>:.:.: note: scanning from here}}
-; CHECK:hello world
-; CHECK:^
-; CHECK-EMPTY:
+TODO: Is this FileCheck bug? (caret is -1 wrong and therefore position is either 9 or 10)
+CHECK:{{^.*filecheck.check:1:(7|8): error: CHECK: expected string not found in input$}}
+TODO: Improve regex match:
+CHECK:{{CHECK: ...hello world...}}
+TODO: Is this FileCheck bug? (caret is -1 wrong)
+CHECK:{{.*^}}
+CHECK:{{<stdin>:.:.: note: scanning from here}}
+CHECK:hello world
+CHECK:^
+CHECK-EMPTY:
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/03_trailing_whitespace_escaped/filecheck.check b/tests/integration/tests/options/--match-full-lines/CHECK/03_trailing_whitespace_escaped/filecheck.check
index c200635..e7bbab2 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/03_trailing_whitespace_escaped/filecheck.check
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/03_trailing_whitespace_escaped/filecheck.check
@@ -1 +1 @@
-; CHECK: hello
+CHECK: hello
diff --git a/tests/integration/tests/options/--match-full-lines/CHECK/03_trailing_whitespace_escaped/sample.itest b/tests/integration/tests/options/--match-full-lines/CHECK/03_trailing_whitespace_escaped/sample.itest
index a15cea0..d121f58 100644
--- a/tests/integration/tests/options/--match-full-lines/CHECK/03_trailing_whitespace_escaped/sample.itest
+++ b/tests/integration/tests/options/--match-full-lines/CHECK/03_trailing_whitespace_escaped/sample.itest
@@ -1,9 +1,9 @@
-; RUN: echo "hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
+RUN: echo "hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
 
-; RUN: echo " hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
+RUN: echo " hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
 
-; RUN: echo "  hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
+RUN: echo "  hello" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
 
-; RUN: echo "hello " | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
+RUN: echo "hello " | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
 
-; RUN: echo "hello  " | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
+RUN: echo "hello  " | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --match-full-lines
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/filecheck.check b/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/filecheck.check
index 477cd33..740b6a5 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/filecheck.check
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/filecheck.check
@@ -1 +1 @@
-; CHECK: hello world hello world
+CHECK: hello world hello world
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest
index 551666a..3e99f85 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK/01_input_has_mixed_spaces_and_tabs/sample.itest
@@ -1,11 +1,11 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --check-prefix=OPTION
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --match-full-lines --check-prefix=OPTION
 
-; OPTION: {{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
-; OPTION: ; CHECK: hello world hello world
-; OPTION:          ^
-; OPTION: {{^<stdin>:.*:.*: note: scanning from here$}}
-; OPTION: hello   world hello  world
-; OPTION: {{^\^$}}
-; TODO: error: OPTION-EMPTY is not on the line after the previous match
-; OPTION-EMPTY
+OPTION: {{^.*}}filecheck.check:1:8: error: CHECK: expected string not found in input{{$}}
+OPTION: CHECK: hello world hello world
+OPTION:        ^
+OPTION: {{^<stdin>:.*:.*: note: scanning from here$}}
+OPTION: hello   world hello  world
+OPTION: {{^\^$}}
+TODO: error: OPTION-EMPTY is not on the line after the previous match
+OPTION-EMPTY
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/filecheck.check b/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/filecheck.check
index 0b8daea..ccf5a27 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/filecheck.check
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/filecheck.check
@@ -1 +1 @@
-; CHECK: hello   world hello  world
+CHECK: hello   world hello  world
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest
index fa9134c..d9b0cd3 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK/02_check_has_mixed_spaces_and_tabs/sample.itest
@@ -1,11 +1,11 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix=OPTION
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix=OPTION
 
-; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
-; OPTION:; CHECK: hello   world hello  world
-; OPTION:         ^
-; OPTION:{{^<stdin>:.*:.*: note: scanning from here$}}
-; OPTION:hello world hello world
-; OPTION:^
-; TODO: error: OPTION-EMPTY is not on the line after the previous match
-; OPTION-EMPTY
+OPTION:{{^.*}}filecheck.check:1:8: error: CHECK: expected string not found in input{{$}}
+OPTION:CHECK: hello   world hello  world
+OPTION:       ^
+OPTION:{{^<stdin>:.*:.*: note: scanning from here$}}
+OPTION:hello world hello world
+OPTION:^
+TODO: error: OPTION-EMPTY is not on the line after the previous match
+OPTION-EMPTY
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/filecheck.check b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/filecheck.check
index a43cced..7127e57 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/filecheck.check
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/filecheck.check
@@ -1 +1 @@
-; CHECK-NOT: hello world hello world
+CHECK-NOT: hello world hello world
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest
index 0977b4e..d876dcd 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/01_input_has_mixed_spaces_and_tabs/sample.itest
@@ -1,10 +1,10 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix=NO_OPTION
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix=NO_OPTION
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace
 
-; NO_OPTION:{{^.*}}filecheck.check:1:14: error: CHECK-NOT: excluded string found in input{{$}}
-; NO_OPTION:; CHECK-NOT: hello world hello world
-; NO_OPTION:             ^
-; NO_OPTION:{{^<stdin>:.:.: note: found here$}}
-; NO_OPTION:hello world hello world
-; NO_OPTION:^~~~~~~~~~~~~~~~~~~~~~~
-; NO_OPTION-EMPTY:
+NO_OPTION:{{^.*}}filecheck.check:1:12: error: CHECK-NOT: excluded string found in input{{$}}
+NO_OPTION:CHECK-NOT: hello world hello world
+NO_OPTION:           ^
+NO_OPTION:{{^<stdin>:.:.: note: found here$}}
+NO_OPTION:hello world hello world
+NO_OPTION:^~~~~~~~~~~~~~~~~~~~~~~
+NO_OPTION-EMPTY:
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/filecheck.check b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/filecheck.check
index 0b8daea..ccf5a27 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/filecheck.check
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/filecheck.check
@@ -1 +1 @@
-; CHECK: hello   world hello  world
+CHECK: hello   world hello  world
diff --git a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest
index fa9134c..d9b0cd3 100644
--- a/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest
+++ b/tests/integration/tests/options/--strict-whitespace/CHECK_NOT/02_check_has_mixed_spaces_and_tabs/sample.itest
@@ -1,11 +1,11 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix=OPTION
+RUN: %cat "%S/filecheck.input" | %expect_exit 0 --expect-no-content %FILECHECK_EXEC "%S/filecheck.check"
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines --check-prefix=OPTION
 
-; OPTION:{{^.*}}filecheck.check:1:10: error: CHECK: expected string not found in input{{$}}
-; OPTION:; CHECK: hello   world hello  world
-; OPTION:         ^
-; OPTION:{{^<stdin>:.*:.*: note: scanning from here$}}
-; OPTION:hello world hello world
-; OPTION:^
-; TODO: error: OPTION-EMPTY is not on the line after the previous match
-; OPTION-EMPTY
+OPTION:{{^.*}}filecheck.check:1:8: error: CHECK: expected string not found in input{{$}}
+OPTION:CHECK: hello   world hello  world
+OPTION:       ^
+OPTION:{{^<stdin>:.*:.*: note: scanning from here$}}
+OPTION:hello world hello world
+OPTION:^
+TODO: error: OPTION-EMPTY is not on the line after the previous match
+OPTION-EMPTY
diff --git a/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/filecheck.check b/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/filecheck.check
index f280ebd..9f31bc5 100644
--- a/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/filecheck.check
+++ b/tests/integration/tests/real_world_samples/FileCheck-manual/CHECK-EMPTY/filecheck.check
@@ -1,3 +1,3 @@
-; CHECK: foo
-; CHECK-EMPTY:
-; CHECK-NEXT: bar
\ No newline at end of file
+CHECK: foo
+CHECK-EMPTY:
+CHECK-NEXT: bar
\ No newline at end of file
diff --git a/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/filecheck.check b/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/filecheck.check
index 438b5cb..169ae19 100644
--- a/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/filecheck.check
+++ b/tests/integration/tests/real_world_samples/mull/01-mull-scalar-operator-enum/filecheck.check
@@ -1,14 +1,14 @@
 /**
-; RUN: cd / && %CLANG_EXEC -fembed-bitcode -g -O0 -MJ %S/raw_compilation_database.tmp %s -o %s.exe
-; RUN: cd %CURRENT_DIR
-; RUN: compilation_database.sh %S/raw_compilation_database.tmp %S/compile_commands.tmp
-; RUN: compilation_database.py %S/compile_commands.tmp %S/compile_commands.json
-; RUN: %MULL_EXEC -enable-ast -test-framework CustomTest -compdb-path %S/compile_commands.json -compilation-flags="" -mutators=scalar_value_mutator -reporters=IDE -reporters=Elements -report-dir=%S -report-name=report %s.exe| %FILECHECK_EXEC %s --strict-whitespace
-; CHECK-NOT: No mutants found. Mutation score: infinitely high
-; CHECK: Running mutants (threads: 1): 0/1{{.*$}}
-; CHECK: {{.*}}:17:3: warning: Replacing scalar with 0 or 42
-; CHECK: {{^  }}return SUCCESS;{{$}}
-; CHECK: {{^  }}^{{$}}
+RUN: cd / && %CLANG_EXEC -fembed-bitcode -g -O0 -MJ %S/raw_compilation_database.tmp %s -o %s.exe
+RUN: cd %CURRENT_DIR
+RUN: compilation_database.sh %S/raw_compilation_database.tmp %S/compile_commands.tmp
+RUN: compilation_database.py %S/compile_commands.tmp %S/compile_commands.json
+RUN: %MULL_EXEC -enable-ast -test-framework CustomTest -compdb-path %S/compile_commands.json -compilation-flags="" -mutators=scalar_value_mutator -reporters=IDE -reporters=Elements -report-dir=%S -report-name=report %s.exe| %FILECHECK_EXEC %s --strict-whitespace
+CHECK-NOT: No mutants found. Mutation score: infinitely high
+CHECK: Running mutants (threads: 1): 0/1{{.*$}}
+CHECK: {{.*}}:17:3: warning: Replacing scalar with 0 or 42
+CHECK: {{^  }}return SUCCESS;{{$}}
+CHECK: {{^  }}^{{$}}
 **/
 
 enum Enum { SUCCESS = 1234 };
diff --git a/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/filecheck.check b/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/filecheck.check
index 9702902..81ece25 100644
--- a/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/filecheck.check
+++ b/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/filecheck.check
@@ -1,13 +1,13 @@
 /**
-; RUN: cd / && %CLANG_EXEC -fembed-bitcode -g -O0 %s -o %s.exe
-; RUN: cd %CURRENT_DIR
+RUN: cd / && %CLANG_EXEC -fembed-bitcode -g -O0 %s -o %s.exe
+RUN: cd %CURRENT_DIR
 
 /// IDEReporter is enabled by default. So we test both invocations of mull-cxx:
 /// 1) when -reporters=IDE is not provided
 /// 2) when -reporters=IDE is provided
 
-; RUN: (unset TERM; %MULL_EXEC -test-framework CustomTest -mutators=cxx_add_to_sub %s.exe | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines --check-prefix=WITHOUT-OPTION)
-; RUN: (unset TERM; %MULL_EXEC -test-framework CustomTest -mutators=cxx_add_to_sub -reporters=IDE %s.exe | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines --check-prefix=WITHOUT-OPTION)
+RUN: (unset TERM; %MULL_EXEC -test-framework CustomTest -mutators=cxx_add_to_sub %s.exe | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines --check-prefix=WITHOUT-OPTION)
+RUN: (unset TERM; %MULL_EXEC -test-framework CustomTest -mutators=cxx_add_to_sub -reporters=IDE %s.exe | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines --check-prefix=WITHOUT-OPTION)
 ; WITHOUT-OPTION:{{^Running mutants \(threads: 2\): 2\/2.*$}}
 ; WITHOUT-OPTION:Survived mutants (1/2):
 ; WITHOUT-OPTION-EMPTY:
@@ -18,8 +18,8 @@
 ; WITHOUT-OPTION-NEXT:Mutation score: 50%
 ; WITHOUT-OPTION-EMPTY:
 
-; RUN: (unset TERM; %MULL_EXEC -test-framework CustomTest -mutators=cxx_add_to_sub -ide-reporter-show-killed %s.exe | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION)
-; RUN: (unset TERM; %MULL_EXEC -test-framework CustomTest -mutators=cxx_add_to_sub -reporters=IDE -ide-reporter-show-killed %s.exe | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION)
+RUN: (unset TERM; %MULL_EXEC -test-framework CustomTest -mutators=cxx_add_to_sub -ide-reporter-show-killed %s.exe | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION)
+RUN: (unset TERM; %MULL_EXEC -test-framework CustomTest -mutators=cxx_add_to_sub -reporters=IDE -ide-reporter-show-killed %s.exe | %FILECHECK_EXEC %s --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION)
 ; WITH-OPTION:{{^Running mutsants \(threads: 2\): 2\/2.*$}}
 ; WITH-OPTION:Killed mutants (1/2):
 ; WITH-OPTION-EMPTY:
diff --git a/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/sample.itest b/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/sample.itest
index 7d81ddd..5586f9f 100644
--- a/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/sample.itest
+++ b/tests/integration/tests/real_world_samples/mull/02-weird-scanning-from-here-location/sample.itest
@@ -1,15 +1,15 @@
-; RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
+RUN: %cat "%S/filecheck.input" | %expect_exit 1 %FILECHECK_EXEC "%S/filecheck.check" --strict-whitespace --match-full-lines --check-prefix=WITH-OPTION | %FILECHECK_TESTER_EXEC "%s" --strict-whitespace --match-full-lines
 
-; CHECK:{{^.*}}filecheck.check:23:15: error: WITH-OPTION: expected string not found in input
-; CHECK-NEXT:{{^; WITH-OPTION:..\^Running mutsants \\\(threads: 2\\\): 2\\\/2\.\*\$..$}}
-; CHECK-NEXT:{{^              \^$}}
-; CHECK-NEXT:<stdin>:2:1: note: scanning from here
-; CHECK-NEXT:Extracting bitcode from executable (threads: 1): 0/1
-; CHECK-NEXT:^
+CHECK:{{^.*}}filecheck.check:23:15: error: WITH-OPTION: expected string not found in input
+CHECK-NEXT:{{^; WITH-OPTION:..\^Running mutsants \\\(threads: 2\\\): 2\\\/2\.\*\$..$}}
+CHECK-NEXT:{{^              \^$}}
+CHECK-NEXT:<stdin>:2:1: note: scanning from here
+CHECK-NEXT:Extracting bitcode from executable (threads: 1): 0/1
+CHECK-NEXT:^
 ; TODO: Again, the "note: possible intended match here" feature needs revision, #38
 ; TODO: https://github.com/stanislaw/FileCheck.py/issues/38.
 ; TODO: Doing (1|17) and ".*\^" for now.
-; CHECK-NEXT:<stdin>:59:{{(1|17)}}: note: possible intended match here
-; CHECK-NEXT:Running mutants (threads: 2): 0/2
-; CHECK-NEXT:{{^.*\^$}}
-; CHECK-EMPTY:
+CHECK-NEXT:<stdin>:59:{{(1|17)}}: note: possible intended match here
+CHECK-NEXT:Running mutants (threads: 2): 0/2
+CHECK-NEXT:{{^.*\^$}}
+CHECK-EMPTY: