From b18c8a60ffc59e8664a298cc595e79951b54ebd9 Mon Sep 17 00:00:00 2001
From: androlo <androlo1980@gmail.com>
Date: Thu, 20 Dec 2018 12:28:42 +0100
Subject: Use directories for tests.

---
 test/cmdlineTests.sh | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 3beee552..f8cafc52 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -217,30 +217,29 @@ test_solc_behaviour "${0}" "ctx:=/some/remapping/target" "" "" 1 "Invalid remapp
 
 printTask "Running standard JSON commandline tests..."
 (
-    cd "$REPO_ROOT"/test/cmdlineTests/
-    for file in *.json
+    cd "$REPO_ROOT"/test/cmdlineTests/standard_json/
+    for tdir in */
     do
-        args="--standard-json"
-        stdin="$REPO_ROOT/test/cmdlineTests/$file"
-        stdout=$(cat $file.stdout 2>/dev/null || true)
-        exitCode=$(cat $file.exit 2>/dev/null || true)
-        err=$(cat $file.err 2>/dev/null || true)
-        printTask " - $file"
-        test_solc_behaviour "" "$args" "$stdin" "$stdout" "$exitCode" "$err"
+        stdin="${tdir}/input.json"
+        stdout=$(cat ${tdir}/output.json 2>/dev/null || true)
+        exitCode=$(cat ${tdir}/exit 2>/dev/null || true)
+        err=$(cat ${tdir}/err 2>/dev/null || true)
+        printTask " - ${tdir}"
+        test_solc_behaviour "" "--standard-json" "$stdin" "$stdout" "$exitCode" "$err"
     done
 )
 
 printTask "Running general commandline tests..."
 (
-    cd "$REPO_ROOT"/test/cmdlineTests/
-    for file in *.sol
+    cd "$REPO_ROOT"/test/cmdlineTests/regular_sol
+    for tdir in */
     do
-        args=$(cat $file.args 2>/dev/null || true)
-        stdout=$(cat $file.stdout 2>/dev/null || true)
-        exitCode=$(cat $file.exit 2>/dev/null || true)
-        err=$(cat $file.err 2>/dev/null || true)
-        printTask " - $file"
-        test_solc_behaviour "$file" "$args" "" "$stdout" "$exitCode" "$err"
+        args=$(cat ${tdir}/args 2>/dev/null || true)
+        stdout=$(cat ${tdir}/output 2>/dev/null || true)
+        exitCode=$(cat ${tdir}/exit 2>/dev/null || true)
+        err=$(cat ${tdir}/err 2>/dev/null || true)
+        printTask " - ${tdir}"
+        test_solc_behaviour "${tdir}contracts.sol" "$args" "" "$stdout" "$exitCode" "$err"
     done
 )
 
-- 
cgit 


From 6e626ad95502549d6b156c3b294990a450c590e1 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 20 Dec 2018 12:32:53 +0100
Subject: Unify json and non-json commandline tests.

---
 test/cmdlineTests.sh | 32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index f8cafc52..1ef1b320 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -215,31 +215,27 @@ printTask "Testing passing empty remappings..."
 test_solc_behaviour "${0}" "=/some/remapping/target" "" "" 1 "Invalid remapping: \"=/some/remapping/target\"."
 test_solc_behaviour "${0}" "ctx:=/some/remapping/target" "" "" 1 "Invalid remapping: \"ctx:=/some/remapping/target\"."
 
-printTask "Running standard JSON commandline tests..."
-(
-    cd "$REPO_ROOT"/test/cmdlineTests/standard_json/
-    for tdir in */
-    do
-        stdin="${tdir}/input.json"
-        stdout=$(cat ${tdir}/output.json 2>/dev/null || true)
-        exitCode=$(cat ${tdir}/exit 2>/dev/null || true)
-        err=$(cat ${tdir}/err 2>/dev/null || true)
-        printTask " - ${tdir}"
-        test_solc_behaviour "" "--standard-json" "$stdin" "$stdout" "$exitCode" "$err"
-    done
-)
-
 printTask "Running general commandline tests..."
 (
-    cd "$REPO_ROOT"/test/cmdlineTests/regular_sol
+    cd "$REPO_ROOT"/test/cmdlineTests/
     for tdir in */
     do
-        args=$(cat ${tdir}/args 2>/dev/null || true)
-        stdout=$(cat ${tdir}/output 2>/dev/null || true)
+        if [ -e "${tdir}/input.json" ]
+        then
+            inputFile=""
+            stdin="${tdir}/input.json"
+            stdout=$(cat ${tdir}/output.json 2>/dev/null || true)
+            args="--standard-json "$(cat ${tdir}/args 2>/dev/null || true)
+        else
+            inputFile="${tdir}input.sol"
+            stdin=""
+            stdout=$(cat ${tdir}/output 2>/dev/null || true)
+            args=$(cat ${tdir}/args 2>/dev/null || true)
+        fi
         exitCode=$(cat ${tdir}/exit 2>/dev/null || true)
         err=$(cat ${tdir}/err 2>/dev/null || true)
         printTask " - ${tdir}"
-        test_solc_behaviour "${tdir}contracts.sol" "$args" "" "$stdout" "$exitCode" "$err"
+        test_solc_behaviour "$inputFile" "$args" "$stdin" "$stdout" "$exitCode" "$err"
     done
 )
 
-- 
cgit 


From d2105be57d62e5113a086b555a747ac7b4601b41 Mon Sep 17 00:00:00 2001
From: androlo <androlo1980@gmail.com>
Date: Tue, 18 Dec 2018 20:48:56 +0100
Subject: Move actual test files.

---
 test/cmdlineTests/data_storage.sol                 | 15 ------
 test/cmdlineTests/data_storage.sol.args            |  1 -
 test/cmdlineTests/data_storage.sol.stdout          |  7 ---
 test/cmdlineTests/data_storage/args                |  1 +
 test/cmdlineTests/data_storage/input.sol           | 15 ++++++
 test/cmdlineTests/data_storage/output              |  7 +++
 test/cmdlineTests/gas_test_dispatch.sol            | 43 ------------------
 test/cmdlineTests/gas_test_dispatch.sol.args       |  1 -
 test/cmdlineTests/gas_test_dispatch.sol.stdout     | 53 ----------------------
 test/cmdlineTests/gas_test_dispatch/args           |  1 +
 test/cmdlineTests/gas_test_dispatch/input.sol      | 43 ++++++++++++++++++
 test/cmdlineTests/gas_test_dispatch/output         | 53 ++++++++++++++++++++++
 test/cmdlineTests/gas_test_dispatch_optimize.sol   | 43 ------------------
 .../gas_test_dispatch_optimize.sol.args            |  1 -
 .../gas_test_dispatch_optimize.sol.stdout          | 53 ----------------------
 test/cmdlineTests/gas_test_dispatch_optimize/args  |  1 +
 .../gas_test_dispatch_optimize/input.sol           | 43 ++++++++++++++++++
 .../cmdlineTests/gas_test_dispatch_optimize/output | 53 ++++++++++++++++++++++
 test/cmdlineTests/standard.json                    | 10 ----
 test/cmdlineTests/standard.json.exit               |  1 -
 test/cmdlineTests/standard.json.stdout             |  1 -
 test/cmdlineTests/standard_binaries_requested.json | 17 -------
 .../standard_binaries_requested.json.stdout        |  1 -
 .../standard_binaries_requested/input.json         | 17 +++++++
 .../standard_binaries_requested/output.json        |  1 +
 test/cmdlineTests/standard_default_success/exit    |  1 +
 .../standard_default_success/input.json            | 10 ++++
 .../standard_default_success/output.json           |  1 +
 .../standard_methodIdentifiersRequested.json       | 17 -------
 ...standard_methodIdentifiersRequested.json.stdout |  1 -
 .../input.json                                     | 17 +++++++
 .../output.json                                    |  1 +
 test/cmdlineTests/standard_only_ast_requested.json | 17 -------
 .../standard_only_ast_requested.json.stdout        |  1 -
 .../standard_only_ast_requested/input.json         | 17 +++++++
 .../standard_only_ast_requested/output.json        |  1 +
 .../standard_wrong_key_auxiliary_input.json        | 14 ------
 .../standard_wrong_key_auxiliary_input.json.exit   |  1 -
 .../standard_wrong_key_auxiliary_input.json.stdout |  1 -
 .../standard_wrong_key_auxiliary_input/exit        |  1 +
 .../standard_wrong_key_auxiliary_input/input.json  | 14 ++++++
 .../standard_wrong_key_auxiliary_input/output.json |  1 +
 test/cmdlineTests/standard_wrong_key_metadata.json | 22 ---------
 .../standard_wrong_key_metadata.json.exit          |  1 -
 .../standard_wrong_key_metadata.json.stdout        |  1 -
 test/cmdlineTests/standard_wrong_key_metadata/exit |  1 +
 .../standard_wrong_key_metadata/input.json         | 22 +++++++++
 .../standard_wrong_key_metadata/output.json        |  1 +
 .../cmdlineTests/standard_wrong_key_optimizer.json | 22 ---------
 .../standard_wrong_key_optimizer.json.exit         |  1 -
 .../standard_wrong_key_optimizer.json.stdout       |  1 -
 .../cmdlineTests/standard_wrong_key_optimizer/exit |  1 +
 .../standard_wrong_key_optimizer/input.json        | 22 +++++++++
 .../standard_wrong_key_optimizer/output.json       |  1 +
 test/cmdlineTests/standard_wrong_key_root.json     | 11 -----
 .../cmdlineTests/standard_wrong_key_root.json.exit |  1 -
 .../standard_wrong_key_root.json.stdout            |  1 -
 test/cmdlineTests/standard_wrong_key_root/exit     |  1 +
 .../standard_wrong_key_root/input.json             | 11 +++++
 .../standard_wrong_key_root/output.json            |  1 +
 test/cmdlineTests/standard_wrong_key_settings.json | 22 ---------
 .../standard_wrong_key_settings.json.exit          |  1 -
 .../standard_wrong_key_settings.json.stdout        |  1 -
 test/cmdlineTests/standard_wrong_key_settings/exit |  1 +
 .../standard_wrong_key_settings/input.json         | 22 +++++++++
 .../standard_wrong_key_settings/output.json        |  1 +
 test/cmdlineTests/standard_wrong_key_source.json   | 11 -----
 .../standard_wrong_key_source.json.exit            |  1 -
 .../standard_wrong_key_source.json.stdout          |  1 -
 test/cmdlineTests/standard_wrong_key_source/exit   |  1 +
 .../standard_wrong_key_source/input.json           | 11 +++++
 .../standard_wrong_key_source/output.json          |  1 +
 .../standard_wrong_type_auxiliary_input.json       | 11 -----
 .../standard_wrong_type_auxiliary_input.json.exit  |  1 -
 ...standard_wrong_type_auxiliary_input.json.stdout |  2 -
 .../standard_wrong_type_auxiliary_input/exit       |  1 +
 .../standard_wrong_type_auxiliary_input/input.json | 11 +++++
 .../output.json                                    |  2 +
 ...rong_type_auxiliary_input_smtlib2responses.json | 20 --------
 ...type_auxiliary_input_smtlib2responses.json.exit |  1 -
 ...pe_auxiliary_input_smtlib2responses.json.stdout |  1 -
 .../exit                                           |  1 +
 .../input.json                                     | 20 ++++++++
 .../output.json                                    |  1 +
 ...pe_auxiliary_input_smtlib2responses_member.json | 23 ----------
 ...xiliary_input_smtlib2responses_member.json.exit |  1 -
 ...liary_input_smtlib2responses_member.json.stdout |  1 -
 .../exit                                           |  1 +
 .../input.json                                     | 23 ++++++++++
 .../output.json                                    |  1 +
 .../cmdlineTests/standard_wrong_type_metadata.json | 19 --------
 .../standard_wrong_type_metadata.json.exit         |  1 -
 .../standard_wrong_type_metadata.json.stdout       |  1 -
 .../cmdlineTests/standard_wrong_type_metadata/exit |  1 +
 .../standard_wrong_type_metadata/input.json        | 19 ++++++++
 .../standard_wrong_type_metadata/output.json       |  1 +
 .../standard_wrong_type_optimizer.json             | 18 --------
 .../standard_wrong_type_optimizer.json.exit        |  1 -
 .../standard_wrong_type_optimizer.json.stdout      |  1 -
 .../standard_wrong_type_optimizer/exit             |  1 +
 .../standard_wrong_type_optimizer/input.json       | 18 ++++++++
 .../standard_wrong_type_optimizer/output.json      |  1 +
 .../standard_wrong_type_output_selection.json      | 11 -----
 .../standard_wrong_type_output_selection.json.exit |  1 -
 ...tandard_wrong_type_output_selection.json.stdout |  1 -
 .../standard_wrong_type_output_selection/exit      |  1 +
 .../input.json                                     | 11 +++++
 .../output.json                                    |  1 +
 ...ndard_wrong_type_output_selection_contract.json | 16 -------
 ..._wrong_type_output_selection_contract.json.exit |  1 -
 ...rong_type_output_selection_contract.json.stdout |  1 -
 .../exit                                           |  1 +
 .../input.json                                     | 16 +++++++
 .../output.json                                    |  1 +
 .../standard_wrong_type_output_selection_file.json | 13 ------
 ...dard_wrong_type_output_selection_file.json.exit |  1 -
 ...rd_wrong_type_output_selection_file.json.stdout |  1 -
 .../standard_wrong_type_output_selection_file/exit |  1 +
 .../input.json                                     | 13 ++++++
 .../output.json                                    |  1 +
 ...tandard_wrong_type_output_selection_output.json | 16 -------
 ...rd_wrong_type_output_selection_output.json.exit |  1 -
 ..._wrong_type_output_selection_output.json.stdout |  1 -
 .../exit                                           |  1 +
 .../input.json                                     | 16 +++++++
 .../output.json                                    |  1 +
 .../standard_wrong_type_remappings.json            | 17 -------
 .../standard_wrong_type_remappings.json.exit       |  1 -
 .../standard_wrong_type_remappings.json.stdout     |  1 -
 .../standard_wrong_type_remappings/exit            |  1 +
 .../standard_wrong_type_remappings/input.json      | 17 +++++++
 .../standard_wrong_type_remappings/output.json     |  1 +
 .../standard_wrong_type_remappings_entry.json      | 17 -------
 .../standard_wrong_type_remappings_entry.json.exit |  1 -
 ...tandard_wrong_type_remappings_entry.json.stdout |  1 -
 .../standard_wrong_type_remappings_entry/exit      |  1 +
 .../input.json                                     | 17 +++++++
 .../output.json                                    |  1 +
 test/cmdlineTests/standard_wrong_type_root.json    |  1 -
 .../standard_wrong_type_root.json.exit             |  1 -
 .../standard_wrong_type_root.json.stdout           |  1 -
 test/cmdlineTests/standard_wrong_type_root/exit    |  1 +
 .../standard_wrong_type_root/input.json            |  1 +
 .../standard_wrong_type_root/output.json           |  1 +
 .../cmdlineTests/standard_wrong_type_settings.json | 23 ----------
 .../standard_wrong_type_settings.json.exit         |  1 -
 .../standard_wrong_type_settings.json.stdout       |  1 -
 .../cmdlineTests/standard_wrong_type_settings/exit |  1 +
 .../standard_wrong_type_settings/input.json        | 23 ++++++++++
 .../standard_wrong_type_settings/output.json       |  1 +
 test/cmdlineTests/standard_wrong_type_source.json  | 12 -----
 .../standard_wrong_type_source.json.exit           |  1 -
 .../standard_wrong_type_source.json.stdout         |  1 -
 test/cmdlineTests/standard_wrong_type_source/exit  |  1 +
 .../standard_wrong_type_source/input.json          | 12 +++++
 .../standard_wrong_type_source/output.json         |  1 +
 test/cmdlineTests/standard_wrong_type_sources.json |  4 --
 .../standard_wrong_type_sources.json.exit          |  1 -
 .../standard_wrong_type_sources.json.stdout        |  1 -
 test/cmdlineTests/standard_wrong_type_sources/exit |  1 +
 .../standard_wrong_type_sources/input.json         |  4 ++
 .../standard_wrong_type_sources/output.json        |  1 +
 test/cmdlineTests/too_long_line.sol                |  4 --
 test/cmdlineTests/too_long_line.sol.err            |  6 ---
 test/cmdlineTests/too_long_line.sol.exit           |  1 -
 test/cmdlineTests/too_long_line/err                |  6 +++
 test/cmdlineTests/too_long_line/exit               |  1 +
 test/cmdlineTests/too_long_line/input.sol          |  4 ++
 .../too_long_line_both_sides_short.sol             |  5 --
 .../too_long_line_both_sides_short.sol.err         |  6 ---
 .../too_long_line_both_sides_short.sol.exit        |  1 -
 .../too_long_line_both_sides_short/err             |  6 +++
 .../too_long_line_both_sides_short/exit            |  1 +
 .../too_long_line_both_sides_short/input.sol       |  5 ++
 test/cmdlineTests/too_long_line_edge_in.sol        |  4 --
 test/cmdlineTests/too_long_line_edge_in.sol.err    |  6 ---
 test/cmdlineTests/too_long_line_edge_in.sol.exit   |  1 -
 test/cmdlineTests/too_long_line_edge_in/err        |  6 +++
 test/cmdlineTests/too_long_line_edge_in/exit       |  1 +
 test/cmdlineTests/too_long_line_edge_in/input.sol  |  4 ++
 test/cmdlineTests/too_long_line_edge_out.sol       |  4 --
 test/cmdlineTests/too_long_line_edge_out.sol.err   |  6 ---
 test/cmdlineTests/too_long_line_edge_out.sol.exit  |  1 -
 test/cmdlineTests/too_long_line_edge_out/err       |  6 +++
 test/cmdlineTests/too_long_line_edge_out/exit      |  1 +
 test/cmdlineTests/too_long_line_edge_out/input.sol |  4 ++
 test/cmdlineTests/too_long_line_left_short.sol     |  4 --
 test/cmdlineTests/too_long_line_left_short.sol.err |  6 ---
 .../cmdlineTests/too_long_line_left_short.sol.exit |  1 -
 test/cmdlineTests/too_long_line_left_short/err     |  6 +++
 test/cmdlineTests/too_long_line_left_short/exit    |  1 +
 .../too_long_line_left_short/input.sol             |  4 ++
 test/cmdlineTests/too_long_line_right_short.sol    |  5 --
 .../cmdlineTests/too_long_line_right_short.sol.err |  6 ---
 .../too_long_line_right_short.sol.exit             |  1 -
 test/cmdlineTests/too_long_line_right_short/err    |  6 +++
 test/cmdlineTests/too_long_line_right_short/exit   |  1 +
 .../too_long_line_right_short/input.sol            |  5 ++
 198 files changed, 717 insertions(+), 717 deletions(-)
 delete mode 100644 test/cmdlineTests/data_storage.sol
 delete mode 100644 test/cmdlineTests/data_storage.sol.args
 delete mode 100644 test/cmdlineTests/data_storage.sol.stdout
 create mode 100644 test/cmdlineTests/data_storage/args
 create mode 100644 test/cmdlineTests/data_storage/input.sol
 create mode 100644 test/cmdlineTests/data_storage/output
 delete mode 100644 test/cmdlineTests/gas_test_dispatch.sol
 delete mode 100644 test/cmdlineTests/gas_test_dispatch.sol.args
 delete mode 100644 test/cmdlineTests/gas_test_dispatch.sol.stdout
 create mode 100644 test/cmdlineTests/gas_test_dispatch/args
 create mode 100644 test/cmdlineTests/gas_test_dispatch/input.sol
 create mode 100644 test/cmdlineTests/gas_test_dispatch/output
 delete mode 100644 test/cmdlineTests/gas_test_dispatch_optimize.sol
 delete mode 100644 test/cmdlineTests/gas_test_dispatch_optimize.sol.args
 delete mode 100644 test/cmdlineTests/gas_test_dispatch_optimize.sol.stdout
 create mode 100644 test/cmdlineTests/gas_test_dispatch_optimize/args
 create mode 100644 test/cmdlineTests/gas_test_dispatch_optimize/input.sol
 create mode 100644 test/cmdlineTests/gas_test_dispatch_optimize/output
 delete mode 100644 test/cmdlineTests/standard.json
 delete mode 100644 test/cmdlineTests/standard.json.exit
 delete mode 100644 test/cmdlineTests/standard.json.stdout
 delete mode 100644 test/cmdlineTests/standard_binaries_requested.json
 delete mode 100644 test/cmdlineTests/standard_binaries_requested.json.stdout
 create mode 100644 test/cmdlineTests/standard_binaries_requested/input.json
 create mode 100644 test/cmdlineTests/standard_binaries_requested/output.json
 create mode 100644 test/cmdlineTests/standard_default_success/exit
 create mode 100644 test/cmdlineTests/standard_default_success/input.json
 create mode 100644 test/cmdlineTests/standard_default_success/output.json
 delete mode 100644 test/cmdlineTests/standard_methodIdentifiersRequested.json
 delete mode 100644 test/cmdlineTests/standard_methodIdentifiersRequested.json.stdout
 create mode 100644 test/cmdlineTests/standard_method_identifiers_requested/input.json
 create mode 100644 test/cmdlineTests/standard_method_identifiers_requested/output.json
 delete mode 100644 test/cmdlineTests/standard_only_ast_requested.json
 delete mode 100644 test/cmdlineTests/standard_only_ast_requested.json.stdout
 create mode 100644 test/cmdlineTests/standard_only_ast_requested/input.json
 create mode 100644 test/cmdlineTests/standard_only_ast_requested/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_auxiliary_input.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_auxiliary_input.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_key_auxiliary_input.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_key_auxiliary_input/exit
 create mode 100644 test/cmdlineTests/standard_wrong_key_auxiliary_input/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_metadata.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_metadata.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_key_metadata.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_key_metadata/exit
 create mode 100644 test/cmdlineTests/standard_wrong_key_metadata/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_key_metadata/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_optimizer.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_optimizer.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_key_optimizer.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_key_optimizer/exit
 create mode 100644 test/cmdlineTests/standard_wrong_key_optimizer/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_key_optimizer/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_root.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_root.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_key_root.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_key_root/exit
 create mode 100644 test/cmdlineTests/standard_wrong_key_root/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_key_root/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_settings.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_settings.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_key_settings.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_key_settings/exit
 create mode 100644 test/cmdlineTests/standard_wrong_key_settings/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_key_settings/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_source.json
 delete mode 100644 test/cmdlineTests/standard_wrong_key_source.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_key_source.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_key_source/exit
 create mode 100644 test/cmdlineTests/standard_wrong_key_source/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_key_source/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_metadata.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_metadata.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_metadata.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_metadata/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_metadata/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_metadata/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_optimizer.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_optimizer.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_optimizer.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_optimizer/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_optimizer/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_optimizer/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_contract.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_contract.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_contract.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_contract/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_file.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_file.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_file.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_file/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_file/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_output.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_output.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_output/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_output/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_remappings.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_remappings.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_remappings.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_remappings/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_remappings/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_remappings/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_remappings_entry.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_remappings_entry.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_remappings_entry.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_remappings_entry/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_remappings_entry/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_root.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_root.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_root.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_root/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_root/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_root/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_settings.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_settings.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_settings.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_settings/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_settings/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_settings/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_source.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_source.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_source.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_source/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_source/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_source/output.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_sources.json
 delete mode 100644 test/cmdlineTests/standard_wrong_type_sources.json.exit
 delete mode 100644 test/cmdlineTests/standard_wrong_type_sources.json.stdout
 create mode 100644 test/cmdlineTests/standard_wrong_type_sources/exit
 create mode 100644 test/cmdlineTests/standard_wrong_type_sources/input.json
 create mode 100644 test/cmdlineTests/standard_wrong_type_sources/output.json
 delete mode 100644 test/cmdlineTests/too_long_line.sol
 delete mode 100644 test/cmdlineTests/too_long_line.sol.err
 delete mode 100644 test/cmdlineTests/too_long_line.sol.exit
 create mode 100644 test/cmdlineTests/too_long_line/err
 create mode 100644 test/cmdlineTests/too_long_line/exit
 create mode 100644 test/cmdlineTests/too_long_line/input.sol
 delete mode 100644 test/cmdlineTests/too_long_line_both_sides_short.sol
 delete mode 100644 test/cmdlineTests/too_long_line_both_sides_short.sol.err
 delete mode 100644 test/cmdlineTests/too_long_line_both_sides_short.sol.exit
 create mode 100644 test/cmdlineTests/too_long_line_both_sides_short/err
 create mode 100644 test/cmdlineTests/too_long_line_both_sides_short/exit
 create mode 100644 test/cmdlineTests/too_long_line_both_sides_short/input.sol
 delete mode 100644 test/cmdlineTests/too_long_line_edge_in.sol
 delete mode 100644 test/cmdlineTests/too_long_line_edge_in.sol.err
 delete mode 100644 test/cmdlineTests/too_long_line_edge_in.sol.exit
 create mode 100644 test/cmdlineTests/too_long_line_edge_in/err
 create mode 100644 test/cmdlineTests/too_long_line_edge_in/exit
 create mode 100644 test/cmdlineTests/too_long_line_edge_in/input.sol
 delete mode 100644 test/cmdlineTests/too_long_line_edge_out.sol
 delete mode 100644 test/cmdlineTests/too_long_line_edge_out.sol.err
 delete mode 100644 test/cmdlineTests/too_long_line_edge_out.sol.exit
 create mode 100644 test/cmdlineTests/too_long_line_edge_out/err
 create mode 100644 test/cmdlineTests/too_long_line_edge_out/exit
 create mode 100644 test/cmdlineTests/too_long_line_edge_out/input.sol
 delete mode 100644 test/cmdlineTests/too_long_line_left_short.sol
 delete mode 100644 test/cmdlineTests/too_long_line_left_short.sol.err
 delete mode 100644 test/cmdlineTests/too_long_line_left_short.sol.exit
 create mode 100644 test/cmdlineTests/too_long_line_left_short/err
 create mode 100644 test/cmdlineTests/too_long_line_left_short/exit
 create mode 100644 test/cmdlineTests/too_long_line_left_short/input.sol
 delete mode 100644 test/cmdlineTests/too_long_line_right_short.sol
 delete mode 100644 test/cmdlineTests/too_long_line_right_short.sol.err
 delete mode 100644 test/cmdlineTests/too_long_line_right_short.sol.exit
 create mode 100644 test/cmdlineTests/too_long_line_right_short/err
 create mode 100644 test/cmdlineTests/too_long_line_right_short/exit
 create mode 100644 test/cmdlineTests/too_long_line_right_short/input.sol

diff --git a/test/cmdlineTests/data_storage.sol b/test/cmdlineTests/data_storage.sol
deleted file mode 100644
index cc602cc9..00000000
--- a/test/cmdlineTests/data_storage.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma solidity >=0.0;
-
-contract C {
-  function f() pure public {
-    require(false, "1234567890123456789012345678901");
-    require(false, "12345678901234567890123456789012");
-    require(false, "123456789012345678901234567890123");
-    require(false, "1234567890123456789012345678901234");
-    require(false, "12345678901234567890123456789012345");
-    require(false, "123456789012345678901234567890123456");
-    require(false, "123456789012345678901234567890121234567890123456789012345678901");
-    require(false, "1234567890123456789012345678901212345678901234567890123456789012");
-    require(false, "12345678901234567890123456789012123456789012345678901234567890123");
-  }
-}
diff --git a/test/cmdlineTests/data_storage.sol.args b/test/cmdlineTests/data_storage.sol.args
deleted file mode 100644
index 3684987e..00000000
--- a/test/cmdlineTests/data_storage.sol.args
+++ /dev/null
@@ -1 +0,0 @@
---gas
diff --git a/test/cmdlineTests/data_storage.sol.stdout b/test/cmdlineTests/data_storage.sol.stdout
deleted file mode 100644
index 4a5250f7..00000000
--- a/test/cmdlineTests/data_storage.sol.stdout
+++ /dev/null
@@ -1,7 +0,0 @@
-
-======= data_storage.sol:C =======
-Gas estimation:
-construction:
-   306 + 264400 = 264706
-external:
-   f():	263
diff --git a/test/cmdlineTests/data_storage/args b/test/cmdlineTests/data_storage/args
new file mode 100644
index 00000000..3684987e
--- /dev/null
+++ b/test/cmdlineTests/data_storage/args
@@ -0,0 +1 @@
+--gas
diff --git a/test/cmdlineTests/data_storage/input.sol b/test/cmdlineTests/data_storage/input.sol
new file mode 100644
index 00000000..cc602cc9
--- /dev/null
+++ b/test/cmdlineTests/data_storage/input.sol
@@ -0,0 +1,15 @@
+pragma solidity >=0.0;
+
+contract C {
+  function f() pure public {
+    require(false, "1234567890123456789012345678901");
+    require(false, "12345678901234567890123456789012");
+    require(false, "123456789012345678901234567890123");
+    require(false, "1234567890123456789012345678901234");
+    require(false, "12345678901234567890123456789012345");
+    require(false, "123456789012345678901234567890123456");
+    require(false, "123456789012345678901234567890121234567890123456789012345678901");
+    require(false, "1234567890123456789012345678901212345678901234567890123456789012");
+    require(false, "12345678901234567890123456789012123456789012345678901234567890123");
+  }
+}
diff --git a/test/cmdlineTests/data_storage/output b/test/cmdlineTests/data_storage/output
new file mode 100644
index 00000000..e0dae4bd
--- /dev/null
+++ b/test/cmdlineTests/data_storage/output
@@ -0,0 +1,7 @@
+
+======= data_storage/input.sol:C =======
+Gas estimation:
+construction:
+   306 + 264400 = 264706
+external:
+   f():	263
diff --git a/test/cmdlineTests/gas_test_dispatch.sol b/test/cmdlineTests/gas_test_dispatch.sol
deleted file mode 100644
index a5ca9e7d..00000000
--- a/test/cmdlineTests/gas_test_dispatch.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-pragma solidity >=0.0;
-
-contract Large {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
-    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
-    function f4(uint x) public returns (uint) { b[uint8(msg.data[3])] = x; }
-    function f5(uint x) public returns (uint) { b[uint8(msg.data[4])] = x; }
-    function f6(uint x) public returns (uint) { b[uint8(msg.data[5])] = x; }
-    function f7(uint x) public returns (uint) { b[uint8(msg.data[6])] = x; }
-    function f8(uint x) public returns (uint) { b[uint8(msg.data[7])] = x; }
-    function f9(uint x) public returns (uint) { b[uint8(msg.data[8])] = x; }
-    function f0(uint x) public pure returns (uint) { require(x > 10); }
-    function g1(uint x) public payable returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function g2(uint x) public payable returns (uint) { b[uint8(msg.data[1])] = x; }
-    function g3(uint x) public payable returns (uint) { b[uint8(msg.data[2])] = x; }
-    function g4(uint x) public payable returns (uint) { b[uint8(msg.data[3])] = x; }
-    function g5(uint x) public payable returns (uint) { b[uint8(msg.data[4])] = x; }
-    function g6(uint x) public payable returns (uint) { b[uint8(msg.data[5])] = x; }
-    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
-    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
-    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
-    function g0(uint x) public payable returns (uint) { require(x > 10); }
-}
-contract Medium {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
-    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
-    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
-    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
-    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
-    function g0(uint x) public payable returns (uint) { require(x > 10); }
-}
-contract Small {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function () external payable {}
-}
diff --git a/test/cmdlineTests/gas_test_dispatch.sol.args b/test/cmdlineTests/gas_test_dispatch.sol.args
deleted file mode 100644
index 3684987e..00000000
--- a/test/cmdlineTests/gas_test_dispatch.sol.args
+++ /dev/null
@@ -1 +0,0 @@
---gas
diff --git a/test/cmdlineTests/gas_test_dispatch.sol.stdout b/test/cmdlineTests/gas_test_dispatch.sol.stdout
deleted file mode 100644
index 117affad..00000000
--- a/test/cmdlineTests/gas_test_dispatch.sol.stdout
+++ /dev/null
@@ -1,53 +0,0 @@
-
-======= gas_test_dispatch.sol:Large =======
-Gas estimation:
-construction:
-   1034 + 998400 = 999434
-external:
-   a():	456
-   b(uint256):	857
-   f0(uint256):	438
-   f1(uint256):	40781
-   f2(uint256):	20722
-   f3(uint256):	20810
-   f4(uint256):	20788
-   f5(uint256):	20766
-   f6(uint256):	20789
-   f7(uint256):	20701
-   f8(uint256):	20701
-   f9(uint256):	20723
-   g0(uint256):	324
-   g1(uint256):	40736
-   g2(uint256):	20699
-   g3(uint256):	20787
-   g4(uint256):	20765
-   g5(uint256):	20721
-   g6(uint256):	20744
-   g7(uint256):	20743
-   g8(uint256):	20721
-   g9(uint256):	20678
-
-======= gas_test_dispatch.sol:Medium =======
-Gas estimation:
-construction:
-   411 + 376600 = 377011
-external:
-   a():	433
-   b(uint256):	857
-   f1(uint256):	40692
-   f2(uint256):	20722
-   f3(uint256):	20766
-   g0(uint256):	324
-   g7(uint256):	20721
-   g8(uint256):	20699
-   g9(uint256):	20655
-
-======= gas_test_dispatch.sol:Small =======
-Gas estimation:
-construction:
-   153 + 107800 = 107953
-external:
-   fallback:	123
-   a():	388
-   b(uint256):	813
-   f1(uint256):	40692
diff --git a/test/cmdlineTests/gas_test_dispatch/args b/test/cmdlineTests/gas_test_dispatch/args
new file mode 100644
index 00000000..3684987e
--- /dev/null
+++ b/test/cmdlineTests/gas_test_dispatch/args
@@ -0,0 +1 @@
+--gas
diff --git a/test/cmdlineTests/gas_test_dispatch/input.sol b/test/cmdlineTests/gas_test_dispatch/input.sol
new file mode 100644
index 00000000..a5ca9e7d
--- /dev/null
+++ b/test/cmdlineTests/gas_test_dispatch/input.sol
@@ -0,0 +1,43 @@
+pragma solidity >=0.0;
+
+contract Large {
+    uint public a;
+    uint[] public b;
+    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
+    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
+    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
+    function f4(uint x) public returns (uint) { b[uint8(msg.data[3])] = x; }
+    function f5(uint x) public returns (uint) { b[uint8(msg.data[4])] = x; }
+    function f6(uint x) public returns (uint) { b[uint8(msg.data[5])] = x; }
+    function f7(uint x) public returns (uint) { b[uint8(msg.data[6])] = x; }
+    function f8(uint x) public returns (uint) { b[uint8(msg.data[7])] = x; }
+    function f9(uint x) public returns (uint) { b[uint8(msg.data[8])] = x; }
+    function f0(uint x) public pure returns (uint) { require(x > 10); }
+    function g1(uint x) public payable returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
+    function g2(uint x) public payable returns (uint) { b[uint8(msg.data[1])] = x; }
+    function g3(uint x) public payable returns (uint) { b[uint8(msg.data[2])] = x; }
+    function g4(uint x) public payable returns (uint) { b[uint8(msg.data[3])] = x; }
+    function g5(uint x) public payable returns (uint) { b[uint8(msg.data[4])] = x; }
+    function g6(uint x) public payable returns (uint) { b[uint8(msg.data[5])] = x; }
+    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
+    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
+    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
+    function g0(uint x) public payable returns (uint) { require(x > 10); }
+}
+contract Medium {
+    uint public a;
+    uint[] public b;
+    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
+    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
+    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
+    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
+    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
+    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
+    function g0(uint x) public payable returns (uint) { require(x > 10); }
+}
+contract Small {
+    uint public a;
+    uint[] public b;
+    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
+    function () external payable {}
+}
diff --git a/test/cmdlineTests/gas_test_dispatch/output b/test/cmdlineTests/gas_test_dispatch/output
new file mode 100644
index 00000000..d817e85c
--- /dev/null
+++ b/test/cmdlineTests/gas_test_dispatch/output
@@ -0,0 +1,53 @@
+
+======= gas_test_dispatch/input.sol:Large =======
+Gas estimation:
+construction:
+   1034 + 998400 = 999434
+external:
+   a():	456
+   b(uint256):	857
+   f0(uint256):	438
+   f1(uint256):	40781
+   f2(uint256):	20722
+   f3(uint256):	20810
+   f4(uint256):	20788
+   f5(uint256):	20766
+   f6(uint256):	20789
+   f7(uint256):	20701
+   f8(uint256):	20701
+   f9(uint256):	20723
+   g0(uint256):	324
+   g1(uint256):	40736
+   g2(uint256):	20699
+   g3(uint256):	20787
+   g4(uint256):	20765
+   g5(uint256):	20721
+   g6(uint256):	20744
+   g7(uint256):	20743
+   g8(uint256):	20721
+   g9(uint256):	20678
+
+======= gas_test_dispatch/input.sol:Medium =======
+Gas estimation:
+construction:
+   411 + 376600 = 377011
+external:
+   a():	433
+   b(uint256):	857
+   f1(uint256):	40692
+   f2(uint256):	20722
+   f3(uint256):	20766
+   g0(uint256):	324
+   g7(uint256):	20721
+   g8(uint256):	20699
+   g9(uint256):	20655
+
+======= gas_test_dispatch/input.sol:Small =======
+Gas estimation:
+construction:
+   153 + 107800 = 107953
+external:
+   fallback:	123
+   a():	388
+   b(uint256):	813
+   f1(uint256):	40692
diff --git a/test/cmdlineTests/gas_test_dispatch_optimize.sol b/test/cmdlineTests/gas_test_dispatch_optimize.sol
deleted file mode 100644
index a5ca9e7d..00000000
--- a/test/cmdlineTests/gas_test_dispatch_optimize.sol
+++ /dev/null
@@ -1,43 +0,0 @@
-pragma solidity >=0.0;
-
-contract Large {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
-    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
-    function f4(uint x) public returns (uint) { b[uint8(msg.data[3])] = x; }
-    function f5(uint x) public returns (uint) { b[uint8(msg.data[4])] = x; }
-    function f6(uint x) public returns (uint) { b[uint8(msg.data[5])] = x; }
-    function f7(uint x) public returns (uint) { b[uint8(msg.data[6])] = x; }
-    function f8(uint x) public returns (uint) { b[uint8(msg.data[7])] = x; }
-    function f9(uint x) public returns (uint) { b[uint8(msg.data[8])] = x; }
-    function f0(uint x) public pure returns (uint) { require(x > 10); }
-    function g1(uint x) public payable returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function g2(uint x) public payable returns (uint) { b[uint8(msg.data[1])] = x; }
-    function g3(uint x) public payable returns (uint) { b[uint8(msg.data[2])] = x; }
-    function g4(uint x) public payable returns (uint) { b[uint8(msg.data[3])] = x; }
-    function g5(uint x) public payable returns (uint) { b[uint8(msg.data[4])] = x; }
-    function g6(uint x) public payable returns (uint) { b[uint8(msg.data[5])] = x; }
-    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
-    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
-    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
-    function g0(uint x) public payable returns (uint) { require(x > 10); }
-}
-contract Medium {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
-    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
-    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
-    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
-    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
-    function g0(uint x) public payable returns (uint) { require(x > 10); }
-}
-contract Small {
-    uint public a;
-    uint[] public b;
-    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
-    function () external payable {}
-}
diff --git a/test/cmdlineTests/gas_test_dispatch_optimize.sol.args b/test/cmdlineTests/gas_test_dispatch_optimize.sol.args
deleted file mode 100644
index 814e0591..00000000
--- a/test/cmdlineTests/gas_test_dispatch_optimize.sol.args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --optimize-runs 2 --gas
diff --git a/test/cmdlineTests/gas_test_dispatch_optimize.sol.stdout b/test/cmdlineTests/gas_test_dispatch_optimize.sol.stdout
deleted file mode 100644
index 76fa086e..00000000
--- a/test/cmdlineTests/gas_test_dispatch_optimize.sol.stdout
+++ /dev/null
@@ -1,53 +0,0 @@
-
-======= gas_test_dispatch_optimize.sol:Large =======
-Gas estimation:
-construction:
-   300 + 262000 = 262300
-external:
-   a():	463
-   b(uint256):	1173
-   f0(uint256):	399
-   f1(uint256):	41164
-   f2(uint256):	21224
-   f3(uint256):	21312
-   f4(uint256):	21290
-   f5(uint256):	21268
-   f6(uint256):	21180
-   f7(uint256):	20960
-   f8(uint256):	21092
-   f9(uint256):	21114
-   g0(uint256):	639
-   g1(uint256):	40876
-   g2(uint256):	20958
-   g3(uint256):	21046
-   g4(uint256):	21024
-   g5(uint256):	21112
-   g6(uint256):	20892
-   g7(uint256):	21002
-   g8(uint256):	20980
-   g9(uint256):	20826
-
-======= gas_test_dispatch_optimize.sol:Medium =======
-Gas estimation:
-construction:
-   190 + 143000 = 143190
-external:
-   a():	463
-   b(uint256):	931
-   f1(uint256):	40944
-   f2(uint256):	20982
-   f3(uint256):	21026
-   g0(uint256):	397
-   g7(uint256):	20892
-   g8(uint256):	20870
-   g9(uint256):	20826
-
-======= gas_test_dispatch_optimize.sol:Small =======
-Gas estimation:
-construction:
-   117 + 67400 = 67517
-external:
-   fallback:	183
-   a():	441
-   b(uint256):	821
-   f1(uint256):	40878
diff --git a/test/cmdlineTests/gas_test_dispatch_optimize/args b/test/cmdlineTests/gas_test_dispatch_optimize/args
new file mode 100644
index 00000000..814e0591
--- /dev/null
+++ b/test/cmdlineTests/gas_test_dispatch_optimize/args
@@ -0,0 +1 @@
+--optimize --optimize-runs 2 --gas
diff --git a/test/cmdlineTests/gas_test_dispatch_optimize/input.sol b/test/cmdlineTests/gas_test_dispatch_optimize/input.sol
new file mode 100644
index 00000000..a5ca9e7d
--- /dev/null
+++ b/test/cmdlineTests/gas_test_dispatch_optimize/input.sol
@@ -0,0 +1,43 @@
+pragma solidity >=0.0;
+
+contract Large {
+    uint public a;
+    uint[] public b;
+    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
+    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
+    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
+    function f4(uint x) public returns (uint) { b[uint8(msg.data[3])] = x; }
+    function f5(uint x) public returns (uint) { b[uint8(msg.data[4])] = x; }
+    function f6(uint x) public returns (uint) { b[uint8(msg.data[5])] = x; }
+    function f7(uint x) public returns (uint) { b[uint8(msg.data[6])] = x; }
+    function f8(uint x) public returns (uint) { b[uint8(msg.data[7])] = x; }
+    function f9(uint x) public returns (uint) { b[uint8(msg.data[8])] = x; }
+    function f0(uint x) public pure returns (uint) { require(x > 10); }
+    function g1(uint x) public payable returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
+    function g2(uint x) public payable returns (uint) { b[uint8(msg.data[1])] = x; }
+    function g3(uint x) public payable returns (uint) { b[uint8(msg.data[2])] = x; }
+    function g4(uint x) public payable returns (uint) { b[uint8(msg.data[3])] = x; }
+    function g5(uint x) public payable returns (uint) { b[uint8(msg.data[4])] = x; }
+    function g6(uint x) public payable returns (uint) { b[uint8(msg.data[5])] = x; }
+    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
+    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
+    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
+    function g0(uint x) public payable returns (uint) { require(x > 10); }
+}
+contract Medium {
+    uint public a;
+    uint[] public b;
+    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
+    function f2(uint x) public returns (uint) { b[uint8(msg.data[1])] = x; }
+    function f3(uint x) public returns (uint) { b[uint8(msg.data[2])] = x; }
+    function g7(uint x) public payable returns (uint) { b[uint8(msg.data[6])] = x; }
+    function g8(uint x) public payable returns (uint) { b[uint8(msg.data[7])] = x; }
+    function g9(uint x) public payable returns (uint) { b[uint8(msg.data[8])] = x; }
+    function g0(uint x) public payable returns (uint) { require(x > 10); }
+}
+contract Small {
+    uint public a;
+    uint[] public b;
+    function f1(uint x) public returns (uint) { a = x; b[uint8(msg.data[0])] = x; }
+    function () external payable {}
+}
diff --git a/test/cmdlineTests/gas_test_dispatch_optimize/output b/test/cmdlineTests/gas_test_dispatch_optimize/output
new file mode 100644
index 00000000..fd8e9e93
--- /dev/null
+++ b/test/cmdlineTests/gas_test_dispatch_optimize/output
@@ -0,0 +1,53 @@
+
+======= gas_test_dispatch_optimize/input.sol:Large =======
+Gas estimation:
+construction:
+   300 + 262000 = 262300
+external:
+   a():	463
+   b(uint256):	1173
+   f0(uint256):	399
+   f1(uint256):	41164
+   f2(uint256):	21224
+   f3(uint256):	21312
+   f4(uint256):	21290
+   f5(uint256):	21268
+   f6(uint256):	21180
+   f7(uint256):	20960
+   f8(uint256):	21092
+   f9(uint256):	21114
+   g0(uint256):	639
+   g1(uint256):	40876
+   g2(uint256):	20958
+   g3(uint256):	21046
+   g4(uint256):	21024
+   g5(uint256):	21112
+   g6(uint256):	20892
+   g7(uint256):	21002
+   g8(uint256):	20980
+   g9(uint256):	20826
+
+======= gas_test_dispatch_optimize/input.sol:Medium =======
+Gas estimation:
+construction:
+   190 + 143000 = 143190
+external:
+   a():	463
+   b(uint256):	931
+   f1(uint256):	40944
+   f2(uint256):	20982
+   f3(uint256):	21026
+   g0(uint256):	397
+   g7(uint256):	20892
+   g8(uint256):	20870
+   g9(uint256):	20826
+
+======= gas_test_dispatch_optimize/input.sol:Small =======
+Gas estimation:
+construction:
+   117 + 67400 = 67517
+external:
+   fallback:	183
+   a():	441
+   b(uint256):	821
+   f1(uint256):	40878
diff --git a/test/cmdlineTests/standard.json b/test/cmdlineTests/standard.json
deleted file mode 100644
index 826253b8..00000000
--- a/test/cmdlineTests/standard.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard.json.exit b/test/cmdlineTests/standard.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard.json.stdout b/test/cmdlineTests/standard.json.stdout
deleted file mode 100644
index 59b90c8c..00000000
--- a/test/cmdlineTests/standard.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/standard_binaries_requested.json b/test/cmdlineTests/standard_binaries_requested.json
deleted file mode 100644
index 65f19543..00000000
--- a/test/cmdlineTests/standard_binaries_requested.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["evm.gasEstimates"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_binaries_requested.json.stdout b/test/cmdlineTests/standard_binaries_requested.json.stdout
deleted file mode 100644
index 2baef22a..00000000
--- a/test/cmdlineTests/standard_binaries_requested.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"contracts":{"A":{"C":{"evm":{"gasEstimates":{"creation":{"codeDepositCost":"25600","executionCost":"75","totalCost":"25675"},"external":{"f()":"127"}}}}}},"sources":{"A":{"id":0}}}
\ No newline at end of file
diff --git a/test/cmdlineTests/standard_binaries_requested/input.json b/test/cmdlineTests/standard_binaries_requested/input.json
new file mode 100644
index 00000000..65f19543
--- /dev/null
+++ b/test/cmdlineTests/standard_binaries_requested/input.json
@@ -0,0 +1,17 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"outputSelection":
+		{
+			"*": { "*": ["evm.gasEstimates"] }
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_binaries_requested/output.json b/test/cmdlineTests/standard_binaries_requested/output.json
new file mode 100644
index 00000000..2baef22a
--- /dev/null
+++ b/test/cmdlineTests/standard_binaries_requested/output.json
@@ -0,0 +1 @@
+{"contracts":{"A":{"C":{"evm":{"gasEstimates":{"creation":{"codeDepositCost":"25600","executionCost":"75","totalCost":"25675"},"external":{"f()":"127"}}}}}},"sources":{"A":{"id":0}}}
\ No newline at end of file
diff --git a/test/cmdlineTests/standard_default_success/exit b/test/cmdlineTests/standard_default_success/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_default_success/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_default_success/input.json b/test/cmdlineTests/standard_default_success/input.json
new file mode 100644
index 00000000..826253b8
--- /dev/null
+++ b/test/cmdlineTests/standard_default_success/input.json
@@ -0,0 +1,10 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_default_success/output.json b/test/cmdlineTests/standard_default_success/output.json
new file mode 100644
index 00000000..59b90c8c
--- /dev/null
+++ b/test/cmdlineTests/standard_default_success/output.json
@@ -0,0 +1 @@
+{"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/standard_methodIdentifiersRequested.json b/test/cmdlineTests/standard_methodIdentifiersRequested.json
deleted file mode 100644
index 79a3c75d..00000000
--- a/test/cmdlineTests/standard_methodIdentifiersRequested.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "*": ["evm.methodIdentifiers"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_methodIdentifiersRequested.json.stdout b/test/cmdlineTests/standard_methodIdentifiersRequested.json.stdout
deleted file mode 100644
index 7e3f139f..00000000
--- a/test/cmdlineTests/standard_methodIdentifiersRequested.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"contracts":{"A":{"C":{"evm":{"methodIdentifiers":{"f()":"26121ff0"}}}}},"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/standard_method_identifiers_requested/input.json b/test/cmdlineTests/standard_method_identifiers_requested/input.json
new file mode 100644
index 00000000..79a3c75d
--- /dev/null
+++ b/test/cmdlineTests/standard_method_identifiers_requested/input.json
@@ -0,0 +1,17 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"outputSelection":
+		{
+			"*": { "*": ["evm.methodIdentifiers"] }
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_method_identifiers_requested/output.json b/test/cmdlineTests/standard_method_identifiers_requested/output.json
new file mode 100644
index 00000000..7e3f139f
--- /dev/null
+++ b/test/cmdlineTests/standard_method_identifiers_requested/output.json
@@ -0,0 +1 @@
+{"contracts":{"A":{"C":{"evm":{"methodIdentifiers":{"f()":"26121ff0"}}}}},"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/standard_only_ast_requested.json b/test/cmdlineTests/standard_only_ast_requested.json
deleted file mode 100644
index 7abd6da5..00000000
--- a/test/cmdlineTests/standard_only_ast_requested.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"outputSelection":
-		{
-			"*": { "": ["ast"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_only_ast_requested.json.stdout b/test/cmdlineTests/standard_only_ast_requested.json.stdout
deleted file mode 100644
index b884ab7d..00000000
--- a/test/cmdlineTests/standard_only_ast_requested.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"C":[6]},"id":7,"nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"0:22:0"},{"baseContracts":[],"contractDependencies":[],"contractKind":"contract","documentation":null,"fullyImplemented":true,"id":6,"linearizedBaseContracts":[6],"name":"C","nodeType":"ContractDefinition","nodes":[{"body":{"id":4,"nodeType":"Block","src":"61:2:0","statements":[]},"documentation":null,"id":5,"implemented":true,"kind":"function","modifiers":[],"name":"f","nodeType":"FunctionDefinition","parameters":{"id":2,"nodeType":"ParameterList","parameters":[],"src":"46:2:0"},"returnParameters":{"id":3,"nodeType":"ParameterList","parameters":[],"src":"61:0:0"},"scope":6,"src":"36:27:0","stateMutability":"pure","superFunction":null,"visibility":"public"}],"scope":7,"src":"23:42:0"}],"src":"0:65:0"},"id":0}}}
diff --git a/test/cmdlineTests/standard_only_ast_requested/input.json b/test/cmdlineTests/standard_only_ast_requested/input.json
new file mode 100644
index 00000000..7abd6da5
--- /dev/null
+++ b/test/cmdlineTests/standard_only_ast_requested/input.json
@@ -0,0 +1,17 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"outputSelection":
+		{
+			"*": { "": ["ast"] }
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_only_ast_requested/output.json b/test/cmdlineTests/standard_only_ast_requested/output.json
new file mode 100644
index 00000000..b884ab7d
--- /dev/null
+++ b/test/cmdlineTests/standard_only_ast_requested/output.json
@@ -0,0 +1 @@
+{"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"C":[6]},"id":7,"nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"0:22:0"},{"baseContracts":[],"contractDependencies":[],"contractKind":"contract","documentation":null,"fullyImplemented":true,"id":6,"linearizedBaseContracts":[6],"name":"C","nodeType":"ContractDefinition","nodes":[{"body":{"id":4,"nodeType":"Block","src":"61:2:0","statements":[]},"documentation":null,"id":5,"implemented":true,"kind":"function","modifiers":[],"name":"f","nodeType":"FunctionDefinition","parameters":{"id":2,"nodeType":"ParameterList","parameters":[],"src":"46:2:0"},"returnParameters":{"id":3,"nodeType":"ParameterList","parameters":[],"src":"61:0:0"},"scope":6,"src":"36:27:0","stateMutability":"pure","superFunction":null,"visibility":"public"}],"scope":7,"src":"23:42:0"}],"src":"0:65:0"},"id":0}}}
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json b/test/cmdlineTests/standard_wrong_key_auxiliary_input.json
deleted file mode 100644
index 51dbce41..00000000
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"auxiliaryInput":
-	{
-		"key1": "test"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.exit b/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.stdout b/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.stdout
deleted file mode 100644
index 077ac47e..00000000
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input/exit b/test/cmdlineTests/standard_wrong_key_auxiliary_input/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_auxiliary_input/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input/input.json b/test/cmdlineTests/standard_wrong_key_auxiliary_input/input.json
new file mode 100644
index 00000000..51dbce41
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_auxiliary_input/input.json
@@ -0,0 +1,14 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"auxiliaryInput":
+	{
+		"key1": "test"
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json b/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
new file mode 100644
index 00000000..077ac47e
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_metadata.json b/test/cmdlineTests/standard_wrong_key_metadata.json
deleted file mode 100644
index 490e489a..00000000
--- a/test/cmdlineTests/standard_wrong_key_metadata.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-      		"enabled": true,
-      		"runs": 200
-    	},
-    	"evmVersion": "byzantium",
-    	"metadata": {
-			"key1": "test",
-      		"useLiteralContent": true
-    	}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_metadata.json.exit b/test/cmdlineTests/standard_wrong_key_metadata.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_key_metadata.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_key_metadata.json.stdout b/test/cmdlineTests/standard_wrong_key_metadata.json.stdout
deleted file mode 100644
index 077ac47e..00000000
--- a/test/cmdlineTests/standard_wrong_key_metadata.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_metadata/exit b/test/cmdlineTests/standard_wrong_key_metadata/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_metadata/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_key_metadata/input.json b/test/cmdlineTests/standard_wrong_key_metadata/input.json
new file mode 100644
index 00000000..490e489a
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_metadata/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"optimizer": {
+      		"enabled": true,
+      		"runs": 200
+    	},
+    	"evmVersion": "byzantium",
+    	"metadata": {
+			"key1": "test",
+      		"useLiteralContent": true
+    	}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_key_metadata/output.json b/test/cmdlineTests/standard_wrong_key_metadata/output.json
new file mode 100644
index 00000000..077ac47e
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_metadata/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer.json b/test/cmdlineTests/standard_wrong_key_optimizer.json
deleted file mode 100644
index c28c3a92..00000000
--- a/test/cmdlineTests/standard_wrong_key_optimizer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"key1": "test",
-      		"enabled": true,
-      		"runs": 200
-    	},
-    	"evmVersion": "byzantium",
-    	"metadata": {
-      		"useLiteralContent": true
-    	}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer.json.exit b/test/cmdlineTests/standard_wrong_key_optimizer.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_key_optimizer.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer.json.stdout b/test/cmdlineTests/standard_wrong_key_optimizer.json.stdout
deleted file mode 100644
index 077ac47e..00000000
--- a/test/cmdlineTests/standard_wrong_key_optimizer.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer/exit b/test/cmdlineTests/standard_wrong_key_optimizer/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_optimizer/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer/input.json b/test/cmdlineTests/standard_wrong_key_optimizer/input.json
new file mode 100644
index 00000000..c28c3a92
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_optimizer/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"optimizer": {
+			"key1": "test",
+      		"enabled": true,
+      		"runs": 200
+    	},
+    	"evmVersion": "byzantium",
+    	"metadata": {
+      		"useLiteralContent": true
+    	}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer/output.json b/test/cmdlineTests/standard_wrong_key_optimizer/output.json
new file mode 100644
index 00000000..077ac47e
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_optimizer/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_root.json b/test/cmdlineTests/standard_wrong_key_root.json
deleted file mode 100644
index 4689c50c..00000000
--- a/test/cmdlineTests/standard_wrong_key_root.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"key1": "test",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_root.json.exit b/test/cmdlineTests/standard_wrong_key_root.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_key_root.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_key_root.json.stdout b/test/cmdlineTests/standard_wrong_key_root.json.stdout
deleted file mode 100644
index 077ac47e..00000000
--- a/test/cmdlineTests/standard_wrong_key_root.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_root/exit b/test/cmdlineTests/standard_wrong_key_root/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_root/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_key_root/input.json b/test/cmdlineTests/standard_wrong_key_root/input.json
new file mode 100644
index 00000000..4689c50c
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_root/input.json
@@ -0,0 +1,11 @@
+{
+	"language": "Solidity",
+	"key1": "test",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_key_root/output.json b/test/cmdlineTests/standard_wrong_key_root/output.json
new file mode 100644
index 00000000..077ac47e
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_root/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_settings.json b/test/cmdlineTests/standard_wrong_key_settings.json
deleted file mode 100644
index d7809b1c..00000000
--- a/test/cmdlineTests/standard_wrong_key_settings.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-      		"enabled": true,
-      		"runs": 200
-    	},
-    	"evmVersion": "byzantium",
-    	"metadata": {
-      		"useLiteralContent": true
-    	},
-		"key1": "test"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_settings.json.exit b/test/cmdlineTests/standard_wrong_key_settings.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_key_settings.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_key_settings.json.stdout b/test/cmdlineTests/standard_wrong_key_settings.json.stdout
deleted file mode 100644
index 077ac47e..00000000
--- a/test/cmdlineTests/standard_wrong_key_settings.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_settings/exit b/test/cmdlineTests/standard_wrong_key_settings/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_settings/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_key_settings/input.json b/test/cmdlineTests/standard_wrong_key_settings/input.json
new file mode 100644
index 00000000..d7809b1c
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_settings/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"optimizer": {
+      		"enabled": true,
+      		"runs": 200
+    	},
+    	"evmVersion": "byzantium",
+    	"metadata": {
+      		"useLiteralContent": true
+    	},
+		"key1": "test"
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_key_settings/output.json b/test/cmdlineTests/standard_wrong_key_settings/output.json
new file mode 100644
index 00000000..077ac47e
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_settings/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_source.json b/test/cmdlineTests/standard_wrong_key_source.json
deleted file mode 100644
index d8a8aa16..00000000
--- a/test/cmdlineTests/standard_wrong_key_source.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"key1": "test",
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_key_source.json.exit b/test/cmdlineTests/standard_wrong_key_source.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_key_source.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_key_source.json.stdout b/test/cmdlineTests/standard_wrong_key_source.json.stdout
deleted file mode 100644
index 077ac47e..00000000
--- a/test/cmdlineTests/standard_wrong_key_source.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_key_source/exit b/test/cmdlineTests/standard_wrong_key_source/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_source/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_key_source/input.json b/test/cmdlineTests/standard_wrong_key_source/input.json
new file mode 100644
index 00000000..d8a8aa16
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_source/input.json
@@ -0,0 +1,11 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"key1": "test",
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_key_source/output.json b/test/cmdlineTests/standard_wrong_key_source/output.json
new file mode 100644
index 00000000..077ac47e
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_key_source/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input.json
deleted file mode 100644
index 8d2c7593..00000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"auxiliaryInput": [1, 2, 3]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.exit b/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.stdout b/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.stdout
deleted file mode 100644
index 046cb6d9..00000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input.json.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"auxiliaryInput\" must be an object","message":"\"auxiliaryInput\" must be an object","severity":"error","type":"JSONError"}]}
-
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input/exit b/test/cmdlineTests/standard_wrong_type_auxiliary_input/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input/input.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input/input.json
new file mode 100644
index 00000000..8d2c7593
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input/input.json
@@ -0,0 +1,11 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"auxiliaryInput": [1, 2, 3]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
new file mode 100644
index 00000000..046cb6d9
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
@@ -0,0 +1,2 @@
+{"errors":[{"component":"general","formattedMessage":"\"auxiliaryInput\" must be an object","message":"\"auxiliaryInput\" must be an object","severity":"error","type":"JSONError"}]}
+
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json
deleted file mode 100644
index 9175050f..00000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "contract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
-				"": [ "legacyAST" ]
-			}
-		}
-	},
-	"auxiliaryInput":
-	{
-		"smtlib2responses": "not an object"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.exit b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.stdout b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.stdout
deleted file mode 100644
index 3efaea20..00000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"auxiliaryInput.smtlib2responses\" must be an object.","message":"\"auxiliaryInput.smtlib2responses\" must be an object.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/exit b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/input.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/input.json
new file mode 100644
index 00000000..9175050f
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/input.json
@@ -0,0 +1,20 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "contract A { }"
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
+				"": [ "legacyAST" ]
+			}
+		}
+	},
+	"auxiliaryInput":
+	{
+		"smtlib2responses": "not an object"
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
new file mode 100644
index 00000000..3efaea20
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"auxiliaryInput.smtlib2responses\" must be an object.","message":"\"auxiliaryInput.smtlib2responses\" must be an object.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json
deleted file mode 100644
index aa7d451b..00000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "contract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
-				"": [ "legacyAST" ]
-			}
-		}
-	},
-	"auxiliaryInput":
-	{
-		"smtlib2responses":
-		{
-			"abc": ["not a string"]
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.exit b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.stdout b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.stdout
deleted file mode 100644
index a05176be..00000000
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"smtlib2Responses.abc\" must be a string.","message":"\"smtlib2Responses.abc\" must be a string.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/exit b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/input.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/input.json
new file mode 100644
index 00000000..aa7d451b
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "contract A { }"
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
+				"": [ "legacyAST" ]
+			}
+		}
+	},
+	"auxiliaryInput":
+	{
+		"smtlib2responses":
+		{
+			"abc": ["not a string"]
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
new file mode 100644
index 00000000..a05176be
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"smtlib2Responses.abc\" must be a string.","message":"\"smtlib2Responses.abc\" must be a string.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_metadata.json b/test/cmdlineTests/standard_wrong_type_metadata.json
deleted file mode 100644
index d4dd06a1..00000000
--- a/test/cmdlineTests/standard_wrong_type_metadata.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": {
-			"enabled": true,
-			"runs": 200
-		},
-		"evmVersion": "byzantium",
-		"metadata": ["meta1", "meta2", "meta3"]
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_metadata.json.exit b/test/cmdlineTests/standard_wrong_type_metadata.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_metadata.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_metadata.json.stdout b/test/cmdlineTests/standard_wrong_type_metadata.json.stdout
deleted file mode 100644
index 7b997cec..00000000
--- a/test/cmdlineTests/standard_wrong_type_metadata.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.metadata\" must be an object","message":"\"settings.metadata\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_metadata/exit b/test/cmdlineTests/standard_wrong_type_metadata/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_metadata/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_metadata/input.json b/test/cmdlineTests/standard_wrong_type_metadata/input.json
new file mode 100644
index 00000000..d4dd06a1
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_metadata/input.json
@@ -0,0 +1,19 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"optimizer": {
+			"enabled": true,
+			"runs": 200
+		},
+		"evmVersion": "byzantium",
+		"metadata": ["meta1", "meta2", "meta3"]
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_metadata/output.json b/test/cmdlineTests/standard_wrong_type_metadata/output.json
new file mode 100644
index 00000000..7b997cec
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_metadata/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"settings.metadata\" must be an object","message":"\"settings.metadata\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer.json b/test/cmdlineTests/standard_wrong_type_optimizer.json
deleted file mode 100644
index b42ca550..00000000
--- a/test/cmdlineTests/standard_wrong_type_optimizer.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	{
-		"optimizer": 1,
-		"evmVersion": "byzantium",
-		"metadata": {
-			"useLiteralContent": true
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer.json.exit b/test/cmdlineTests/standard_wrong_type_optimizer.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_optimizer.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer.json.stdout b/test/cmdlineTests/standard_wrong_type_optimizer.json.stdout
deleted file mode 100644
index d43b6470..00000000
--- a/test/cmdlineTests/standard_wrong_type_optimizer.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.optimizer\" must be an object","message":"\"settings.optimizer\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer/exit b/test/cmdlineTests/standard_wrong_type_optimizer/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_optimizer/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer/input.json b/test/cmdlineTests/standard_wrong_type_optimizer/input.json
new file mode 100644
index 00000000..b42ca550
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_optimizer/input.json
@@ -0,0 +1,18 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	{
+		"optimizer": 1,
+		"evmVersion": "byzantium",
+		"metadata": {
+			"useLiteralContent": true
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer/output.json b/test/cmdlineTests/standard_wrong_type_optimizer/output.json
new file mode 100644
index 00000000..d43b6470
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_optimizer/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"settings.optimizer\" must be an object","message":"\"settings.optimizer\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection.json b/test/cmdlineTests/standard_wrong_type_output_selection.json
deleted file mode 100644
index a7b615d1..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "contract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": "not an object"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection.json.exit b/test/cmdlineTests/standard_wrong_type_output_selection.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection.json.stdout b/test/cmdlineTests/standard_wrong_type_output_selection.json.stdout
deleted file mode 100644
index 39e74882..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection\" must be an object","message":"\"settings.outputSelection\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection/exit b/test/cmdlineTests/standard_wrong_type_output_selection/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection/input.json b/test/cmdlineTests/standard_wrong_type_output_selection/input.json
new file mode 100644
index 00000000..a7b615d1
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection/input.json
@@ -0,0 +1,11 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "contract A { }"
+		}
+	},
+	"settings": {
+		"outputSelection": "not an object"
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection/output.json b/test/cmdlineTests/standard_wrong_type_output_selection/output.json
new file mode 100644
index 00000000..39e74882
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection\" must be an object","message":"\"settings.outputSelection\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json b/test/cmdlineTests/standard_wrong_type_output_selection_contract.json
deleted file mode 100644
index 9840a97e..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "contract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": "it's a contract, but not an array!",
-				"": [ "legacyAST" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.exit b/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.stdout b/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.stdout
deleted file mode 100644
index a4ba320e..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection.fileA.A\" must be a string array","message":"\"settings.outputSelection.fileA.A\" must be a string array","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract/exit b/test/cmdlineTests/standard_wrong_type_output_selection_contract/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_contract/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json b/test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json
new file mode 100644
index 00000000..9840a97e
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_contract/input.json
@@ -0,0 +1,16 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "contract A { }"
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": "it's a contract, but not an array!",
+				"": [ "legacyAST" ]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json b/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
new file mode 100644
index 00000000..a4ba320e
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection.fileA.A\" must be a string array","message":"\"settings.outputSelection.fileA.A\" must be a string array","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file.json b/test/cmdlineTests/standard_wrong_type_output_selection_file.json
deleted file mode 100644
index 7ab12ba8..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "contract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": "awesome file!"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file.json.exit b/test/cmdlineTests/standard_wrong_type_output_selection_file.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file.json.stdout b/test/cmdlineTests/standard_wrong_type_output_selection_file.json.stdout
deleted file mode 100644
index 8874e636..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection.fileA\" must be an object","message":"\"settings.outputSelection.fileA\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file/exit b/test/cmdlineTests/standard_wrong_type_output_selection_file/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_file/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file/input.json b/test/cmdlineTests/standard_wrong_type_output_selection_file/input.json
new file mode 100644
index 00000000..7ab12ba8
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_file/input.json
@@ -0,0 +1,13 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "contract A { }"
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": "awesome file!"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json b/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
new file mode 100644
index 00000000..8874e636
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection.fileA\" must be an object","message":"\"settings.outputSelection.fileA\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output.json b/test/cmdlineTests/standard_wrong_type_output_selection_output.json
deleted file mode 100644
index 3e5cd661..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "contract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ 1, 2, 3 ,4],
-				"": [ "legacyAST" ]
-			}
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output.json.exit b/test/cmdlineTests/standard_wrong_type_output_selection_output.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output.json.stdout b/test/cmdlineTests/standard_wrong_type_output_selection_output.json.stdout
deleted file mode 100644
index a4ba320e..00000000
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection.fileA.A\" must be a string array","message":"\"settings.outputSelection.fileA.A\" must be a string array","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output/exit b/test/cmdlineTests/standard_wrong_type_output_selection_output/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_output/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output/input.json b/test/cmdlineTests/standard_wrong_type_output_selection_output/input.json
new file mode 100644
index 00000000..3e5cd661
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_output/input.json
@@ -0,0 +1,16 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "contract A { }"
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": [ 1, 2, 3 ,4],
+				"": [ "legacyAST" ]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json b/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
new file mode 100644
index 00000000..a4ba320e
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection.fileA.A\" must be a string array","message":"\"settings.outputSelection.fileA.A\" must be a string array","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings.json b/test/cmdlineTests/standard_wrong_type_remappings.json
deleted file mode 100644
index 1436e014..00000000
--- a/test/cmdlineTests/standard_wrong_type_remappings.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "contract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
-				"": [ "legacyAST" ]
-			}
-		},
-		"remappings": "not an object"
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings.json.exit b/test/cmdlineTests/standard_wrong_type_remappings.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_remappings.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_remappings.json.stdout b/test/cmdlineTests/standard_wrong_type_remappings.json.stdout
deleted file mode 100644
index b5e4ea5c..00000000
--- a/test/cmdlineTests/standard_wrong_type_remappings.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.remappings\" must be an array of strings.","message":"\"settings.remappings\" must be an array of strings.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings/exit b/test/cmdlineTests/standard_wrong_type_remappings/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_remappings/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_remappings/input.json b/test/cmdlineTests/standard_wrong_type_remappings/input.json
new file mode 100644
index 00000000..1436e014
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_remappings/input.json
@@ -0,0 +1,17 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "contract A { }"
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
+				"": [ "legacyAST" ]
+			}
+		},
+		"remappings": "not an object"
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings/output.json b/test/cmdlineTests/standard_wrong_type_remappings/output.json
new file mode 100644
index 00000000..b5e4ea5c
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_remappings/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"settings.remappings\" must be an array of strings.","message":"\"settings.remappings\" must be an array of strings.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry.json b/test/cmdlineTests/standard_wrong_type_remappings_entry.json
deleted file mode 100644
index c96611f3..00000000
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": {
-		"fileA": {
-			"content": "contract A { }"
-		}
-	},
-	"settings": {
-		"outputSelection": {
-			"fileA": {
-				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
-				"": [ "legacyAST" ]
-			}
-		},
-		"remappings": [1, 2 ,3 ,4]
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry.json.exit b/test/cmdlineTests/standard_wrong_type_remappings_entry.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry.json.stdout b/test/cmdlineTests/standard_wrong_type_remappings_entry.json.stdout
deleted file mode 100644
index 0fc71ded..00000000
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.remappings\" must be an array of strings","message":"\"settings.remappings\" must be an array of strings","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry/exit b/test/cmdlineTests/standard_wrong_type_remappings_entry/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_remappings_entry/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry/input.json b/test/cmdlineTests/standard_wrong_type_remappings_entry/input.json
new file mode 100644
index 00000000..c96611f3
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_remappings_entry/input.json
@@ -0,0 +1,17 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"fileA": {
+			"content": "contract A { }"
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"fileA": {
+				"A": [ "abi", "devdoc", "userdoc", "evm.bytecode", "evm.assembly", "evm.gasEstimates", "evm.legacyAssembly", "metadata" ],
+				"": [ "legacyAST" ]
+			}
+		},
+		"remappings": [1, 2 ,3 ,4]
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json b/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
new file mode 100644
index 00000000..0fc71ded
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"settings.remappings\" must be an array of strings","message":"\"settings.remappings\" must be an array of strings","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_root.json b/test/cmdlineTests/standard_wrong_type_root.json
deleted file mode 100644
index 4763607a..00000000
--- a/test/cmdlineTests/standard_wrong_type_root.json
+++ /dev/null
@@ -1 +0,0 @@
-["abc"]
diff --git a/test/cmdlineTests/standard_wrong_type_root.json.exit b/test/cmdlineTests/standard_wrong_type_root.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_root.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_root.json.stdout b/test/cmdlineTests/standard_wrong_type_root.json.stdout
deleted file mode 100644
index 15c12e77..00000000
--- a/test/cmdlineTests/standard_wrong_type_root.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"Input is not a JSON object.","message":"Input is not a JSON object.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_root/exit b/test/cmdlineTests/standard_wrong_type_root/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_root/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_root/input.json b/test/cmdlineTests/standard_wrong_type_root/input.json
new file mode 100644
index 00000000..4763607a
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_root/input.json
@@ -0,0 +1 @@
+["abc"]
diff --git a/test/cmdlineTests/standard_wrong_type_root/output.json b/test/cmdlineTests/standard_wrong_type_root/output.json
new file mode 100644
index 00000000..15c12e77
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_root/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Input is not a JSON object.","message":"Input is not a JSON object.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_settings.json b/test/cmdlineTests/standard_wrong_type_settings.json
deleted file mode 100644
index 7cdb0881..00000000
--- a/test/cmdlineTests/standard_wrong_type_settings.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	},
-	"settings":
-	[
-		{
-			"optimizer": {
-				"enabled": true,
-				"runs": 200
-			},
-			"evmVersion": "byzantium",
-			"metadata": {
-				"useLiteralContent": true
-			}
-		}
-	]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_settings.json.exit b/test/cmdlineTests/standard_wrong_type_settings.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_settings.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_settings.json.stdout b/test/cmdlineTests/standard_wrong_type_settings.json.stdout
deleted file mode 100644
index c78c6086..00000000
--- a/test/cmdlineTests/standard_wrong_type_settings.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings\" must be an object","message":"\"settings\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_settings/exit b/test/cmdlineTests/standard_wrong_type_settings/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_settings/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_settings/input.json b/test/cmdlineTests/standard_wrong_type_settings/input.json
new file mode 100644
index 00000000..7cdb0881
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_settings/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	},
+	"settings":
+	[
+		{
+			"optimizer": {
+				"enabled": true,
+				"runs": 200
+			},
+			"evmVersion": "byzantium",
+			"metadata": {
+				"useLiteralContent": true
+			}
+		}
+	]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_settings/output.json b/test/cmdlineTests/standard_wrong_type_settings/output.json
new file mode 100644
index 00000000..c78c6086
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_settings/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"settings\" must be an object","message":"\"settings\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_source.json b/test/cmdlineTests/standard_wrong_type_source.json
deleted file mode 100644
index d58504fe..00000000
--- a/test/cmdlineTests/standard_wrong_type_source.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A": "not an object :o",
-		"B": [1, 2, 3],
-		"C":
-		{
-			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_wrong_type_source.json.exit b/test/cmdlineTests/standard_wrong_type_source.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_source.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_source.json.stdout b/test/cmdlineTests/standard_wrong_type_source.json.stdout
deleted file mode 100644
index 98fe32fd..00000000
--- a/test/cmdlineTests/standard_wrong_type_source.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"sources.A\" must be an object","message":"\"sources.A\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_source/exit b/test/cmdlineTests/standard_wrong_type_source/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_source/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_source/input.json b/test/cmdlineTests/standard_wrong_type_source/input.json
new file mode 100644
index 00000000..d58504fe
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_source/input.json
@@ -0,0 +1,12 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A": "not an object :o",
+		"B": [1, 2, 3],
+		"C":
+		{
+			"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_wrong_type_source/output.json b/test/cmdlineTests/standard_wrong_type_source/output.json
new file mode 100644
index 00000000..98fe32fd
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_source/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"sources.A\" must be an object","message":"\"sources.A\" must be an object","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_sources.json b/test/cmdlineTests/standard_wrong_type_sources.json
deleted file mode 100644
index 76e1ae7d..00000000
--- a/test/cmdlineTests/standard_wrong_type_sources.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-	"language": "Solidity",
-	"sources": ["source1", "source2", "source3"]
-}
diff --git a/test/cmdlineTests/standard_wrong_type_sources.json.exit b/test/cmdlineTests/standard_wrong_type_sources.json.exit
deleted file mode 100644
index 573541ac..00000000
--- a/test/cmdlineTests/standard_wrong_type_sources.json.exit
+++ /dev/null
@@ -1 +0,0 @@
-0
diff --git a/test/cmdlineTests/standard_wrong_type_sources.json.stdout b/test/cmdlineTests/standard_wrong_type_sources.json.stdout
deleted file mode 100644
index ac6c613f..00000000
--- a/test/cmdlineTests/standard_wrong_type_sources.json.stdout
+++ /dev/null
@@ -1 +0,0 @@
-{"errors":[{"component":"general","formattedMessage":"\"sources\" is not a JSON object.","message":"\"sources\" is not a JSON object.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_wrong_type_sources/exit b/test/cmdlineTests/standard_wrong_type_sources/exit
new file mode 100644
index 00000000..573541ac
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_sources/exit
@@ -0,0 +1 @@
+0
diff --git a/test/cmdlineTests/standard_wrong_type_sources/input.json b/test/cmdlineTests/standard_wrong_type_sources/input.json
new file mode 100644
index 00000000..76e1ae7d
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_sources/input.json
@@ -0,0 +1,4 @@
+{
+	"language": "Solidity",
+	"sources": ["source1", "source2", "source3"]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_sources/output.json b/test/cmdlineTests/standard_wrong_type_sources/output.json
new file mode 100644
index 00000000..ac6c613f
--- /dev/null
+++ b/test/cmdlineTests/standard_wrong_type_sources/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"\"sources\" is not a JSON object.","message":"\"sources\" is not a JSON object.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/too_long_line.sol b/test/cmdlineTests/too_long_line.sol
deleted file mode 100644
index 7df1057a..00000000
--- a/test/cmdlineTests/too_long_line.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-   function ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff(announcementType Type, string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line.sol.err b/test/cmdlineTests/too_long_line.sol.err
deleted file mode 100644
index 55cd1935..00000000
--- a/test/cmdlineTests/too_long_line.sol.err
+++ /dev/null
@@ -1,6 +0,0 @@
-too_long_line.sol:1:1: Warning: Source file does not specify required compiler version!
-contract C {
-^ (Relevant source part starts here and spans across multiple lines).
-too_long_line.sol:2:164: Error: Identifier not found or not unique.
- ... ffffffffffffffffffffffffffffffffff(announcementType Type, string Announcement, string  ...
-                                        ^--------------^
diff --git a/test/cmdlineTests/too_long_line.sol.exit b/test/cmdlineTests/too_long_line.sol.exit
deleted file mode 100644
index d00491fd..00000000
--- a/test/cmdlineTests/too_long_line.sol.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line/err b/test/cmdlineTests/too_long_line/err
new file mode 100644
index 00000000..bfbc8e1e
--- /dev/null
+++ b/test/cmdlineTests/too_long_line/err
@@ -0,0 +1,6 @@
+too_long_line/input.sol:1:1: Warning: Source file does not specify required compiler version!
+contract C {
+^ (Relevant source part starts here and spans across multiple lines).
+too_long_line/input.sol:2:164: Error: Identifier not found or not unique.
+ ... ffffffffffffffffffffffffffffffffff(announcementType Type, string Announcement, string  ...
+                                        ^--------------^
diff --git a/test/cmdlineTests/too_long_line/exit b/test/cmdlineTests/too_long_line/exit
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/test/cmdlineTests/too_long_line/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/too_long_line/input.sol b/test/cmdlineTests/too_long_line/input.sol
new file mode 100644
index 00000000..7df1057a
--- /dev/null
+++ b/test/cmdlineTests/too_long_line/input.sol
@@ -0,0 +1,4 @@
+contract C {
+   function ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff(announcementType Type, string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
+}
+}
diff --git a/test/cmdlineTests/too_long_line_both_sides_short.sol b/test/cmdlineTests/too_long_line_both_sides_short.sol
deleted file mode 100644
index 062f0292..00000000
--- a/test/cmdlineTests/too_long_line_both_sides_short.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-   function f(announcementTypeXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX Type,
-       string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_both_sides_short.sol.err b/test/cmdlineTests/too_long_line_both_sides_short.sol.err
deleted file mode 100644
index 9a5ebfba..00000000
--- a/test/cmdlineTests/too_long_line_both_sides_short.sol.err
+++ /dev/null
@@ -1,6 +0,0 @@
-too_long_line_both_sides_short.sol:1:1: Warning: Source file does not specify required compiler version!
-contract C {
-^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_both_sides_short.sol:2:15: Error: Identifier not found or not unique.
-   function f(announcementTypeXXXXXXXXXXXXXXXXXXX ... XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX Type,
-              ^-------------------------------------------------------------------------^
diff --git a/test/cmdlineTests/too_long_line_both_sides_short.sol.exit b/test/cmdlineTests/too_long_line_both_sides_short.sol.exit
deleted file mode 100644
index d00491fd..00000000
--- a/test/cmdlineTests/too_long_line_both_sides_short.sol.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_both_sides_short/err b/test/cmdlineTests/too_long_line_both_sides_short/err
new file mode 100644
index 00000000..2868fcb1
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_both_sides_short/err
@@ -0,0 +1,6 @@
+too_long_line_both_sides_short/input.sol:1:1: Warning: Source file does not specify required compiler version!
+contract C {
+^ (Relevant source part starts here and spans across multiple lines).
+too_long_line_both_sides_short/input.sol:2:15: Error: Identifier not found or not unique.
+   function f(announcementTypeXXXXXXXXXXXXXXXXXXX ... XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX Type,
+              ^-------------------------------------------------------------------------^
diff --git a/test/cmdlineTests/too_long_line_both_sides_short/exit b/test/cmdlineTests/too_long_line_both_sides_short/exit
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_both_sides_short/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/too_long_line_both_sides_short/input.sol b/test/cmdlineTests/too_long_line_both_sides_short/input.sol
new file mode 100644
index 00000000..062f0292
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_both_sides_short/input.sol
@@ -0,0 +1,5 @@
+contract C {
+   function f(announcementTypeXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX Type,
+       string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
+}
+}
diff --git a/test/cmdlineTests/too_long_line_edge_in.sol b/test/cmdlineTests/too_long_line_edge_in.sol
deleted file mode 100644
index 6f181c83..00000000
--- a/test/cmdlineTests/too_long_line_edge_in.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-   function ffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Ty, string A) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_edge_in.sol.err b/test/cmdlineTests/too_long_line_edge_in.sol.err
deleted file mode 100644
index ad3b7805..00000000
--- a/test/cmdlineTests/too_long_line_edge_in.sol.err
+++ /dev/null
@@ -1,6 +0,0 @@
-too_long_line_edge_in.sol:1:1: Warning: Source file does not specify required compiler version!
-contract C {
-^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_edge_in.sol:2:36: Error: Identifier not found or not unique.
-   function ffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Ty, string A) onlyOwner external {
-                                   ^----------------------------------------------------------------------------------------------^
diff --git a/test/cmdlineTests/too_long_line_edge_in.sol.exit b/test/cmdlineTests/too_long_line_edge_in.sol.exit
deleted file mode 100644
index d00491fd..00000000
--- a/test/cmdlineTests/too_long_line_edge_in.sol.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_edge_in/err b/test/cmdlineTests/too_long_line_edge_in/err
new file mode 100644
index 00000000..626451e1
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_edge_in/err
@@ -0,0 +1,6 @@
+too_long_line_edge_in/input.sol:1:1: Warning: Source file does not specify required compiler version!
+contract C {
+^ (Relevant source part starts here and spans across multiple lines).
+too_long_line_edge_in/input.sol:2:36: Error: Identifier not found or not unique.
+   function ffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Ty, string A) onlyOwner external {
+                                   ^----------------------------------------------------------------------------------------------^
diff --git a/test/cmdlineTests/too_long_line_edge_in/exit b/test/cmdlineTests/too_long_line_edge_in/exit
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_edge_in/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/too_long_line_edge_in/input.sol b/test/cmdlineTests/too_long_line_edge_in/input.sol
new file mode 100644
index 00000000..6f181c83
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_edge_in/input.sol
@@ -0,0 +1,4 @@
+contract C {
+   function ffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Ty, string A) onlyOwner external {
+}
+}
diff --git a/test/cmdlineTests/too_long_line_edge_out.sol b/test/cmdlineTests/too_long_line_edge_out.sol
deleted file mode 100644
index 29d3cee6..00000000
--- a/test/cmdlineTests/too_long_line_edge_out.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-   function fffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Typ, string A) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_edge_out.sol.err b/test/cmdlineTests/too_long_line_edge_out.sol.err
deleted file mode 100644
index d8495c11..00000000
--- a/test/cmdlineTests/too_long_line_edge_out.sol.err
+++ /dev/null
@@ -1,6 +0,0 @@
-too_long_line_edge_out.sol:1:1: Warning: Source file does not specify required compiler version!
-contract C {
-^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_edge_out.sol:2:37: Error: Identifier not found or not unique.
- ...   function fffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Typ, string A) onlyOwner external  ...
-                                        ^----------------------------------------------------------------------------------------------^
diff --git a/test/cmdlineTests/too_long_line_edge_out.sol.exit b/test/cmdlineTests/too_long_line_edge_out.sol.exit
deleted file mode 100644
index d00491fd..00000000
--- a/test/cmdlineTests/too_long_line_edge_out.sol.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_edge_out/err b/test/cmdlineTests/too_long_line_edge_out/err
new file mode 100644
index 00000000..7a4f935a
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_edge_out/err
@@ -0,0 +1,6 @@
+too_long_line_edge_out/input.sol:1:1: Warning: Source file does not specify required compiler version!
+contract C {
+^ (Relevant source part starts here and spans across multiple lines).
+too_long_line_edge_out/input.sol:2:37: Error: Identifier not found or not unique.
+ ...   function fffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Typ, string A) onlyOwner external  ...
+                                        ^----------------------------------------------------------------------------------------------^
diff --git a/test/cmdlineTests/too_long_line_edge_out/exit b/test/cmdlineTests/too_long_line_edge_out/exit
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_edge_out/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/too_long_line_edge_out/input.sol b/test/cmdlineTests/too_long_line_edge_out/input.sol
new file mode 100644
index 00000000..29d3cee6
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_edge_out/input.sol
@@ -0,0 +1,4 @@
+contract C {
+   function fffffffffffffffffffffff(announcementTypeTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTT Typ, string A) onlyOwner external {
+}
+}
diff --git a/test/cmdlineTests/too_long_line_left_short.sol b/test/cmdlineTests/too_long_line_left_short.sol
deleted file mode 100644
index 2accfcce..00000000
--- a/test/cmdlineTests/too_long_line_left_short.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-contract C {
-   function f(announcementType Type, string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_left_short.sol.err b/test/cmdlineTests/too_long_line_left_short.sol.err
deleted file mode 100644
index 00b6be5c..00000000
--- a/test/cmdlineTests/too_long_line_left_short.sol.err
+++ /dev/null
@@ -1,6 +0,0 @@
-too_long_line_left_short.sol:1:1: Warning: Source file does not specify required compiler version!
-contract C {
-^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_left_short.sol:2:15: Error: Identifier not found or not unique.
-   function f(announcementType Type, string Announcement, string  ...
-              ^--------------^
diff --git a/test/cmdlineTests/too_long_line_left_short.sol.exit b/test/cmdlineTests/too_long_line_left_short.sol.exit
deleted file mode 100644
index d00491fd..00000000
--- a/test/cmdlineTests/too_long_line_left_short.sol.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_left_short/err b/test/cmdlineTests/too_long_line_left_short/err
new file mode 100644
index 00000000..4aa830b6
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_left_short/err
@@ -0,0 +1,6 @@
+too_long_line_left_short/input.sol:1:1: Warning: Source file does not specify required compiler version!
+contract C {
+^ (Relevant source part starts here and spans across multiple lines).
+too_long_line_left_short/input.sol:2:15: Error: Identifier not found or not unique.
+   function f(announcementType Type, string Announcement, string  ...
+              ^--------------^
diff --git a/test/cmdlineTests/too_long_line_left_short/exit b/test/cmdlineTests/too_long_line_left_short/exit
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_left_short/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/too_long_line_left_short/input.sol b/test/cmdlineTests/too_long_line_left_short/input.sol
new file mode 100644
index 00000000..2accfcce
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_left_short/input.sol
@@ -0,0 +1,4 @@
+contract C {
+   function f(announcementType Type, string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
+}
+}
diff --git a/test/cmdlineTests/too_long_line_right_short.sol b/test/cmdlineTests/too_long_line_right_short.sol
deleted file mode 100644
index 936b3961..00000000
--- a/test/cmdlineTests/too_long_line_right_short.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract C {
-   function ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff(announcementType Type,
-       string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
-}
-}
diff --git a/test/cmdlineTests/too_long_line_right_short.sol.err b/test/cmdlineTests/too_long_line_right_short.sol.err
deleted file mode 100644
index 88072d95..00000000
--- a/test/cmdlineTests/too_long_line_right_short.sol.err
+++ /dev/null
@@ -1,6 +0,0 @@
-too_long_line_right_short.sol:1:1: Warning: Source file does not specify required compiler version!
-contract C {
-^ (Relevant source part starts here and spans across multiple lines).
-too_long_line_right_short.sol:2:164: Error: Identifier not found or not unique.
- ... ffffffffffffffffffffffffffffffffff(announcementType Type,
-                                        ^--------------^
diff --git a/test/cmdlineTests/too_long_line_right_short.sol.exit b/test/cmdlineTests/too_long_line_right_short.sol.exit
deleted file mode 100644
index d00491fd..00000000
--- a/test/cmdlineTests/too_long_line_right_short.sol.exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/too_long_line_right_short/err b/test/cmdlineTests/too_long_line_right_short/err
new file mode 100644
index 00000000..ed992565
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_right_short/err
@@ -0,0 +1,6 @@
+too_long_line_right_short/input.sol:1:1: Warning: Source file does not specify required compiler version!
+contract C {
+^ (Relevant source part starts here and spans across multiple lines).
+too_long_line_right_short/input.sol:2:164: Error: Identifier not found or not unique.
+ ... ffffffffffffffffffffffffffffffffff(announcementType Type,
+                                        ^--------------^
diff --git a/test/cmdlineTests/too_long_line_right_short/exit b/test/cmdlineTests/too_long_line_right_short/exit
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_right_short/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/too_long_line_right_short/input.sol b/test/cmdlineTests/too_long_line_right_short/input.sol
new file mode 100644
index 00000000..936b3961
--- /dev/null
+++ b/test/cmdlineTests/too_long_line_right_short/input.sol
@@ -0,0 +1,5 @@
+contract C {
+   function ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff(announcementType Type,
+       string Announcement, string Link, bool Oppositable, string _str, uint256 _uint, address _addr) onlyOwner external {
+}
+}
-- 
cgit