diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po
index b0921d7d..4c2b3f55 100644
Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ
diff --git a/TESTS/ARGTEST.txt b/TESTS/ARGTEST.txt
index b66eba49..b40c0cf6 100644
--- a/TESTS/ARGTEST.txt
+++ b/TESTS/ARGTEST.txt
@@ -16,15 +16,9 @@ AUTO 4,1
 #  we first make sure it was called from that suite by
 #  checking for $LOG
 #
-IF [ $LOG = "" ]
-  ECHO "Log Empty True"
-ELSE
-  ECHO "Log Empty False"
-FI
-PAUSE 
 #
 #  Now call Argtest Sub Script
 #
-ARGTEST2 A 1 B 2 C 3 Hello $$ 82 Tenth
+. ARGTEST2 A 1 B 2 C 3 Hello $$ 82 Tenth
 MAN
 TEXT /MAKE/USR/SHARE/TESTS/ARGTEST
diff --git a/TESTS/ARGTEST2.txt b/TESTS/ARGTEST2.txt
index f571f52f..6d126907 100644
--- a/TESTS/ARGTEST2.txt
+++ b/TESTS/ARGTEST2.txt
@@ -16,25 +16,17 @@ AUTO 4,1
 #  of the calling script that can be compared with this 
 #  scripts parent process id; validating both are working.
 #
-#  We first need to check if this script is being called
-#  by BUILDTEST or if it is being run interactively.
-#
-IF [ -F ${ROOT}TMP/BUILDTEST ]
-  ELSE
-SET B = 0
-FI
-#
 #  $0 should be name of script
 #
 SET T = $T + 1
 IF [ $0 = "ARGTEST2" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 0 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 0 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 0 Failed  -  $0" >> ${Log}
   FI
@@ -45,13 +37,13 @@ FI
 #
 SET T = $T + 1
 IF [ $1 = "A" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 1 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 1 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 1 Failed  -  $1" >> ${Log}
   FI
@@ -62,13 +54,13 @@ FI
 #
 SET T = $T + 1
 IF [ $2 -EQ 1 ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 2 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 2 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 2 Failed  -  $2" >> ${Log}
   FI
@@ -79,13 +71,13 @@ FI
 #
 SET T = $T + 1
 IF [ $3 = "B" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 3 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 3 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 3 Failed  -  $3" >> ${Log}
   FI
@@ -96,13 +88,13 @@ FI
 #
 SET T = $T + 1
 IF [ $4 -EQ 2 ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 4 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 4 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 4 Failed  -  $4" >> ${Log}
   FI
@@ -113,13 +105,13 @@ FI
 #
 SET T = $T + 1
 IF [ $5 = "C" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 5 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 5 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 5 Failed  -  $5" >> ${Log}
   FI
@@ -130,13 +122,13 @@ FI
 #
 SET T = $T + 1
 IF [ $6 -EQ 3 ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 6 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 6 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 6 Failed  -  $6" >> ${Log}
   FI
@@ -147,13 +139,13 @@ FI
 #
 SET T = $T + 1
 IF [ $7 = "Hello" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 7 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 7 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 7 Failed  -  $7" >> ${Log}
   FI
@@ -164,13 +156,13 @@ FI
 #
 SET T = $T + 1
 IF [ $8 -EQ $@ ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 8 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 8 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 8 Failed  -  $8 vs $@" >> ${Log}
   FI
@@ -181,13 +173,13 @@ FI
 #
 SET T = $T + 1
 IF [ $2 -EQ 82 ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg 9 Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg 9 Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg 9 Failed  -  $9" >> ${Log}
   FI
@@ -198,13 +190,13 @@ FI
 #
 SET T = $T + 1
 IF [ $# -EQ 10 ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg Count Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg Count Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg Count Failed  -  $#" >> ${Log}
   FI
@@ -215,20 +207,20 @@ FI
 #
 SET T = $T + 1
 IF [ $* = "A 1 B 2 C 3 Hello $$ 82 Tenth" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ARGTEST Arg ALL Passed" >> ${Log}
   FI
   echo "\nARGTEST Arg ALL Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ARGTEST Arg ALL Failed  -  $*" >> ${Log}
   FI
 echo "\nARGTEST Arg ALL Failed\n"
 FI
 ECHO "\nArg Tests Done
-IF [ $B -GT 0 ]
+IF [ -N $Log ]
   echo "Arg Tests Complete" >> ${Log}
 FI
 MAN
diff --git a/TESTS/BADSHTEST.txt b/TESTS/BADSHTEST.txt
index 2133fa7a..d2a55484 100644
--- a/TESTS/BADSHTEST.txt
+++ b/TESTS/BADSHTEST.txt
@@ -7,14 +7,6 @@ AUTO 4,1
 #  (with error) an invalid shell script.  It should return error
 #  F6/246. This script calls BADSCRIPT and checks for that code.
 #
-#  We first need to check if this script is being called
-#  by BUILDTEST or if it is being run interactively.
-#
-IF [ -F ${ROOT}TMP/BUILDTEST ]
-  ELSE
-SET B = 0
-FI
-#
 echo "\n\nThis test will generate an error"
 echo "between the lines.  This is expected."
 echo "---------------------------------------"
@@ -23,14 +15,14 @@ SET R = $?
 ECHO $R
 echo "---------------------------------------"
 IF [ $R -EQ 246 ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "I am at AAAAAAA Pass with Log"
     echo "BADSHTEST Passed" >> ${Log}
   FI
   echo "\nBADSHTEST Passed\n" 
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "I am at BBBBBBB Fail with Log"
     echo "BADSHTEST Failed  -  $R" >> ${Log}
diff --git a/TESTS/BUILDTEST.txt b/TESTS/BUILDTEST.txt
index 7813c133..665ffd81 100644
--- a/TESTS/BUILDTEST.txt
+++ b/TESTS/BUILDTEST.txt
@@ -8,13 +8,14 @@ AUTO 4,1
 #  to a log file.
 #
 #  First Clear the Screen
-echo -N \f
+echo "\f"
 #
 echo "\n\n                          Build Test Script\n\n"
 #    
 #  Now get the build Number
 #
 READ -P "            Enter Build Number: " B
+ECHO
 echo "\n\n   Running All Tests for Build: $B"
 #
 #  Check to see if VAR then VAR/LOG exits, if not create
@@ -36,8 +37,10 @@ FI
 #  Write Header To Log
 #
 SET Log = "${ROOT}VAR/LOG/TESTS/BUILD.${B}"
-ECHO "              Build Test Suite" > ${Log}
-ECHO "\nBuild No: $B" >> ${Log}
+ECHO > ${Log}
+ECHO >> ${Log}
+ECHO "              Build Test Suite" >> ${Log}
+ECHO "\nBuild No: ${B}" >> ${Log}
 ECHO -N "    Date: " >> ${Log}
 DATE >> ${Log}
 ECHO -N "    Time: " >> ${Log}
diff --git a/TESTS/ECHONTEST.txt b/TESTS/ECHONTEST.txt
new file mode 100644
index 00000000..7ff5a36a
--- /dev/null
+++ b/TESTS/ECHONTEST.txt
@@ -0,0 +1,13 @@
+NEW
+  PREFIX
+AUTO 4,1
+#!/BIN/SH
+#
+#  Simple Echo -N Test
+#
+ECHO "\n\n"
+ECHO -N "First Part of Line : "
+ECHO "Second Part of Line"
+ECHO "\n\n"
+MAN
+TEXT /MAKE/USR/SHARE/TESTS/ECHONTEST
diff --git a/TESTS/ECHOTEST.txt b/TESTS/ECHOTEST.txt
index 2857645e..ace94c42 100644
--- a/TESTS/ECHOTEST.txt
+++ b/TESTS/ECHOTEST.txt
@@ -8,6 +8,7 @@ echo "each performed as expected by Responding (Y) or (N) after each test."
 echo "Responses can be in UPPER or Lower case and are a single letter,"
 echo "Y for Yes and N for No.  Return (blank or empty) will mean NO."
 echo "\n\n"
+echo "Log is : $Log"
 READ -P "Press Return to start tests" Z
 #Clear Screen Test
 SET T = $T + 1
@@ -18,12 +19,13 @@ IF [ $Z = "y" ]
   SET Z = "Y"
 FI
 IF [ $Z = "Y" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ECHO Clear Screen Passed" >> ${Log}
+	echo "I am doing the LOG writing block"
   FI
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ECHO Clear Screen Failed" >> ${Log}
   FI
@@ -38,12 +40,12 @@ IF [ $Z = "y" ]
   SET Z = "Y"
 FI
 IF [ $Z = "Y" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ECHO Backspace Passed" >> ${Log}
   FI
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ECHO Backspace Failed" >> ${Log}
   FI
@@ -58,12 +60,12 @@ IF [ $Z = "y" ]
   SET Z = "Y"
 FI
 IF [ $Z = "Y" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ECHO Inverse Passed" >> ${Log}
   FI
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ECHO Inverse Failed" >> ${Log}
   FI
@@ -78,12 +80,12 @@ IF [ $Z = "y" ]
   SET Z = "Y"
 FI
 IF [ $Z = "Y" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ECHO Newline Passed" >> ${Log}
   FI
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ECHO Newline Failed" >> ${Log}
   FI
@@ -98,12 +100,12 @@ IF [ $Z = "y" ]
   SET Z = "Y"
 FI
 IF [ $Z = "Y" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ECHO Backslash Passed" >> ${Log}
   FI
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ECHO Backslash Failed" >> ${Log}
   FI
@@ -118,12 +120,12 @@ IF [ $Z = "y" ]
   SET Z = "Y"
 FI
 IF [ $Z = "Y" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ECHO Percent Passed" >> ${Log}
   FI
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ECHO Percent Failed" >> ${Log}
   FI
@@ -142,18 +144,18 @@ IF [ $Z = "y" ]
   SET Z = "Y"
 FI
 IF [ $Z = "Y" ]
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET P = $P + 1
     echo "ECHO Newline Suppress Passed" >> ${Log}
   FI
 ELSE
-  IF [ $B -GT 0 ]
+  IF [ -N $Log ]
     SET F = $F + 1
     echo "ECHO Newline Suppress Failed" >> ${Log}
   FI
 FI
-echo "\nEcho Tests Done
-IF [ $B -GT 0 ]
+echo "\nEcho Tests Done"
+IF [ -N $Log ]
   echo "ECHO Tests Complete" >> ${Log}
 FI
 SET Z = 
diff --git a/TESTS/IFFDTEST.txt b/TESTS/IFFDTEST.txt
index 2365df02..c7316074 100644
--- a/TESTS/IFFDTEST.txt
+++ b/TESTS/IFFDTEST.txt
@@ -5,37 +5,37 @@ AUTO 4,1
 #
 #
 #
-echo \f IFFDTEST Script
-echo \n\n
-echo Testing for this File using -E
+echo "\f IFFDTEST Script"
+echo "\n\n"
+echo "Testing for this File using -E"
 IF [ -E /PKA2OSX/TESTS/IFFILETEST ]
- Echo Found by full path
+ Echo "Found by full path"
 ELSE
- Echo Not Found
+ Echo "Not Found"
 FI
-echo Testing for this Dir using -E
+echo "Testing for this Dir using -E"
 IF [ -E /PKA2OSX/TESTS ]
- Echo Found by full path
+ Echo "Found by full path"
 ELSE
- Echo Not Found
+ Echo "Not Found"
 FI
-echo Testing for IFFILETEST
+echo "Testing for IFFILETEST"
 IF [ -E IFFILETEST ]
- Echo Found 
+ Echo "Found"
 ELSE
- Echo Not Found
+ Echo "Not Found"
 FI
-echo Testing for ../MANPAGES
+echo "Testing for ../MANPAGES"
 IF [ -E ../MANPAGES ]
- Echo Found 
+ Echo "Found" 
 ELSE
- Echo Not Found
+ Echo "Not Found"
 FI
-echo Testing for IFFILETEST2
+echo "Testing for IFFILETEST2"
 IF [ -E IFFILETEST2 ]
- Echo Found 
+ Echo "Found "
 ELSE
- Echo Not Found
+ Echo "Not Found"
 FI
 MAN
 TEXT /MAKE/USR/SHARE/TESTS/IFFDTEST
diff --git a/TESTS/IFSTRTEST.txt b/TESTS/IFSTRTEST.txt
index db2d98ab..2b4cd3ef 100644
--- a/TESTS/IFSTRTEST.txt
+++ b/TESTS/IFSTRTEST.txt
@@ -6,8 +6,8 @@ AUTO 4,1
 #
 #
 #!/BIN/SH
-ECHO \f              IF String Tests
-ECHO \nThis Performs Several String Comparison Tests\n
+ECHO "\f              IF String Tests"
+ECHO "\nThis Performs Several String Comparison Tests\n"
 ECHO -N "       Test 1     ABC = ABC  :  "
 IF [ "ABC" = "ABC" ]
 echo PASSED
@@ -32,13 +32,18 @@ echo FAILED
 ELSE
 echo PASSED
 FI
-#  Check comparison to bogus var
-ECHO -N "       Test 5 Bad VAR = ABC  :  "
-IF [ "$ABC" = "ABC" ]
+ECHO -N "       Test 5   -N Bad Var   :  "
+IF [ -N $ABC ]
 echo FAILED
 ELSE
 echo PASSED
 FI
+ECHO -N "       Test 6   -Z Bad Var   :  "
+IF [ -Z $ABC ]
+echo PASSED
+ELSE
+echo FAILED
+FI
 ECHO "\n             End of Test\n"
 MAN
 TEXT /MAKE/USR/SHARE/TESTS/IFSTRTEST
diff --git a/TESTS/VTTEST.txt b/TESTS/VTTEST.txt
index 8cd5616f..4b8c6b0a 100644
--- a/TESTS/VTTEST.txt
+++ b/TESTS/VTTEST.txt
@@ -5,12 +5,13 @@ AUTO 4,1
 #
 #
 #
-ECHO "\f              VT100 Code Echo Tests
+ECHO "\f              VT100 Code Echo Tests"
 ECHO
 ECHO -N "\e[5;5H"
-ECHO This Text Should be on line 5 column 5
+ECHO "This Text Should be on line 5 column 5"
 ECHO
 ECHO -N "\e[10;20H"
-ECHO This on line 10 Column 20
+ECHO "This on line 10 Column 20"
+ECHO
 MAN
 TEXT /MAKE/USR/SHARE/TESTS/VTTEST