Fix test files (#163)

* Fix test files

* Fix

exercises/practice/acronym/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/affine-cipher/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/armstrong-numbers/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/atbash-cipher/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/bob/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/collatz-conjecture/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/darts/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/difference-of-squares/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/eliuds-eggs/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/etl/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/flatten-array/libs/exercism/test

@@ -68,6 +68,14 @@ true var, run-test
    l: =
 ;
 
+: eps_eq? \ n x x -- T
+   \ are the items the same kind?
+   2dup >kind swap >kind n:=
+   !if 2drop false ;then
+   number? !if 2drop false ;then  
+   rot n:~=
+;
+
 : check-depth \ ... n -- ...
   dup>r
   n:1+ depth n:=
@@ -109,6 +117,16 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
+: approx_equal? \ s x w n -- | s w x n --
+   run-test? !if 3drop test-skipped ;; then
+   -rot isword? !if swap then
+   w:exec
+   4 check-depth
+   3dup            \ so test-failed can show actual and expected
+   eps_eq?
+   if rot drop test-passed else rot drop test-failed then
+;
+
 : true? \ s w --
    run-test? !if drop test-skipped ;; then
    w:exec

exercises/practice/gigasecond/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/grains/libs/exercism/test

@@ -12,6 +12,13 @@ true var, run-test
 
 \ Some utility words
 
+
+: test-passed \ s x x --   \\ test name, expected value, actual value
+    2drop
+    1 tests-passed n:+!
+    con:green con:onBlack . space " ... OK" . con:white con:onBlack cr
+;
+
 : test-skipped \ s --
     1 tests-skipped n:+!
     con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr
@@ -110,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/hamming/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/hello-world/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/high-scores/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/isogram/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/largest-series-product/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/leap/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/luhn/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/matching-brackets/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/pangram/libs/exercism/test

@@ -28,8 +28,8 @@ true var, run-test
     1 tests-failed n:+!
     rot
     con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr
-    "    Actual:    «" . .
-    "    Expected:  «" . .
+    "    Actual:    «" . . "»" . cr
+    "    Expected:  «" . . "»" . cr cr
 ;
 
 : isword?  \ x -- x f
@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/pascals-triangle/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/perfect-numbers/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/pythagorean-triplet/libs/exercism/test

@@ -12,6 +12,13 @@ true var, run-test
 
 \ Some utility words
 
+
+: test-passed \ s x x --   \\ test name, expected value, actual value
+    2drop
+    1 tests-passed n:+!
+    con:green con:onBlack . space " ... OK" . con:white con:onBlack cr
+;
+
 : test-skipped \ s --
     1 tests-skipped n:+!
     con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr
@@ -110,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/raindrops/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/resistor-color/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/reverse-string/libs/exercism/test

@@ -28,8 +28,8 @@ true var, run-test
     1 tests-failed n:+!
     rot
     con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr
-    "    Actual:    «" . .
-    "    Expected:  «" . .
+    "    Actual:    «" . . "»" . cr
+    "    Expected:  «" . . "»" . cr cr
 ;
 
 : isword?  \ x -- x f
@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/rna-transcription/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/roman-numerals/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/rotational-cipher/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/scrabble-score/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/series/libs/exercism/test

@@ -12,6 +12,13 @@ true var, run-test
 
 \ Some utility words
 
+
+: test-passed \ s x x --   \\ test name, expected value, actual value
+    2drop
+    1 tests-passed n:+!
+    con:green con:onBlack . space " ... OK" . con:white con:onBlack cr
+;
+
 : test-skipped \ s --
     1 tests-skipped n:+!
     con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr
@@ -110,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/sieve/libs/exercism/test

@@ -12,6 +12,13 @@ true var, run-test
 
 \ Some utility words
 
+
+: test-passed \ s x x --   \\ test name, expected value, actual value
+    2drop
+    1 tests-passed n:+!
+    con:green con:onBlack . space " ... OK" . con:white con:onBlack cr
+;
+
 : test-skipped \ s --
     1 tests-skipped n:+!
     con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr
@@ -21,8 +28,8 @@ true var, run-test
     1 tests-failed n:+!
     rot
     con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr
-    "    Actual:    «" . .
-    "    Expected:  «" . .
+    "    Actual:    «" . . "»" . cr
+    "    Expected:  «" . . "»" . cr cr
 ;
 
 : isword?  \ x -- x f
@@ -110,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/space-age/libs/exercism/test

@@ -12,13 +12,6 @@ true var, run-test
 
 \ Some utility words
 
-: array-insens-dot \ x --  \\ removes leading space on stringified arrays
-  dup >kind ns:a n:= 
-  if 
-    >s s:trim 
-  then 
-  .
-;
 
 : test-passed \ s x x --   \\ test name, expected value, actual value
     2drop
@@ -35,8 +28,8 @@ true var, run-test
     1 tests-failed n:+!
     rot
     con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr
-    "    Actual:    «" . array-insens-dot "»" . cr
-    "    Expected:  «" . array-insens-dot "»" . cr cr
+    "    Actual:    «" . . "»" . cr
+    "    Expected:  «" . . "»" . cr cr
 ;
 
 : isword?  \ x -- x f

exercises/practice/sum-of-multiples/libs/exercism/test

@@ -12,6 +12,13 @@ true var, run-test
 
 \ Some utility words
 
+
+: test-passed \ s x x --   \\ test name, expected value, actual value
+    2drop
+    1 tests-passed n:+!
+    con:green con:onBlack . space " ... OK" . con:white con:onBlack cr
+;
+
 : test-skipped \ s --
     1 tests-skipped n:+!
     con:cyan con:onBlack . space " ... SKIPPED" . con:white con:onBlack cr
@@ -21,8 +28,8 @@ true var, run-test
     1 tests-failed n:+!
     rot
     con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr
-    "    Actual:    «" . .
-    "    Expected:  «" . .
+    "    Actual:    «" . . "»" . cr
+    "    Expected:  «" . . "»" . cr cr
 ;
 
 : isword?  \ x -- x f
@@ -110,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/triangle/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/trinary/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/two-fer/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/word-count/libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

exercises/practice/yacht/libs/exercism/test

@@ -28,8 +28,8 @@ true var, run-test
     1 tests-failed n:+!
     rot
     con:red con:onBlack . space " ... FAIL" . con:white con:onBlack cr
-    "    Actual:    «" . .
-    "    Expected:  «" . .
+    "    Actual:    «" . . "»" . cr
+    "    Expected:  «" . . "»" . cr cr
 ;
 
 : isword?  \ x -- x f
@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec

libs/exercism/test

@@ -117,7 +117,7 @@ true var, run-test
    eq? if test-passed else test-failed then
 ;
 
-: approx_eaqual? \ s x w n -- | s w x n --
+: approx_equal? \ s x w n -- | s w x n --
    run-test? !if 3drop test-skipped ;; then
    -rot isword? !if swap then
    w:exec