diff --git a/.Floppies/A2OSX.MAKE.po b/.Floppies/A2OSX.MAKE.po
index 1d154b97..666239d4 100644
Binary files a/.Floppies/A2OSX.MAKE.po and b/.Floppies/A2OSX.MAKE.po differ
diff --git a/ADMIN/ADMIN.txt b/ADMIN/ADMIN.txt
index 05351a99..4c639f2b 100644
--- a/ADMIN/ADMIN.txt
+++ b/ADMIN/ADMIN.txt
@@ -6,5 +6,6 @@ AUTO 4,1
 #
 #
 CD /MAKE/USR/SHARE/ADMIN
+ADMINMENU
 MAN
 TEXT ROOT/ADMIN
diff --git a/ADMIN/ADMINMENU.txt b/ADMIN/ADMINMENU.txt
index ac8bcc72..eda1767c 100644
--- a/ADMIN/ADMINMENU.txt
+++ b/ADMIN/ADMINMENU.txt
@@ -6,6 +6,8 @@ AUTO 4,1
 #  This menu will display a menu of options
 #  for the Administration of your A2osX system.
 #
+SET MENULOOP = 1
+WHILE [ $MENULOOP -EQ 1 ]
 ECHO "\f          A2osX Admin System Menu\n"
 ECHO "     1)  Display Processes (PS)"
 ECHO "     2)  Display Memory (MEM)"
@@ -27,7 +29,7 @@ IF [ $Z = "1" ]
 ELSE
   IF [ $Z = "2" ]
     echo "\f                   A2osx Memory Listing\n"
-    PS
+    MEM
     ECHO "\nPress Return to redisplay menu"
     PAUSE
   ELSE
@@ -43,21 +45,25 @@ ELSE
           ECHO "\nPress Return to redisplay menu"
           PAUSE
         ELSE
-          IF [ $Z = "6" ]
-          ELSE
-            IF [ $Z = "7" ]
-            ELSE
-              IF [ $Z = "8" ]
-              ELSE
+#          IF [ $Z = "6" ]
+#          ELSE
+#            IF [ $Z = "7" ]
+#            ELSE
+#              IF [ $Z = "8" ]
+#              ELSE
                 IF [ $Z = "9" ]
                   PUSHD
                   CD ../TESTS
                   TESTMENU
                   POPD
                 ELSE
-                  ECHO "\n\nInvalid Selection\n"
-                FI
-              FI
+                  IF [ $Z = "0" ]
+                    SET MENULOOP = 0
+                  ELSE
+                    ECHO "\n\nInvalid Selection\n"
+#                  FI
+#                FI
+#              FI
             FI
           FI
         FI
@@ -65,5 +71,8 @@ ELSE
     FI
   FI
 FI
+LOOP
+ECHO
+ECHO
 MAN
 TEXT /MAKE/USR/SHARE/ADMIN/ADMINMENU
diff --git a/TESTS/CATTEST.txt b/TESTS/CATTEST.txt
index 68abd5be..69f9ee32 100644
--- a/TESTS/CATTEST.txt
+++ b/TESTS/CATTEST.txt
@@ -3,13 +3,6 @@ NEW
 AUTO 4,1
 #!/BIN/SH
 #
-#  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 "\f\n\n      Cat Test"
 echo "\nThis script will perform tests of the CAT command"
diff --git a/TESTS/ECHOTEST.txt b/TESTS/ECHOTEST.txt
index ace94c42..c9587800 100644
--- a/TESTS/ECHOTEST.txt
+++ b/TESTS/ECHOTEST.txt
@@ -2,13 +2,12 @@ NEW
   PREFIX 
 AUTO 4,1
 #!/BIN/SH
-Echo "\n\nThis Script will perform a series of tests on the ECHO command"
+Echo "\f\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."
 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
@@ -22,7 +21,6 @@ IF [ $Z = "Y" ]
   IF [ -N $Log ]
     SET P = $P + 1
     echo "ECHO Clear Screen Passed" >> ${Log}
-	echo "I am doing the LOG writing block"
   FI
 ELSE
   IF [ -N $Log ]
@@ -32,9 +30,10 @@ ELSE
 FI
 #Backspace Test
 SET T = $T + 1
-echo \n
+echo
+echo "\n"
 echo "----> 1234\b\b5678 <----"
-echo \n
+echo "\n"
 read -P "Is 125678 displayed between the arrows: " Z
 IF [ $Z = "y" ]
   SET Z = "Y"
@@ -52,9 +51,10 @@ ELSE
 FI
 #Inverse Test
 SET T = $T + 1
-echo \n
+echo
+echo "\n"
 echo "----> abc \e[7mdef\e[0m ghi <----"
-echo \n
+echo "\n"
 read -P "Is def above inversed: " Z
 IF [ $Z = "y" ]
   SET Z = "Y"
@@ -72,9 +72,10 @@ ELSE
 FI
 #Newline Test
 SET T = $T + 1
-echo \n
+echo
+echo "\n"
 echo "----> abc\ndef <----"
-echo \n
+echo "\n"
 read -P "Does abcdef appear split between two lines: " Z
 IF [ $Z = "y" ]
   SET Z = "Y"
@@ -92,9 +93,10 @@ ELSE
 FI
 #Backslash Test
 SET T = $T + 1
-echo \n
+echo
+echo "\n"
 echo "----> \\ <----"
-echo \n
+echo "\n"
 read -P "Is there a blackslash above: " Z
 IF [ $Z = "y" ]
   SET Z = "Y"
@@ -112,9 +114,10 @@ ELSE
 FI
 #Percent Test
 SET T = $T + 1
-echo \n
+echo
+echo "\n"
 echo "----> \% <----"
-echo \n
+echo "\n"
 read -P "Is there a percent symbol above: " Z
 IF [ $Z = "y" ]
   SET Z = "Y"
@@ -132,13 +135,14 @@ ELSE
 FI
 #Newline Suppress Test
 SET T = $T + 1
-echo \n
+echo
+echo "\n"
 echo -N "----> "
 echo -N "One"
 echo -N "Two"
 echo -N "Three"
 echo " <----"
-echo \n
+echo "\n"
 read -P "Do you see OneTwoThree between arrows on only ONE line above: " Z
 IF [ $Z = "y" ]
   SET Z = "Y"
@@ -158,6 +162,6 @@ echo "\nEcho Tests Done"
 IF [ -N $Log ]
   echo "ECHO Tests Complete" >> ${Log}
 FI
-SET Z = 
+SET Z =
 MAN
 TEXT /MAKE/USR/SHARE/TESTS/ECHOTEST
diff --git a/TESTS/TESTMENU.txt b/TESTS/TESTMENU.txt
index fe88a12e..5475c84f 100644
--- a/TESTS/TESTMENU.txt
+++ b/TESTS/TESTMENU.txt
@@ -6,6 +6,8 @@ AUTO 4,1
 #  This menu will display a menu of test options
 #  to run, both interactive and batch.
 #
+SET MENULOOP = 1
+WHILE [ $MENULOOP -EQ 1 ]
 ECHO "\f          A2osX Test System Menu\n"
 ECHO "     1)  Core Tests"
 ECHO "     2)  Display Tests (Echo and Read)"
@@ -16,6 +18,7 @@ ECHO "     6)  SHTEST"
 ECHO "     7)  Copy Test Files\n"
 ECHO "     8)  Display Logs\n"
 ECHO "     9)  Build Test Suite with Logging"
+ECHO "\n     0)  Exit Test System"
 ECHO "\n"
 READ -P "Enter Choice:  " Z
 IF [ $Z = "1" ]
@@ -45,7 +48,13 @@ ELSE
                 IF [ $Z = "9" ]
                   BUILDTEST
                 ELSE
-                  ECHO "\n\nInvalid Selection\n"
+                  IF [ $Z = "0" ]
+                    SET MENULOOP = 0
+                  ELSE
+                    ECHO "\n\nInvalid Selection\n"
+                    ECHO "Press return to continue"
+                    PAUSE
+                  FI
                 FI
               FI
             FI
@@ -55,5 +64,6 @@ ELSE
     FI
   FI
 FI
+LOOP
 MAN
 TEXT /MAKE/USR/SHARE/TESTS/TESTMENU
