diff --git a/.A2osX Issue List.xlsx b/.A2osX Issue List.xlsx
index a1fc281d..f9afafd8 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 a914e133..eb89f86f 100644
Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ
diff --git a/TESTS/ARGTEST b/TESTS/ARGTEST
index 5d425eee..69aabdbc 100644
--- a/TESTS/ARGTEST
+++ b/TESTS/ARGTEST
@@ -1,7 +1,7 @@
 NEW
   PREFIX
 AUTO 4,1
-#!/BIN/SHELL
+#!/BIN/SH
 #
 #  This is a test of passing args
 #  This script calls ARGTEST2 passing a known set
diff --git a/TESTS/ARGTEST2 b/TESTS/ARGTEST2
index d090871d..f571f52f 100644
--- a/TESTS/ARGTEST2
+++ b/TESTS/ARGTEST2
@@ -1,7 +1,7 @@
 NEW
   PREFIX
 AUTO 4,1
-#!/BIN/SHELL
+#!/BIN/SH
 #
 #  This is a test of passing args
 #  This script is called by ARGTEST passing a known set
diff --git a/TESTS/BUILDTEST b/TESTS/BUILDTEST
index 9aea6edd..5d548c5d 100644
--- a/TESTS/BUILDTEST
+++ b/TESTS/BUILDTEST
@@ -1,7 +1,7 @@
 NEW
   PREFIX 
 AUTO 4,1
-#!/BIN/SHELL
+#!/BIN/SH
 #
 #  This is the master script that calls all test scripts.
 #  It keeps a count of passed/failed tests and writes results
diff --git a/TESTS/CATTEST b/TESTS/CATTEST
index 6570a36b..546419b4 100644
--- a/TESTS/CATTEST
+++ b/TESTS/CATTEST
@@ -1,7 +1,7 @@
 NEW
   PREFIX 
 AUTO 4,1
-#!/BIN/SHELL
+#!/BIN/SH
 #
 #  We first need to check if this script is being called
 #  by BUILDTEST or if it is being run interactively.
diff --git a/TESTS/CATTESTFILE b/TESTS/CATTESTFILE
new file mode 100644
index 00000000..aba9fc1a
--- /dev/null
+++ b/TESTS/CATTESTFILE
@@ -0,0 +1,13 @@
+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/CDTEST b/TESTS/CDTEST
index 2b8527b8..e4497579 100644
--- a/TESTS/CDTEST
+++ b/TESTS/CDTEST
@@ -1,10 +1,14 @@
 NEW
   PREFIX 
 AUTO 4,1
-#!/bin/shell
+#!/BIN/SH
 #
 # test CD command gives errors back
 #
+IF [ -D HHH ]
+ELSE
+  MD HHH
+FI
 CD HHH
 echo "return code was $?"
 CD ..
diff --git a/TESTS/COPYTESTS b/TESTS/COPYTESTS
new file mode 100644
index 00000000..146777d8
--- /dev/null
+++ b/TESTS/COPYTESTS
@@ -0,0 +1,60 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  This script copies the A2osX Test Suite to the
+#  current Boot Drive.
+#
+#  First we verify that current directory structure
+#  exists and if not create it.
+#
+ECHO "\n\nConfirming Directory Structure...."
+IF [ -D ${ROOT}USR ]
+ELSE
+  ECHO "\N    Creating USR Directory"
+  MD ${ROOT}USR
+FI
+IF [ -D ${ROOT}USR/SHARE ]
+ELSE
+  ECHO "\N    Creating SHARE Directory"
+  MD ${ROOT}USR/SHARE
+FI
+IF [ -D ${ROOT}USR/SHARE/TESTS ]
+ELSE
+  ECHO "\N    Creating TESTS Directory"
+  MD ${ROOT}USR/SHARE/TESTS
+FI
+#
+#  Now check to make sure we are in the directory
+#  that contains all the tests.  Do this by checking
+#  checking for this script (COPYTESTS).
+#
+ECHO "\nConfirming Source Directory ...."
+IF [ -F COPYTESTS ]
+ELSE
+  ECHO "\n\nError:  You need to be in the TESTS directory"
+  ECHO "        before executing this script\n\n"
+  EXIT
+FI
+#
+#  See if user wants to erase any old test from destination
+#
+ECHO "\nDo you want to remove old tests from your system?"
+ECHO "This will rm ${ROOT}USR/SHARE/TESTS/*.  Enter E to"
+READ -P "erase old files: " Z
+IF [ $Z = "e" ]
+  SET Z = "E"
+FI
+IF [ $Z = "E" ]
+  ECHO "\nErasing Old Files..."
+  RM ${ROOT}USR/SHARE/TESTS/*
+FI
+#
+#  Now copy the new test files
+#
+ECHO "\nCopying new Test Files....\n"
+CP -R * ${ROOT}USR/SHARE/TESTS
+ECHO "\N    COPYTESTS Completed\n"
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/COPYTESTS
diff --git a/TESTS/CORETEST b/TESTS/CORETEST
new file mode 100644
index 00000000..58a6a2e9
--- /dev/null
+++ b/TESTS/CORETEST
@@ -0,0 +1,57 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  This script performs a series of tests for commands or
+#  features that are needed by even the most basic tests so
+#  therefor are CORE to entire test suite.
+#
+ECHO "\nThis script will test the core commands and features"
+ECHO "\needed by most if not all other tests."
+ECHO "\nIf you are reading this then the first two tests have"
+ECHO "already passed, being able to run scripts with BIN/SH and"
+ECHO "the ECHO command."
+ECHO "\nPress Return to begin additional tests."
+PAUSE
+ECHO "\nThe third test is of the Read command.\n"
+READ -P "Please enter Y and press return " Z
+IF [ $Z = "y" ]
+  SET Z = "Y"
+FI
+IF [ $Z != "Y" ]
+  ECHO "\nFAILED Coretest READ"
+  ECHO "\nTerminating CORETEST Early\n" 
+  EXIT 254
+FI
+ECHO "\nNext we test for Return Codes."
+ECHO "Note: You may see an error on the screen from running"
+ECHO "this test, that is OK.  You will be told if the RC"
+ECHO "test PASSED or FAILED"
+ECHO "\nPress Return to begin RC tests."
+PAUSE
+RC144
+IF [ $? -EQ 144 ]
+  ECHO "\nPassed RC Test"
+ELSE
+  ECHO "\nFAILED Coretest RC"
+  ECHO "\nTerminating CORETEST Early\n" 
+  EXIT 254
+FI
+ECHO "\nNext we test the IF script element."
+ECHO "Note this does not test all IF options,"
+ECHO "run Internal Command Tests to fully test IF."
+ECHO "\nPress Return to begin IF tests."
+PAUSE
+IF [ -D ${ROOT} ]
+ELSE
+  ECHO "\nFailed Coretest IF -D"
+  EXIT 254
+FI
+IF [ -D ${ROOT}A2OSX.SYSTEM ]
+ELSE
+  ECHO "\nFailed Coretest IF -F"
+  EXIT 254
+FI
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/CORETEST
diff --git a/TESTS/ECHOTEST b/TESTS/ECHOTEST
index a3a1b951..2857645e 100644
--- a/TESTS/ECHOTEST
+++ b/TESTS/ECHOTEST
@@ -1,7 +1,7 @@
 NEW
   PREFIX 
 AUTO 4,1
-#!/BIN/SHELL
+#!/BIN/SH
 Echo "\n\nThis Script will perform a series of tests on the ECHO command"
 echo "\nSince these are visual tests, you will be asked to verify that"
 echo "each performed as expected by Responding (Y) or (N) after each test."
diff --git a/TESTS/ENVTEST b/TESTS/ENVTEST
index e523879a..8f50b67f 100644
--- a/TESTS/ENVTEST
+++ b/TESTS/ENVTEST
@@ -1,7 +1,7 @@
 NEW
   PREFIX 
 AUTO 4,1
-#!/BIN/SHELL
+#!/BIN/SH
 #SET -X
 ECHO "\n\nThis is the ENV Test"
 ECHO "\n This will stress the ENV space and string handling"
diff --git a/TESTS/IFZNTEST b/TESTS/IFZNTEST
new file mode 100644
index 00000000..d6b90b0e
--- /dev/null
+++ b/TESTS/IFZNTEST
@@ -0,0 +1,31 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  Testing the new IF -Z -N Options
+#
+SET ABC = "HELLO"
+SET DEF =""
+IF [ -Z $ABC ]
+  ECHO "Z ABC True"
+ELSE
+  ECHO "Z ABC False"
+FI
+IF [ -N $ABC ]
+  ECHO "N ABC True"
+ELSE
+  ECHO "N ABC False"
+FI
+IF [ -Z $DEF ]
+  ECHO "Z DEF True"
+ELSE
+  ECHO "Z DEF False"
+FI
+IF [ -N $DEF ]
+  ECHO "N DEF True"
+ELSE
+  ECHO "N DEF False"
+FI
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/IFZNTEST
diff --git a/TESTS/LOG b/TESTS/LOG
index 1cfe1dde..697707ce 100644
--- a/TESTS/LOG
+++ b/TESTS/LOG
@@ -1,17 +1,17 @@
 NEW
-  PREFIX /A2OSX.BUILD
+  PREFIX
 AUTO 4,1
-#!/BIN/SHELL
+#!/BIN/SH
 #
 IF [ $# -GT 0 ]
   IF [ $1 -GT 0 ]
     SET B = $1
   ELSE
-    READ -P "WHICH BUILD: " B
+    ECHO "Syntax Error" 
   FI
 ELSE
-  ECHO "Syntax Error" 
+  READ -P "WHICH BUILD: " B
 FI
 MORE ${ROOT}VAR/LOG/TESTS/BUILD.${B}
 MAN
-TEXT USR/SHARE/TESTS/LOG
+TEXT /MAKE/USR/SHARE/TESTS/LOG
diff --git a/TESTS/MAKECHARS b/TESTS/MAKECHARS
new file mode 100644
index 00000000..6c708e19
--- /dev/null
+++ b/TESTS/MAKECHARS
@@ -0,0 +1,14 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  This script makes the special CHARS file that
+#  the CATTEST uses to test for printing of BIN data.
+#
+ECHO "\x00\x01\x02\x03\x04"  > CHARS
+ECHO "\x05\x06\x07\x08\x09" >> CHARS
+ECHO "\x0A\x0B\x0C\x0D\x00" >> CHARS
+MAN
+
+TEXT /MAKE/USR/SHARE/TESTS/MAKECHARS
diff --git a/TESTS/RC144 b/TESTS/RC144
new file mode 100644
index 00000000..592ca59c
--- /dev/null
+++ b/TESTS/RC144
@@ -0,0 +1,12 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  Returns Exit Code 144, this is a script used
+#  by other test scripts.
+#
+ECHO Returning 144
+EXIT 144
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/RC144
diff --git a/TESTS/RC20 b/TESTS/RC20
new file mode 100644
index 00000000..e7ed5083
--- /dev/null
+++ b/TESTS/RC20
@@ -0,0 +1,12 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  Returns Exit Code 20, this is a script used
+#  by other test scripts.
+#
+ECHO Returning 20
+EXIT 20
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/RC20
diff --git a/TESTS/RCTEST b/TESTS/RCTEST
index c446c6a0..f0aacb07 100644
--- a/TESTS/RCTEST
+++ b/TESTS/RCTEST
@@ -1,4 +1,10 @@
-#!/BIN/SHELL
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  Return Code Test
+#
 ECHO Return Code Test
 ECHO $?
 ECHO $*
@@ -6,10 +12,11 @@ LS /RAM3
 ECHO $?
 LS /RAM4 2> /DEV/NULL
 ECHO $?
-RCSUB1
+RC144
 ECHO $?
-RCSUB2
+RC20
 ECHO $?
 ECHO FIRST ONE SHULD BE 144 THEN 20
 ECHO DONE
- 
\ No newline at end of file
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/RCTEST
diff --git a/TESTS/SHTEST b/TESTS/SHTEST
new file mode 100644
index 00000000..8668c55b
--- /dev/null
+++ b/TESTS/SHTEST
@@ -0,0 +1,12 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  SHTEST tests that the shell detects and properly handles
+#  the new BIN/SH header and runs a simple script.
+#
+#
+echo "\n\nThis script is running correctly.\n\n"
+MAN
+TEXT /A2OSX.BUILD/ROOT/SHTEST
diff --git a/TESTS/TEMPLATE b/TESTS/TEMPLATE
new file mode 100644
index 00000000..89a6192b
--- /dev/null
+++ b/TESTS/TEMPLATE
@@ -0,0 +1,9 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#
+#
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/TEMPLATE
diff --git a/TESTS/TESTMENU b/TESTS/TESTMENU
new file mode 100644
index 00000000..fe88a12e
--- /dev/null
+++ b/TESTS/TESTMENU
@@ -0,0 +1,59 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  This menu will display a menu of test options
+#  to run, both interactive and batch.
+#
+ECHO "\f          A2osX Test System Menu\n"
+ECHO "     1)  Core Tests"
+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"
+ECHO "     6)  SHTEST"
+ECHO "     7)  Copy Test Files\n"
+ECHO "     8)  Display Logs\n"
+ECHO "     9)  Build Test Suite with Logging"
+ECHO "\n"
+READ -P "Enter Choice:  " Z
+IF [ $Z = "1" ]
+  CORETEST
+ELSE
+  IF [ $Z = "2" ]
+    DISPLAYTEST
+  ELSE
+    IF [ $Z = "3" ]
+      PATHTEST
+    ELSE
+      IF [ $Z = "4" ]
+        INTERNALTEST
+      ELSE
+        IF [ $Z = "5" ]
+          EXTERNALTEST
+        ELSE
+          IF [ $Z = "6" ]
+            SHTEST
+          ELSE
+            IF [ $Z = "7" ]
+              COPYTESTS
+            ELSE
+              IF [ $Z = "8" ]
+                LOG
+              ELSE
+                IF [ $Z = "9" ]
+                  BUILDTEST
+                ELSE
+                  ECHO "\n\nInvalid Selection\n"
+                FI
+              FI
+            FI
+          FI
+        FI
+      FI
+    FI
+  FI
+FI
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/TESTMENU
diff --git a/TESTS/TESTS b/TESTS/TESTS
index 3e0d82cb..176a00f3 100644
--- a/TESTS/TESTS
+++ b/TESTS/TESTS
@@ -1,5 +1,5 @@
 NEW
-  PREFIX /A2OSX.BUILD
+  PREFIX
 AUTO 4,1
 #!/BIN/SHELL
 #