exercism · ajborla · Jul 23, 2024 · Jul 23, 2024 · Jul 23, 2024
diff --git a/bin/verify-exercises b/bin/verify-exercises
@@ -28,9 +28,9 @@ verify_practice_exercise() {
     # Check whether exercise is a work-in-progress; if so, skip test, return success
     local is_wip=$(jq '.exercises.practice[] | select(.slug=="'${exercise}'") | select(.status=="wip")' config.json)
     [ -n "${is_wip}" ] && return 0
-    # Copy exercise directory contents to temporary directory
+    # Create temporary directory, and copy exercise directory contents to it
     local testdir="$(mktemp -d)"
-    cp "${srcdir}"/* "${testdir}"/
+    cp -r "${srcdir}"/* "${testdir}"/
     cp "${srcdir}"/.meta/example*.rexx "${testdir}"/
     # Prepare and perform exercise tests
     echo "Testing ${exercise} ..."

diff --git a/exercises/practice/accumulate/.meta/config.json b/exercises/practice/accumulate/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["accumulate.rexx"],
+    "solution": ["accumulate.rexx", "accumulate-toplevel.rexx"],
     "test": ["test-accumulate"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/accumulate/test-accumulate b/exercises/practice/accumulate/test-accumulate
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina accumulate-check accumulate accumulate-toplevel ; else ./runt "$@" accumulate-check accumulate accumulate-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../accumulate-check ../accumulate ../accumulate-toplevel ; else ./runt "$@" ../accumulate-check ../accumulate ../accumulate-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/accumulate/test-accumulate.bat b/exercises/practice/accumulate/test-accumulate.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% accumulate-check accumulate accumulate-toplevel
+cd "testlib"
+@call runt.bat %options% ..\accumulate-check ..\accumulate ..\accumulate-toplevel
+cd ..
diff --git a/exercises/practice/accumulate/testlib/accumulate-funcs.rexx b/exercises/practice/accumulate/testlib/accumulate-funcs.rexx
@@ -0,0 +1,8 @@
+/* accumulate - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/accumulate/runt → exercises/practice/accumulate/testlib/runt b/exercises/practice/accumulate/runt → exercises/practice/accumulate/testlib/runt
diff --git a/exercises/practice/accumulate/runt.bat → ...ises/practice/accumulate/testlib/runt.bat b/exercises/practice/accumulate/runt.bat → ...ises/practice/accumulate/testlib/runt.bat
diff --git a/exercises/practice/accumulate/t1.rexx → ...cises/practice/accumulate/testlib/t1.rexx b/exercises/practice/accumulate/t1.rexx → ...cises/practice/accumulate/testlib/t1.rexx
diff --git a/exercises/practice/accumulate/t2.rexx → ...cises/practice/accumulate/testlib/t2.rexx b/exercises/practice/accumulate/t2.rexx → ...cises/practice/accumulate/testlib/t2.rexx
diff --git a/exercises/practice/accumulate/t3.rexx → ...cises/practice/accumulate/testlib/t3.rexx b/exercises/practice/accumulate/t3.rexx → ...cises/practice/accumulate/testlib/t3.rexx
diff --git a/exercises/practice/acronym/.meta/config.json b/exercises/practice/acronym/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["acronym.rexx"],
+    "solution": ["acronym.rexx", "acronym-toplevel.rexx"],
     "test": ["test-acronym"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/acronym/test-acronym b/exercises/practice/acronym/test-acronym
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina acronym-check acronym acronym-toplevel ; else ./runt "$@" acronym-check acronym acronym-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../acronym-check ../acronym ../acronym-toplevel ; else ./runt "$@" ../acronym-check ../acronym ../acronym-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/acronym/test-acronym.bat b/exercises/practice/acronym/test-acronym.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% acronym-check acronym acronym-toplevel
+cd "testlib"
+@call runt.bat %options% ..\acronym-check ..\acronym ..\acronym-toplevel
+cd ..
diff --git a/exercises/practice/acronym/testlib/acronym-funcs.rexx b/exercises/practice/acronym/testlib/acronym-funcs.rexx
@@ -0,0 +1,8 @@
+/* acronym - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/acronym/runt → exercises/practice/acronym/testlib/runt b/exercises/practice/acronym/runt → exercises/practice/acronym/testlib/runt
diff --git a/exercises/practice/acronym/runt.bat → exercises/practice/acronym/testlib/runt.bat b/exercises/practice/acronym/runt.bat → exercises/practice/acronym/testlib/runt.bat
diff --git a/exercises/practice/acronym/t1.rexx → exercises/practice/acronym/testlib/t1.rexx b/exercises/practice/acronym/t1.rexx → exercises/practice/acronym/testlib/t1.rexx
diff --git a/exercises/practice/acronym/t2.rexx → exercises/practice/acronym/testlib/t2.rexx b/exercises/practice/acronym/t2.rexx → exercises/practice/acronym/testlib/t2.rexx
diff --git a/exercises/practice/acronym/t3.rexx → exercises/practice/acronym/testlib/t3.rexx b/exercises/practice/acronym/t3.rexx → exercises/practice/acronym/testlib/t3.rexx
diff --git a/exercises/practice/all-your-base/.meta/config.json b/exercises/practice/all-your-base/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["all-your-base.rexx"],
+    "solution": ["all-your-base.rexx", "all-your-base-toplevel.rexx"],
     "test": ["test-all-your-base"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/all-your-base/test-all-your-base b/exercises/practice/all-your-base/test-all-your-base
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina all-your-base-check all-your-base all-your-base-toplevel ; else ./runt "$@" all-your-base-check all-your-base all-your-base-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../all-your-base-check ../all-your-base ../all-your-base-toplevel ; else ./runt "$@" ../all-your-base-check ../all-your-base ../all-your-base-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/all-your-base/test-all-your-base.bat b/exercises/practice/all-your-base/test-all-your-base.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% all-your-base-check all-your-base all-your-base-toplevel
+cd "testlib"
+@call runt.bat %options% ..\all-your-base-check ..\all-your-base ..\all-your-base-toplevel
+cd ..
diff --git a/exercises/practice/all-your-base/testlib/all-your-base-funcs.rexx b/exercises/practice/all-your-base/testlib/all-your-base-funcs.rexx
@@ -0,0 +1,8 @@
+/* all-your-base - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/all-your-base/runt → ...cises/practice/all-your-base/testlib/runt b/exercises/practice/all-your-base/runt → ...cises/practice/all-your-base/testlib/runt
diff --git a/exercises/practice/all-your-base/runt.bat → ...s/practice/all-your-base/testlib/runt.bat b/exercises/practice/all-your-base/runt.bat → ...s/practice/all-your-base/testlib/runt.bat
diff --git a/exercises/practice/all-your-base/t1.rexx → ...es/practice/all-your-base/testlib/t1.rexx b/exercises/practice/all-your-base/t1.rexx → ...es/practice/all-your-base/testlib/t1.rexx
diff --git a/exercises/practice/all-your-base/t2.rexx → ...es/practice/all-your-base/testlib/t2.rexx b/exercises/practice/all-your-base/t2.rexx → ...es/practice/all-your-base/testlib/t2.rexx
diff --git a/exercises/practice/all-your-base/t3.rexx → ...es/practice/all-your-base/testlib/t3.rexx b/exercises/practice/all-your-base/t3.rexx → ...es/practice/all-your-base/testlib/t3.rexx
diff --git a/exercises/practice/anagram/.meta/config.json b/exercises/practice/anagram/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["anagram.rexx"],
+    "solution": ["anagram.rexx", "anagram-toplevel.rexx"],
     "test": ["test-anagram"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/anagram/test-anagram b/exercises/practice/anagram/test-anagram
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina anagram-check anagram anagram-toplevel ; else ./runt "$@" anagram-check anagram anagram-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../anagram-check ../anagram ../anagram-toplevel ; else ./runt "$@" ../anagram-check ../anagram ../anagram-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/anagram/test-anagram.bat b/exercises/practice/anagram/test-anagram.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% anagram-check anagram anagram-toplevel
+cd "testlib"
+@call runt.bat %options% ..\anagram-check ..\anagram ..\anagram-toplevel
+cd ..
diff --git a/exercises/practice/anagram/testlib/anagram-funcs.rexx b/exercises/practice/anagram/testlib/anagram-funcs.rexx
@@ -0,0 +1,8 @@
+/* anagram - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/anagram/runt → exercises/practice/anagram/testlib/runt b/exercises/practice/anagram/runt → exercises/practice/anagram/testlib/runt
diff --git a/exercises/practice/anagram/runt.bat → exercises/practice/anagram/testlib/runt.bat b/exercises/practice/anagram/runt.bat → exercises/practice/anagram/testlib/runt.bat
diff --git a/exercises/practice/anagram/t1.rexx → exercises/practice/anagram/testlib/t1.rexx b/exercises/practice/anagram/t1.rexx → exercises/practice/anagram/testlib/t1.rexx
diff --git a/exercises/practice/anagram/t2.rexx → exercises/practice/anagram/testlib/t2.rexx b/exercises/practice/anagram/t2.rexx → exercises/practice/anagram/testlib/t2.rexx
diff --git a/exercises/practice/anagram/t3.rexx → exercises/practice/anagram/testlib/t3.rexx b/exercises/practice/anagram/t3.rexx → exercises/practice/anagram/testlib/t3.rexx
diff --git a/exercises/practice/armstrong-numbers/.meta/config.json b/exercises/practice/armstrong-numbers/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["armstrong-numbers.rexx"],
+    "solution": ["armstrong-numbers.rexx", "armstrong-numbers-toplevel.rexx"],
     "test": ["test-armstrong-numbers"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/armstrong-numbers/test-armstrong-numbers b/exercises/practice/armstrong-numbers/test-armstrong-numbers
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina armstrong-numbers-check armstrong-numbers armstrong-numbers-toplevel ; else ./runt "$@" armstrong-numbers-check armstrong-numbers armstrong-numbers-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../armstrong-numbers-check ../armstrong-numbers ../armstrong-numbers-toplevel ; else ./runt "$@" ../armstrong-numbers-check ../armstrong-numbers ../armstrong-numbers-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/armstrong-numbers/test-armstrong-numbers.bat b/exercises/practice/armstrong-numbers/test-armstrong-numbers.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% armstrong-numbers-check armstrong-numbers armstrong-numbers-toplevel
+cd "testlib"
+@call runt.bat %options% ..\armstrong-numbers-check ..\armstrong-numbers ..\armstrong-numbers-toplevel
+cd ..
diff --git a/exercises/practice/armstrong-numbers/testlib/armstrong-numbers-funcs.rexx b/exercises/practice/armstrong-numbers/testlib/armstrong-numbers-funcs.rexx
@@ -0,0 +1,8 @@
+/* armstrong-numbers - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/armstrong-numbers/runt → ...s/practice/armstrong-numbers/testlib/runt b/exercises/practice/armstrong-numbers/runt → ...s/practice/armstrong-numbers/testlib/runt
diff --git a/...cises/practice/armstrong-numbers/runt.bat → ...actice/armstrong-numbers/testlib/runt.bat b/...cises/practice/armstrong-numbers/runt.bat → ...actice/armstrong-numbers/testlib/runt.bat
diff --git a/exercises/practice/armstrong-numbers/t1.rexx → ...ractice/armstrong-numbers/testlib/t1.rexx b/exercises/practice/armstrong-numbers/t1.rexx → ...ractice/armstrong-numbers/testlib/t1.rexx
diff --git a/exercises/practice/armstrong-numbers/t2.rexx → ...ractice/armstrong-numbers/testlib/t2.rexx b/exercises/practice/armstrong-numbers/t2.rexx → ...ractice/armstrong-numbers/testlib/t2.rexx
diff --git a/exercises/practice/armstrong-numbers/t3.rexx → ...ractice/armstrong-numbers/testlib/t3.rexx b/exercises/practice/armstrong-numbers/t3.rexx → ...ractice/armstrong-numbers/testlib/t3.rexx
diff --git a/exercises/practice/atbash-cipher/.meta/config.json b/exercises/practice/atbash-cipher/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["atbash-cipher.rexx"],
+    "solution": ["atbash-cipher.rexx", "atbash-cipher-toplevel.rexx"],
     "test": ["test-atbash-cipher"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/atbash-cipher/test-atbash-cipher b/exercises/practice/atbash-cipher/test-atbash-cipher
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina atbash-cipher-check atbash-cipher atbash-cipher-toplevel ; else ./runt "$@" atbash-cipher-check atbash-cipher atbash-cipher-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../atbash-cipher-check ../atbash-cipher ../atbash-cipher-toplevel ; else ./runt "$@" ../atbash-cipher-check ../atbash-cipher ../atbash-cipher-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/atbash-cipher/test-atbash-cipher.bat b/exercises/practice/atbash-cipher/test-atbash-cipher.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% atbash-cipher-check atbash-cipher atbash-cipher-toplevel
+cd "testlib"
+@call runt.bat %options% ..\atbash-cipher-check ..\atbash-cipher ..\atbash-cipher-toplevel
+cd ..
diff --git a/exercises/practice/atbash-cipher/testlib/atbash-cipher-funcs.rexx b/exercises/practice/atbash-cipher/testlib/atbash-cipher-funcs.rexx
@@ -0,0 +1,8 @@
+/* atbash-cipher - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/atbash-cipher/runt → ...cises/practice/atbash-cipher/testlib/runt b/exercises/practice/atbash-cipher/runt → ...cises/practice/atbash-cipher/testlib/runt
diff --git a/exercises/practice/atbash-cipher/runt.bat → ...s/practice/atbash-cipher/testlib/runt.bat b/exercises/practice/atbash-cipher/runt.bat → ...s/practice/atbash-cipher/testlib/runt.bat
diff --git a/exercises/practice/atbash-cipher/t1.rexx → ...es/practice/atbash-cipher/testlib/t1.rexx b/exercises/practice/atbash-cipher/t1.rexx → ...es/practice/atbash-cipher/testlib/t1.rexx
diff --git a/exercises/practice/atbash-cipher/t2.rexx → ...es/practice/atbash-cipher/testlib/t2.rexx b/exercises/practice/atbash-cipher/t2.rexx → ...es/practice/atbash-cipher/testlib/t2.rexx
diff --git a/exercises/practice/atbash-cipher/t3.rexx → ...es/practice/atbash-cipher/testlib/t3.rexx b/exercises/practice/atbash-cipher/t3.rexx → ...es/practice/atbash-cipher/testlib/t3.rexx
diff --git a/exercises/practice/bank-account/.meta/config.json b/exercises/practice/bank-account/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["bank-account.rexx"],
+    "solution": ["bank-account.rexx", "bank-account-toplevel.rexx"],
     "test": ["test-bank-account"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/bank-account/test-bank-account b/exercises/practice/bank-account/test-bank-account
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina bank-account-check bank-account bank-account-toplevel ; else ./runt "$@" bank-account-check bank-account bank-account-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../bank-account-check ../bank-account ../bank-account-toplevel ; else ./runt "$@" ../bank-account-check ../bank-account ../bank-account-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/bank-account/test-bank-account.bat b/exercises/practice/bank-account/test-bank-account.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% bank-account-check bank-account bank-account-toplevel
+cd "testlib"
+@call runt.bat %options% ..\bank-account-check ..\bank-account ..\bank-account-toplevel
+cd ..
diff --git a/exercises/practice/bank-account/testlib/bank-account-funcs.rexx b/exercises/practice/bank-account/testlib/bank-account-funcs.rexx
@@ -0,0 +1,8 @@
+/* bank-account - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/bank-account/runt → exercises/practice/bank-account/testlib/runt b/exercises/practice/bank-account/runt → exercises/practice/bank-account/testlib/runt
diff --git a/exercises/practice/bank-account/runt.bat → ...es/practice/bank-account/testlib/runt.bat b/exercises/practice/bank-account/runt.bat → ...es/practice/bank-account/testlib/runt.bat
diff --git a/exercises/practice/bank-account/t1.rexx → ...ses/practice/bank-account/testlib/t1.rexx b/exercises/practice/bank-account/t1.rexx → ...ses/practice/bank-account/testlib/t1.rexx
diff --git a/exercises/practice/bank-account/t2.rexx → ...ses/practice/bank-account/testlib/t2.rexx b/exercises/practice/bank-account/t2.rexx → ...ses/practice/bank-account/testlib/t2.rexx
diff --git a/exercises/practice/bank-account/t3.rexx → ...ses/practice/bank-account/testlib/t3.rexx b/exercises/practice/bank-account/t3.rexx → ...ses/practice/bank-account/testlib/t3.rexx
diff --git a/exercises/practice/beer-song/.meta/config.json b/exercises/practice/beer-song/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["beer-song.rexx"],
+    "solution": ["beer-song.rexx", "beer-song-toplevel.rexx"],
     "test": ["test-beer-song"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/beer-song/test-beer-song b/exercises/practice/beer-song/test-beer-song
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina beer-song-check beer-song beer-song-toplevel ; else ./runt "$@" beer-song-check beer-song beer-song-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../beer-song-check ../beer-song ../beer-song-toplevel ; else ./runt "$@" ../beer-song-check ../beer-song ../beer-song-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/beer-song/test-beer-song.bat b/exercises/practice/beer-song/test-beer-song.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% beer-song-check beer-song beer-song-toplevel
+cd "testlib"
+@call runt.bat %options% ..\beer-song-check ..\beer-song ..\beer-song-toplevel
+cd ..
diff --git a/exercises/practice/beer-song/testlib/beer-song-funcs.rexx b/exercises/practice/beer-song/testlib/beer-song-funcs.rexx
@@ -0,0 +1,8 @@
+/* beer-song - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/beer-song/runt → exercises/practice/beer-song/testlib/runt b/exercises/practice/beer-song/runt → exercises/practice/beer-song/testlib/runt
diff --git a/exercises/practice/beer-song/runt.bat → ...cises/practice/beer-song/testlib/runt.bat b/exercises/practice/beer-song/runt.bat → ...cises/practice/beer-song/testlib/runt.bat
diff --git a/exercises/practice/beer-song/t1.rexx → exercises/practice/beer-song/testlib/t1.rexx b/exercises/practice/beer-song/t1.rexx → exercises/practice/beer-song/testlib/t1.rexx
diff --git a/exercises/practice/beer-song/t2.rexx → exercises/practice/beer-song/testlib/t2.rexx b/exercises/practice/beer-song/t2.rexx → exercises/practice/beer-song/testlib/t2.rexx
diff --git a/exercises/practice/beer-song/t3.rexx → exercises/practice/beer-song/testlib/t3.rexx b/exercises/practice/beer-song/t3.rexx → exercises/practice/beer-song/testlib/t3.rexx
diff --git a/exercises/practice/binary-search/.meta/config.json b/exercises/practice/binary-search/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["binary-search.rexx"],
+    "solution": ["binary-search.rexx", "binary-search-toplevel.rexx"],
     "test": ["test-binary-search"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/binary-search/test-binary-search b/exercises/practice/binary-search/test-binary-search
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina binary-search-check binary-search binary-search-toplevel ; else ./runt "$@" binary-search-check binary-search binary-search-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../binary-search-check ../binary-search ../binary-search-toplevel ; else ./runt "$@" ../binary-search-check ../binary-search ../binary-search-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/binary-search/test-binary-search.bat b/exercises/practice/binary-search/test-binary-search.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% binary-search-check binary-search binary-search-toplevel
+cd "testlib"
+@call runt.bat %options% ..\binary-search-check ..\binary-search ..\binary-search-toplevel
+cd ..
diff --git a/exercises/practice/binary-search/testlib/binary-search-funcs.rexx b/exercises/practice/binary-search/testlib/binary-search-funcs.rexx
@@ -0,0 +1,8 @@
+/* binary-search - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/binary-search/runt → ...cises/practice/binary-search/testlib/runt b/exercises/practice/binary-search/runt → ...cises/practice/binary-search/testlib/runt
diff --git a/exercises/practice/binary-search/runt.bat → ...s/practice/binary-search/testlib/runt.bat b/exercises/practice/binary-search/runt.bat → ...s/practice/binary-search/testlib/runt.bat
diff --git a/exercises/practice/binary-search/t1.rexx → ...es/practice/binary-search/testlib/t1.rexx b/exercises/practice/binary-search/t1.rexx → ...es/practice/binary-search/testlib/t1.rexx
diff --git a/exercises/practice/binary-search/t2.rexx → ...es/practice/binary-search/testlib/t2.rexx b/exercises/practice/binary-search/t2.rexx → ...es/practice/binary-search/testlib/t2.rexx
diff --git a/exercises/practice/binary-search/t3.rexx → ...es/practice/binary-search/testlib/t3.rexx b/exercises/practice/binary-search/t3.rexx → ...es/practice/binary-search/testlib/t3.rexx
diff --git a/exercises/practice/bob/.meta/config.json b/exercises/practice/bob/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["bob.rexx"],
+    "solution": ["bob.rexx", "bob-toplevel.rexx"],
     "test": ["test-bob"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/bob/test-bob b/exercises/practice/bob/test-bob
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina bob-check bob bob-toplevel ; else ./runt "$@" bob-check bob bob-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../bob-check ../bob ../bob-toplevel ; else ./runt "$@" ../bob-check ../bob ../bob-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/bob/test-bob.bat b/exercises/practice/bob/test-bob.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% bob-check bob bob-toplevel
+cd "testlib"
+@call runt.bat %options% ..\bob-check ..\bob ..\bob-toplevel
+cd ..
diff --git a/exercises/practice/bob/testlib/bob-funcs.rexx b/exercises/practice/bob/testlib/bob-funcs.rexx
@@ -0,0 +1,8 @@
+/* bob - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/bob/runt → exercises/practice/bob/testlib/runt b/exercises/practice/bob/runt → exercises/practice/bob/testlib/runt
diff --git a/exercises/practice/bob/runt.bat → exercises/practice/bob/testlib/runt.bat b/exercises/practice/bob/runt.bat → exercises/practice/bob/testlib/runt.bat
diff --git a/exercises/practice/bob/t1.rexx → exercises/practice/bob/testlib/t1.rexx b/exercises/practice/bob/t1.rexx → exercises/practice/bob/testlib/t1.rexx
diff --git a/exercises/practice/bob/t2.rexx → exercises/practice/bob/testlib/t2.rexx b/exercises/practice/bob/t2.rexx → exercises/practice/bob/testlib/t2.rexx
diff --git a/exercises/practice/bob/t3.rexx → exercises/practice/bob/testlib/t3.rexx b/exercises/practice/bob/t3.rexx → exercises/practice/bob/testlib/t3.rexx
diff --git a/exercises/practice/clock/.meta/config.json b/exercises/practice/clock/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["clock.rexx"],
+    "solution": ["clock.rexx", "clock-toplevel.rexx"],
     "test": ["test-clock"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/clock/test-clock b/exercises/practice/clock/test-clock
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina clock-check clock clock-toplevel ; else ./runt "$@" clock-check clock clock-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../clock-check ../clock ../clock-toplevel ; else ./runt "$@" ../clock-check ../clock ../clock-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/clock/test-clock.bat b/exercises/practice/clock/test-clock.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% clock-check clock clock-toplevel
+cd "testlib"
+@call runt.bat %options% ..\clock-check ..\clock ..\clock-toplevel
+cd ..
diff --git a/exercises/practice/clock/testlib/clock-funcs.rexx b/exercises/practice/clock/testlib/clock-funcs.rexx
@@ -0,0 +1,8 @@
+/* clock - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/clock/runt → exercises/practice/clock/testlib/runt b/exercises/practice/clock/runt → exercises/practice/clock/testlib/runt
diff --git a/exercises/practice/clock/runt.bat → exercises/practice/clock/testlib/runt.bat b/exercises/practice/clock/runt.bat → exercises/practice/clock/testlib/runt.bat
diff --git a/exercises/practice/clock/t1.rexx → exercises/practice/clock/testlib/t1.rexx b/exercises/practice/clock/t1.rexx → exercises/practice/clock/testlib/t1.rexx
diff --git a/exercises/practice/clock/t2.rexx → exercises/practice/clock/testlib/t2.rexx b/exercises/practice/clock/t2.rexx → exercises/practice/clock/testlib/t2.rexx
diff --git a/exercises/practice/clock/t3.rexx → exercises/practice/clock/testlib/t3.rexx b/exercises/practice/clock/t3.rexx → exercises/practice/clock/testlib/t3.rexx
diff --git a/exercises/practice/collatz-conjecture/.meta/config.json b/exercises/practice/collatz-conjecture/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["collatz-conjecture.rexx"],
+    "solution": ["collatz-conjecture.rexx", "collatz-conjecture-toplevel.rexx"],
     "test": ["test-collatz-conjecture"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/collatz-conjecture/test-collatz-conjecture b/exercises/practice/collatz-conjecture/test-collatz-conjecture
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina collatz-conjecture-check collatz-conjecture collatz-conjecture-toplevel ; else ./runt "$@" collatz-conjecture-check collatz-conjecture collatz-conjecture-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../collatz-conjecture-check ../collatz-conjecture ../collatz-conjecture-toplevel ; else ./runt "$@" ../collatz-conjecture-check ../collatz-conjecture ../collatz-conjecture-toplevel ; fi
+cd - 2>&1 >/dev/null
diff --git a/exercises/practice/collatz-conjecture/test-collatz-conjecture.bat b/exercises/practice/collatz-conjecture/test-collatz-conjecture.bat
@@ -1,3 +1,5 @@
 @set options=%*
 @if "%1"=="" @set options=--regina
-@runt.bat %options% collatz-conjecture-check collatz-conjecture collatz-conjecture-toplevel
+cd "testlib"
+@call runt.bat %options% ..\collatz-conjecture-check ..\collatz-conjecture ..\collatz-conjecture-toplevel
+cd ..
diff --git a/exercises/practice/collatz-conjecture/testlib/collatz-conjecture-funcs.rexx b/exercises/practice/collatz-conjecture/testlib/collatz-conjecture-funcs.rexx
@@ -0,0 +1,8 @@
+/* collatz-conjecture - Additional Test Functions */
+
+/*
+
+  Include any test-callable, non-user-visible functions in this file.
+
+*/
+
diff --git a/exercises/practice/collatz-conjecture/runt → .../practice/collatz-conjecture/testlib/runt b/exercises/practice/collatz-conjecture/runt → .../practice/collatz-conjecture/testlib/runt
diff --git a/...ises/practice/collatz-conjecture/runt.bat → ...ctice/collatz-conjecture/testlib/runt.bat b/...ises/practice/collatz-conjecture/runt.bat → ...ctice/collatz-conjecture/testlib/runt.bat
diff --git a/...cises/practice/collatz-conjecture/t1.rexx → ...actice/collatz-conjecture/testlib/t1.rexx b/...cises/practice/collatz-conjecture/t1.rexx → ...actice/collatz-conjecture/testlib/t1.rexx
diff --git a/...cises/practice/collatz-conjecture/t2.rexx → ...actice/collatz-conjecture/testlib/t2.rexx b/...cises/practice/collatz-conjecture/t2.rexx → ...actice/collatz-conjecture/testlib/t2.rexx
diff --git a/...cises/practice/collatz-conjecture/t3.rexx → ...actice/collatz-conjecture/testlib/t3.rexx b/...cises/practice/collatz-conjecture/t3.rexx → ...actice/collatz-conjecture/testlib/t3.rexx
diff --git a/exercises/practice/custom-set/.meta/config.json b/exercises/practice/custom-set/.meta/config.json
@@ -1,7 +1,7 @@
 {
   "authors": ["ajborla"],
   "files": {
-    "solution": ["custom-set.rexx"],
+    "solution": ["custom-set.rexx", "custom-set-toplevel.rexx"],
     "test": ["test-custom-set"],
     "example": [".meta/example.rexx"]
   },

diff --git a/exercises/practice/custom-set/test-custom-set b/exercises/practice/custom-set/test-custom-set
@@ -1,2 +1,4 @@
 #!/usr/bin/env bash
-if [ $# -eq 0 ] ; then ./runt --regina custom-set-check custom-set custom-set-toplevel ; else ./runt "$@" custom-set-check custom-set custom-set-toplevel ; fi
+cd "testlib" 2>&1 >/dev/null
+if [ $# -eq 0 ] ; then ./runt --regina ../custom-set-check ../custom-set ../custom-set-toplevel ; else ./runt "$@" ../custom-set-check ../custom-set ../custom-set-toplevel ; fi
+cd - 2>&1 >/dev/null