diff --git a/README.md b/README.md
index f7887f805e..01415643a4 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,14 @@ If `make small-test` fails in a branch that you wish to merge into the main
 branch, run `make small-test` in the main branch (which should succeed) and also
 in your branch, and investigate the differences.
 
+#### Updating the goal files
+
+If you make a change to the mergers that changes merge results, you need to
+update the goal files or else reproducibility checks will fail.
+Copy certain files from `results/small/` to `test/small-goal-files/`.
+
+To update the reproducibility tests, run `make run-all`.
+
 ### Load the stored cache
 
 To decompress the cache run `make decompress-cache`. This is done automatically in `run_combined.sh` if `cache/` does not exist.
@@ -238,6 +246,8 @@ To investigate differences between two mergers:
 * Set `DELETE_WORKDIRS` to `false` in `src/python/variables.py`.
 * run `src/python/replay_merge.py --idx INDEX` (maybe add `-test`) for the index of the merge you are interested in.
 
+If the merge is in the small test, you may need to add `--merges_csv ./test/small-goal-files/result.csv`.
+
 ## Overwriting results manually
 
 In some cases it might be worth to overwrite the computed results. To do that you should modify the `results/manual_override.csv` file. In that file for the merge you want to overwrite a result of you should include at least the information `repository,merge,left,right` and a new column for the result you want to overwrite. You can overwrite anything you want but if there is a column you don't want to overwrite either do not include that column or leave the entry blanck i.e. `,,`. See the file for an example.
diff --git a/src/scripts/merge_tools/adjacent.sh b/src/scripts/merge_tools/adjacent.sh
index a66d6eff43..116661bb3b 100755
--- a/src/scripts/merge_tools/adjacent.sh
+++ b/src/scripts/merge_tools/adjacent.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./adjacent.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/adjacent_ignorespace.sh b/src/scripts/merge_tools/adjacent_ignorespace.sh
index 0baf960fc1..947334cc5c 100755
--- a/src/scripts/merge_tools/adjacent_ignorespace.sh
+++ b/src/scripts/merge_tools/adjacent_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./adjacent_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/adjacent_plus.sh b/src/scripts/merge_tools/adjacent_plus.sh
index adb0478df2..f246994a9d 100755
--- a/src/scripts/merge_tools/adjacent_plus.sh
+++ b/src/scripts/merge_tools/adjacent_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./adjacent.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/git_hires_merge.sh b/src/scripts/merge_tools/git_hires_merge.sh
index ef1795eb9c..83d2fad295 100755
--- a/src/scripts/merge_tools/git_hires_merge.sh
+++ b/src/scripts/merge_tools/git_hires_merge.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./git_hires_merge.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 set -o nounset
 
diff --git a/src/scripts/merge_tools/git_hires_merge_plus.sh b/src/scripts/merge_tools/git_hires_merge_plus.sh
index 38f01be17a..ed8ed5b86d 100755
--- a/src/scripts/merge_tools/git_hires_merge_plus.sh
+++ b/src/scripts/merge_tools/git_hires_merge_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./git_hires_merge_plus.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_ort.sh b/src/scripts/merge_tools/gitmerge_ort.sh
index 2f74883e68..8d736ef802 100755
--- a/src/scripts/merge_tools/gitmerge_ort.sh
+++ b/src/scripts/merge_tools/gitmerge_ort.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh b/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh
index 70b6ab3f80..5b58d1679c 100755
--- a/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh
+++ b/src/scripts/merge_tools/gitmerge_ort_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_ort_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_histogram.sh b/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
index e7a8677144..2d6acab8d5 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_histogram.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_histogram.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_histogram_plus.sh b/src/scripts/merge_tools/gitmerge_recursive_histogram_plus.sh
index 0ecfb0d6b3..aaf9c13609 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_histogram_plus.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_histogram_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_histogram_plus.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh b/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh
index ac78d10e16..1d735e8362 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_DIR="$(dirname "$0")"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh b/src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh
index a49b82bc12..e9bdd0e77f 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_ignorespace_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_ignorespace_plus.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_minimal.sh b/src/scripts/merge_tools/gitmerge_recursive_minimal.sh
index e1a4f4f4db..6efc432059 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_minimal.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_minimal.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_minimal.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_minimal_plus.sh b/src/scripts/merge_tools/gitmerge_recursive_minimal_plus.sh
index f9457f945d..c8151126c6 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_minimal_plus.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_minimal_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_minimal_plus.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_myers.sh b/src/scripts/merge_tools/gitmerge_recursive_myers.sh
index 07c5c06328..dd0c432487 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_myers.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_myers.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_myers.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_myers_plus.sh b/src/scripts/merge_tools/gitmerge_recursive_myers_plus.sh
index 712c3c0c76..dea5c5dac0 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_myers_plus.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_myers_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_myers_plus.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_patience.sh b/src/scripts/merge_tools/gitmerge_recursive_patience.sh
index 5a4e0782d8..f5fe3f76ee 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_patience.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_patience.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_patience.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_recursive_patience_plus.sh b/src/scripts/merge_tools/gitmerge_recursive_patience_plus.sh
index de31d1d26c..51b28505b2 100755
--- a/src/scripts/merge_tools/gitmerge_recursive_patience_plus.sh
+++ b/src/scripts/merge_tools/gitmerge_recursive_patience_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_recursive_patience_plus.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_resolve.sh b/src/scripts/merge_tools/gitmerge_resolve.sh
index 3287584a16..56bf5db8d9 100755
--- a/src/scripts/merge_tools/gitmerge_resolve.sh
+++ b/src/scripts/merge_tools/gitmerge_resolve.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# usage: ./gitmerge_resolve.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/gitmerge_resolve_plus.sh b/src/scripts/merge_tools/gitmerge_resolve_plus.sh
index f910795811..e78198a189 100755
--- a/src/scripts/merge_tools/gitmerge_resolve_plus.sh
+++ b/src/scripts/merge_tools/gitmerge_resolve_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./gitmerge_resolve_plus.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/imports.sh b/src/scripts/merge_tools/imports.sh
index 74808cffac..4850621e23 100755
--- a/src/scripts/merge_tools/imports.sh
+++ b/src/scripts/merge_tools/imports.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./imports.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/imports_ignorespace.sh b/src/scripts/merge_tools/imports_ignorespace.sh
index 5ab81c26b4..c263ca4829 100755
--- a/src/scripts/merge_tools/imports_ignorespace.sh
+++ b/src/scripts/merge_tools/imports_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./imports_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/intellimerge.sh b/src/scripts/merge_tools/intellimerge.sh
index 44da521634..5641d4f16a 100755
--- a/src/scripts/merge_tools/intellimerge.sh
+++ b/src/scripts/merge_tools/intellimerge.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./intellimerge.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 # <clone_dir> must contain a clone of a repository.
 # Merges branch2 into branch1, in <clone_dir>.
 # Return code is 0 for merge success, 1 for merge failure, 2 for script failure.
diff --git a/src/scripts/merge_tools/intellimerge_plus.sh b/src/scripts/merge_tools/intellimerge_plus.sh
index bccff7d4fd..044e290166 100755
--- a/src/scripts/merge_tools/intellimerge_plus.sh
+++ b/src/scripts/merge_tools/intellimerge_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./intellimerge_plus.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/ivn.sh b/src/scripts/merge_tools/ivn.sh
index 162976a74f..15a395c7a0 100755
--- a/src/scripts/merge_tools/ivn.sh
+++ b/src/scripts/merge_tools/ivn.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./ivn.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/ivn_ignorespace.sh b/src/scripts/merge_tools/ivn_ignorespace.sh
index e6d4d5aa31..af3a3009f4 100755
--- a/src/scripts/merge_tools/ivn_ignorespace.sh
+++ b/src/scripts/merge_tools/ivn_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./ivn_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/spork.sh b/src/scripts/merge_tools/spork.sh
index 595cee1473..fcc7386d24 100755
--- a/src/scripts/merge_tools/spork.sh
+++ b/src/scripts/merge_tools/spork.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./spork.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 # <clone_dir> must contain a clone of a repository.
 # Merges branch2 into branch1, in <clone_dir>.
 # Return code is 0 for merge success, 1 for merge failure, 2 for script failure.
diff --git a/src/scripts/merge_tools/spork_plus.sh b/src/scripts/merge_tools/spork_plus.sh
index 44f67a1046..12633ade4f 100755
--- a/src/scripts/merge_tools/spork_plus.sh
+++ b/src/scripts/merge_tools/spork_plus.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./spork_plus.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/version_numbers.sh b/src/scripts/merge_tools/version_numbers.sh
index 9eb28511a9..1166b146cd 100755
--- a/src/scripts/merge_tools/version_numbers.sh
+++ b/src/scripts/merge_tools/version_numbers.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./version_numbers.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1
diff --git a/src/scripts/merge_tools/version_numbers_ignorespace.sh b/src/scripts/merge_tools/version_numbers_ignorespace.sh
index c902f8e03a..9fca1f26ed 100755
--- a/src/scripts/merge_tools/version_numbers_ignorespace.sh
+++ b/src/scripts/merge_tools/version_numbers_ignorespace.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-# usage: ./version_numbers_ignorespace.sh <clone_dir> <branch-1> <branch-2>
+# usage: <scriptname> <clone_dir> <branch-1> <branch-2>
 
 MERGE_SCRIPTS_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 clone_dir=$1