From f0b83e6d6fb0b7d9f2f3c34cc75317d5dee2dd77 Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:15:24 +0200
Subject: [PATCH 01/13] Fix compile error

---
 src/testrunner/Sources/TestRunner/main.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/testrunner/Sources/TestRunner/main.swift b/src/testrunner/Sources/TestRunner/main.swift
index e2f615f..a46e9b9 100644
--- a/src/testrunner/Sources/TestRunner/main.swift
+++ b/src/testrunner/Sources/TestRunner/main.swift
@@ -18,7 +18,7 @@ struct RunnerOptions: ParsableArguments {
   var buildDirectory: String
 
   @Flag()
-  var showSkipped: Bool
+  var showSkipped: Bool = true
 }
 
 // macOS test options

From 6eb90b1690ff68bd4171481101eb1d050d309c69 Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:21:03 +0200
Subject: [PATCH 02/13] Use updated bin scripts

---
 bin/run-all-in-docker.sh   | 11 --------
 bin/run-all.sh             | 22 ---------------
 bin/run-in-docker.sh       | 46 ++++++++++++++++--------------
 bin/run-tests-in-docker.sh | 27 ++++++++++++++++++
 bin/run-tests.sh           | 42 +++++++++++++++++++++++++++
 bin/run.sh                 | 58 ++++++++++++++++++--------------------
 6 files changed, 121 insertions(+), 85 deletions(-)
 delete mode 100755 bin/run-all-in-docker.sh
 delete mode 100755 bin/run-all.sh
 create mode 100755 bin/run-tests-in-docker.sh
 create mode 100755 bin/run-tests.sh

diff --git a/bin/run-all-in-docker.sh b/bin/run-all-in-docker.sh
deleted file mode 100755
index b1f5bbe..0000000
--- a/bin/run-all-in-docker.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/bash -e
-
-SOLUTION_DIR="${1:-dockerTest}"
-
-# build docker image
-docker build --rm --no-cache -t swift-test-runner .
-
-docker run \
-    --mount type=bind,src=$PWD/$SOLUTION_DIR/,dst=/solution \
-    --mount type=bind,src=$PWD/$SOLUTION_DIR/output/,dst=/output \
-    --entrypoint './bin/run-all.sh' swift-test-runner
diff --git a/bin/run-all.sh b/bin/run-all.sh
deleted file mode 100755
index 80e238a..0000000
--- a/bin/run-all.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-set -e
-
-test_root="${1:-/solution}"
-output_dir="${2:-/output/}"
-
-# echo "Output:"
-# echo "${output_dir}"
-# echo "Test root:"
-# echo "${test_root}"
-
-for testdir in "${test_root}"/*; do
-    testname="$(basename $testdir)"
-    # echo "testdir"
-    # echo "${testdir}"
-    # echo "testname"
-    # echo "${testname}"
-    # echo "-----------"
-    if [ "$testname" != output ] && [ -f "${testdir}/results.json" ]; then
-        bin/run.sh "$testname" "$test_root" "$output_dir"
-    fi
-done
diff --git a/bin/run-in-docker.sh b/bin/run-in-docker.sh
index 99775cb..564d452 100755
--- a/bin/run-in-docker.sh
+++ b/bin/run-in-docker.sh
@@ -1,39 +1,43 @@
-#!/usr/bin/env bash
-set -e
+#!/usr/bin/env sh
 
 # Synopsis:
-# Test runner for run.sh in a docker container
-# Takes the same arguments as run.sh (EXCEPT THAT SOLUTION AND OUTPUT PATH ARE RELATIVE)
-# Builds the Dockerfile
-# Runs the docker image passing along the initial arguments
+# Run the test runner on a solution using the test runner Docker image.
+# The test runner Docker image is built automatically.
 
 # Arguments:
 # $1: exercise slug
-# $2: **RELATIVE** path to solution folder (with trailing slash)
-# $3: **RELATIVE** path to output directory (with trailing slash)
+# $2: absolute path to solution folder
+# $3: absolute path to output directory
 
 # Output:
 # Writes the test results to a results.json file in the passed-in output directory.
-# The test results are formatted according to the specifications at https://github.com/exercism/automated-tests/blob/master/docs/interface.md
+# The test results are formatted according to the specifications at https://github.com/exercism/docs/blob/main/building/tooling/test-runners/interface.md
 
 # Example:
-# ./run-in-docker.sh two-fer ./relative/path/to/two-fer/solution/folder/ ./relative/path/to/output/directory/
+# ./bin/run-in-docker.sh two-fer /absolute/path/to/two-fer/solution/folder/ /absolute/path/to/output/directory/
 
-# If arguments not provided, print usage and exit
+# If any required arguments is missing, print the usage and exit
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
-    echo "usage: run-in-docker.sh exercise-slug ./relative/path/to/solution/folder/ ./relative/path/to/output/directory/"
+    echo "usage: ./bin/run-in-docker.sh exercise-slug /absolute/path/to/solution/folder/ /absolute/path/to/output/directory/"
     exit 1
 fi
 
-# build docker image
-docker build --rm --no-cache -t swift-test-runner .
+slug="$1"
+input_dir="${2%/}"
+output_dir="${3%/}"
 
-# Create output directory if it doesn't exist
-output_dir="$3"
-mkdir -p "$output_dir"
+# Create the output directory if it doesn't exist
+mkdir -p "${output_dir}"
 
-# run image passing the arguments
+# Build the Docker image
+docker build --rm -t exercism/test-runner .
+
+# Run the Docker image using the settings mimicking the production environment
 docker run \
-    --mount type=bind,src=$PWD/$2,dst=/solution \
-    --mount type=bind,src=$PWD/$output_dir,dst=/output \
-    swift-test-runner $1 /solution/ /output/
+    --rm \
+    --network none \
+    --read-only \
+    --mount type=bind,src="${input_dir}",dst=/solution \
+    --mount type=bind,src="${output_dir}",dst=/output \
+    --mount type=tmpfs,dst=/tmp \
+    exercism/test-runner "${slug}" /solution /output 
diff --git a/bin/run-tests-in-docker.sh b/bin/run-tests-in-docker.sh
new file mode 100755
index 0000000..7c45972
--- /dev/null
+++ b/bin/run-tests-in-docker.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env sh
+
+# Synopsis:
+# Test the test runner Docker image by running it against a predefined set of 
+# solutions with an expected output.
+# The test runner Docker image is built automatically.
+
+# Output:
+# Outputs the diff of the expected test results against the actual test results
+# generated by the test runner Docker image.
+
+# Example:
+# ./bin/run-tests-in-docker.sh
+
+# Build the Docker image
+docker build --rm -t exercism/test-runner .
+
+# Run the Docker image using the settings mimicking the production environment
+docker run \
+    --rm \
+    --network none \
+    --read-only \
+    --mount type=bind,src="${PWD}/tests",dst=/opt/test-runner/tests \
+    --mount type=tmpfs,dst=/tmp \
+    --workdir /opt/test-runner \
+    --entrypoint /opt/test-runner/bin/run-tests.sh \
+    exercism/test-runner
diff --git a/bin/run-tests.sh b/bin/run-tests.sh
new file mode 100755
index 0000000..ac7c9f2
--- /dev/null
+++ b/bin/run-tests.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env sh
+
+# Synopsis:
+# Test the test runner by running it against a predefined set of solutions 
+# with an expected output.
+
+# Output:
+# Outputs the diff of the expected test results against the actual test results
+# generated by the test runner.
+
+# Example:
+# ./bin/run-tests.sh
+
+exit_code=0
+
+# Iterate over all test directories
+for test_dir in tests/*; do
+    test_dir_name=$(basename "${test_dir}")
+    test_dir_path=$(realpath "${test_dir}")
+    results_file_path="${test_dir_path}/results.json"
+    expected_results_file_path="${test_dir_path}/expected_results.json"
+
+    bin/run.sh "${test_dir_name}" "${test_dir_path}" "${test_dir_path}"
+
+    # OPTIONAL: Normalize the results file
+    # If the results.json file contains information that changes between 
+    # different test runs (e.g. timing information or paths), you should normalize
+    # the results file to allow the diff comparison below to work as expected
+    # sed -i -E \
+    #   -e 's/Elapsed time: [0-9]+\.[0-9]+ seconds//g' \
+    #   -e "s~${test_dir_path}~/solution~g" \
+    #   "${results_file_path}"
+
+    echo "${test_dir_name}: comparing results.json to expected_results.json"
+    diff "${results_file_path}" "${expected_results_file_path}"
+
+    if [ $? -ne 0 ]; then
+        exit_code=1
+    fi
+done
+
+exit ${exit_code}
diff --git a/bin/run.sh b/bin/run.sh
index c09ece4..a266d07 100755
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -1,40 +1,36 @@
-#! /bin/sh
-set -e
+#!/usr/bin/env sh
 
-# If arguments not provided, print usage and exit
-if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
-    echo "usage: run.sh exercise-slug ./relative/path/to/solution/folder/ ./relative/path/to/output/directory/"
-    exit 1
-fi
+# Synopsis:
+# Run the test runner on a solution.
+
+# Arguments:
+# $1: exercise slug
+# $2: absolute path to solution folder
+# $3: absolute path to output directory
 
-SLUG="$1"
-INPUT_DIR="$2"
-OUTPUT_DIR="$3"
+# Output:
+# Writes the test results to a results.json file in the passed-in output directory.
+# The test results are formatted according to the specifications at https://github.com/exercism/docs/blob/main/building/tooling/test-runners/interface.md
 
-BASEDIR=$(dirname "$0")
+# Example:
+# ./bin/run.sh two-fer /absolute/path/to/two-fer/solution/folder/ /absolute/path/to/output/directory/
 
-# echo "$SLUG: testing..."
-# echo "$1"
-# echo "$2"
-# echo "$3"
-# echo "-------------"
-RUNALL=true "${BASEDIR}"/TestRunner --slug "${SLUG}" --solution-directory "${INPUT_DIR}/${SLUG}" --output-directory "${OUTPUT_DIR}" --swift-location $(which swift) --build-directory "/tmp/"
+# If any required arguments is missing, print the usage and exit
+if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
+    echo "usage: ./bin/run.sh exercise-slug /absolute/path/to/two-fer/solution/folder/ /absolute/path/to/output/directory/"
+    exit 1
+fi
 
-#echo "$SLUG: processing test output in $INPUT_DIR..."
-## PLACEHOLDER - OPTIONAL: Your language may support outputting results
-##   in the correct format
-#
-# Create $OUTPUT_DIR if it doesn't exist
-[ -d "$OUTPUT_DIR" ] || mkdir -p "$OUTPUT_DIR"
-#
-#echo "$SLUG: copying processed results to $OUTPUT_DIR..."
-## PLACEHOLDER - OPTIONAL: Your language may support placing results
-##   directly in $OUTPUT_DIR
-#cp "${INPUT_DIR}/results.json" "$OUTPUT_DIR"
+slug="$1"
+input_dir="${2%/}"
+output_dir="${3%/}"
 
-echo "$SLUG: comparing ${OUTPUT_DIR}/results"
-diff "${INPUT_DIR}/${SLUG}/results.json" "${OUTPUT_DIR}/results.json"
+# Create the output directory if it doesn't exist
+mkdir -p "${output_dir}"
 
-echo "$SLUG: OK\n-------------\n"
+echo "${slug}: testing..."
 
+# Run the tests for the provided implementation file
+RUNALL=true ./bin/TestRunner --slug "${slug}" --solution-directory "${input_dir}/${slug}" --output-directory "${output_dir}" --swift-location $(which swift) --build-directory "/tmp/"
 
+echo "${slug}: done"

From 8855985ad9a400036fc7977e904009eb962e26c5 Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:21:13 +0200
Subject: [PATCH 03/13] Cleanup Dockerfile

---
 Dockerfile | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8c0f8de..ea396a2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,8 @@
 FROM swift:latest AS builder
-# WORKDIR /opt/testrunner
+
 COPY src/testrunner ./
 
-# Print Installed Swift Version
 RUN swift --version
-#RUN swift package clean
 RUN swift build --configuration release
 
 FROM swift:latest
@@ -12,7 +10,4 @@ WORKDIR /opt/test-runner/
 COPY bin/ bin/
 COPY --from=builder /.build/release/TestRunner bin/
 
-ENV NAME RUNALL
-
-ENTRYPOINT ["./bin/run.sh"]
-# ENTRYPOINT ["bin/TestRunner", "--help"]
+ENTRYPOINT ["/opt/test-runner/bin/run.sh"]

From ed7289396f27e568091db5b26047ab178b0e2a1b Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:21:36 +0200
Subject: [PATCH 04/13] Move tests from test/ to tests/

---
 .gitignore                                    |   4 +-
 dockerTest/compile-error/README.md            |   3 --
 .../compile-error/expected_results.json       |   7 ++++
 dockerTest/multiple-tests-all-pass/README.md  |   3 --
 .../expected_results.json                     |   0
 .../multiple-tests-multiple-fails/README.md   |   3 --
 .../expected_results.json                     |  19 +++++++++
 .../multiple-tests-single-fail/README.md      |   3 --
 .../expected_results.json                     |  37 ++++++++++++++++++
 .../multiple-tests-with-exception/README.md   |   3 --
 .../expected_results.json                     |  22 +++++++++++
 dockerTest/output/expected_results.json       |  37 ++++++++++++++++++
 dockerTest/single-test-that-fails/README.md   |   3 --
 .../expected_results.json                     |  10 +++++
 dockerTest/single-test-that-passes/README.md  |   3 --
 .../expected_results.json                     |   0
 .../single-test-with-exception/README.md      |   3 --
 .../expected_results.json                     |  10 +++++
 src/testrunner/README.md                      |   3 --
 .../contents.xcworkspacedata                  |   7 ----
 .../UserInterfaceState.xcuserstate            | Bin 10427 -> 0 bytes
 .../xcschemes/xcschememanagement.plist        |  14 -------
 test/compile-error/README.md                  |   3 --
 .../contents.xcworkspacedata                  |   7 ----
 .../UserInterfaceState.xcuserstate            | Bin 13274 -> 0 bytes
 .../xcschemes/xcschememanagement.plist        |  14 -------
 test/multiple-tests-all-pass/README.md        |   3 --
 .../contents.xcworkspacedata                  |   7 ----
 test/multiple-tests-multiple-fails/README.md  |   3 --
 .../contents.xcworkspacedata                  |   7 ----
 test/multiple-tests-single-fail/README.md     |   3 --
 .../contents.xcworkspacedata                  |   7 ----
 test/multiple-tests-with-exception/README.md  |   3 --
 .../contents.xcworkspacedata                  |   7 ----
 test/single-test-that-fails/README.md         |   3 --
 .../contents.xcworkspacedata                  |   7 ----
 test/single-test-that-passes/README.md        |   3 --
 .../contents.xcworkspacedata                  |   7 ----
 test/single-test-with-exception/README.md     |   3 --
 {test => tests}/compile-error/Package.swift   |   0
 .../Sources/CompileError/CompileError.swift   |   0
 .../CompileErrorTests/CompileErrorTests.swift |   0
 .../CompileErrorTests/XCTestManifests.swift   |   0
 .../compile-error/Tests/LinuxMain.swift       |   0
 .../compile-error/expected_results.json       |   0
 .../multiple-tests-all-pass/Package.swift     |   0
 .../MultipleAllPass/MultipleAllPass.swift     |   0
 .../Tests/LinuxMain.swift                     |   0
 .../MultipleAllPassTests.swift                |   0
 .../XCTestManifests.swift                     |   0
 .../expected_results.json                     |  29 ++++++++++++++
 .../multiple-tests-multiple-fails/.gitignore  |   0
 .../Package.swift                             |   0
 .../MultipleMultipleFails.swift               |   0
 .../Tests/LinuxMain.swift                     |   0
 .../MultipleMultipleFailsTests.swift          |   0
 .../XCTestManifests.swift                     |   0
 .../expected_results.json                     |   0
 .../multiple-tests-single-fail/.gitignore     |   0
 .../multiple-tests-single-fail/Package.swift  |   0
 .../MultipleSingleFail.swift                  |   0
 .../Tests/LinuxMain.swift                     |   0
 .../MultipleSingleFailTests.swift             |   0
 .../XCTestManifests.swift                     |   0
 .../expected_results.json                     |   0
 .../multiple-tests-with-exception/.gitignore  |   0
 .../Package.swift                             |   0
 .../MultipleWithException.swift               |   0
 .../Tests/LinuxMain.swift                     |   0
 .../MultipleWithExceptionTests.swift          |   0
 .../XCTestManifests.swift                     |   0
 .../expected_results.json                     |   0
 .../single-test-that-fails/.gitignore         |   0
 .../single-test-that-fails/Package.swift      |   0
 .../SingleThatFails/SingleThatFails.swift     |   0
 .../Tests/LinuxMain.swift                     |   0
 .../SingleThatFailsTests.swift                |   0
 .../XCTestManifests.swift                     |   0
 .../expected_results.json                     |   0
 .../single-test-that-passes/.gitignore        |   0
 .../single-test-that-passes/Package.swift     |   0
 .../SingleThatPasses/SingleThatPasses.swift   |   0
 .../Tests/LinuxMain.swift                     |   0
 .../SingleThatPassesTests.swift               |   0
 .../XCTestManifests.swift                     |   0
 .../expected_results.json                     |   9 +++++
 .../single-test-with-exception/.gitignore     |   0
 .../single-test-with-exception/Package.swift  |   0
 .../SingleWithException.swift                 |   0
 .../Tests/LinuxMain.swift                     |   0
 .../SingleWithExceptionTests.swift            |   0
 .../XCTestManifests.swift                     |   0
 .../expected_results.json                     |   0
 93 files changed, 183 insertions(+), 136 deletions(-)
 delete mode 100644 dockerTest/compile-error/README.md
 create mode 100644 dockerTest/compile-error/expected_results.json
 delete mode 100644 dockerTest/multiple-tests-all-pass/README.md
 rename test/multiple-tests-all-pass/results.json => dockerTest/multiple-tests-all-pass/expected_results.json (100%)
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/README.md
 create mode 100644 dockerTest/multiple-tests-multiple-fails/expected_results.json
 delete mode 100644 dockerTest/multiple-tests-single-fail/README.md
 create mode 100644 dockerTest/multiple-tests-single-fail/expected_results.json
 delete mode 100644 dockerTest/multiple-tests-with-exception/README.md
 create mode 100644 dockerTest/multiple-tests-with-exception/expected_results.json
 create mode 100644 dockerTest/output/expected_results.json
 delete mode 100644 dockerTest/single-test-that-fails/README.md
 create mode 100644 dockerTest/single-test-that-fails/expected_results.json
 delete mode 100644 dockerTest/single-test-that-passes/README.md
 rename test/single-test-that-passes/results.json => dockerTest/single-test-that-passes/expected_results.json (100%)
 delete mode 100644 dockerTest/single-test-with-exception/README.md
 create mode 100644 dockerTest/single-test-with-exception/expected_results.json
 delete mode 100644 src/testrunner/README.md
 delete mode 100644 test/compile-error/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 test/compile-error/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate
 delete mode 100644 test/compile-error/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
 delete mode 100644 test/compile-error/README.md
 delete mode 100644 test/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 test/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate
 delete mode 100644 test/multiple-tests-all-pass/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
 delete mode 100644 test/multiple-tests-all-pass/README.md
 delete mode 100644 test/multiple-tests-multiple-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 test/multiple-tests-multiple-fails/README.md
 delete mode 100644 test/multiple-tests-single-fail/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 test/multiple-tests-single-fail/README.md
 delete mode 100644 test/multiple-tests-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 test/multiple-tests-with-exception/README.md
 delete mode 100644 test/single-test-that-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 test/single-test-that-fails/README.md
 delete mode 100644 test/single-test-that-passes/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 test/single-test-that-passes/README.md
 delete mode 100644 test/single-test-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 test/single-test-with-exception/README.md
 rename {test => tests}/compile-error/Package.swift (100%)
 rename {test => tests}/compile-error/Sources/CompileError/CompileError.swift (100%)
 rename {test => tests}/compile-error/Tests/CompileErrorTests/CompileErrorTests.swift (100%)
 rename {test => tests}/compile-error/Tests/CompileErrorTests/XCTestManifests.swift (100%)
 rename {test => tests}/compile-error/Tests/LinuxMain.swift (100%)
 rename test/compile-error/results.json => tests/compile-error/expected_results.json (100%)
 rename {test => tests}/multiple-tests-all-pass/Package.swift (100%)
 rename {test => tests}/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift (100%)
 rename {test => tests}/multiple-tests-all-pass/Tests/LinuxMain.swift (100%)
 rename {test => tests}/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift (100%)
 rename {test => tests}/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift (100%)
 create mode 100644 tests/multiple-tests-all-pass/expected_results.json
 rename {test => tests}/multiple-tests-multiple-fails/.gitignore (100%)
 rename {test => tests}/multiple-tests-multiple-fails/Package.swift (100%)
 rename {test => tests}/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift (100%)
 rename {test => tests}/multiple-tests-multiple-fails/Tests/LinuxMain.swift (100%)
 rename {test => tests}/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift (100%)
 rename {test => tests}/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift (100%)
 rename test/multiple-tests-multiple-fails/results.json => tests/multiple-tests-multiple-fails/expected_results.json (100%)
 rename {test => tests}/multiple-tests-single-fail/.gitignore (100%)
 rename {test => tests}/multiple-tests-single-fail/Package.swift (100%)
 rename {test => tests}/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift (100%)
 rename {test => tests}/multiple-tests-single-fail/Tests/LinuxMain.swift (100%)
 rename {test => tests}/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift (100%)
 rename {test => tests}/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift (100%)
 rename test/multiple-tests-single-fail/results.json => tests/multiple-tests-single-fail/expected_results.json (100%)
 rename {test => tests}/multiple-tests-with-exception/.gitignore (100%)
 rename {test => tests}/multiple-tests-with-exception/Package.swift (100%)
 rename {test => tests}/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift (100%)
 rename {test => tests}/multiple-tests-with-exception/Tests/LinuxMain.swift (100%)
 rename {test => tests}/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift (100%)
 rename {test => tests}/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift (100%)
 rename test/multiple-tests-with-exception/results.json => tests/multiple-tests-with-exception/expected_results.json (100%)
 rename {test => tests}/single-test-that-fails/.gitignore (100%)
 rename {test => tests}/single-test-that-fails/Package.swift (100%)
 rename {test => tests}/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift (100%)
 rename {test => tests}/single-test-that-fails/Tests/LinuxMain.swift (100%)
 rename {test => tests}/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift (100%)
 rename {test => tests}/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift (100%)
 rename test/single-test-that-fails/results.json => tests/single-test-that-fails/expected_results.json (100%)
 rename {test => tests}/single-test-that-passes/.gitignore (100%)
 rename {test => tests}/single-test-that-passes/Package.swift (100%)
 rename {test => tests}/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift (100%)
 rename {test => tests}/single-test-that-passes/Tests/LinuxMain.swift (100%)
 rename {test => tests}/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift (100%)
 rename {test => tests}/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift (100%)
 create mode 100644 tests/single-test-that-passes/expected_results.json
 rename {test => tests}/single-test-with-exception/.gitignore (100%)
 rename {test => tests}/single-test-with-exception/Package.swift (100%)
 rename {test => tests}/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift (100%)
 rename {test => tests}/single-test-with-exception/Tests/LinuxMain.swift (100%)
 rename {test => tests}/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift (100%)
 rename {test => tests}/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift (100%)
 rename test/single-test-with-exception/results.json => tests/single-test-with-exception/expected_results.json (100%)

diff --git a/.gitignore b/.gitignore
index a948af2..0300688 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
-test/output/
 .DS_Store
 **/.build
 **/Packages
 **/Package.resolved
 **/*.xcodeproj
+
+tests/*/results.json
+tests/*/.swiftpm/
diff --git a/dockerTest/compile-error/README.md b/dockerTest/compile-error/README.md
deleted file mode 100644
index 29bf5fd..0000000
--- a/dockerTest/compile-error/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# CompileError
-
-A description of this package.
diff --git a/dockerTest/compile-error/expected_results.json b/dockerTest/compile-error/expected_results.json
new file mode 100644
index 0000000..7223336
--- /dev/null
+++ b/dockerTest/compile-error/expected_results.json
@@ -0,0 +1,7 @@
+{
+  "message" : "\/solution\/compile-error\/Sources\/CompileError\/CompileError.swift:2:12: error: unexpected non-void return value in void function\n  return x + y\n           ^\n",
+  "status" : "error",
+  "tests" : [
+    
+  ]
+}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-all-pass/README.md b/dockerTest/multiple-tests-all-pass/README.md
deleted file mode 100644
index 01a8408..0000000
--- a/dockerTest/multiple-tests-all-pass/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# MultipleAllPass
-
-A description of this package.
diff --git a/test/multiple-tests-all-pass/results.json b/dockerTest/multiple-tests-all-pass/expected_results.json
similarity index 100%
rename from test/multiple-tests-all-pass/results.json
rename to dockerTest/multiple-tests-all-pass/expected_results.json
diff --git a/dockerTest/multiple-tests-multiple-fails/README.md b/dockerTest/multiple-tests-multiple-fails/README.md
deleted file mode 100644
index d13b138..0000000
--- a/dockerTest/multiple-tests-multiple-fails/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# MultipleMultipleFails
-
-A description of this package.
diff --git a/dockerTest/multiple-tests-multiple-fails/expected_results.json b/dockerTest/multiple-tests-multiple-fails/expected_results.json
new file mode 100644
index 0000000..eb3c60a
--- /dev/null
+++ b/dockerTest/multiple-tests-multiple-fails/expected_results.json
@@ -0,0 +1,19 @@
+{
+  "status" : "fail",
+  "tests" : [
+    {
+      "message" : "\/solution\/multiple-tests-multiple-fails\/Tests\/MultipleMultipleFailsTests\/MultipleMultipleFailsTests.swift:7: error: MultipleMultipleFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
+      "name" : "MultipleMultipleFailsTests.testAdd",
+      "status" : "fail"
+    },
+    {
+      "message" : "\/solution\/multiple-tests-multiple-fails\/Tests\/MultipleMultipleFailsTests\/MultipleMultipleFailsTests.swift:11: error: MultipleMultipleFailsTests.testSub : XCTAssertEqual failed: (\"5\") is not equal to (\"-1\") - ",
+      "name" : "MultipleMultipleFailsTests.testSub",
+      "status" : "fail"
+    },
+    {
+      "name" : "MultipleMultipleFailsTests.testMul",
+      "status" : "pass"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-single-fail/README.md b/dockerTest/multiple-tests-single-fail/README.md
deleted file mode 100644
index 025797a..0000000
--- a/dockerTest/multiple-tests-single-fail/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# MultipleSingleFail
-
-A description of this package.
diff --git a/dockerTest/multiple-tests-single-fail/expected_results.json b/dockerTest/multiple-tests-single-fail/expected_results.json
new file mode 100644
index 0000000..3b00124
--- /dev/null
+++ b/dockerTest/multiple-tests-single-fail/expected_results.json
@@ -0,0 +1,37 @@
+{
+  "status" : "fail",
+  "tests" : [
+    {
+      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:9: error: MultipleSingleFailTests.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"5\") - 2+3 should equal 5",
+      "name" : "MultipleSingleFailTests.testAdd",
+      "output" : "yabba…",
+      "status" : "fail"
+    },
+    {
+      "name" : "MultipleSingleFailTests.testSub",
+      "output" : "dabba…",
+      "status" : "pass"
+    },
+    {
+      "name" : "MultipleSingleFailTests.testMul",
+      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
+      "status" : "pass"
+    },
+    {
+      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:34: error: SecondSuite.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"25\") - 12+13 should equal 25",
+      "name" : "SecondSuite.testAdd",
+      "output" : "yabba…",
+      "status" : "fail"
+    },
+    {
+      "name" : "SecondSuite.testSub",
+      "output" : "dabba…",
+      "status" : "pass"
+    },
+    {
+      "name" : "SecondSuite.testMul",
+      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
+      "status" : "pass"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-with-exception/README.md b/dockerTest/multiple-tests-with-exception/README.md
deleted file mode 100644
index 103fb4b..0000000
--- a/dockerTest/multiple-tests-with-exception/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# MultipleWithException
-
-A description of this package.
diff --git a/dockerTest/multiple-tests-with-exception/expected_results.json b/dockerTest/multiple-tests-with-exception/expected_results.json
new file mode 100644
index 0000000..46b33d4
--- /dev/null
+++ b/dockerTest/multiple-tests-with-exception/expected_results.json
@@ -0,0 +1,22 @@
+{
+  "status" : "fail",
+  "tests" : [
+    {
+      "name" : "MultipleWithExceptionTests.testAdd",
+      "status" : "pass"
+    },
+    {
+      "name" : "MultipleWithExceptionTests.testSub",
+      "status" : "pass"
+    },
+    {
+      "name" : "MultipleWithExceptionTests.testMul",
+      "status" : "pass"
+    },
+    {
+      "message" : "\/solution\/multiple-tests-with-exception\/Tests\/MultipleWithExceptionTests\/MultipleWithExceptionTests.swift:19: error: MultipleWithExceptionTests.testThrow : XCTAssertEqual threw error \"testError(\"Oh noes! Div by zeroes!!!\")\" - ",
+      "name" : "MultipleWithExceptionTests.testThrow",
+      "status" : "fail"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/dockerTest/output/expected_results.json b/dockerTest/output/expected_results.json
new file mode 100644
index 0000000..3b00124
--- /dev/null
+++ b/dockerTest/output/expected_results.json
@@ -0,0 +1,37 @@
+{
+  "status" : "fail",
+  "tests" : [
+    {
+      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:9: error: MultipleSingleFailTests.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"5\") - 2+3 should equal 5",
+      "name" : "MultipleSingleFailTests.testAdd",
+      "output" : "yabba…",
+      "status" : "fail"
+    },
+    {
+      "name" : "MultipleSingleFailTests.testSub",
+      "output" : "dabba…",
+      "status" : "pass"
+    },
+    {
+      "name" : "MultipleSingleFailTests.testMul",
+      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
+      "status" : "pass"
+    },
+    {
+      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:34: error: SecondSuite.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"25\") - 12+13 should equal 25",
+      "name" : "SecondSuite.testAdd",
+      "output" : "yabba…",
+      "status" : "fail"
+    },
+    {
+      "name" : "SecondSuite.testSub",
+      "output" : "dabba…",
+      "status" : "pass"
+    },
+    {
+      "name" : "SecondSuite.testMul",
+      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
+      "status" : "pass"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/dockerTest/single-test-that-fails/README.md b/dockerTest/single-test-that-fails/README.md
deleted file mode 100644
index f8dd2c3..0000000
--- a/dockerTest/single-test-that-fails/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# SingleThatFails
-
-A description of this package.
diff --git a/dockerTest/single-test-that-fails/expected_results.json b/dockerTest/single-test-that-fails/expected_results.json
new file mode 100644
index 0000000..7918c5f
--- /dev/null
+++ b/dockerTest/single-test-that-fails/expected_results.json
@@ -0,0 +1,10 @@
+{
+  "status" : "fail",
+  "tests" : [
+    {
+      "message" : "\/solution\/single-test-that-fails\/Tests\/SingleThatFailsTests\/SingleThatFailsTests.swift:7: error: SingleThatFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
+      "name" : "SingleThatFailsTests.testAdd",
+      "status" : "fail"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/dockerTest/single-test-that-passes/README.md b/dockerTest/single-test-that-passes/README.md
deleted file mode 100644
index 44a922c..0000000
--- a/dockerTest/single-test-that-passes/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# SingleThatPasses
-
-A description of this package.
diff --git a/test/single-test-that-passes/results.json b/dockerTest/single-test-that-passes/expected_results.json
similarity index 100%
rename from test/single-test-that-passes/results.json
rename to dockerTest/single-test-that-passes/expected_results.json
diff --git a/dockerTest/single-test-with-exception/README.md b/dockerTest/single-test-with-exception/README.md
deleted file mode 100644
index 3cd118b..0000000
--- a/dockerTest/single-test-with-exception/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# SingleWithException
-
-A description of this package.
diff --git a/dockerTest/single-test-with-exception/expected_results.json b/dockerTest/single-test-with-exception/expected_results.json
new file mode 100644
index 0000000..7588313
--- /dev/null
+++ b/dockerTest/single-test-with-exception/expected_results.json
@@ -0,0 +1,10 @@
+{
+  "status" : "fail",
+  "tests" : [
+    {
+      "message" : "\/solution\/single-test-with-exception\/Tests\/SingleWithExceptionTests\/SingleWithExceptionTests.swift:7: error: SingleWithExceptionTests.testAdd : XCTAssertEqual threw error \"testError(\"Kaboomtown!\")\" - 2+3 should equal 5",
+      "name" : "SingleWithExceptionTests.testAdd",
+      "status" : "fail"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/testrunner/README.md b/src/testrunner/README.md
deleted file mode 100644
index 4d273f9..0000000
--- a/src/testrunner/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# TestRunner
-
-The source code for the test-runner executable for the Exercism v3 Swift track.
\ No newline at end of file
diff --git a/test/compile-error/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/test/compile-error/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/test/compile-error/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/test/compile-error/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate b/test/compile-error/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index efe15df990cf714ac0790ebd8de89a810c0c6227..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10427
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
F{BI{{<K+MV

diff --git a/test/compile-error/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist b/test/compile-error/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 063c567..0000000
--- a/test/compile-error/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>CompileError.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/test/compile-error/README.md b/test/compile-error/README.md
deleted file mode 100644
index 29bf5fd..0000000
--- a/test/compile-error/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# CompileError
-
-A description of this package.
diff --git a/test/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/test/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/test/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/test/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate b/test/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 0a6e8e782c8674d9abfb6335a2e199f1366c9183..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13274
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
LLSN$Ce*OOe9Inmm

diff --git a/test/multiple-tests-all-pass/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist b/test/multiple-tests-all-pass/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index dc01e4e..0000000
--- a/test/multiple-tests-all-pass/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>MultipleAllPass.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/test/multiple-tests-all-pass/README.md b/test/multiple-tests-all-pass/README.md
deleted file mode 100644
index 01a8408..0000000
--- a/test/multiple-tests-all-pass/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# MultipleAllPass
-
-A description of this package.
diff --git a/test/multiple-tests-multiple-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/test/multiple-tests-multiple-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/test/multiple-tests-multiple-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/test/multiple-tests-multiple-fails/README.md b/test/multiple-tests-multiple-fails/README.md
deleted file mode 100644
index d13b138..0000000
--- a/test/multiple-tests-multiple-fails/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# MultipleMultipleFails
-
-A description of this package.
diff --git a/test/multiple-tests-single-fail/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/test/multiple-tests-single-fail/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/test/multiple-tests-single-fail/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/test/multiple-tests-single-fail/README.md b/test/multiple-tests-single-fail/README.md
deleted file mode 100644
index 025797a..0000000
--- a/test/multiple-tests-single-fail/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# MultipleSingleFail
-
-A description of this package.
diff --git a/test/multiple-tests-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/test/multiple-tests-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/test/multiple-tests-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/test/multiple-tests-with-exception/README.md b/test/multiple-tests-with-exception/README.md
deleted file mode 100644
index 103fb4b..0000000
--- a/test/multiple-tests-with-exception/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# MultipleWithException
-
-A description of this package.
diff --git a/test/single-test-that-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/test/single-test-that-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/test/single-test-that-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/test/single-test-that-fails/README.md b/test/single-test-that-fails/README.md
deleted file mode 100644
index f8dd2c3..0000000
--- a/test/single-test-that-fails/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# SingleThatFails
-
-A description of this package.
diff --git a/test/single-test-that-passes/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/test/single-test-that-passes/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/test/single-test-that-passes/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/test/single-test-that-passes/README.md b/test/single-test-that-passes/README.md
deleted file mode 100644
index 44a922c..0000000
--- a/test/single-test-that-passes/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# SingleThatPasses
-
-A description of this package.
diff --git a/test/single-test-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/test/single-test-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/test/single-test-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/test/single-test-with-exception/README.md b/test/single-test-with-exception/README.md
deleted file mode 100644
index 3cd118b..0000000
--- a/test/single-test-with-exception/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# SingleWithException
-
-A description of this package.
diff --git a/test/compile-error/Package.swift b/tests/compile-error/Package.swift
similarity index 100%
rename from test/compile-error/Package.swift
rename to tests/compile-error/Package.swift
diff --git a/test/compile-error/Sources/CompileError/CompileError.swift b/tests/compile-error/Sources/CompileError/CompileError.swift
similarity index 100%
rename from test/compile-error/Sources/CompileError/CompileError.swift
rename to tests/compile-error/Sources/CompileError/CompileError.swift
diff --git a/test/compile-error/Tests/CompileErrorTests/CompileErrorTests.swift b/tests/compile-error/Tests/CompileErrorTests/CompileErrorTests.swift
similarity index 100%
rename from test/compile-error/Tests/CompileErrorTests/CompileErrorTests.swift
rename to tests/compile-error/Tests/CompileErrorTests/CompileErrorTests.swift
diff --git a/test/compile-error/Tests/CompileErrorTests/XCTestManifests.swift b/tests/compile-error/Tests/CompileErrorTests/XCTestManifests.swift
similarity index 100%
rename from test/compile-error/Tests/CompileErrorTests/XCTestManifests.swift
rename to tests/compile-error/Tests/CompileErrorTests/XCTestManifests.swift
diff --git a/test/compile-error/Tests/LinuxMain.swift b/tests/compile-error/Tests/LinuxMain.swift
similarity index 100%
rename from test/compile-error/Tests/LinuxMain.swift
rename to tests/compile-error/Tests/LinuxMain.swift
diff --git a/test/compile-error/results.json b/tests/compile-error/expected_results.json
similarity index 100%
rename from test/compile-error/results.json
rename to tests/compile-error/expected_results.json
diff --git a/test/multiple-tests-all-pass/Package.swift b/tests/multiple-tests-all-pass/Package.swift
similarity index 100%
rename from test/multiple-tests-all-pass/Package.swift
rename to tests/multiple-tests-all-pass/Package.swift
diff --git a/test/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift b/tests/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift
similarity index 100%
rename from test/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift
rename to tests/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift
diff --git a/test/multiple-tests-all-pass/Tests/LinuxMain.swift b/tests/multiple-tests-all-pass/Tests/LinuxMain.swift
similarity index 100%
rename from test/multiple-tests-all-pass/Tests/LinuxMain.swift
rename to tests/multiple-tests-all-pass/Tests/LinuxMain.swift
diff --git a/test/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift b/tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift
similarity index 100%
rename from test/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift
rename to tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift
diff --git a/test/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift b/tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift
similarity index 100%
rename from test/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift
rename to tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift
diff --git a/tests/multiple-tests-all-pass/expected_results.json b/tests/multiple-tests-all-pass/expected_results.json
new file mode 100644
index 0000000..d814f79
--- /dev/null
+++ b/tests/multiple-tests-all-pass/expected_results.json
@@ -0,0 +1,29 @@
+{
+  "status" : "pass",
+  "tests" : [
+    {
+      "name" : "MultipleAllPassTests.testAdd",
+      "status" : "pass"
+    },
+    {
+      "name" : "MultipleAllPassTests.testSub",
+      "status" : "pass"
+    },
+    {
+      "name" : "MultipleAllPassTests.testMul",
+      "status" : "pass"
+    },
+    {
+      "name" : "SecondSuite.testAdd",
+      "status" : "pass"
+    },
+    {
+      "name" : "SecondSuite.testSub",
+      "status" : "pass"
+    },
+    {
+      "name" : "SecondSuite.testMul",
+      "status" : "pass"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/multiple-tests-multiple-fails/.gitignore b/tests/multiple-tests-multiple-fails/.gitignore
similarity index 100%
rename from test/multiple-tests-multiple-fails/.gitignore
rename to tests/multiple-tests-multiple-fails/.gitignore
diff --git a/test/multiple-tests-multiple-fails/Package.swift b/tests/multiple-tests-multiple-fails/Package.swift
similarity index 100%
rename from test/multiple-tests-multiple-fails/Package.swift
rename to tests/multiple-tests-multiple-fails/Package.swift
diff --git a/test/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift b/tests/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift
similarity index 100%
rename from test/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift
rename to tests/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift
diff --git a/test/multiple-tests-multiple-fails/Tests/LinuxMain.swift b/tests/multiple-tests-multiple-fails/Tests/LinuxMain.swift
similarity index 100%
rename from test/multiple-tests-multiple-fails/Tests/LinuxMain.swift
rename to tests/multiple-tests-multiple-fails/Tests/LinuxMain.swift
diff --git a/test/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift b/tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift
similarity index 100%
rename from test/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift
rename to tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift
diff --git a/test/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift b/tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift
similarity index 100%
rename from test/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift
rename to tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift
diff --git a/test/multiple-tests-multiple-fails/results.json b/tests/multiple-tests-multiple-fails/expected_results.json
similarity index 100%
rename from test/multiple-tests-multiple-fails/results.json
rename to tests/multiple-tests-multiple-fails/expected_results.json
diff --git a/test/multiple-tests-single-fail/.gitignore b/tests/multiple-tests-single-fail/.gitignore
similarity index 100%
rename from test/multiple-tests-single-fail/.gitignore
rename to tests/multiple-tests-single-fail/.gitignore
diff --git a/test/multiple-tests-single-fail/Package.swift b/tests/multiple-tests-single-fail/Package.swift
similarity index 100%
rename from test/multiple-tests-single-fail/Package.swift
rename to tests/multiple-tests-single-fail/Package.swift
diff --git a/test/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift b/tests/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift
similarity index 100%
rename from test/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift
rename to tests/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift
diff --git a/test/multiple-tests-single-fail/Tests/LinuxMain.swift b/tests/multiple-tests-single-fail/Tests/LinuxMain.swift
similarity index 100%
rename from test/multiple-tests-single-fail/Tests/LinuxMain.swift
rename to tests/multiple-tests-single-fail/Tests/LinuxMain.swift
diff --git a/test/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift b/tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift
similarity index 100%
rename from test/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift
rename to tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift
diff --git a/test/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift b/tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift
similarity index 100%
rename from test/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift
rename to tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift
diff --git a/test/multiple-tests-single-fail/results.json b/tests/multiple-tests-single-fail/expected_results.json
similarity index 100%
rename from test/multiple-tests-single-fail/results.json
rename to tests/multiple-tests-single-fail/expected_results.json
diff --git a/test/multiple-tests-with-exception/.gitignore b/tests/multiple-tests-with-exception/.gitignore
similarity index 100%
rename from test/multiple-tests-with-exception/.gitignore
rename to tests/multiple-tests-with-exception/.gitignore
diff --git a/test/multiple-tests-with-exception/Package.swift b/tests/multiple-tests-with-exception/Package.swift
similarity index 100%
rename from test/multiple-tests-with-exception/Package.swift
rename to tests/multiple-tests-with-exception/Package.swift
diff --git a/test/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift b/tests/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift
similarity index 100%
rename from test/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift
rename to tests/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift
diff --git a/test/multiple-tests-with-exception/Tests/LinuxMain.swift b/tests/multiple-tests-with-exception/Tests/LinuxMain.swift
similarity index 100%
rename from test/multiple-tests-with-exception/Tests/LinuxMain.swift
rename to tests/multiple-tests-with-exception/Tests/LinuxMain.swift
diff --git a/test/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift b/tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift
similarity index 100%
rename from test/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift
rename to tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift
diff --git a/test/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift b/tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift
similarity index 100%
rename from test/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift
rename to tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift
diff --git a/test/multiple-tests-with-exception/results.json b/tests/multiple-tests-with-exception/expected_results.json
similarity index 100%
rename from test/multiple-tests-with-exception/results.json
rename to tests/multiple-tests-with-exception/expected_results.json
diff --git a/test/single-test-that-fails/.gitignore b/tests/single-test-that-fails/.gitignore
similarity index 100%
rename from test/single-test-that-fails/.gitignore
rename to tests/single-test-that-fails/.gitignore
diff --git a/test/single-test-that-fails/Package.swift b/tests/single-test-that-fails/Package.swift
similarity index 100%
rename from test/single-test-that-fails/Package.swift
rename to tests/single-test-that-fails/Package.swift
diff --git a/test/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift b/tests/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift
similarity index 100%
rename from test/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift
rename to tests/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift
diff --git a/test/single-test-that-fails/Tests/LinuxMain.swift b/tests/single-test-that-fails/Tests/LinuxMain.swift
similarity index 100%
rename from test/single-test-that-fails/Tests/LinuxMain.swift
rename to tests/single-test-that-fails/Tests/LinuxMain.swift
diff --git a/test/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift b/tests/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift
similarity index 100%
rename from test/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift
rename to tests/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift
diff --git a/test/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift b/tests/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift
similarity index 100%
rename from test/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift
rename to tests/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift
diff --git a/test/single-test-that-fails/results.json b/tests/single-test-that-fails/expected_results.json
similarity index 100%
rename from test/single-test-that-fails/results.json
rename to tests/single-test-that-fails/expected_results.json
diff --git a/test/single-test-that-passes/.gitignore b/tests/single-test-that-passes/.gitignore
similarity index 100%
rename from test/single-test-that-passes/.gitignore
rename to tests/single-test-that-passes/.gitignore
diff --git a/test/single-test-that-passes/Package.swift b/tests/single-test-that-passes/Package.swift
similarity index 100%
rename from test/single-test-that-passes/Package.swift
rename to tests/single-test-that-passes/Package.swift
diff --git a/test/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift b/tests/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift
similarity index 100%
rename from test/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift
rename to tests/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift
diff --git a/test/single-test-that-passes/Tests/LinuxMain.swift b/tests/single-test-that-passes/Tests/LinuxMain.swift
similarity index 100%
rename from test/single-test-that-passes/Tests/LinuxMain.swift
rename to tests/single-test-that-passes/Tests/LinuxMain.swift
diff --git a/test/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift b/tests/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift
similarity index 100%
rename from test/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift
rename to tests/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift
diff --git a/test/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift b/tests/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift
similarity index 100%
rename from test/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift
rename to tests/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift
diff --git a/tests/single-test-that-passes/expected_results.json b/tests/single-test-that-passes/expected_results.json
new file mode 100644
index 0000000..4472e04
--- /dev/null
+++ b/tests/single-test-that-passes/expected_results.json
@@ -0,0 +1,9 @@
+{
+  "status" : "pass",
+  "tests" : [
+    {
+      "name" : "SingleThatPassesTests.testAdd",
+      "status" : "pass"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/test/single-test-with-exception/.gitignore b/tests/single-test-with-exception/.gitignore
similarity index 100%
rename from test/single-test-with-exception/.gitignore
rename to tests/single-test-with-exception/.gitignore
diff --git a/test/single-test-with-exception/Package.swift b/tests/single-test-with-exception/Package.swift
similarity index 100%
rename from test/single-test-with-exception/Package.swift
rename to tests/single-test-with-exception/Package.swift
diff --git a/test/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift b/tests/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift
similarity index 100%
rename from test/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift
rename to tests/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift
diff --git a/test/single-test-with-exception/Tests/LinuxMain.swift b/tests/single-test-with-exception/Tests/LinuxMain.swift
similarity index 100%
rename from test/single-test-with-exception/Tests/LinuxMain.swift
rename to tests/single-test-with-exception/Tests/LinuxMain.swift
diff --git a/test/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift b/tests/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift
similarity index 100%
rename from test/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift
rename to tests/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift
diff --git a/test/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift b/tests/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift
similarity index 100%
rename from test/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift
rename to tests/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift
diff --git a/test/single-test-with-exception/results.json b/tests/single-test-with-exception/expected_results.json
similarity index 100%
rename from test/single-test-with-exception/results.json
rename to tests/single-test-with-exception/expected_results.json

From 906ee0dc98756c0fc1fdbd0d36b8d9cd59f1979d Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:21:53 +0200
Subject: [PATCH 05/13] Remove dockerTest directory

---
 .../contents.xcworkspacedata                  |   7 ---
 .../UserInterfaceState.xcuserstate            | Bin 10427 -> 0 bytes
 .../xcschemes/xcschememanagement.plist        |  14 -----
 dockerTest/compile-error/Package.swift        |  28 ----------
 .../Sources/CompileError/CompileError.swift   |   3 -
 .../CompileErrorTests/CompileErrorTests.swift |  13 -----
 .../CompileErrorTests/XCTestManifests.swift   |   9 ---
 .../compile-error/Tests/LinuxMain.swift       |   7 ---
 .../compile-error/expected_results.json       |   7 ---
 dockerTest/compile-error/results.json         |   7 ---
 .../contents.xcworkspacedata                  |   7 ---
 .../UserInterfaceState.xcuserstate            | Bin 13274 -> 0 bytes
 .../xcschemes/xcschememanagement.plist        |  14 -----
 .../multiple-tests-all-pass/Package.swift     |  28 ----------
 .../MultipleAllPass/MultipleAllPass.swift     |  11 ----
 .../Tests/LinuxMain.swift                     |   7 ---
 .../MultipleAllPassTests.swift                |  43 ---------------
 .../XCTestManifests.swift                     |  10 ----
 .../expected_results.json                     |  29 ----------
 .../multiple-tests-all-pass/results.json      |  29 ----------
 .../multiple-tests-multiple-fails/.gitignore  |   5 --
 .../contents.xcworkspacedata                  |   7 ---
 .../Package.swift                             |  28 ----------
 .../MultipleMultipleFails.swift               |  11 ----
 .../Tests/LinuxMain.swift                     |   6 --
 .../MultipleMultipleFailsTests.swift          |  23 --------
 .../XCTestManifests.swift                     |   9 ---
 .../expected_results.json                     |  19 -------
 .../results.json                              |  19 -------
 .../multiple-tests-single-fail/.gitignore     |   5 --
 .../contents.xcworkspacedata                  |   7 ---
 .../multiple-tests-single-fail/Package.swift  |  28 ----------
 .../MultipleSingleFail.swift                  |  30 ----------
 .../Tests/LinuxMain.swift                     |   6 --
 .../MultipleSingleFailTests.swift             |  52 ------------------
 .../XCTestManifests.swift                     |  10 ----
 .../expected_results.json                     |  37 -------------
 .../multiple-tests-single-fail/results.json   |  37 -------------
 .../multiple-tests-with-exception/.gitignore  |   5 --
 .../contents.xcworkspacedata                  |   7 ---
 .../Package.swift                             |  28 ----------
 .../MultipleWithException.swift               |  27 ---------
 .../Tests/LinuxMain.swift                     |   6 --
 .../MultipleWithExceptionTests.swift          |  28 ----------
 .../XCTestManifests.swift                     |   9 ---
 .../expected_results.json                     |  22 --------
 .../results.json                              |  22 --------
 dockerTest/output/expected_results.json       |  37 -------------
 dockerTest/output/results.json                |  37 -------------
 dockerTest/single-test-that-fails/.gitignore  |   5 --
 .../contents.xcworkspacedata                  |   7 ---
 .../single-test-that-fails/Package.swift      |  28 ----------
 .../SingleThatFails/SingleThatFails.swift     |   7 ---
 .../Tests/LinuxMain.swift                     |   6 --
 .../SingleThatFailsTests.swift                |  13 -----
 .../XCTestManifests.swift                     |   9 ---
 .../expected_results.json                     |  10 ----
 .../single-test-that-fails/results.json       |  10 ----
 dockerTest/single-test-that-passes/.gitignore |   5 --
 .../contents.xcworkspacedata                  |   7 ---
 .../single-test-that-passes/Package.swift     |  28 ----------
 .../SingleThatPasses/SingleThatPasses.swift   |   7 ---
 .../Tests/LinuxMain.swift                     |   6 --
 .../SingleThatPassesTests.swift               |  13 -----
 .../XCTestManifests.swift                     |   9 ---
 .../expected_results.json                     |   9 ---
 .../single-test-that-passes/results.json      |   9 ---
 .../single-test-with-exception/.gitignore     |   5 --
 .../contents.xcworkspacedata                  |   7 ---
 .../single-test-with-exception/Package.swift  |  28 ----------
 .../SingleWithException.swift                 |   7 ---
 .../Tests/LinuxMain.swift                     |   6 --
 .../SingleWithExceptionTests.swift            |  13 -----
 .../XCTestManifests.swift                     |   9 ---
 .../expected_results.json                     |  10 ----
 .../single-test-with-exception/results.json   |  10 ----
 76 files changed, 1123 deletions(-)
 delete mode 100644 dockerTest/compile-error/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 dockerTest/compile-error/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate
 delete mode 100644 dockerTest/compile-error/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
 delete mode 100644 dockerTest/compile-error/Package.swift
 delete mode 100644 dockerTest/compile-error/Sources/CompileError/CompileError.swift
 delete mode 100644 dockerTest/compile-error/Tests/CompileErrorTests/CompileErrorTests.swift
 delete mode 100644 dockerTest/compile-error/Tests/CompileErrorTests/XCTestManifests.swift
 delete mode 100644 dockerTest/compile-error/Tests/LinuxMain.swift
 delete mode 100644 dockerTest/compile-error/expected_results.json
 delete mode 100644 dockerTest/compile-error/results.json
 delete mode 100644 dockerTest/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 dockerTest/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate
 delete mode 100644 dockerTest/multiple-tests-all-pass/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
 delete mode 100644 dockerTest/multiple-tests-all-pass/Package.swift
 delete mode 100644 dockerTest/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift
 delete mode 100644 dockerTest/multiple-tests-all-pass/Tests/LinuxMain.swift
 delete mode 100644 dockerTest/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift
 delete mode 100644 dockerTest/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift
 delete mode 100644 dockerTest/multiple-tests-all-pass/expected_results.json
 delete mode 100644 dockerTest/multiple-tests-all-pass/results.json
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/.gitignore
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/Package.swift
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/Tests/LinuxMain.swift
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/expected_results.json
 delete mode 100644 dockerTest/multiple-tests-multiple-fails/results.json
 delete mode 100644 dockerTest/multiple-tests-single-fail/.gitignore
 delete mode 100644 dockerTest/multiple-tests-single-fail/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 dockerTest/multiple-tests-single-fail/Package.swift
 delete mode 100644 dockerTest/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift
 delete mode 100644 dockerTest/multiple-tests-single-fail/Tests/LinuxMain.swift
 delete mode 100644 dockerTest/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift
 delete mode 100644 dockerTest/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift
 delete mode 100644 dockerTest/multiple-tests-single-fail/expected_results.json
 delete mode 100644 dockerTest/multiple-tests-single-fail/results.json
 delete mode 100644 dockerTest/multiple-tests-with-exception/.gitignore
 delete mode 100644 dockerTest/multiple-tests-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 dockerTest/multiple-tests-with-exception/Package.swift
 delete mode 100644 dockerTest/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift
 delete mode 100644 dockerTest/multiple-tests-with-exception/Tests/LinuxMain.swift
 delete mode 100644 dockerTest/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift
 delete mode 100644 dockerTest/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift
 delete mode 100644 dockerTest/multiple-tests-with-exception/expected_results.json
 delete mode 100644 dockerTest/multiple-tests-with-exception/results.json
 delete mode 100644 dockerTest/output/expected_results.json
 delete mode 100644 dockerTest/output/results.json
 delete mode 100644 dockerTest/single-test-that-fails/.gitignore
 delete mode 100644 dockerTest/single-test-that-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 dockerTest/single-test-that-fails/Package.swift
 delete mode 100644 dockerTest/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift
 delete mode 100644 dockerTest/single-test-that-fails/Tests/LinuxMain.swift
 delete mode 100644 dockerTest/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift
 delete mode 100644 dockerTest/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift
 delete mode 100644 dockerTest/single-test-that-fails/expected_results.json
 delete mode 100644 dockerTest/single-test-that-fails/results.json
 delete mode 100644 dockerTest/single-test-that-passes/.gitignore
 delete mode 100644 dockerTest/single-test-that-passes/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 dockerTest/single-test-that-passes/Package.swift
 delete mode 100644 dockerTest/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift
 delete mode 100644 dockerTest/single-test-that-passes/Tests/LinuxMain.swift
 delete mode 100644 dockerTest/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift
 delete mode 100644 dockerTest/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift
 delete mode 100644 dockerTest/single-test-that-passes/expected_results.json
 delete mode 100644 dockerTest/single-test-that-passes/results.json
 delete mode 100644 dockerTest/single-test-with-exception/.gitignore
 delete mode 100644 dockerTest/single-test-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
 delete mode 100644 dockerTest/single-test-with-exception/Package.swift
 delete mode 100644 dockerTest/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift
 delete mode 100644 dockerTest/single-test-with-exception/Tests/LinuxMain.swift
 delete mode 100644 dockerTest/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift
 delete mode 100644 dockerTest/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift
 delete mode 100644 dockerTest/single-test-with-exception/expected_results.json
 delete mode 100644 dockerTest/single-test-with-exception/results.json

diff --git a/dockerTest/compile-error/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/dockerTest/compile-error/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/dockerTest/compile-error/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/dockerTest/compile-error/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate b/dockerTest/compile-error/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index efe15df990cf714ac0790ebd8de89a810c0c6227..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10427
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
F{BI{{<K+MV

diff --git a/dockerTest/compile-error/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist b/dockerTest/compile-error/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index 063c567..0000000
--- a/dockerTest/compile-error/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>CompileError.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/dockerTest/compile-error/Package.swift b/dockerTest/compile-error/Package.swift
deleted file mode 100644
index b0183f0..0000000
--- a/dockerTest/compile-error/Package.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// swift-tools-version:5.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "CompileError",
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "CompileError",
-            targets: ["CompileError"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-        .target(
-            name: "CompileError",
-            dependencies: []),
-        .testTarget(
-            name: "CompileErrorTests",
-            dependencies: ["CompileError"]),
-    ]
-)
diff --git a/dockerTest/compile-error/Sources/CompileError/CompileError.swift b/dockerTest/compile-error/Sources/CompileError/CompileError.swift
deleted file mode 100644
index eb92bd3..0000000
--- a/dockerTest/compile-error/Sources/CompileError/CompileError.swift
+++ /dev/null
@@ -1,3 +0,0 @@
-func sum(_ x: Int, _ y: Int) {
-  return x + y
-}
diff --git a/dockerTest/compile-error/Tests/CompileErrorTests/CompileErrorTests.swift b/dockerTest/compile-error/Tests/CompileErrorTests/CompileErrorTests.swift
deleted file mode 100644
index 9bee869..0000000
--- a/dockerTest/compile-error/Tests/CompileErrorTests/CompileErrorTests.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import XCTest
-
-@testable import CompileError
-
-final class CompileErrorTests: XCTestCase {
-  func testAdd() {
-    XCTAssertEqual(sum(2, 3), 5)
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd)
-  ]
-}
diff --git a/dockerTest/compile-error/Tests/CompileErrorTests/XCTestManifests.swift b/dockerTest/compile-error/Tests/CompileErrorTests/XCTestManifests.swift
deleted file mode 100644
index 9809232..0000000
--- a/dockerTest/compile-error/Tests/CompileErrorTests/XCTestManifests.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-public func allTests() -> [XCTestCaseEntry] {
-    return [
-        testCase(CompileErrorTests.allTests),
-    ]
-}
-#endif
diff --git a/dockerTest/compile-error/Tests/LinuxMain.swift b/dockerTest/compile-error/Tests/LinuxMain.swift
deleted file mode 100644
index 106c822..0000000
--- a/dockerTest/compile-error/Tests/LinuxMain.swift
+++ /dev/null
@@ -1,7 +0,0 @@
-import XCTest
-
-import CompileErrorTests
-
-var tests = [XCTestCaseEntry]()
-tests += CompileErrorTests.allTests()
-XCTMain(tests)
diff --git a/dockerTest/compile-error/expected_results.json b/dockerTest/compile-error/expected_results.json
deleted file mode 100644
index 7223336..0000000
--- a/dockerTest/compile-error/expected_results.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "message" : "\/solution\/compile-error\/Sources\/CompileError\/CompileError.swift:2:12: error: unexpected non-void return value in void function\n  return x + y\n           ^\n",
-  "status" : "error",
-  "tests" : [
-    
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/compile-error/results.json b/dockerTest/compile-error/results.json
deleted file mode 100644
index 7223336..0000000
--- a/dockerTest/compile-error/results.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "message" : "\/solution\/compile-error\/Sources\/CompileError\/CompileError.swift:2:12: error: unexpected non-void return value in void function\n  return x + y\n           ^\n",
-  "status" : "error",
-  "tests" : [
-    
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/dockerTest/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/dockerTest/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/dockerTest/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate b/dockerTest/multiple-tests-all-pass/.swiftpm/xcode/package.xcworkspace/xcuserdata/wdn.xcuserdatad/UserInterfaceState.xcuserstate
deleted file mode 100644
index 0a6e8e782c8674d9abfb6335a2e199f1366c9183..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 13274
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
LLSN$Ce*OOe9Inmm

diff --git a/dockerTest/multiple-tests-all-pass/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist b/dockerTest/multiple-tests-all-pass/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
deleted file mode 100644
index dc01e4e..0000000
--- a/dockerTest/multiple-tests-all-pass/.swiftpm/xcode/xcuserdata/wdn.xcuserdatad/xcschemes/xcschememanagement.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>SchemeUserState</key>
-	<dict>
-		<key>MultipleAllPass.xcscheme_^#shared#^_</key>
-		<dict>
-			<key>orderHint</key>
-			<integer>0</integer>
-		</dict>
-	</dict>
-</dict>
-</plist>
diff --git a/dockerTest/multiple-tests-all-pass/Package.swift b/dockerTest/multiple-tests-all-pass/Package.swift
deleted file mode 100644
index 8fdada5..0000000
--- a/dockerTest/multiple-tests-all-pass/Package.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// swift-tools-version:5.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "MultipleAllPass",
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "MultipleAllPass",
-            targets: ["MultipleAllPass"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-        .target(
-            name: "MultipleAllPass",
-            dependencies: []),
-        .testTarget(
-            name: "MultipleAllPassTests",
-            dependencies: ["MultipleAllPass"]),
-    ]
-)
diff --git a/dockerTest/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift b/dockerTest/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift
deleted file mode 100644
index ffe4949..0000000
--- a/dockerTest/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-func sum(_ x: Int, _ y: Int) -> Int {
-  return x + y
-}
-
-func sub(_ x: Int, _ y: Int) -> Int {
-  return x - y
-}
-
-func mul(_ x: Int, _ y: Int) -> Int {
-  return x * y
-}
diff --git a/dockerTest/multiple-tests-all-pass/Tests/LinuxMain.swift b/dockerTest/multiple-tests-all-pass/Tests/LinuxMain.swift
deleted file mode 100644
index 00e0fb4..0000000
--- a/dockerTest/multiple-tests-all-pass/Tests/LinuxMain.swift
+++ /dev/null
@@ -1,7 +0,0 @@
-import XCTest
-
-import MultipleAllPassTests
-
-var tests = [XCTestCaseEntry]()
-tests += MultipleAllPassTests.allTests()
-XCTMain(tests)
diff --git a/dockerTest/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift b/dockerTest/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift
deleted file mode 100644
index ef57fa5..0000000
--- a/dockerTest/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift
+++ /dev/null
@@ -1,43 +0,0 @@
-import XCTest
-
-@testable import MultipleAllPass
-
-final class MultipleAllPassTests: XCTestCase {
-  func testAdd() {
-    XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
-  }
-
-  func testSub() {
-    XCTAssertEqual(sub(2, 3), -1)
-  }
-
-  func testMul() {
-    XCTAssertEqual(mul(2, 3), 6)
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd),
-    ("testSub", testSub),
-    ("testMul", testMul),
-  ]
-}
-
-final class SecondSuite: XCTestCase {
-  func testAdd() {
-    XCTAssertEqual(sum(12, 13), 25, "2+3 should equal 5")
-  }
-
-  func testSub() {
-    XCTAssertEqual(sub(12, 13), -1)
-  }
-
-  func testMul() {
-    XCTAssertEqual(mul(12, 13), 156)
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd),
-    ("testSub", testSub),
-    ("testMul", testMul),
-  ]
-}
diff --git a/dockerTest/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift b/dockerTest/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift
deleted file mode 100644
index e83b6c1..0000000
--- a/dockerTest/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift
+++ /dev/null
@@ -1,10 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-public func allTests() -> [XCTestCaseEntry] {
-    return [
-        testCase(MultipleAllPassTests.allTests),
-        testCase(SecondSuite.allTests),
-    ]
-}
-#endif
diff --git a/dockerTest/multiple-tests-all-pass/expected_results.json b/dockerTest/multiple-tests-all-pass/expected_results.json
deleted file mode 100644
index d814f79..0000000
--- a/dockerTest/multiple-tests-all-pass/expected_results.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "status" : "pass",
-  "tests" : [
-    {
-      "name" : "MultipleAllPassTests.testAdd",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleAllPassTests.testSub",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleAllPassTests.testMul",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testAdd",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testSub",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testMul",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-all-pass/results.json b/dockerTest/multiple-tests-all-pass/results.json
deleted file mode 100644
index d814f79..0000000
--- a/dockerTest/multiple-tests-all-pass/results.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "status" : "pass",
-  "tests" : [
-    {
-      "name" : "MultipleAllPassTests.testAdd",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleAllPassTests.testSub",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleAllPassTests.testMul",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testAdd",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testSub",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testMul",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-multiple-fails/.gitignore b/dockerTest/multiple-tests-multiple-fails/.gitignore
deleted file mode 100644
index 95c4320..0000000
--- a/dockerTest/multiple-tests-multiple-fails/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
diff --git a/dockerTest/multiple-tests-multiple-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/dockerTest/multiple-tests-multiple-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/dockerTest/multiple-tests-multiple-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/dockerTest/multiple-tests-multiple-fails/Package.swift b/dockerTest/multiple-tests-multiple-fails/Package.swift
deleted file mode 100644
index c1fe92b..0000000
--- a/dockerTest/multiple-tests-multiple-fails/Package.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// swift-tools-version:5.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "MultipleMultipleFails",
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "MultipleMultipleFails",
-            targets: ["MultipleMultipleFails"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-        .target(
-            name: "MultipleMultipleFails",
-            dependencies: []),
-        .testTarget(
-            name: "MultipleMultipleFailsTests",
-            dependencies: ["MultipleMultipleFails"]),
-    ]
-)
diff --git a/dockerTest/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift b/dockerTest/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift
deleted file mode 100644
index eda1f40..0000000
--- a/dockerTest/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-func sum(_ x: Int, _ y: Int) -> Int {
-  return x - y
-}
-
-func sub(_ x: Int, _ y: Int) -> Int {
-  return x + y
-}
-
-func mul(_ x: Int, _ y: Int) -> Int {
-  return x * y
-}
diff --git a/dockerTest/multiple-tests-multiple-fails/Tests/LinuxMain.swift b/dockerTest/multiple-tests-multiple-fails/Tests/LinuxMain.swift
deleted file mode 100644
index 73e684b..0000000
--- a/dockerTest/multiple-tests-multiple-fails/Tests/LinuxMain.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-import MultipleMultipleFailsTests
-import XCTest
-
-var tests = [XCTestCaseEntry]()
-tests += MultipleMultipleFailsTests.allTests()
-XCTMain(tests)
diff --git a/dockerTest/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift b/dockerTest/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift
deleted file mode 100644
index a737f27..0000000
--- a/dockerTest/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift
+++ /dev/null
@@ -1,23 +0,0 @@
-import XCTest
-
-@testable import MultipleMultipleFails
-
-final class MultipleMultipleFailsTests: XCTestCase {
-  func testAdd() {
-    XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
-  }
-
-  func testSub() {
-    XCTAssertEqual(sub(2, 3), -1)
-  }
-
-  func testMul() {
-    XCTAssertEqual(mul(2, 3), 6)
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd),
-    ("testSub", testSub),
-    ("testMul", testMul),
-  ]
-}
diff --git a/dockerTest/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift b/dockerTest/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift
deleted file mode 100644
index 1bde348..0000000
--- a/dockerTest/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-  public func allTests() -> [XCTestCaseEntry] {
-    return [
-      testCase(MultipleMultipleFailsTests.allTests)
-    ]
-  }
-#endif
diff --git a/dockerTest/multiple-tests-multiple-fails/expected_results.json b/dockerTest/multiple-tests-multiple-fails/expected_results.json
deleted file mode 100644
index eb3c60a..0000000
--- a/dockerTest/multiple-tests-multiple-fails/expected_results.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/multiple-tests-multiple-fails\/Tests\/MultipleMultipleFailsTests\/MultipleMultipleFailsTests.swift:7: error: MultipleMultipleFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "MultipleMultipleFailsTests.testAdd",
-      "status" : "fail"
-    },
-    {
-      "message" : "\/solution\/multiple-tests-multiple-fails\/Tests\/MultipleMultipleFailsTests\/MultipleMultipleFailsTests.swift:11: error: MultipleMultipleFailsTests.testSub : XCTAssertEqual failed: (\"5\") is not equal to (\"-1\") - ",
-      "name" : "MultipleMultipleFailsTests.testSub",
-      "status" : "fail"
-    },
-    {
-      "name" : "MultipleMultipleFailsTests.testMul",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-multiple-fails/results.json b/dockerTest/multiple-tests-multiple-fails/results.json
deleted file mode 100644
index eb3c60a..0000000
--- a/dockerTest/multiple-tests-multiple-fails/results.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/multiple-tests-multiple-fails\/Tests\/MultipleMultipleFailsTests\/MultipleMultipleFailsTests.swift:7: error: MultipleMultipleFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "MultipleMultipleFailsTests.testAdd",
-      "status" : "fail"
-    },
-    {
-      "message" : "\/solution\/multiple-tests-multiple-fails\/Tests\/MultipleMultipleFailsTests\/MultipleMultipleFailsTests.swift:11: error: MultipleMultipleFailsTests.testSub : XCTAssertEqual failed: (\"5\") is not equal to (\"-1\") - ",
-      "name" : "MultipleMultipleFailsTests.testSub",
-      "status" : "fail"
-    },
-    {
-      "name" : "MultipleMultipleFailsTests.testMul",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-single-fail/.gitignore b/dockerTest/multiple-tests-single-fail/.gitignore
deleted file mode 100644
index 95c4320..0000000
--- a/dockerTest/multiple-tests-single-fail/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
diff --git a/dockerTest/multiple-tests-single-fail/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/dockerTest/multiple-tests-single-fail/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/dockerTest/multiple-tests-single-fail/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/dockerTest/multiple-tests-single-fail/Package.swift b/dockerTest/multiple-tests-single-fail/Package.swift
deleted file mode 100644
index e310a14..0000000
--- a/dockerTest/multiple-tests-single-fail/Package.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// swift-tools-version:5.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "MultipleSingleFail",
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "MultipleSingleFail",
-            targets: ["MultipleSingleFail"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-        .target(
-            name: "MultipleSingleFail",
-            dependencies: []),
-        .testTarget(
-            name: "MultipleSingleFailTests",
-            dependencies: ["MultipleSingleFail"]),
-    ]
-)
diff --git a/dockerTest/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift b/dockerTest/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift
deleted file mode 100644
index ee6a85b..0000000
--- a/dockerTest/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift
+++ /dev/null
@@ -1,30 +0,0 @@
-func sum(_ x: Int, _ y: Int) -> Int {
-  print("yabba")
-  return x / y
-}
-
-func sub(_ x: Int, _ y: Int) -> Int {
-  print("dabba")
-  return x - y
-}
-
-func mul(_ x: Int, _ y: Int) -> Int {
-  let benedick =
-    """
-    I will not be sworn but love may transform me to an oyster,
-    but I’ll take my oath on it, till he have made an oyster of me,
-    he shall never make me such a fool. One woman is fair, yet
-    I am well; another is wise, yet I am well; another virtuous,
-    25yet I am well; but till all graces be in one woman, one
-    woman shall not come in my grace. Rich she shall be, that’s
-    certain; wise, or I’ll none; virtuous, or I’ll never cheapen
-    her; fair, or I’ll ever look on her; mild, or come not near
-    me; noble, or not I for an angel; of good discourse, an
-    30excellent musician, and her hair shall be of what color it
-    please God. Ha! The Prince and Monsieur Love! I will hide
-    me in the arbor.
-    """
-  print("Benedick's speech is \(benedick.count) character's long.")
-  print(benedick)
-  return x * y
-}
diff --git a/dockerTest/multiple-tests-single-fail/Tests/LinuxMain.swift b/dockerTest/multiple-tests-single-fail/Tests/LinuxMain.swift
deleted file mode 100644
index 5380f37..0000000
--- a/dockerTest/multiple-tests-single-fail/Tests/LinuxMain.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-import MultipleSingleFailTests
-import XCTest
-
-var tests = [XCTestCaseEntry]()
-tests += MultipleSingleFailTests.allTests()
-XCTMain(tests)
diff --git a/dockerTest/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift b/dockerTest/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift
deleted file mode 100644
index 7895664..0000000
--- a/dockerTest/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift
+++ /dev/null
@@ -1,52 +0,0 @@
-import XCTest
-
-@testable import MultipleSingleFail
-
-final class MultipleSingleFailTests: XCTestCase {
-  let runAll = Bool(ProcessInfo.processInfo.environment["RUNALL", default: "false"]) ?? false
-
-  func testAdd() {
-    XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
-  }
-
-  func testSub() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
-    XCTAssertEqual(sub(2, 3), -1)
-  }
-
-  func testMul() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
-    XCTAssertEqual(mul(2, 3), 6)
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd),
-    ("testSub", testSub),
-    ("testMul", testMul),
-  ]
-}
-
-final class SecondSuite: XCTestCase {
-  let runAll = Bool(ProcessInfo.processInfo.environment["RUNALL", default: "false"]) ?? false
-
-  func testAdd2() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
-    XCTAssertEqual(sum(12, 13), 25, "12+13 should equal 25")
-  }
-
-  func testSub2() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
-    XCTAssertEqual(sub(12, 13), -1)
-  }
-
-  func testMul2() throws {
-    try XCTSkipIf(true && !runAll)  // change true to false to run this test
-    XCTAssertEqual(mul(12, 13), 156)
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd2),
-    ("testSub", testSub2),
-    ("testMul", testMul2),
-  ]
-}
diff --git a/dockerTest/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift b/dockerTest/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift
deleted file mode 100644
index 4f72e30..0000000
--- a/dockerTest/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift
+++ /dev/null
@@ -1,10 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-  public func allTests() -> [XCTestCaseEntry] {
-    return [
-      testCase(MultipleSingleFailTests.allTests),
-      testCase(SecondSuite.allTests),
-    ]
-  }
-#endif
diff --git a/dockerTest/multiple-tests-single-fail/expected_results.json b/dockerTest/multiple-tests-single-fail/expected_results.json
deleted file mode 100644
index 3b00124..0000000
--- a/dockerTest/multiple-tests-single-fail/expected_results.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:9: error: MultipleSingleFailTests.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "MultipleSingleFailTests.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
-    },
-    {
-      "name" : "MultipleSingleFailTests.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleSingleFailTests.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
-    },
-    {
-      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:34: error: SecondSuite.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"25\") - 12+13 should equal 25",
-      "name" : "SecondSuite.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
-    },
-    {
-      "name" : "SecondSuite.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-single-fail/results.json b/dockerTest/multiple-tests-single-fail/results.json
deleted file mode 100644
index 3b00124..0000000
--- a/dockerTest/multiple-tests-single-fail/results.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:9: error: MultipleSingleFailTests.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "MultipleSingleFailTests.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
-    },
-    {
-      "name" : "MultipleSingleFailTests.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleSingleFailTests.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
-    },
-    {
-      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:34: error: SecondSuite.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"25\") - 12+13 should equal 25",
-      "name" : "SecondSuite.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
-    },
-    {
-      "name" : "SecondSuite.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-with-exception/.gitignore b/dockerTest/multiple-tests-with-exception/.gitignore
deleted file mode 100644
index 95c4320..0000000
--- a/dockerTest/multiple-tests-with-exception/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
diff --git a/dockerTest/multiple-tests-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/dockerTest/multiple-tests-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/dockerTest/multiple-tests-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/dockerTest/multiple-tests-with-exception/Package.swift b/dockerTest/multiple-tests-with-exception/Package.swift
deleted file mode 100644
index 501b2b9..0000000
--- a/dockerTest/multiple-tests-with-exception/Package.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// swift-tools-version:5.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-  name: "MultipleWithException",
-  products: [
-    // Products define the executables and libraries produced by a package, and make them visible to other packages.
-    .library(
-      name: "MultipleWithException",
-      targets: ["MultipleWithException"])
-  ],
-  dependencies: [
-    // Dependencies declare other packages that this package depends on.
-    // .package(url: /* package url */, from: "1.0.0"),
-  ],
-  targets: [
-    // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-    // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-    .target(
-      name: "MultipleWithException",
-      dependencies: []),
-    .testTarget(
-      name: "MultipleWithExceptionTests",
-      dependencies: ["MultipleWithException"]),
-  ]
-)
diff --git a/dockerTest/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift b/dockerTest/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift
deleted file mode 100644
index f4cb7cc..0000000
--- a/dockerTest/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift
+++ /dev/null
@@ -1,27 +0,0 @@
-enum TestError: Error {
-  case testError(String)
-}
-
-func sum(_ x: Int, _ y: Int) -> Int {
-  return x + y
-}
-
-func sub(_ x: Int, _ y: Int) -> Int {
-  //    fatalError("Oh noes!")
-  return x - y
-}
-
-func mul(_ x: Int, _ y: Int) -> Int {
-  if x < y {
-    fatalError("Oh noes!")
-  } else {
-    return x * y
-    //        let z = Int.max / y
-    //        return x * z
-  }
-}
-
-func throwErr(_ x: Int, _ y: Int) throws -> Int {
-  guard y != 0 else { throw TestError.testError("Oh noes! Div by zeroes!!!") }
-  return x / y
-}
diff --git a/dockerTest/multiple-tests-with-exception/Tests/LinuxMain.swift b/dockerTest/multiple-tests-with-exception/Tests/LinuxMain.swift
deleted file mode 100644
index 23dbd17..0000000
--- a/dockerTest/multiple-tests-with-exception/Tests/LinuxMain.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-import MultipleWithExceptionTests
-import XCTest
-
-var tests = [XCTestCaseEntry]()
-tests += MultipleWithExceptionTests.allTests()
-XCTMain(tests)
diff --git a/dockerTest/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift b/dockerTest/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift
deleted file mode 100644
index 98a6b84..0000000
--- a/dockerTest/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-import XCTest
-
-@testable import MultipleWithException
-
-final class MultipleWithExceptionTests: XCTestCase {
-  func testAdd() {
-    XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
-  }
-
-  func testSub() {
-    XCTAssertEqual(sub(2, 3), -1)
-  }
-
-  func testMul() {
-    XCTAssertEqual(mul(3, 2), 6)
-  }
-
-  func testThrow() {
-    XCTAssertEqual(try throwErr(2, 0), 6)
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd),
-    ("testSub", testSub),
-    ("testMul", testMul),
-    ("testThrow", testThrow),
-  ]
-}
diff --git a/dockerTest/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift b/dockerTest/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift
deleted file mode 100644
index cbab108..0000000
--- a/dockerTest/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-  public func allTests() -> [XCTestCaseEntry] {
-    return [
-      testCase(MultipleWithExceptionTests.allTests)
-    ]
-  }
-#endif
diff --git a/dockerTest/multiple-tests-with-exception/expected_results.json b/dockerTest/multiple-tests-with-exception/expected_results.json
deleted file mode 100644
index 46b33d4..0000000
--- a/dockerTest/multiple-tests-with-exception/expected_results.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "name" : "MultipleWithExceptionTests.testAdd",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleWithExceptionTests.testSub",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleWithExceptionTests.testMul",
-      "status" : "pass"
-    },
-    {
-      "message" : "\/solution\/multiple-tests-with-exception\/Tests\/MultipleWithExceptionTests\/MultipleWithExceptionTests.swift:19: error: MultipleWithExceptionTests.testThrow : XCTAssertEqual threw error \"testError(\"Oh noes! Div by zeroes!!!\")\" - ",
-      "name" : "MultipleWithExceptionTests.testThrow",
-      "status" : "fail"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/multiple-tests-with-exception/results.json b/dockerTest/multiple-tests-with-exception/results.json
deleted file mode 100644
index 46b33d4..0000000
--- a/dockerTest/multiple-tests-with-exception/results.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "name" : "MultipleWithExceptionTests.testAdd",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleWithExceptionTests.testSub",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleWithExceptionTests.testMul",
-      "status" : "pass"
-    },
-    {
-      "message" : "\/solution\/multiple-tests-with-exception\/Tests\/MultipleWithExceptionTests\/MultipleWithExceptionTests.swift:19: error: MultipleWithExceptionTests.testThrow : XCTAssertEqual threw error \"testError(\"Oh noes! Div by zeroes!!!\")\" - ",
-      "name" : "MultipleWithExceptionTests.testThrow",
-      "status" : "fail"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/output/expected_results.json b/dockerTest/output/expected_results.json
deleted file mode 100644
index 3b00124..0000000
--- a/dockerTest/output/expected_results.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:9: error: MultipleSingleFailTests.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "MultipleSingleFailTests.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
-    },
-    {
-      "name" : "MultipleSingleFailTests.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleSingleFailTests.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
-    },
-    {
-      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:34: error: SecondSuite.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"25\") - 12+13 should equal 25",
-      "name" : "SecondSuite.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
-    },
-    {
-      "name" : "SecondSuite.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/output/results.json b/dockerTest/output/results.json
deleted file mode 100644
index 3b00124..0000000
--- a/dockerTest/output/results.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:9: error: MultipleSingleFailTests.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "MultipleSingleFailTests.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
-    },
-    {
-      "name" : "MultipleSingleFailTests.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
-    },
-    {
-      "name" : "MultipleSingleFailTests.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
-    },
-    {
-      "message" : "\/solution\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:34: error: SecondSuite.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"25\") - 12+13 should equal 25",
-      "name" : "SecondSuite.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
-    },
-    {
-      "name" : "SecondSuite.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
-    },
-    {
-      "name" : "SecondSuite.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/single-test-that-fails/.gitignore b/dockerTest/single-test-that-fails/.gitignore
deleted file mode 100644
index 95c4320..0000000
--- a/dockerTest/single-test-that-fails/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
diff --git a/dockerTest/single-test-that-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/dockerTest/single-test-that-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/dockerTest/single-test-that-fails/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/dockerTest/single-test-that-fails/Package.swift b/dockerTest/single-test-that-fails/Package.swift
deleted file mode 100644
index ec316d6..0000000
--- a/dockerTest/single-test-that-fails/Package.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// swift-tools-version:5.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "SingleThatFails",
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "SingleThatFails",
-            targets: ["SingleThatFails"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-        .target(
-            name: "SingleThatFails",
-            dependencies: []),
-        .testTarget(
-            name: "SingleThatFailsTests",
-            dependencies: ["SingleThatFails"]),
-    ]
-)
diff --git a/dockerTest/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift b/dockerTest/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift
deleted file mode 100644
index bbb07a6..0000000
--- a/dockerTest/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift
+++ /dev/null
@@ -1,7 +0,0 @@
-enum TestError: Error {
-  case testError(String)
-}
-
-func sum(_ x: Int, _ y: Int) -> Int {
-  return x - y
-}
diff --git a/dockerTest/single-test-that-fails/Tests/LinuxMain.swift b/dockerTest/single-test-that-fails/Tests/LinuxMain.swift
deleted file mode 100644
index cb1beda..0000000
--- a/dockerTest/single-test-that-fails/Tests/LinuxMain.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-import SingleThatFailsTests
-import XCTest
-
-var tests = [XCTestCaseEntry]()
-tests += SingleThatFailsTests.allTests()
-XCTMain(tests)
diff --git a/dockerTest/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift b/dockerTest/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift
deleted file mode 100644
index d456db7..0000000
--- a/dockerTest/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import XCTest
-
-@testable import SingleThatFails
-
-final class SingleThatFailsTests: XCTestCase {
-  func testAdd() {
-    XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd)
-  ]
-}
diff --git a/dockerTest/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift b/dockerTest/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift
deleted file mode 100644
index d35899b..0000000
--- a/dockerTest/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-  public func allTests() -> [XCTestCaseEntry] {
-    return [
-      testCase(SingleThatFailsTests.allTests)
-    ]
-  }
-#endif
diff --git a/dockerTest/single-test-that-fails/expected_results.json b/dockerTest/single-test-that-fails/expected_results.json
deleted file mode 100644
index 7918c5f..0000000
--- a/dockerTest/single-test-that-fails/expected_results.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/single-test-that-fails\/Tests\/SingleThatFailsTests\/SingleThatFailsTests.swift:7: error: SingleThatFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "SingleThatFailsTests.testAdd",
-      "status" : "fail"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/single-test-that-fails/results.json b/dockerTest/single-test-that-fails/results.json
deleted file mode 100644
index 7918c5f..0000000
--- a/dockerTest/single-test-that-fails/results.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/single-test-that-fails\/Tests\/SingleThatFailsTests\/SingleThatFailsTests.swift:7: error: SingleThatFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "SingleThatFailsTests.testAdd",
-      "status" : "fail"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/single-test-that-passes/.gitignore b/dockerTest/single-test-that-passes/.gitignore
deleted file mode 100644
index 95c4320..0000000
--- a/dockerTest/single-test-that-passes/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
diff --git a/dockerTest/single-test-that-passes/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/dockerTest/single-test-that-passes/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/dockerTest/single-test-that-passes/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/dockerTest/single-test-that-passes/Package.swift b/dockerTest/single-test-that-passes/Package.swift
deleted file mode 100644
index 6c54388..0000000
--- a/dockerTest/single-test-that-passes/Package.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// swift-tools-version:5.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "SingleThatPasses",
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "SingleThatPasses",
-            targets: ["SingleThatPasses"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-        .target(
-            name: "SingleThatPasses",
-            dependencies: []),
-        .testTarget(
-            name: "SingleThatPassesTests",
-            dependencies: ["SingleThatPasses"]),
-    ]
-)
diff --git a/dockerTest/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift b/dockerTest/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift
deleted file mode 100644
index 8015268..0000000
--- a/dockerTest/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift
+++ /dev/null
@@ -1,7 +0,0 @@
-enum TestError: Error {
-  case testError(String)
-}
-
-func sum(_ x: Int, _ y: Int) -> Int {
-  return x + y
-}
diff --git a/dockerTest/single-test-that-passes/Tests/LinuxMain.swift b/dockerTest/single-test-that-passes/Tests/LinuxMain.swift
deleted file mode 100644
index c2aee5c..0000000
--- a/dockerTest/single-test-that-passes/Tests/LinuxMain.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-import SingleThatPassesTests
-import XCTest
-
-var tests = [XCTestCaseEntry]()
-tests += SingleThatPassesTests.allTests()
-XCTMain(tests)
diff --git a/dockerTest/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift b/dockerTest/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift
deleted file mode 100644
index 8a8d431..0000000
--- a/dockerTest/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import XCTest
-
-@testable import SingleThatPasses
-
-final class SingleThatPassesTests: XCTestCase {
-  func testAdd() {
-    XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd)
-  ]
-}
diff --git a/dockerTest/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift b/dockerTest/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift
deleted file mode 100644
index 76f6b7a..0000000
--- a/dockerTest/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-  public func allTests() -> [XCTestCaseEntry] {
-    return [
-      testCase(SingleThatPassesTests.allTests)
-    ]
-  }
-#endif
diff --git a/dockerTest/single-test-that-passes/expected_results.json b/dockerTest/single-test-that-passes/expected_results.json
deleted file mode 100644
index 4472e04..0000000
--- a/dockerTest/single-test-that-passes/expected_results.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "status" : "pass",
-  "tests" : [
-    {
-      "name" : "SingleThatPassesTests.testAdd",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/single-test-that-passes/results.json b/dockerTest/single-test-that-passes/results.json
deleted file mode 100644
index 4472e04..0000000
--- a/dockerTest/single-test-that-passes/results.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "status" : "pass",
-  "tests" : [
-    {
-      "name" : "SingleThatPassesTests.testAdd",
-      "status" : "pass"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/single-test-with-exception/.gitignore b/dockerTest/single-test-with-exception/.gitignore
deleted file mode 100644
index 95c4320..0000000
--- a/dockerTest/single-test-with-exception/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.DS_Store
-/.build
-/Packages
-/*.xcodeproj
-xcuserdata/
diff --git a/dockerTest/single-test-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata b/dockerTest/single-test-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
deleted file mode 100644
index 919434a..0000000
--- a/dockerTest/single-test-with-exception/.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "self:">
-   </FileRef>
-</Workspace>
diff --git a/dockerTest/single-test-with-exception/Package.swift b/dockerTest/single-test-with-exception/Package.swift
deleted file mode 100644
index bfe3bc9..0000000
--- a/dockerTest/single-test-with-exception/Package.swift
+++ /dev/null
@@ -1,28 +0,0 @@
-// swift-tools-version:5.2
-// The swift-tools-version declares the minimum version of Swift required to build this package.
-
-import PackageDescription
-
-let package = Package(
-    name: "SingleWithException",
-    products: [
-        // Products define the executables and libraries produced by a package, and make them visible to other packages.
-        .library(
-            name: "SingleWithException",
-            targets: ["SingleWithException"]),
-    ],
-    dependencies: [
-        // Dependencies declare other packages that this package depends on.
-        // .package(url: /* package url */, from: "1.0.0"),
-    ],
-    targets: [
-        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
-        // Targets can depend on other targets in this package, and on products in packages which this package depends on.
-        .target(
-            name: "SingleWithException",
-            dependencies: []),
-        .testTarget(
-            name: "SingleWithExceptionTests",
-            dependencies: ["SingleWithException"]),
-    ]
-)
diff --git a/dockerTest/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift b/dockerTest/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift
deleted file mode 100644
index cb8eaaa..0000000
--- a/dockerTest/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift
+++ /dev/null
@@ -1,7 +0,0 @@
-enum TestError: Error {
-  case testError(String)
-}
-
-func sum(_ x: Int, _ y: Int) throws -> Int {
-  throw TestError.testError("Kaboomtown!")
-}
diff --git a/dockerTest/single-test-with-exception/Tests/LinuxMain.swift b/dockerTest/single-test-with-exception/Tests/LinuxMain.swift
deleted file mode 100644
index 778ae21..0000000
--- a/dockerTest/single-test-with-exception/Tests/LinuxMain.swift
+++ /dev/null
@@ -1,6 +0,0 @@
-import SingleWithExceptionTests
-import XCTest
-
-var tests = [XCTestCaseEntry]()
-tests += SingleWithExceptionTests.allTests()
-XCTMain(tests)
diff --git a/dockerTest/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift b/dockerTest/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift
deleted file mode 100644
index 376a9c2..0000000
--- a/dockerTest/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import XCTest
-
-@testable import SingleWithException
-
-final class SingleWithExceptionTests: XCTestCase {
-  func testAdd() {
-    XCTAssertEqual(try sum(2, 3), 5, "2+3 should equal 5")
-  }
-
-  static var allTests = [
-    ("testAdd", testAdd)
-  ]
-}
diff --git a/dockerTest/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift b/dockerTest/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift
deleted file mode 100644
index 61fb57b..0000000
--- a/dockerTest/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-  public func allTests() -> [XCTestCaseEntry] {
-    return [
-      testCase(SingleWithExceptionTests.allTests)
-    ]
-  }
-#endif
diff --git a/dockerTest/single-test-with-exception/expected_results.json b/dockerTest/single-test-with-exception/expected_results.json
deleted file mode 100644
index 7588313..0000000
--- a/dockerTest/single-test-with-exception/expected_results.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/single-test-with-exception\/Tests\/SingleWithExceptionTests\/SingleWithExceptionTests.swift:7: error: SingleWithExceptionTests.testAdd : XCTAssertEqual threw error \"testError(\"Kaboomtown!\")\" - 2+3 should equal 5",
-      "name" : "SingleWithExceptionTests.testAdd",
-      "status" : "fail"
-    }
-  ]
-}
\ No newline at end of file
diff --git a/dockerTest/single-test-with-exception/results.json b/dockerTest/single-test-with-exception/results.json
deleted file mode 100644
index 7588313..0000000
--- a/dockerTest/single-test-with-exception/results.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "status" : "fail",
-  "tests" : [
-    {
-      "message" : "\/solution\/single-test-with-exception\/Tests\/SingleWithExceptionTests\/SingleWithExceptionTests.swift:7: error: SingleWithExceptionTests.testAdd : XCTAssertEqual threw error \"testError(\"Kaboomtown!\")\" - 2+3 should equal 5",
-      "name" : "SingleWithExceptionTests.testAdd",
-      "status" : "fail"
-    }
-  ]
-}
\ No newline at end of file

From dd04c749cbe3a415cd0848197877f8853df186ed Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:27:37 +0200
Subject: [PATCH 06/13] Update CI workflow

---
 .github/workflows/ci.yml   | 20 ++++++++++++++++++++
 .github/workflows/main.yml | 31 -------------------------------
 2 files changed, 20 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..dd74479
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,20 @@
+name: CI
+
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+
+jobs:
+  build:
+    name: Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f # 2.3.4
+
+      - name: Run Tests in Docker
+        run: bin/run-tests-in-docker.sh
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
deleted file mode 100644
index 9599840..0000000
--- a/.github/workflows/main.yml
+++ /dev/null
@@ -1,31 +0,0 @@
----
-name: CI
-
-on:
-  pull_request:
-    branches:
-      - master
-    paths-ignore:
-      - '.gitignore'
-      - 'LICENSE'
-      - '**.md'
-  push:
-    branches:
-      - master
-    paths-ignore:
-      - '.gitignore'
-      - 'LICENSE'
-      - '**.md'
-
-jobs:
-  build:
-    name: Test Runner
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-
-      - name: Build Docker Image
-        run: docker build -f Dockerfile -t generic-test-runner .
-
-      - name: Run Tests
-        run: docker run -w "/opt/test-runner" --entrypoint "bin/run-all.sh" generic-test-runner

From 338a3191e334e35ce435de626d66ef16e6d1e01b Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:28:56 +0200
Subject: [PATCH 07/13] Remove unneeded comments

---
 bin/run-tests.sh | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/bin/run-tests.sh b/bin/run-tests.sh
index ac7c9f2..4184021 100755
--- a/bin/run-tests.sh
+++ b/bin/run-tests.sh
@@ -22,15 +22,6 @@ for test_dir in tests/*; do
 
     bin/run.sh "${test_dir_name}" "${test_dir_path}" "${test_dir_path}"
 
-    # OPTIONAL: Normalize the results file
-    # If the results.json file contains information that changes between 
-    # different test runs (e.g. timing information or paths), you should normalize
-    # the results file to allow the diff comparison below to work as expected
-    # sed -i -E \
-    #   -e 's/Elapsed time: [0-9]+\.[0-9]+ seconds//g' \
-    #   -e "s~${test_dir_path}~/solution~g" \
-    #   "${results_file_path}"
-
     echo "${test_dir_name}: comparing results.json to expected_results.json"
     diff "${results_file_path}" "${expected_results_file_path}"
 

From 692727e5e3179c8477639be57a3f27e318cd31dd Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:41:07 +0200
Subject: [PATCH 08/13] Fix input directory in runner

---
 bin/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/run.sh b/bin/run.sh
index a266d07..391b426 100755
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -31,6 +31,6 @@ mkdir -p "${output_dir}"
 echo "${slug}: testing..."
 
 # Run the tests for the provided implementation file
-RUNALL=true ./bin/TestRunner --slug "${slug}" --solution-directory "${input_dir}/${slug}" --output-directory "${output_dir}" --swift-location $(which swift) --build-directory "/tmp/"
+RUNALL=true ./bin/TestRunner --slug "${slug}" --solution-directory "${input_dir}" --output-directory "${output_dir}" --swift-location $(which swift) --build-directory "/tmp/"
 
 echo "${slug}: done"

From 7d5d27f77b7afdb8f03cd267e110e4ed07c8e594 Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:44:55 +0200
Subject: [PATCH 09/13] Use correct naming of files

---
 tests/multiple-tests-all-pass/Package.swift   | 12 ++---
 .../MultipleTestsAllPass.swift}               |  0
 .../Tests/LinuxMain.swift                     |  4 +-
 .../MultipleTestsAllPassTests.swift}          |  4 +-
 .../XCTestManifests.swift                     |  2 +-
 .../expected_results.json                     | 30 ++++++------
 .../Package.swift                             | 12 ++---
 .../MultipleTestsMultipleFails.swift}         |  0
 .../Tests/LinuxMain.swift                     |  4 +-
 .../MultipleTestsMultipleFailsTests.swift}    |  4 +-
 .../XCTestManifests.swift                     |  2 +-
 .../expected_results.json                     | 22 ++++-----
 .../multiple-tests-single-fail/Package.swift  | 12 ++---
 .../MultipleTestsSingleFail.swift}            |  0
 .../Tests/LinuxMain.swift                     |  4 +-
 .../MultipleTestsSingleFailTests.swift}       |  4 +-
 .../XCTestManifests.swift                     |  2 +-
 .../expected_results.json                     | 46 +++++++++----------
 .../Package.swift                             | 12 ++---
 .../MultipleTestsWithException.swift}         |  0
 .../Tests/LinuxMain.swift                     |  4 +-
 .../MultipleTestsWithExceptionTests.swift}    |  4 +-
 .../XCTestManifests.swift                     |  9 ++++
 .../expected_results.json                     | 24 +++++-----
 tests/single-test-that-fails/Package.swift    | 12 ++---
 .../SingleTestThatFails.swift}                |  0
 .../Tests/LinuxMain.swift                     |  4 +-
 .../SingleTestThatFailsTests.swift}           |  4 +-
 .../XCTestManifests.swift                     |  2 +-
 .../expected_results.json                     | 12 ++---
 tests/single-test-that-passes/Package.swift   | 12 ++---
 .../SingleTestThatPasses.swift}               |  0
 .../Tests/LinuxMain.swift                     |  4 +-
 .../SingleTestThatPassesTests.swift}          |  4 +-
 .../XCTestManifests.swift                     |  2 +-
 .../expected_results.json                     | 10 ++--
 .../single-test-with-exception/Package.swift  | 12 ++---
 .../SingleTestWithException.swift}            |  0
 .../Tests/LinuxMain.swift                     |  4 +-
 .../SingleTestWithExceptionTests.swift}       |  4 +-
 .../XCTestManifests.swift                     |  2 +-
 .../XCTestManifests.swift                     |  9 ----
 .../expected_results.json                     | 12 ++---
 43 files changed, 163 insertions(+), 163 deletions(-)
 rename tests/multiple-tests-all-pass/Sources/{MultipleAllPass/MultipleAllPass.swift => MultipleTestsAllPass/MultipleTestsAllPass.swift} (100%)
 rename tests/multiple-tests-all-pass/Tests/{MultipleAllPassTests/MultipleAllPassTests.swift => MultipleTestsAllPassTests/MultipleTestsAllPassTests.swift} (88%)
 rename tests/multiple-tests-all-pass/Tests/{MultipleAllPassTests => MultipleTestsAllPassTests}/XCTestManifests.swift (74%)
 rename tests/multiple-tests-multiple-fails/Sources/{MultipleMultipleFails/MultipleMultipleFails.swift => MultipleTestsMultipleFails/MultipleTestsMultipleFails.swift} (100%)
 rename tests/multiple-tests-multiple-fails/Tests/{MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift => MultipleTestsMultipleFailsTests/MultipleTestsMultipleFailsTests.swift} (75%)
 rename tests/multiple-tests-multiple-fails/Tests/{MultipleMultipleFailsTests => MultipleTestsMultipleFailsTests}/XCTestManifests.swift (67%)
 rename tests/multiple-tests-single-fail/Sources/{MultipleSingleFail/MultipleSingleFail.swift => MultipleTestsSingleFail/MultipleTestsSingleFail.swift} (100%)
 rename tests/multiple-tests-single-fail/Tests/{MultipleSingleFailTests/MultipleSingleFailTests.swift => MultipleTestsSingleFailTests/MultipleTestsSingleFailTests.swift} (93%)
 rename tests/multiple-tests-single-fail/Tests/{MultipleSingleFailTests => MultipleTestsSingleFailTests}/XCTestManifests.swift (74%)
 rename tests/multiple-tests-with-exception/Sources/{MultipleWithException/MultipleWithException.swift => MultipleTestsWithException/MultipleTestsWithException.swift} (100%)
 rename tests/multiple-tests-with-exception/Tests/{MultipleWithExceptionTests/MultipleWithExceptionTests.swift => MultipleTestsWithExceptionTests/MultipleTestsWithExceptionTests.swift} (80%)
 create mode 100644 tests/multiple-tests-with-exception/Tests/MultipleTestsWithExceptionTests/XCTestManifests.swift
 rename tests/single-test-that-fails/Sources/{SingleThatFails/SingleThatFails.swift => SingleTestThatFails/SingleTestThatFails.swift} (100%)
 rename tests/single-test-that-fails/Tests/{SingleThatFailsTests/SingleThatFailsTests.swift => SingleTestThatFailsTests/SingleTestThatFailsTests.swift} (63%)
 rename tests/{single-test-that-passes/Tests/SingleThatPassesTests => single-test-that-fails/Tests/SingleTestThatFailsTests}/XCTestManifests.swift (70%)
 rename tests/single-test-that-passes/Sources/{SingleThatPasses/SingleThatPasses.swift => SingleTestThatPasses/SingleTestThatPasses.swift} (100%)
 rename tests/single-test-that-passes/Tests/{SingleThatPassesTests/SingleThatPassesTests.swift => SingleTestThatPassesTests/SingleTestThatPassesTests.swift} (62%)
 rename tests/{single-test-that-fails/Tests/SingleThatFailsTests => single-test-that-passes/Tests/SingleTestThatPassesTests}/XCTestManifests.swift (70%)
 rename tests/single-test-with-exception/Sources/{SingleWithException/SingleWithException.swift => SingleTestWithException/SingleTestWithException.swift} (100%)
 rename tests/single-test-with-exception/Tests/{SingleWithExceptionTests/SingleWithExceptionTests.swift => SingleTestWithExceptionTests/SingleTestWithExceptionTests.swift} (61%)
 rename tests/{multiple-tests-with-exception/Tests/MultipleWithExceptionTests => single-test-with-exception/Tests/SingleTestWithExceptionTests}/XCTestManifests.swift (68%)
 delete mode 100644 tests/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift

diff --git a/tests/multiple-tests-all-pass/Package.swift b/tests/multiple-tests-all-pass/Package.swift
index 8fdada5..775f117 100644
--- a/tests/multiple-tests-all-pass/Package.swift
+++ b/tests/multiple-tests-all-pass/Package.swift
@@ -4,12 +4,12 @@
 import PackageDescription
 
 let package = Package(
-    name: "MultipleAllPass",
+    name: "MultipleTestsAllPass",
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
-            name: "MultipleAllPass",
-            targets: ["MultipleAllPass"]),
+            name: "MultipleTestsAllPass",
+            targets: ["MultipleTestsAllPass"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -19,10 +19,10 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
-            name: "MultipleAllPass",
+            name: "MultipleTestsAllPass",
             dependencies: []),
         .testTarget(
-            name: "MultipleAllPassTests",
-            dependencies: ["MultipleAllPass"]),
+            name: "MultipleTestsAllPassTests",
+            dependencies: ["MultipleTestsAllPass"]),
     ]
 )
diff --git a/tests/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift b/tests/multiple-tests-all-pass/Sources/MultipleTestsAllPass/MultipleTestsAllPass.swift
similarity index 100%
rename from tests/multiple-tests-all-pass/Sources/MultipleAllPass/MultipleAllPass.swift
rename to tests/multiple-tests-all-pass/Sources/MultipleTestsAllPass/MultipleTestsAllPass.swift
diff --git a/tests/multiple-tests-all-pass/Tests/LinuxMain.swift b/tests/multiple-tests-all-pass/Tests/LinuxMain.swift
index 00e0fb4..e6d9117 100644
--- a/tests/multiple-tests-all-pass/Tests/LinuxMain.swift
+++ b/tests/multiple-tests-all-pass/Tests/LinuxMain.swift
@@ -1,7 +1,7 @@
 import XCTest
 
-import MultipleAllPassTests
+import MultipleTestsAllPassTests
 
 var tests = [XCTestCaseEntry]()
-tests += MultipleAllPassTests.allTests()
+tests += MultipleTestsAllPassTests.allTests()
 XCTMain(tests)
diff --git a/tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift b/tests/multiple-tests-all-pass/Tests/MultipleTestsAllPassTests/MultipleTestsAllPassTests.swift
similarity index 88%
rename from tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift
rename to tests/multiple-tests-all-pass/Tests/MultipleTestsAllPassTests/MultipleTestsAllPassTests.swift
index ef57fa5..c9e8047 100644
--- a/tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/MultipleAllPassTests.swift
+++ b/tests/multiple-tests-all-pass/Tests/MultipleTestsAllPassTests/MultipleTestsAllPassTests.swift
@@ -1,8 +1,8 @@
 import XCTest
 
-@testable import MultipleAllPass
+@testable import MultipleTestsAllPass
 
-final class MultipleAllPassTests: XCTestCase {
+final class MultipleTestsAllPassTests: XCTestCase {
   func testAdd() {
     XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
   }
diff --git a/tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift b/tests/multiple-tests-all-pass/Tests/MultipleTestsAllPassTests/XCTestManifests.swift
similarity index 74%
rename from tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift
rename to tests/multiple-tests-all-pass/Tests/MultipleTestsAllPassTests/XCTestManifests.swift
index e83b6c1..cb3998c 100644
--- a/tests/multiple-tests-all-pass/Tests/MultipleAllPassTests/XCTestManifests.swift
+++ b/tests/multiple-tests-all-pass/Tests/MultipleTestsAllPassTests/XCTestManifests.swift
@@ -3,7 +3,7 @@ import XCTest
 #if !canImport(ObjectiveC)
 public func allTests() -> [XCTestCaseEntry] {
     return [
-        testCase(MultipleAllPassTests.allTests),
+        testCase(MultipleTestsAllPassTests.allTests),
         testCase(SecondSuite.allTests),
     ]
 }
diff --git a/tests/multiple-tests-all-pass/expected_results.json b/tests/multiple-tests-all-pass/expected_results.json
index d814f79..e720f6a 100644
--- a/tests/multiple-tests-all-pass/expected_results.json
+++ b/tests/multiple-tests-all-pass/expected_results.json
@@ -1,29 +1,29 @@
 {
-  "status" : "pass",
-  "tests" : [
+  "status": "pass",
+  "tests": [
     {
-      "name" : "MultipleAllPassTests.testAdd",
-      "status" : "pass"
+      "name": "MultipleTestsAllPassTests.testAdd",
+      "status": "pass"
     },
     {
-      "name" : "MultipleAllPassTests.testSub",
-      "status" : "pass"
+      "name": "MultipleTestsAllPassTests.testSub",
+      "status": "pass"
     },
     {
-      "name" : "MultipleAllPassTests.testMul",
-      "status" : "pass"
+      "name": "MultipleTestsAllPassTests.testMul",
+      "status": "pass"
     },
     {
-      "name" : "SecondSuite.testAdd",
-      "status" : "pass"
+      "name": "SecondSuite.testAdd",
+      "status": "pass"
     },
     {
-      "name" : "SecondSuite.testSub",
-      "status" : "pass"
+      "name": "SecondSuite.testSub",
+      "status": "pass"
     },
     {
-      "name" : "SecondSuite.testMul",
-      "status" : "pass"
+      "name": "SecondSuite.testMul",
+      "status": "pass"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/multiple-tests-multiple-fails/Package.swift b/tests/multiple-tests-multiple-fails/Package.swift
index c1fe92b..1a52df0 100644
--- a/tests/multiple-tests-multiple-fails/Package.swift
+++ b/tests/multiple-tests-multiple-fails/Package.swift
@@ -4,12 +4,12 @@
 import PackageDescription
 
 let package = Package(
-    name: "MultipleMultipleFails",
+    name: "MultipleTestsMultipleFails",
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
-            name: "MultipleMultipleFails",
-            targets: ["MultipleMultipleFails"]),
+            name: "MultipleTestsMultipleFails",
+            targets: ["MultipleTestsMultipleFails"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -19,10 +19,10 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
-            name: "MultipleMultipleFails",
+            name: "MultipleTestsMultipleFails",
             dependencies: []),
         .testTarget(
-            name: "MultipleMultipleFailsTests",
-            dependencies: ["MultipleMultipleFails"]),
+            name: "MultipleTestsMultipleFailsTests",
+            dependencies: ["MultipleTestsMultipleFails"]),
     ]
 )
diff --git a/tests/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift b/tests/multiple-tests-multiple-fails/Sources/MultipleTestsMultipleFails/MultipleTestsMultipleFails.swift
similarity index 100%
rename from tests/multiple-tests-multiple-fails/Sources/MultipleMultipleFails/MultipleMultipleFails.swift
rename to tests/multiple-tests-multiple-fails/Sources/MultipleTestsMultipleFails/MultipleTestsMultipleFails.swift
diff --git a/tests/multiple-tests-multiple-fails/Tests/LinuxMain.swift b/tests/multiple-tests-multiple-fails/Tests/LinuxMain.swift
index 73e684b..8ab085a 100644
--- a/tests/multiple-tests-multiple-fails/Tests/LinuxMain.swift
+++ b/tests/multiple-tests-multiple-fails/Tests/LinuxMain.swift
@@ -1,6 +1,6 @@
-import MultipleMultipleFailsTests
+import MultipleTestsMultipleFailsTests
 import XCTest
 
 var tests = [XCTestCaseEntry]()
-tests += MultipleMultipleFailsTests.allTests()
+tests += MultipleTestsMultipleFailsTests.allTests()
 XCTMain(tests)
diff --git a/tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift b/tests/multiple-tests-multiple-fails/Tests/MultipleTestsMultipleFailsTests/MultipleTestsMultipleFailsTests.swift
similarity index 75%
rename from tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift
rename to tests/multiple-tests-multiple-fails/Tests/MultipleTestsMultipleFailsTests/MultipleTestsMultipleFailsTests.swift
index a737f27..20bcb2a 100644
--- a/tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/MultipleMultipleFailsTests.swift
+++ b/tests/multiple-tests-multiple-fails/Tests/MultipleTestsMultipleFailsTests/MultipleTestsMultipleFailsTests.swift
@@ -1,8 +1,8 @@
 import XCTest
 
-@testable import MultipleMultipleFails
+@testable import MultipleTestsMultipleFails
 
-final class MultipleMultipleFailsTests: XCTestCase {
+final class MultipleTestsMultipleFailsTests: XCTestCase {
   func testAdd() {
     XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
   }
diff --git a/tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift b/tests/multiple-tests-multiple-fails/Tests/MultipleTestsMultipleFailsTests/XCTestManifests.swift
similarity index 67%
rename from tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift
rename to tests/multiple-tests-multiple-fails/Tests/MultipleTestsMultipleFailsTests/XCTestManifests.swift
index 1bde348..5e0e8d1 100644
--- a/tests/multiple-tests-multiple-fails/Tests/MultipleMultipleFailsTests/XCTestManifests.swift
+++ b/tests/multiple-tests-multiple-fails/Tests/MultipleTestsMultipleFailsTests/XCTestManifests.swift
@@ -3,7 +3,7 @@ import XCTest
 #if !canImport(ObjectiveC)
   public func allTests() -> [XCTestCaseEntry] {
     return [
-      testCase(MultipleMultipleFailsTests.allTests)
+      testCase(MultipleTestsMultipleFailsTests.allTests)
     ]
   }
 #endif
diff --git a/tests/multiple-tests-multiple-fails/expected_results.json b/tests/multiple-tests-multiple-fails/expected_results.json
index 1c3d3b9..cac6586 100644
--- a/tests/multiple-tests-multiple-fails/expected_results.json
+++ b/tests/multiple-tests-multiple-fails/expected_results.json
@@ -1,19 +1,19 @@
 {
-  "status" : "fail",
-  "tests" : [
+  "status": "fail",
+  "tests": [
     {
-      "message" : "\/home\/wdn\/dev\/exercism\/swift-test-runner\/test\/multiple-tests-multiple-fails\/Tests\/MultipleMultipleFailsTests\/MultipleMultipleFailsTests.swift:7: error: MultipleMultipleFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "MultipleMultipleFailsTests.testAdd",
-      "status" : "fail"
+      "message": "/home/wdn/dev/exercism/swift-test-runner/test/multiple-tests-multiple-fails/Tests/MultipleTestsMultipleFailsTests/MultipleTestsMultipleFailsTests.swift:7: error: MultipleTestsMultipleFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
+      "name": "MultipleTestsMultipleFailsTests.testAdd",
+      "status": "fail"
     },
     {
-      "message" : "\/home\/wdn\/dev\/exercism\/swift-test-runner\/test\/multiple-tests-multiple-fails\/Tests\/MultipleMultipleFailsTests\/MultipleMultipleFailsTests.swift:11: error: MultipleMultipleFailsTests.testSub : XCTAssertEqual failed: (\"5\") is not equal to (\"-1\") - ",
-      "name" : "MultipleMultipleFailsTests.testSub",
-      "status" : "fail"
+      "message": "/home/wdn/dev/exercism/swift-test-runner/test/multiple-tests-multiple-fails/Tests/MultipleTestsMultipleFailsTests/MultipleTestsMultipleFailsTests.swift:11: error: MultipleTestsMultipleFailsTests.testSub : XCTAssertEqual failed: (\"5\") is not equal to (\"-1\") - ",
+      "name": "MultipleTestsMultipleFailsTests.testSub",
+      "status": "fail"
     },
     {
-      "name" : "MultipleMultipleFailsTests.testMul",
-      "status" : "pass"
+      "name": "MultipleTestsMultipleFailsTests.testMul",
+      "status": "pass"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/multiple-tests-single-fail/Package.swift b/tests/multiple-tests-single-fail/Package.swift
index e310a14..4651b6d 100644
--- a/tests/multiple-tests-single-fail/Package.swift
+++ b/tests/multiple-tests-single-fail/Package.swift
@@ -4,12 +4,12 @@
 import PackageDescription
 
 let package = Package(
-    name: "MultipleSingleFail",
+    name: "MultipleTestsSingleFail",
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
-            name: "MultipleSingleFail",
-            targets: ["MultipleSingleFail"]),
+            name: "MultipleTestsSingleFail",
+            targets: ["MultipleTestsSingleFail"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -19,10 +19,10 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
-            name: "MultipleSingleFail",
+            name: "MultipleTestsSingleFail",
             dependencies: []),
         .testTarget(
-            name: "MultipleSingleFailTests",
-            dependencies: ["MultipleSingleFail"]),
+            name: "MultipleTestsSingleFailTests",
+            dependencies: ["MultipleTestsSingleFail"]),
     ]
 )
diff --git a/tests/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift b/tests/multiple-tests-single-fail/Sources/MultipleTestsSingleFail/MultipleTestsSingleFail.swift
similarity index 100%
rename from tests/multiple-tests-single-fail/Sources/MultipleSingleFail/MultipleSingleFail.swift
rename to tests/multiple-tests-single-fail/Sources/MultipleTestsSingleFail/MultipleTestsSingleFail.swift
diff --git a/tests/multiple-tests-single-fail/Tests/LinuxMain.swift b/tests/multiple-tests-single-fail/Tests/LinuxMain.swift
index 5380f37..ce25265 100644
--- a/tests/multiple-tests-single-fail/Tests/LinuxMain.swift
+++ b/tests/multiple-tests-single-fail/Tests/LinuxMain.swift
@@ -1,6 +1,6 @@
-import MultipleSingleFailTests
+import MultipleTestsSingleFailTests
 import XCTest
 
 var tests = [XCTestCaseEntry]()
-tests += MultipleSingleFailTests.allTests()
+tests += MultipleTestsSingleFailTests.allTests()
 XCTMain(tests)
diff --git a/tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift b/tests/multiple-tests-single-fail/Tests/MultipleTestsSingleFailTests/MultipleTestsSingleFailTests.swift
similarity index 93%
rename from tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift
rename to tests/multiple-tests-single-fail/Tests/MultipleTestsSingleFailTests/MultipleTestsSingleFailTests.swift
index 7895664..67071d2 100644
--- a/tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/MultipleSingleFailTests.swift
+++ b/tests/multiple-tests-single-fail/Tests/MultipleTestsSingleFailTests/MultipleTestsSingleFailTests.swift
@@ -1,8 +1,8 @@
 import XCTest
 
-@testable import MultipleSingleFail
+@testable import MultipleTestsSingleFail
 
-final class MultipleSingleFailTests: XCTestCase {
+final class MultipleTestsSingleFailTests: XCTestCase {
   let runAll = Bool(ProcessInfo.processInfo.environment["RUNALL", default: "false"]) ?? false
 
   func testAdd() {
diff --git a/tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift b/tests/multiple-tests-single-fail/Tests/MultipleTestsSingleFailTests/XCTestManifests.swift
similarity index 74%
rename from tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift
rename to tests/multiple-tests-single-fail/Tests/MultipleTestsSingleFailTests/XCTestManifests.swift
index 4f72e30..4a0b6d6 100644
--- a/tests/multiple-tests-single-fail/Tests/MultipleSingleFailTests/XCTestManifests.swift
+++ b/tests/multiple-tests-single-fail/Tests/MultipleTestsSingleFailTests/XCTestManifests.swift
@@ -3,7 +3,7 @@ import XCTest
 #if !canImport(ObjectiveC)
   public func allTests() -> [XCTestCaseEntry] {
     return [
-      testCase(MultipleSingleFailTests.allTests),
+      testCase(MultipleTestsSingleFailTests.allTests),
       testCase(SecondSuite.allTests),
     ]
   }
diff --git a/tests/multiple-tests-single-fail/expected_results.json b/tests/multiple-tests-single-fail/expected_results.json
index 0055ece..6ab835f 100644
--- a/tests/multiple-tests-single-fail/expected_results.json
+++ b/tests/multiple-tests-single-fail/expected_results.json
@@ -1,37 +1,37 @@
 {
-  "status" : "fail",
-  "tests" : [
+  "status": "fail",
+  "tests": [
     {
-      "message" : "\/home\/wdn\/dev\/exercism\/swift-test-runner\/test\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:9: error: MultipleSingleFailTests.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "MultipleSingleFailTests.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
+      "message": "/home/wdn/dev/exercism/swift-test-runner/test/multiple-tests-single-fail/Tests/MultipleTestsSingleFailTests/MultipleTestsSingleFailTests.swift:9: error: MultipleTestsSingleFailTests.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"5\") - 2+3 should equal 5",
+      "name": "MultipleTestsSingleFailTests.testAdd",
+      "output": "yabba…",
+      "status": "fail"
     },
     {
-      "name" : "MultipleSingleFailTests.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
+      "name": "MultipleTestsSingleFailTests.testSub",
+      "output": "dabba…",
+      "status": "pass"
     },
     {
-      "name" : "MultipleSingleFailTests.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
+      "name": "MultipleTestsSingleFailTests.testMul",
+      "output": "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
+      "status": "pass"
     },
     {
-      "message" : "\/home\/wdn\/dev\/exercism\/swift-test-runner\/test\/multiple-tests-single-fail\/Tests\/MultipleSingleFailTests\/MultipleSingleFailTests.swift:34: error: SecondSuite.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"25\") - 12+13 should equal 25",
-      "name" : "SecondSuite.testAdd",
-      "output" : "yabba…",
-      "status" : "fail"
+      "message": "/home/wdn/dev/exercism/swift-test-runner/test/multiple-tests-single-fail/Tests/MultipleTestsSingleFailTests/MultipleTestsSingleFailTests.swift:34: error: SecondSuite.testAdd : XCTAssertEqual failed: (\"0\") is not equal to (\"25\") - 12+13 should equal 25",
+      "name": "SecondSuite.testAdd",
+      "output": "yabba…",
+      "status": "fail"
     },
     {
-      "name" : "SecondSuite.testSub",
-      "output" : "dabba…",
-      "status" : "pass"
+      "name": "SecondSuite.testSub",
+      "output": "dabba…",
+      "status": "pass"
     },
     {
-      "name" : "SecondSuite.testMul",
-      "output" : "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
-      "status" : "pass"
+      "name": "SecondSuite.testMul",
+      "output": "Benedick's speech is 674 character's long.\nI will not be sworn but love may transform me to an oyster,\nbut I’ll take my oath on it, till he have made an oyster of me,\nhe shall never make me such a fool. One woman is fair, yet\nI am well; another is wise, yet I am well; another virtuous,\n25yet I am well; but till all graces be in one woman, one\nwoman shall not come in my grace. Rich she shall be, that’s\ncertain; wise, or I’ll none; virtuous, or I’ll never cheapen\nher; fair, or I’ll ever look on h…",
+      "status": "pass"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/multiple-tests-with-exception/Package.swift b/tests/multiple-tests-with-exception/Package.swift
index 501b2b9..c126fbb 100644
--- a/tests/multiple-tests-with-exception/Package.swift
+++ b/tests/multiple-tests-with-exception/Package.swift
@@ -4,12 +4,12 @@
 import PackageDescription
 
 let package = Package(
-  name: "MultipleWithException",
+  name: "MultipleTestsWithException",
   products: [
     // Products define the executables and libraries produced by a package, and make them visible to other packages.
     .library(
-      name: "MultipleWithException",
-      targets: ["MultipleWithException"])
+      name: "MultipleTestsWithException",
+      targets: ["MultipleTestsWithException"])
   ],
   dependencies: [
     // Dependencies declare other packages that this package depends on.
@@ -19,10 +19,10 @@ let package = Package(
     // Targets are the basic building blocks of a package. A target can define a module or a test suite.
     // Targets can depend on other targets in this package, and on products in packages which this package depends on.
     .target(
-      name: "MultipleWithException",
+      name: "MultipleTestsWithException",
       dependencies: []),
     .testTarget(
-      name: "MultipleWithExceptionTests",
-      dependencies: ["MultipleWithException"]),
+      name: "MultipleTestsWithExceptionTests",
+      dependencies: ["MultipleTestsWithException"]),
   ]
 )
diff --git a/tests/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift b/tests/multiple-tests-with-exception/Sources/MultipleTestsWithException/MultipleTestsWithException.swift
similarity index 100%
rename from tests/multiple-tests-with-exception/Sources/MultipleWithException/MultipleWithException.swift
rename to tests/multiple-tests-with-exception/Sources/MultipleTestsWithException/MultipleTestsWithException.swift
diff --git a/tests/multiple-tests-with-exception/Tests/LinuxMain.swift b/tests/multiple-tests-with-exception/Tests/LinuxMain.swift
index 23dbd17..a5492f6 100644
--- a/tests/multiple-tests-with-exception/Tests/LinuxMain.swift
+++ b/tests/multiple-tests-with-exception/Tests/LinuxMain.swift
@@ -1,6 +1,6 @@
-import MultipleWithExceptionTests
+import MultipleTestsWithExceptionTests
 import XCTest
 
 var tests = [XCTestCaseEntry]()
-tests += MultipleWithExceptionTests.allTests()
+tests += MultipleTestsWithExceptionTests.allTests()
 XCTMain(tests)
diff --git a/tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift b/tests/multiple-tests-with-exception/Tests/MultipleTestsWithExceptionTests/MultipleTestsWithExceptionTests.swift
similarity index 80%
rename from tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift
rename to tests/multiple-tests-with-exception/Tests/MultipleTestsWithExceptionTests/MultipleTestsWithExceptionTests.swift
index 98a6b84..2774166 100644
--- a/tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/MultipleWithExceptionTests.swift
+++ b/tests/multiple-tests-with-exception/Tests/MultipleTestsWithExceptionTests/MultipleTestsWithExceptionTests.swift
@@ -1,8 +1,8 @@
 import XCTest
 
-@testable import MultipleWithException
+@testable import MultipleTestsWithException
 
-final class MultipleWithExceptionTests: XCTestCase {
+final class MultipleTestsWithExceptionTests: XCTestCase {
   func testAdd() {
     XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
   }
diff --git a/tests/multiple-tests-with-exception/Tests/MultipleTestsWithExceptionTests/XCTestManifests.swift b/tests/multiple-tests-with-exception/Tests/MultipleTestsWithExceptionTests/XCTestManifests.swift
new file mode 100644
index 0000000..9926250
--- /dev/null
+++ b/tests/multiple-tests-with-exception/Tests/MultipleTestsWithExceptionTests/XCTestManifests.swift
@@ -0,0 +1,9 @@
+import XCTest
+
+#if !canImport(ObjectiveC)
+  public func allTests() -> [XCTestCaseEntry] {
+    return [
+      testCase(MultipleTestsWithExceptionTests.allTests)
+    ]
+  }
+#endif
diff --git a/tests/multiple-tests-with-exception/expected_results.json b/tests/multiple-tests-with-exception/expected_results.json
index 5c61440..6dd796a 100644
--- a/tests/multiple-tests-with-exception/expected_results.json
+++ b/tests/multiple-tests-with-exception/expected_results.json
@@ -1,22 +1,22 @@
 {
-  "status" : "fail",
-  "tests" : [
+  "status": "fail",
+  "tests": [
     {
-      "name" : "MultipleWithExceptionTests.testAdd",
-      "status" : "pass"
+      "name": "MultipleTestsWithExceptionTests.testAdd",
+      "status": "pass"
     },
     {
-      "name" : "MultipleWithExceptionTests.testSub",
-      "status" : "pass"
+      "name": "MultipleTestsWithExceptionTests.testSub",
+      "status": "pass"
     },
     {
-      "name" : "MultipleWithExceptionTests.testMul",
-      "status" : "pass"
+      "name": "MultipleTestsWithExceptionTests.testMul",
+      "status": "pass"
     },
     {
-      "message" : "\/home\/wdn\/dev\/exercism\/swift-test-runner\/test\/multiple-tests-with-exception\/Tests\/MultipleWithExceptionTests\/MultipleWithExceptionTests.swift:19: error: MultipleWithExceptionTests.testThrow : XCTAssertEqual threw error \"testError(\"Oh noes! Div by zeroes!!!\")\" - ",
-      "name" : "MultipleWithExceptionTests.testThrow",
-      "status" : "fail"
+      "message": "/home/wdn/dev/exercism/swift-test-runner/test/multiple-tests-with-exception/Tests/MultipleTestsWithExceptionTests/MultipleTestsWithExceptionTests.swift:19: error: MultipleTestsWithExceptionTests.testThrow : XCTAssertEqual threw error \"testError(\"Oh noes! Div by zeroes!!!\")\" - ",
+      "name": "MultipleTestsWithExceptionTests.testThrow",
+      "status": "fail"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/single-test-that-fails/Package.swift b/tests/single-test-that-fails/Package.swift
index ec316d6..e9bf88f 100644
--- a/tests/single-test-that-fails/Package.swift
+++ b/tests/single-test-that-fails/Package.swift
@@ -4,12 +4,12 @@
 import PackageDescription
 
 let package = Package(
-    name: "SingleThatFails",
+    name: "SingleTestThatFails",
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
-            name: "SingleThatFails",
-            targets: ["SingleThatFails"]),
+            name: "SingleTestThatFails",
+            targets: ["SingleTestThatFails"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -19,10 +19,10 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
-            name: "SingleThatFails",
+            name: "SingleTestThatFails",
             dependencies: []),
         .testTarget(
-            name: "SingleThatFailsTests",
-            dependencies: ["SingleThatFails"]),
+            name: "SingleTestThatFailsTests",
+            dependencies: ["SingleTestThatFails"]),
     ]
 )
diff --git a/tests/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift b/tests/single-test-that-fails/Sources/SingleTestThatFails/SingleTestThatFails.swift
similarity index 100%
rename from tests/single-test-that-fails/Sources/SingleThatFails/SingleThatFails.swift
rename to tests/single-test-that-fails/Sources/SingleTestThatFails/SingleTestThatFails.swift
diff --git a/tests/single-test-that-fails/Tests/LinuxMain.swift b/tests/single-test-that-fails/Tests/LinuxMain.swift
index cb1beda..4d279bc 100644
--- a/tests/single-test-that-fails/Tests/LinuxMain.swift
+++ b/tests/single-test-that-fails/Tests/LinuxMain.swift
@@ -1,6 +1,6 @@
-import SingleThatFailsTests
+import SingleTestThatFailsTests
 import XCTest
 
 var tests = [XCTestCaseEntry]()
-tests += SingleThatFailsTests.allTests()
+tests += SingleTestThatFailsTests.allTests()
 XCTMain(tests)
diff --git a/tests/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift b/tests/single-test-that-fails/Tests/SingleTestThatFailsTests/SingleTestThatFailsTests.swift
similarity index 63%
rename from tests/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift
rename to tests/single-test-that-fails/Tests/SingleTestThatFailsTests/SingleTestThatFailsTests.swift
index d456db7..9882958 100644
--- a/tests/single-test-that-fails/Tests/SingleThatFailsTests/SingleThatFailsTests.swift
+++ b/tests/single-test-that-fails/Tests/SingleTestThatFailsTests/SingleTestThatFailsTests.swift
@@ -1,8 +1,8 @@
 import XCTest
 
-@testable import SingleThatFails
+@testable import SingleTestThatFails
 
-final class SingleThatFailsTests: XCTestCase {
+final class SingleTestThatFailsTests: XCTestCase {
   func testAdd() {
     XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
   }
diff --git a/tests/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift b/tests/single-test-that-fails/Tests/SingleTestThatFailsTests/XCTestManifests.swift
similarity index 70%
rename from tests/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift
rename to tests/single-test-that-fails/Tests/SingleTestThatFailsTests/XCTestManifests.swift
index 76f6b7a..425c116 100644
--- a/tests/single-test-that-passes/Tests/SingleThatPassesTests/XCTestManifests.swift
+++ b/tests/single-test-that-fails/Tests/SingleTestThatFailsTests/XCTestManifests.swift
@@ -3,7 +3,7 @@ import XCTest
 #if !canImport(ObjectiveC)
   public func allTests() -> [XCTestCaseEntry] {
     return [
-      testCase(SingleThatPassesTests.allTests)
+      testCase(SingleTestThatFailsTests.allTests)
     ]
   }
 #endif
diff --git a/tests/single-test-that-fails/expected_results.json b/tests/single-test-that-fails/expected_results.json
index 939bd57..bc016ef 100644
--- a/tests/single-test-that-fails/expected_results.json
+++ b/tests/single-test-that-fails/expected_results.json
@@ -1,10 +1,10 @@
 {
-  "status" : "fail",
-  "tests" : [
+  "status": "fail",
+  "tests": [
     {
-      "message" : "\/home\/wdn\/dev\/exercism\/swift-test-runner\/test\/single-test-that-fails\/Tests\/SingleThatFailsTests\/SingleThatFailsTests.swift:7: error: SingleThatFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
-      "name" : "SingleThatFailsTests.testAdd",
-      "status" : "fail"
+      "message": "/home/wdn/dev/exercism/swift-test-runner/test/single-test-that-fails/Tests/SingleTestThatFailsTests/SingleTestThatFailsTests.swift:7: error: SingleTestThatFailsTests.testAdd : XCTAssertEqual failed: (\"-1\") is not equal to (\"5\") - 2+3 should equal 5",
+      "name": "SingleTestThatFailsTests.testAdd",
+      "status": "fail"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/single-test-that-passes/Package.swift b/tests/single-test-that-passes/Package.swift
index 6c54388..b2d3e43 100644
--- a/tests/single-test-that-passes/Package.swift
+++ b/tests/single-test-that-passes/Package.swift
@@ -4,12 +4,12 @@
 import PackageDescription
 
 let package = Package(
-    name: "SingleThatPasses",
+    name: "SingleTestThatPasses",
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
-            name: "SingleThatPasses",
-            targets: ["SingleThatPasses"]),
+            name: "SingleTestThatPasses",
+            targets: ["SingleTestThatPasses"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -19,10 +19,10 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
-            name: "SingleThatPasses",
+            name: "SingleTestThatPasses",
             dependencies: []),
         .testTarget(
-            name: "SingleThatPassesTests",
-            dependencies: ["SingleThatPasses"]),
+            name: "SingleTestThatPassesTests",
+            dependencies: ["SingleTestThatPasses"]),
     ]
 )
diff --git a/tests/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift b/tests/single-test-that-passes/Sources/SingleTestThatPasses/SingleTestThatPasses.swift
similarity index 100%
rename from tests/single-test-that-passes/Sources/SingleThatPasses/SingleThatPasses.swift
rename to tests/single-test-that-passes/Sources/SingleTestThatPasses/SingleTestThatPasses.swift
diff --git a/tests/single-test-that-passes/Tests/LinuxMain.swift b/tests/single-test-that-passes/Tests/LinuxMain.swift
index c2aee5c..916e248 100644
--- a/tests/single-test-that-passes/Tests/LinuxMain.swift
+++ b/tests/single-test-that-passes/Tests/LinuxMain.swift
@@ -1,6 +1,6 @@
-import SingleThatPassesTests
+import SingleTestThatPassesTests
 import XCTest
 
 var tests = [XCTestCaseEntry]()
-tests += SingleThatPassesTests.allTests()
+tests += SingleTestThatPassesTests.allTests()
 XCTMain(tests)
diff --git a/tests/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift b/tests/single-test-that-passes/Tests/SingleTestThatPassesTests/SingleTestThatPassesTests.swift
similarity index 62%
rename from tests/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift
rename to tests/single-test-that-passes/Tests/SingleTestThatPassesTests/SingleTestThatPassesTests.swift
index 8a8d431..13e26eb 100644
--- a/tests/single-test-that-passes/Tests/SingleThatPassesTests/SingleThatPassesTests.swift
+++ b/tests/single-test-that-passes/Tests/SingleTestThatPassesTests/SingleTestThatPassesTests.swift
@@ -1,8 +1,8 @@
 import XCTest
 
-@testable import SingleThatPasses
+@testable import SingleTestThatPasses
 
-final class SingleThatPassesTests: XCTestCase {
+final class SingleTestThatPassesTests: XCTestCase {
   func testAdd() {
     XCTAssertEqual(sum(2, 3), 5, "2+3 should equal 5")
   }
diff --git a/tests/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift b/tests/single-test-that-passes/Tests/SingleTestThatPassesTests/XCTestManifests.swift
similarity index 70%
rename from tests/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift
rename to tests/single-test-that-passes/Tests/SingleTestThatPassesTests/XCTestManifests.swift
index d35899b..09dab25 100644
--- a/tests/single-test-that-fails/Tests/SingleThatFailsTests/XCTestManifests.swift
+++ b/tests/single-test-that-passes/Tests/SingleTestThatPassesTests/XCTestManifests.swift
@@ -3,7 +3,7 @@ import XCTest
 #if !canImport(ObjectiveC)
   public func allTests() -> [XCTestCaseEntry] {
     return [
-      testCase(SingleThatFailsTests.allTests)
+      testCase(SingleTestThatPassesTests.allTests)
     ]
   }
 #endif
diff --git a/tests/single-test-that-passes/expected_results.json b/tests/single-test-that-passes/expected_results.json
index 4472e04..2227a83 100644
--- a/tests/single-test-that-passes/expected_results.json
+++ b/tests/single-test-that-passes/expected_results.json
@@ -1,9 +1,9 @@
 {
-  "status" : "pass",
-  "tests" : [
+  "status": "pass",
+  "tests": [
     {
-      "name" : "SingleThatPassesTests.testAdd",
-      "status" : "pass"
+      "name": "SingleTestThatPassesTests.testAdd",
+      "status": "pass"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/tests/single-test-with-exception/Package.swift b/tests/single-test-with-exception/Package.swift
index bfe3bc9..3262ff1 100644
--- a/tests/single-test-with-exception/Package.swift
+++ b/tests/single-test-with-exception/Package.swift
@@ -4,12 +4,12 @@
 import PackageDescription
 
 let package = Package(
-    name: "SingleWithException",
+    name: "SingleTestWithException",
     products: [
         // Products define the executables and libraries produced by a package, and make them visible to other packages.
         .library(
-            name: "SingleWithException",
-            targets: ["SingleWithException"]),
+            name: "SingleTestWithException",
+            targets: ["SingleTestWithException"]),
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
@@ -19,10 +19,10 @@ let package = Package(
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages which this package depends on.
         .target(
-            name: "SingleWithException",
+            name: "SingleTestWithException",
             dependencies: []),
         .testTarget(
-            name: "SingleWithExceptionTests",
-            dependencies: ["SingleWithException"]),
+            name: "SingleTestWithExceptionTests",
+            dependencies: ["SingleTestWithException"]),
     ]
 )
diff --git a/tests/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift b/tests/single-test-with-exception/Sources/SingleTestWithException/SingleTestWithException.swift
similarity index 100%
rename from tests/single-test-with-exception/Sources/SingleWithException/SingleWithException.swift
rename to tests/single-test-with-exception/Sources/SingleTestWithException/SingleTestWithException.swift
diff --git a/tests/single-test-with-exception/Tests/LinuxMain.swift b/tests/single-test-with-exception/Tests/LinuxMain.swift
index 778ae21..0ce37a8 100644
--- a/tests/single-test-with-exception/Tests/LinuxMain.swift
+++ b/tests/single-test-with-exception/Tests/LinuxMain.swift
@@ -1,6 +1,6 @@
-import SingleWithExceptionTests
+import SingleTestWithExceptionTests
 import XCTest
 
 var tests = [XCTestCaseEntry]()
-tests += SingleWithExceptionTests.allTests()
+tests += SingleTestWithExceptionTests.allTests()
 XCTMain(tests)
diff --git a/tests/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift b/tests/single-test-with-exception/Tests/SingleTestWithExceptionTests/SingleTestWithExceptionTests.swift
similarity index 61%
rename from tests/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift
rename to tests/single-test-with-exception/Tests/SingleTestWithExceptionTests/SingleTestWithExceptionTests.swift
index 376a9c2..8b19aeb 100644
--- a/tests/single-test-with-exception/Tests/SingleWithExceptionTests/SingleWithExceptionTests.swift
+++ b/tests/single-test-with-exception/Tests/SingleTestWithExceptionTests/SingleTestWithExceptionTests.swift
@@ -1,8 +1,8 @@
 import XCTest
 
-@testable import SingleWithException
+@testable import SingleTestWithException
 
-final class SingleWithExceptionTests: XCTestCase {
+final class SingleTestWithExceptionTests: XCTestCase {
   func testAdd() {
     XCTAssertEqual(try sum(2, 3), 5, "2+3 should equal 5")
   }
diff --git a/tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift b/tests/single-test-with-exception/Tests/SingleTestWithExceptionTests/XCTestManifests.swift
similarity index 68%
rename from tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift
rename to tests/single-test-with-exception/Tests/SingleTestWithExceptionTests/XCTestManifests.swift
index cbab108..86df0f1 100644
--- a/tests/multiple-tests-with-exception/Tests/MultipleWithExceptionTests/XCTestManifests.swift
+++ b/tests/single-test-with-exception/Tests/SingleTestWithExceptionTests/XCTestManifests.swift
@@ -3,7 +3,7 @@ import XCTest
 #if !canImport(ObjectiveC)
   public func allTests() -> [XCTestCaseEntry] {
     return [
-      testCase(MultipleWithExceptionTests.allTests)
+      testCase(SingleTestWithExceptionTests.allTests)
     ]
   }
 #endif
diff --git a/tests/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift b/tests/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift
deleted file mode 100644
index 61fb57b..0000000
--- a/tests/single-test-with-exception/Tests/SingleWithExceptionTests/XCTestManifests.swift
+++ /dev/null
@@ -1,9 +0,0 @@
-import XCTest
-
-#if !canImport(ObjectiveC)
-  public func allTests() -> [XCTestCaseEntry] {
-    return [
-      testCase(SingleWithExceptionTests.allTests)
-    ]
-  }
-#endif
diff --git a/tests/single-test-with-exception/expected_results.json b/tests/single-test-with-exception/expected_results.json
index 3200ae4..59cbf62 100644
--- a/tests/single-test-with-exception/expected_results.json
+++ b/tests/single-test-with-exception/expected_results.json
@@ -1,10 +1,10 @@
 {
-  "status" : "fail",
-  "tests" : [
+  "status": "fail",
+  "tests": [
     {
-      "message" : "\/home\/wdn\/dev\/exercism\/swift-test-runner\/test\/single-test-with-exception\/Tests\/SingleWithExceptionTests\/SingleWithExceptionTests.swift:7: error: SingleWithExceptionTests.testAdd : XCTAssertEqual threw error \"testError(\"Kaboomtown!\")\" - 2+3 should equal 5",
-      "name" : "SingleWithExceptionTests.testAdd",
-      "status" : "fail"
+      "message": "/home/wdn/dev/exercism/swift-test-runner/test/single-test-with-exception/Tests/SingleTestWithExceptionTests/SingleTestWithExceptionTests.swift:7: error: SingleTestWithExceptionTests.testAdd : XCTAssertEqual threw error \"testError(\"Kaboomtown!\")\" - 2+3 should equal 5",
+      "name": "SingleTestWithExceptionTests.testAdd",
+      "status": "fail"
     }
   ]
-}
\ No newline at end of file
+}

From 2d76393a4c67463c57e8ebacb11327e3e58f79c6 Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:49:46 +0200
Subject: [PATCH 10/13] Remove unneeded comment

---
 src/testrunner/Sources/TestRunner/main.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/testrunner/Sources/TestRunner/main.swift b/src/testrunner/Sources/TestRunner/main.swift
index a46e9b9..5003ad2 100644
--- a/src/testrunner/Sources/TestRunner/main.swift
+++ b/src/testrunner/Sources/TestRunner/main.swift
@@ -67,11 +67,11 @@ let process = Process()
 #if os(macOS)
   var testFileRoot = options.solutionDirectory
   process.launchPath = options.swiftLocation
-  process.currentDirectoryPath = testFileRoot// + options.slug
+  process.currentDirectoryPath = testFileRoot
 #else
   var testFileRoot = URL(fileURLWithPath: options.solutionDirectory)
   process.executableURL = URL(fileURLWithPath: options.swiftLocation)
-  process.currentDirectoryURL = testFileRoot//.appendingPathComponent(options.slug)
+  process.currentDirectoryURL = testFileRoot
 #endif
 
 process.arguments = ["test", "--build-path", tempDir.path]

From 6d810eb7d5ea184ebc7eeb2d2f38976786d8ca11 Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 13:58:22 +0200
Subject: [PATCH 11/13] Simplify run

---
 bin/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/run.sh b/bin/run.sh
index 391b426..aa543d2 100755
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -31,6 +31,6 @@ mkdir -p "${output_dir}"
 echo "${slug}: testing..."
 
 # Run the tests for the provided implementation file
-RUNALL=true ./bin/TestRunner --slug "${slug}" --solution-directory "${input_dir}" --output-directory "${output_dir}" --swift-location $(which swift) --build-directory "/tmp/"
+RUNALL=true ./bin/TestRunner --slug "${slug}" --solution-directory "${input_dir}" --output-directory "${output_dir}" --swift-location $(which swift) --build-directory "/tmp"
 
 echo "${slug}: done"

From 58a6e54b57db1178926f4de3fd8149e9ef45b3ed Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 14:12:43 +0200
Subject: [PATCH 12/13] Upgrade to swift 5.3

---
 src/testrunner/Package.swift                      | 2 +-
 tests/compile-error/Package.swift                 | 2 +-
 tests/multiple-tests-all-pass/Package.swift       | 2 +-
 tests/multiple-tests-multiple-fails/Package.swift | 2 +-
 tests/multiple-tests-single-fail/Package.swift    | 2 +-
 tests/multiple-tests-with-exception/Package.swift | 2 +-
 tests/single-test-that-fails/Package.swift        | 2 +-
 tests/single-test-that-passes/Package.swift       | 2 +-
 tests/single-test-with-exception/Package.swift    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/testrunner/Package.swift b/src/testrunner/Package.swift
index f7953b4..800d733 100644
--- a/src/testrunner/Package.swift
+++ b/src/testrunner/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/tests/compile-error/Package.swift b/tests/compile-error/Package.swift
index b0183f0..1a275ee 100644
--- a/tests/compile-error/Package.swift
+++ b/tests/compile-error/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/tests/multiple-tests-all-pass/Package.swift b/tests/multiple-tests-all-pass/Package.swift
index 775f117..d219472 100644
--- a/tests/multiple-tests-all-pass/Package.swift
+++ b/tests/multiple-tests-all-pass/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/tests/multiple-tests-multiple-fails/Package.swift b/tests/multiple-tests-multiple-fails/Package.swift
index 1a52df0..6636eca 100644
--- a/tests/multiple-tests-multiple-fails/Package.swift
+++ b/tests/multiple-tests-multiple-fails/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/tests/multiple-tests-single-fail/Package.swift b/tests/multiple-tests-single-fail/Package.swift
index 4651b6d..2236076 100644
--- a/tests/multiple-tests-single-fail/Package.swift
+++ b/tests/multiple-tests-single-fail/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/tests/multiple-tests-with-exception/Package.swift b/tests/multiple-tests-with-exception/Package.swift
index c126fbb..b18e7e8 100644
--- a/tests/multiple-tests-with-exception/Package.swift
+++ b/tests/multiple-tests-with-exception/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/tests/single-test-that-fails/Package.swift b/tests/single-test-that-fails/Package.swift
index e9bf88f..be97e84 100644
--- a/tests/single-test-that-fails/Package.swift
+++ b/tests/single-test-that-fails/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/tests/single-test-that-passes/Package.swift b/tests/single-test-that-passes/Package.swift
index b2d3e43..8ca6adb 100644
--- a/tests/single-test-that-passes/Package.swift
+++ b/tests/single-test-that-passes/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
diff --git a/tests/single-test-with-exception/Package.swift b/tests/single-test-with-exception/Package.swift
index 3262ff1..ce51030 100644
--- a/tests/single-test-with-exception/Package.swift
+++ b/tests/single-test-with-exception/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription

From 9f019e94f23b2a4cc1b40b55afbc7d539df0f937 Mon Sep 17 00:00:00 2001
From: Erik Schierboom <erik_schierboom@hotmail.com>
Date: Fri, 16 Apr 2021 14:13:44 +0200
Subject: [PATCH 13/13] Pin version in Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ea396a2..eac3673 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,11 @@
-FROM swift:latest AS builder
+FROM swift:5.3.3-bionic AS builder
 
 COPY src/testrunner ./
 
 RUN swift --version
 RUN swift build --configuration release
 
-FROM swift:latest
+FROM swift:5.3.3-bionic
 WORKDIR /opt/test-runner/
 COPY bin/ bin/
 COPY --from=builder /.build/release/TestRunner bin/