diff --git a/.A2osX Issue List.xlsx b/.A2osX Issue List.xlsx
index f9afafd8..58691d6a 100644
Binary files a/.A2osX Issue List.xlsx and b/.A2osX Issue List.xlsx differ
diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po
index cee10c55..8b25fd9d 100644
Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ
diff --git a/TESTS/BADSHTEST b/TESTS/BADSHTEST
index 024415a1..2133fa7a 100644
--- a/TESTS/BADSHTEST
+++ b/TESTS/BADSHTEST
@@ -1,7 +1,7 @@
 NEW
   PREFIX
 AUTO 4,1
-#!/BIN/SHELL
+#!/BIN/SH
 #
 #  BADSHTEST tests that the shell detects and properly handles
 #  (with error) an invalid shell script.  It should return error
diff --git a/TESTS/CATTEST b/TESTS/CATTEST
index 546419b4..68abd5be 100644
--- a/TESTS/CATTEST
+++ b/TESTS/CATTEST
@@ -17,7 +17,7 @@ echo "\nThe first cats a file with line numbers at the left.\n"
 READ -P "Press Return to start test" Z
 SET T = $T + 1
 echo \n
-CAT -N CATFILE1
+CAT -N CATTEXT
 echo \n
 read -P "Did you see 8 numbered lines: " Z
 IF [ $Z = "y" ]
@@ -39,7 +39,7 @@ ECHO "the duplicate empty lines\n"
 READ -P "Press Return to start test" Z
 echo \n
 SET T = $T + 1
-CAT -S CATFILE1
+CAT -S CATTEXT
 echo \n
 read -P "Did you just 4 lines: " Z
 IF [ $Z = "y" ]
@@ -56,8 +56,12 @@ ELSE
     echo "CAT -S Failed" >> ${Log}
   FI
 FI
+ECHO "\nThis next test CATs a binary file which should"
+ECHO "be display as code in brackets []\n"
+READ -P "Press Return to start test" Z
+echo \n
 SET T = $T + 1
-CAT -A CATFILE2
+CAT -A CATCHARS
 echo \n
 read -P "Was the CAT display correct: " Z
 IF [ $Z = "y" ]
diff --git a/TESTS/CATTESTFILE b/TESTS/CATTESTFILE
deleted file mode 100644
index aba9fc1a..00000000
--- a/TESTS/CATTESTFILE
+++ /dev/null
@@ -1,13 +0,0 @@
-NEW
-  PREFIX 
-AUTO 4,1
-This is Cat File 1
-------------------
-
-
-
-
-------------------
-This is Line 8
-MAN
-TEXT /MAKE/USR/SHARE/TESTS/CATTESTFILE
diff --git a/TESTS/COPYTORAM3 b/TESTS/COPYTORAM3
new file mode 100644
index 00000000..62388984
--- /dev/null
+++ b/TESTS/COPYTORAM3
@@ -0,0 +1,17 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
+MD /RAM3/A
+MD /RAM3/B
+MD /RAM3/C
+MD /RAM3/D
+CP -R /A2OSX.BUILD/* /RAM3/A
+CP -R /A2OSX.BUILD/* /RAM3/B
+CP -R /A2OSX.BUILD/* /RAM3/C
+CP -R /A2OSX.BUILD/* /RAM3/D
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/COPYTORAM3
diff --git a/TESTS/IFDIRTEST b/TESTS/IFDIRTEST
index e1fcfb64..a572344e 100644
--- a/TESTS/IFDIRTEST
+++ b/TESTS/IFDIRTEST
@@ -1,4 +1,10 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 echo \f IFDIRTEST Script
 echo \n\n
 echo Testing for this Dir
@@ -13,3 +19,5 @@ IF [ -D /BLANK ]
 ELSE
  Echo No /BLANK
 FI
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/IFDIRTEST
diff --git a/TESTS/IFFDTEST b/TESTS/IFFDTEST
index 03e3fac9..2365df02 100644
--- a/TESTS/IFFDTEST
+++ b/TESTS/IFFDTEST
@@ -1,4 +1,10 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 echo \f IFFDTEST Script
 echo \n\n
 echo Testing for this File using -E
@@ -31,3 +37,5 @@ IF [ -E IFFILETEST2 ]
 ELSE
  Echo Not Found
 FI
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/IFFDTEST
diff --git a/TESTS/IFFILETEST b/TESTS/IFFILETEST
index de8e096b..0f394276 100644
--- a/TESTS/IFFILETEST
+++ b/TESTS/IFFILETEST
@@ -1,4 +1,10 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 echo \f IFFILETEST Script
 echo \n\n
 echo Testing for this File
@@ -19,3 +25,5 @@ IF [ -F IFFILETEST2 ]
 ELSE
  Echo Not Found
 FI
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/IFFILETEST
diff --git a/TESTS/IFNUMTEST b/TESTS/IFNUMTEST
index 4f3d222c..6fd165cd 100644
--- a/TESTS/IFNUMTEST
+++ b/TESTS/IFNUMTEST
@@ -1,88 +1,96 @@
-#!/BIN/SHELL
-ECHO "\f IF Numeric Tests
-ECHO "\n This Performs Several Numeric Comparison Tests
-ECHO -N "\nTest  1: 99 = 99     "
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
+ECHO "\f            If Numeric Tests
+ECHO "\nThis Performs Several Numeric Comparison Tests
+ECHO -N "\n       Test  1: 99 = 99     "
 IF [ 99 -eq 99 ]
 echo True Pass
 ELSE
 echo False Fail
 FI
-ECHO -N "Test  2: 99 = 79     "
+ECHO -N "       Test  2: 99 = 79     "
 IF [ 99 -eq 79 ]
 echo True Fail
 ELSE
 echo False Pass
 FI
-ECHO -N "Test  3: 99 <> 99    "
+ECHO -N "       Test  3: 99 <> 99    "
 IF [ 99 -NE 99 ]
 echo True Fail
 ELSE
 echo False Pass
 FI
-ECHO -N "Test  4: 99 <> 79    "
+ECHO -N "       Test  4: 99 <> 79    "
 IF [ 99 -NE 79 ]
 echo True Pass
 ELSE
 echo False Fail
 FI
-ECHO -N "Test  5: 99 < 79     "
+ECHO -N "       Test  5: 99 < 79     "
 IF [ 99 -LT 79 ]
 ECHO True Fail
 ELSE 
 ECHO False Pass
 FI
-ECHO -N "Test  6: 79 < 99     "
+ECHO -N "       Test  6: 79 < 99     "
 IF [ 79 -LT 99 ]
 ECHO True Pass
 ELSE 
 ECHO False Fail
 FI
-ECHO -N "Test  7: 99 <= 79    "
+ECHO -N "       Test  7: 99 <= 79    "
 IF [ 99 -LE 79 ]
 ECHO True Fail
 ELSE 
 ECHO False Pass
 FI
-ECHO -N "Test  8: 79 <= 99    "
+ECHO -N "       Test  8: 79 <= 99    "
 IF [ 79 -LE 99 ]
 ECHO True Pass
 ELSE 
 ECHO False Fail
 FI
-ECHO -N "Test  9: 99 <= 99    "
+ECHO -N "       Test  9: 99 <= 99    "
 IF [ 99 -LE 99 ]
 ECHO True Pass
 ELSE 
 ECHO False Fail
 FI
-ECHO -N "Test 10: 99 > 79     "
+ECHO -N "       Test 10: 99 > 79     "
 IF [ 99 -GT 79 ]
 ECHO True Pass
 ELSE 
 ECHO False Fail
 FI
-ECHO -N "Test 11: 79 > 99     "
+ECHO -N "       Test 11: 79 > 99     "
 IF [ 79 -GT 99 ]
 ECHO True Fail
 ELSE 
 ECHO False Pass
 FI
-ECHO -N "Test 12: 99 => 79    "
+ECHO -N "       Test 12: 99 => 79    "
 IF [ 99 -GE 79 ]
 ECHO True Pass
 ELSE 
 ECHO False Fail
 FI
-ECHO -N "Test 13: 79 => 99    "
+ECHO -N "       Test 13: 79 => 99    "
 IF [ 79 -GE 99 ]
 ECHO True Fail
 ELSE 
 ECHO False Pass
 FI
-ECHO -N "Test 14: 99 => 99    "
+ECHO -N "       Test 14: 99 => 99    "
 IF [ 99 -GE 99 ]
 ECHO True Pass
 ELSE 
 ECHO False Fail
 FI
-ECHO "\nEnd of Tests
\ No newline at end of file
+ECHO "\n             End of Test\n"
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/IFNUMTEST
diff --git a/TESTS/IFSTRTEST b/TESTS/IFSTRTEST
index 10c99008..52b7e914 100644
--- a/TESTS/IFSTRTEST
+++ b/TESTS/IFSTRTEST
@@ -6,33 +6,32 @@ AUTO 4,1
 #
 #
 #!/BIN/SH
-ECHO \f IF String Tests
-ECHO \n\n This Performs Several String Comparison Tests
-ECHO Test 1 ABC = ABC
+ECHO \f              IF String Tests
+ECHO \nThis Performs Several String Comparison Tests\n
+ECHO -N "       Test 1     ABC = ABC  :  "
 IF [ "ABC" = "ABC" ]
-echo ABC and ABC are equal
+echo PASSED
 ELSE
-echo This Test Failed
+echo FAILED
 FI
-ECHO Test 2 ABC not DEF
+ECHO -N "       Test 2   ABC not DEF  :  "
 IF [ "ABC" != "DEF" ]
-echo ABC and DEF are not equal
+echo PASSED
 ELSE
-echo This Test Failed
+echo FAILED
 FI
-ECHO Test 3 ABC = ABCD
+ECHO -N "       Test 3    ABC = ABCD  :  "
 IF [ "ABC" = "ABCD" ]
-echo ABC and ABCD are equal
-echo This Test Failed 
+echo FAILED
 ELSE
-echo This Test Passed
+echo PASSED
 FI
-ECHO Test 4 ABC not ABC
+ECHO -N "       Test 4   ABC not ABC  :  "
 IF [ "ABC" != "ABC" ]
-echo ABC and ABC are not equal
-echo This Test Failed
+echo FAILED
 ELSE
-echo This Test Passed
+echo PASSED
 FI
+ECHO "\n             End of Test\n"
 MAN
 TEXT /MAKE/USR/SHARE/TESTS/IFSTRTEST
diff --git a/TESTS/MD5TEST b/TESTS/MD5TEST
index 7f61df86..0a2d3e33 100644
--- a/TESTS/MD5TEST
+++ b/TESTS/MD5TEST
@@ -1,6 +1,14 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 ECHO \n\nMD5 Test
 ECHO Hash should be:
 ECHO B10A8DB164E0754105B7A99BE72E3FE5
 MD5 -D "Hello World"
 echo \n\n
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/MD5TEST
diff --git a/TESTS/MDRDTEST b/TESTS/MDRDTEST
index 25978c32..e3246d2a 100644
--- a/TESTS/MDRDTEST
+++ b/TESTS/MDRDTEST
@@ -1,4 +1,10 @@
-#!/bin/shell
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 ECHO MD AND RD TEST
 IF [ -D TESTDIR ] 
   ECHO The TESTDIR already exists
@@ -12,5 +18,6 @@ IF [ -D TESTDIR ]
 ELSE
   ECHO The TESTDIR is missing, THIS SHOULD NOT BE
 FI
-  
 ECHO RD MD TEST Complete
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/MDRDTEST
diff --git a/TESTS/PAUSETEST b/TESTS/PAUSETEST
index 3ea8249f..9588b4f5 100644
--- a/TESTS/PAUSETEST
+++ b/TESTS/PAUSETEST
@@ -1,5 +1,13 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 echo Hello
 echo Press any key to continue
 pause
 echo World
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/PAUSETEST
diff --git a/TESTS/PUSHDPOPDTEST b/TESTS/PUSHDPOPDTEST
index 51fd8035..ac1b7d5d 100644
--- a/TESTS/PUSHDPOPDTEST
+++ b/TESTS/PUSHDPOPDTEST
@@ -1,4 +1,10 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 ECHO THIS TESTS POPD AND PUSHD
 ECHO $PWD
 ECHO PUSHING
@@ -10,3 +16,5 @@ ECHO POPPING
 POPD
 ECHO $PWD
 ECHO END OF TEST
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/PUSHDPOPDTEST
diff --git a/TESTS/SETXTEST b/TESTS/SETXTEST
index 84b4a5ba..6aa43e82 100644
--- a/TESTS/SETXTEST
+++ b/TESTS/SETXTEST
@@ -1,7 +1,15 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 SET -X
 ECHO Read Test
 ECHO "Current Value of TVar is ${TVar}"
 READ -P "Enter your name: " TVar 
 Echo "New TVar is ${TVar} "
 Echo "End Test"
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/SETXTEST
diff --git a/TESTS/SHIFTTEST b/TESTS/SHIFTTEST
index 891253e6..d0ef8cc5 100644
--- a/TESTS/SHIFTTEST
+++ b/TESTS/SHIFTTEST
@@ -1,4 +1,11 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 ECHO CALLING ST2
-/PKA2OSX/TESTS/SHIFTTEST2 a b c d e f g h i j k
-
+SHIFTTEST2 a b c d e f g h i j k
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/SHIFTTEST
diff --git a/TESTS/SHIFTTEST2 b/TESTS/SHIFTTEST2
index df3ab0a0..064934a8 100644
--- a/TESTS/SHIFTTEST2
+++ b/TESTS/SHIFTTEST2
@@ -1,6 +1,11 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
 #This is a test of passing args
 #Echo $0 should be name of script
+#
 ECHO 0 Parm is $0
 ECHO 1 Parm is $1
 ECHO 2 Parm is $2
@@ -22,4 +27,6 @@ shift
 echo $*
 shift
 echo $*
-ECho Done
\ No newline at end of file
+Echo Done
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/SHIFTTEST2
diff --git a/TESTS/SLEEPTEST b/TESTS/SLEEPTEST
index 79f06de2..b4ea1506 100644
--- a/TESTS/SLEEPTEST
+++ b/TESTS/SLEEPTEST
@@ -1,4 +1,10 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 echo Hello
 echo Sleeping 5
 sleep 5
@@ -9,3 +15,5 @@ sleep 25
 echo Sleeping 50
 sleep 50 
 echo World
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/SLEEPTEST
diff --git a/TESTS/TESTMENU b/TESTS/TESTMENU
index 836d045c..fe88a12e 100644
--- a/TESTS/TESTMENU
+++ b/TESTS/TESTMENU
@@ -8,7 +8,7 @@ AUTO 4,1
 #
 ECHO "\f          A2osX Test System Menu\n"
 ECHO "     1)  Core Tests"
-ECHO "     B)  Display Tests (Echo and Read)"
+ECHO "     2)  Display Tests (Echo and Read)"
 ECHO "     3)  Pathing Tests (CD PWD POPD PUSHD)"
 ECHO "     4)  Internal Command Tests"
 ECHO "     5)  External Command Tests"
@@ -18,10 +18,10 @@ ECHO "     8)  Display Logs\n"
 ECHO "     9)  Build Test Suite with Logging"
 ECHO "\n"
 READ -P "Enter Choice:  " Z
-IF [ $Z -EQ 1 ]
+IF [ $Z = "1" ]
   CORETEST
 ELSE
-  IF [ $Z = "B" ]
+  IF [ $Z = "2" ]
     DISPLAYTEST
   ELSE
     IF [ $Z = "3" ]
diff --git a/TESTS/TESTSETUP b/TESTS/TESTSETUP
index 6c708e19..c7e33acd 100644
--- a/TESTS/TESTSETUP
+++ b/TESTS/TESTSETUP
@@ -3,12 +3,25 @@ NEW
 AUTO 4,1
 #!/BIN/SH
 #
-#  This script makes the special CHARS file that
-#  the CATTEST uses to test for printing of BIN data.
+#  This script makes the support files needed for various
+#  tests such as CATTEST.
 #
-ECHO "\x00\x01\x02\x03\x04"  > CHARS
-ECHO "\x05\x06\x07\x08\x09" >> CHARS
-ECHO "\x0A\x0B\x0C\x0D\x00" >> CHARS
+#  This Creates the CATTEXT file used by CATTEST
+#
+ECHO "This is Line 1" > CATTEXT
+ECHO "------------------" >> CATTEXT
+ECHO >> CATTEXT
+ECHO >> CATTEXT
+ECHO >> CATTEXT
+ECHO >> CATTEXT
+ECHO "------------------" >> CATTEXT
+ECHO "This is Line 8" >> CATTEXT
+#
+#  This Creates the CATCHARS file used by CATTEST
+#
+ECHO "\x00\x01\x02\x03\x04"  > CATCHARS
+ECHO "\x05\x06\x07\x08\x09" >> CATCHARS
+ECHO "\x0A\x0B\x0C\x0D\x00" >> CATCHARS
 MAN
 
-TEXT /MAKE/USR/SHARE/TESTS/MAKECHARS
+TEXT /MAKE/USR/SHARE/TESTS/TESTSETUP
diff --git a/TESTS/VTTEST b/TESTS/VTTEST
index 2cfc3ecb..8cd5616f 100644
--- a/TESTS/VTTEST
+++ b/TESTS/VTTEST
@@ -1,4 +1,10 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
 ECHO "\f              VT100 Code Echo Tests
 ECHO
 ECHO -N "\e[5;5H"
@@ -6,4 +12,5 @@ ECHO This Text Should be on line 5 column 5
 ECHO
 ECHO -N "\e[10;20H"
 ECHO This on line 10 Column 20
- 
\ No newline at end of file
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/VTTEST
diff --git a/TESTS/VTTEST2 b/TESTS/VTTEST2
index 9f862ae2..c089dc2a 100644
--- a/TESTS/VTTEST2
+++ b/TESTS/VTTEST2
@@ -1,5 +1,10 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
 #Clear Screen
+#
 ECHO \e[2J
 ECHO "                VT100 Code Echo Tests
 ECHO "\e[10B\e[10CDown 10 Righ 10
@@ -7,4 +12,5 @@ ECHO "\e[5A\e[5CUp 5 Right 5
 ECHO "\e2020I should be at line 20 col 20
 ECHO
 ECHO "\n\nEnd Test
- 
\ No newline at end of file
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/VTTEST2
diff --git a/TESTS/VTTEST3 b/TESTS/VTTEST3
index dbf21dea..82a62dfa 100644
--- a/TESTS/VTTEST3
+++ b/TESTS/VTTEST3
@@ -1,4 +1,7 @@
-#!/bin/shell
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
 #
 # Testing some vt100 codes
 #
@@ -29,3 +32,5 @@ echo -N "\e[A\e[A\e[A\e[AAmI On Line 9"
 echo -N "\e[H"
 echo "I should be on the top line"
 echo "\e[20;0H"
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/VTTEST3
diff --git a/TESTS/WHILETEST b/TESTS/WHILETEST
index d4a964c8..223b894c 100644
--- a/TESTS/WHILETEST
+++ b/TESTS/WHILETEST
@@ -1,4 +1,7 @@
-#!/bin/shell
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
 #
 #  Tests the While Loop function of shell
 #
@@ -9,3 +12,5 @@ while [ $count -lt 5 ]
   set count = $count + 1
 loop
 echo End of Test
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/WHILETEST