diff --git a/Binary/Apps/Clean.cmd b/Binary/Apps/Clean.cmd
index 3b66f0e1..36816f7f 100644
--- a/Binary/Apps/Clean.cmd
+++ b/Binary/Apps/Clean.cmd
@@ -8,3 +8,5 @@ if exist *.doc del *.doc
 if exist *.hlp del *.hlp
 if exist Tunes\*.pt? del Tunes\*.pt?
 if exist Tunes\*.mym del Tunes\*.mym
+
+pushd Test && call Clean || exit /b 1 & popd
diff --git a/Binary/Apps/Makefile b/Binary/Apps/Makefile
index 2290ff2b..20ebfc63 100644
--- a/Binary/Apps/Makefile
+++ b/Binary/Apps/Makefile
@@ -1,5 +1,6 @@
 TOOLS = ../../Tools
-MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.com Tunes/*)
+MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.com)
+SUBDIRS = Test
 
 include $(TOOLS)/Makefile.inc
 
diff --git a/Binary/Apps/Test/Clean.cmd b/Binary/Apps/Test/Clean.cmd
new file mode 100644
index 00000000..c79d414b
--- /dev/null
+++ b/Binary/Apps/Test/Clean.cmd
@@ -0,0 +1,4 @@
+@echo off
+setlocal
+
+if exist *.com del *.com
diff --git a/Binary/Apps/Test/Makefile b/Binary/Apps/Test/Makefile
new file mode 100644
index 00000000..db06d177
--- /dev/null
+++ b/Binary/Apps/Test/Makefile
@@ -0,0 +1,7 @@
+TOOLS = ../../../Tools
+MOREDIFF := $(shell $(TOOLS)/unix/casefn.sh *.com)
+
+include $(TOOLS)/Makefile.inc
+
+clobber::
+	@rm -f *.com
diff --git a/Binary/Apps/Test/ReadMe.txt b/Binary/Apps/Test/ReadMe.txt
new file mode 100644
index 00000000..5532ae80
--- /dev/null
+++ b/Binary/Apps/Test/ReadMe.txt
@@ -0,0 +1,16 @@
+***********************************************************************
+***                                                                 ***
+***                          R o m W B W                            ***
+***                                                                 ***
+***                    Z80/Z180 System Software                     ***
+***                                                                 ***
+***********************************************************************
+
+This directory contains various hardware test application files that
+are specific to RomWBW.  The source for these applications is found
+in the Source\Apps\Test directory of the distribution.
+
+These files are included on the pre-built disk images in user area 2.
+
+N.B., these files may be specific to certain hardware.  They should
+be used as directred by the instructions for your specific hardware.
\ No newline at end of file
diff --git a/Doc/ChangeLog.txt b/Doc/ChangeLog.txt
index 00970472..27ab4262 100644
--- a/Doc/ChangeLog.txt
+++ b/Doc/ChangeLog.txt
@@ -53,6 +53,7 @@ Version 3.1.1
 - WBW: Add support for LINC sound card
 - WBW: Add interrupt receive support to UART driver
 - PMS: Add XModem transfer within Debug Monitor
+- PMS & AJL: Add DMAMON test application
 
 Version 3.1
 -----------
diff --git a/Source/Apps/Build.cmd b/Source/Apps/Build.cmd
index b1bd9f80..da042c4c 100644
--- a/Source/Apps/Build.cmd
+++ b/Source/Apps/Build.cmd
@@ -30,8 +30,7 @@ pushd XM && call Build || exit /b & popd
 pushd FDU && call Build || exit /b & popd
 pushd Tune && call Build || exit /b & popd
 pushd FAT && call Build || exit /b & popd
-pushd I2C && call Build || exit /b & popd
-pushd TEST && call Build || exit /b & popd
+pushd Test && call Build || exit /b & popd
 pushd ZMP && call Build || exit /b & popd
 
 copy *.com %APPBIN%\ || exit /b
diff --git a/Source/Apps/Clean.cmd b/Source/Apps/Clean.cmd
index 997cb632..8e9810e6 100644
--- a/Source/Apps/Clean.cmd
+++ b/Source/Apps/Clean.cmd
@@ -11,6 +11,5 @@ pushd XM && call Clean || exit /b 1 & popd
 pushd FDU && call Clean || exit /b 1 & popd
 pushd Tune && call Clean || exit /b 1 & popd
 pushd FAT && call Clean || exit /b 1 & popd
-pushd I2C && call Clean || exit /b 1 & popd
-pushd TEST && call Clean || exit /b 1 & popd
+pushd Test && call Clean || exit /b 1 & popd
 pushd ZMP && call Clean || exit /b 1 & popd
diff --git a/Source/Apps/Makefile b/Source/Apps/Makefile
index 220fb0e8..7ca650ad 100644
--- a/Source/Apps/Makefile
+++ b/Source/Apps/Makefile
@@ -1,7 +1,7 @@
 OBJECTS = sysgen.com survey.com \
 	syscopy.com assign.com format.com talk.com mode.com rtc.com \
 	timer.com rtchb.com
-SUBDIRS = XM FDU FAT Tune I2C TEST ZMP
+SUBDIRS = XM FDU FAT Tune Test ZMP
 DEST = ../../Binary/Apps
 TOOLS =../../Tools
 
diff --git a/Source/Apps/TEST/Build.cmd b/Source/Apps/Test/Build.cmd
similarity index 77%
rename from Source/Apps/TEST/Build.cmd
rename to Source/Apps/Test/Build.cmd
index 0600f980..5359873a 100644
--- a/Source/Apps/TEST/Build.cmd
+++ b/Source/Apps/Test/Build.cmd
@@ -13,10 +13,11 @@ set ZXLIBDIR=%TOOLS%/cpm/lib/
 set ZXINCDIR=%TOOLS%/cpm/include/
 
 pushd DMAmon && call Build || exit /b & popd
-pushd dskyng && call Build || exit /b & popd
-pushd inttst && call Build || exit /b & popd
+pushd tstdskng && call Build || exit /b & popd
+pushd inttest && call Build || exit /b & popd
 pushd ppidetst && call Build || exit /b & popd
 pushd ramtest && call Build || exit /b & popd
+pushd I2C && call Build || exit /b & popd
 
 goto :eof
 
diff --git a/Source/Apps/TEST/Clean.cmd b/Source/Apps/Test/Clean.cmd
similarity index 65%
rename from Source/Apps/TEST/Clean.cmd
rename to Source/Apps/Test/Clean.cmd
index 22aa3feb..da661cf0 100644
--- a/Source/Apps/TEST/Clean.cmd
+++ b/Source/Apps/Test/Clean.cmd
@@ -8,7 +8,8 @@ if exist *.hex del *.hex
 if exist *.prn del *.prn
 
 pushd DMAmon && call Clean || exit /b 1 & popd
-pushd dskyng && call Clean || exit /b 1 & popd
-pushd inttst && call Clean || exit /b 1 & popd
+pushd tstdskng && call Clean || exit /b 1 & popd
+pushd inttest && call Clean || exit /b 1 & popd
 pushd ppidetst && call Clean || exit /b 1 & popd
 pushd ramtest && call Clean || exit /b 1 & popd
+pushd I2C && call Clean || exit /b 1 & popd
diff --git a/Source/Apps/TEST/DMAmon/Build.cmd b/Source/Apps/Test/DMAmon/Build.cmd
similarity index 71%
rename from Source/Apps/TEST/DMAmon/Build.cmd
rename to Source/Apps/Test/DMAmon/Build.cmd
index 21a48637..7bfc3f43 100644
--- a/Source/Apps/TEST/DMAmon/Build.cmd
+++ b/Source/Apps/Test/DMAmon/Build.cmd
@@ -7,5 +7,5 @@ set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF dmamon.asm dmamon.com dmamon.lst || exit /b
 
-copy /Y dmamon.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y dmamon.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 
diff --git a/Source/Apps/TEST/DMAmon/Clean.cmd b/Source/Apps/Test/DMAmon/Clean.cmd
similarity index 100%
rename from Source/Apps/TEST/DMAmon/Clean.cmd
rename to Source/Apps/Test/DMAmon/Clean.cmd
diff --git a/Source/Apps/TEST/DMAmon/MBC_std.asm b/Source/Apps/Test/DMAmon/MBC_std.asm
similarity index 100%
rename from Source/Apps/TEST/DMAmon/MBC_std.asm
rename to Source/Apps/Test/DMAmon/MBC_std.asm
diff --git a/Source/Apps/Test/DMAmon/Makefile b/Source/Apps/Test/DMAmon/Makefile
new file mode 100644
index 00000000..f605796f
--- /dev/null
+++ b/Source/Apps/Test/DMAmon/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = dmamon.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/TEST/DMAmon/Readme.txt b/Source/Apps/Test/DMAmon/Readme.txt
similarity index 100%
rename from Source/Apps/TEST/DMAmon/Readme.txt
rename to Source/Apps/Test/DMAmon/Readme.txt
diff --git a/Source/Apps/TEST/DMAmon/build.inc b/Source/Apps/Test/DMAmon/build.inc
similarity index 100%
rename from Source/Apps/TEST/DMAmon/build.inc
rename to Source/Apps/Test/DMAmon/build.inc
diff --git a/Source/Apps/TEST/DMAmon/cfg_mbc.asm b/Source/Apps/Test/DMAmon/cfg_mbc.asm
similarity index 100%
rename from Source/Apps/TEST/DMAmon/cfg_mbc.asm
rename to Source/Apps/Test/DMAmon/cfg_mbc.asm
diff --git a/Source/Apps/TEST/DMAmon/dmamon.asm b/Source/Apps/Test/DMAmon/dmamon.asm
similarity index 95%
rename from Source/Apps/TEST/DMAmon/dmamon.asm
rename to Source/Apps/Test/DMAmon/dmamon.asm
index a6535a77..604fefe5 100644
--- a/Source/Apps/TEST/DMAmon/dmamon.asm
+++ b/Source/Apps/Test/DMAmon/dmamon.asm
@@ -95,7 +95,7 @@ DMATST_D:
 ;
 DMATST_Y:
 	call	PRTSTRD
-	.db	"\n\r\Y READY\n\r$"
+	.db	"\n\rY READY\n\r$"
 ;	CALL	
 	JP	MENULP
 ;
diff --git a/Source/Apps/TEST/DMAmon/dmamon.bat b/Source/Apps/Test/DMAmon/dmamon.bat
similarity index 100%
rename from Source/Apps/TEST/DMAmon/dmamon.bat
rename to Source/Apps/Test/DMAmon/dmamon.bat
diff --git a/Source/Apps/TEST/DMAmon/dmamon.sh b/Source/Apps/Test/DMAmon/dmamon.sh
similarity index 100%
rename from Source/Apps/TEST/DMAmon/dmamon.sh
rename to Source/Apps/Test/DMAmon/dmamon.sh
diff --git a/Source/Apps/TEST/DMAmon/hbios.inc b/Source/Apps/Test/DMAmon/hbios.inc
similarity index 100%
rename from Source/Apps/TEST/DMAmon/hbios.inc
rename to Source/Apps/Test/DMAmon/hbios.inc
diff --git a/Source/Apps/TEST/DMAmon/std.asm b/Source/Apps/Test/DMAmon/std.asm
similarity index 100%
rename from Source/Apps/TEST/DMAmon/std.asm
rename to Source/Apps/Test/DMAmon/std.asm
diff --git a/Source/Apps/TEST/DMAmon/util.asm b/Source/Apps/Test/DMAmon/util.asm
similarity index 100%
rename from Source/Apps/TEST/DMAmon/util.asm
rename to Source/Apps/Test/DMAmon/util.asm
diff --git a/Source/Apps/TEST/DMAmon/ver.inc b/Source/Apps/Test/DMAmon/ver.inc
similarity index 100%
rename from Source/Apps/TEST/DMAmon/ver.inc
rename to Source/Apps/Test/DMAmon/ver.inc
diff --git a/Source/Apps/I2C/Build.cmd b/Source/Apps/Test/I2C/Build.cmd
similarity index 63%
rename from Source/Apps/I2C/Build.cmd
rename to Source/Apps/Test/I2C/Build.cmd
index 8ac7bf8b..1a1a8206 100644
--- a/Source/Apps/I2C/Build.cmd
+++ b/Source/Apps/Test/I2C/Build.cmd
@@ -1,7 +1,7 @@
 @echo off
 setlocal
 
-set TOOLS=../../../Tools
+set TOOLS=../../../../Tools
 set PATH=%TOOLS%\tasm32;%PATH%
 set TASMTABS=%TOOLS%\tasm32
 
@@ -9,5 +9,5 @@ tasm -t180 -g3 -fFF i2cscan.asm i2cscan.com i2cscan.lst || exit /b
 tasm -t180 -g3 -fFF rtcds7.asm rtcds7.com rtcds7.lst || exit /b
 tasm -t180 -g3 -fFF i2clcd.asm i2clcd.com i2clcd.lst || exit /b
 
-copy /Y i2c*.com ..\..\..\Binary\Apps\ || exit /b
-copy /Y rtcds7*.com ..\..\..\Binary\Apps\ || exit /b
+copy /Y i2c*.com ..\..\..\..\Binary\Apps\Test\ || exit /b
+copy /Y rtcds7*.com ..\..\..\..\Binary\Apps\Test\ || exit /b
diff --git a/Source/Apps/I2C/Clean.cmd b/Source/Apps/Test/I2C/Clean.cmd
similarity index 100%
rename from Source/Apps/I2C/Clean.cmd
rename to Source/Apps/Test/I2C/Clean.cmd
diff --git a/Source/Apps/I2C/Makefile b/Source/Apps/Test/I2C/Makefile
similarity index 58%
rename from Source/Apps/I2C/Makefile
rename to Source/Apps/Test/I2C/Makefile
index a6715214..c7abbb52 100644
--- a/Source/Apps/I2C/Makefile
+++ b/Source/Apps/Test/I2C/Makefile
@@ -1,6 +1,6 @@
 OBJECTS = i2cscan.com rtcds7.com i2clcd.com
-DEST = ../../../Binary/Apps
-TOOLS = ../../../Tools
+DEST = ../../../../Binary/Apps/Test/
+TOOLS = ../../../../Tools
 
 USETASM=1
 TASMFLAGS=-dWBW
diff --git a/Source/Apps/I2C/i2ccpm.inc b/Source/Apps/Test/I2C/i2ccpm.inc
similarity index 100%
rename from Source/Apps/I2C/i2ccpm.inc
rename to Source/Apps/Test/I2C/i2ccpm.inc
diff --git a/Source/Apps/I2C/i2clcd.asm b/Source/Apps/Test/I2C/i2clcd.asm
similarity index 100%
rename from Source/Apps/I2C/i2clcd.asm
rename to Source/Apps/Test/I2C/i2clcd.asm
diff --git a/Source/Apps/I2C/i2cscan.asm b/Source/Apps/Test/I2C/i2cscan.asm
similarity index 100%
rename from Source/Apps/I2C/i2cscan.asm
rename to Source/Apps/Test/I2C/i2cscan.asm
diff --git a/Source/Apps/I2C/pcfi2c.inc b/Source/Apps/Test/I2C/pcfi2c.inc
similarity index 100%
rename from Source/Apps/I2C/pcfi2c.inc
rename to Source/Apps/Test/I2C/pcfi2c.inc
diff --git a/Source/Apps/I2C/rtcds7.asm b/Source/Apps/Test/I2C/rtcds7.asm
similarity index 100%
rename from Source/Apps/I2C/rtcds7.asm
rename to Source/Apps/Test/I2C/rtcds7.asm
diff --git a/Source/Apps/TEST/MBC/button2.asm b/Source/Apps/Test/MBC/button2.asm
similarity index 100%
rename from Source/Apps/TEST/MBC/button2.asm
rename to Source/Apps/Test/MBC/button2.asm
diff --git a/Source/Apps/TEST/MBC/leds2.asm b/Source/Apps/Test/MBC/leds2.asm
similarity index 100%
rename from Source/Apps/TEST/MBC/leds2.asm
rename to Source/Apps/Test/MBC/leds2.asm
diff --git a/Source/Apps/TEST/MBC/tone3.asm b/Source/Apps/Test/MBC/tone3.asm
similarity index 100%
rename from Source/Apps/TEST/MBC/tone3.asm
rename to Source/Apps/Test/MBC/tone3.asm
diff --git a/Source/Apps/Test/Makefile b/Source/Apps/Test/Makefile
new file mode 100644
index 00000000..9ebade2d
--- /dev/null
+++ b/Source/Apps/Test/Makefile
@@ -0,0 +1,6 @@
+OBJECTS = 
+SUBDIRS = DMAMon I2C inttest ppidetst ramtest tstdskng
+DEST = ../../../Binary/Apps/Test
+TOOLS =../../../Tools
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/TEST/inttst/Build.cmd b/Source/Apps/Test/inttest/Build.cmd
similarity index 71%
rename from Source/Apps/TEST/inttst/Build.cmd
rename to Source/Apps/Test/inttest/Build.cmd
index 9fe25572..e26d9b73 100644
--- a/Source/Apps/TEST/inttst/Build.cmd
+++ b/Source/Apps/Test/inttest/Build.cmd
@@ -7,5 +7,5 @@ set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF inttest.asm inttest.com inttest.lst || exit /b
 
-copy /Y inttest.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y inttest.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 
diff --git a/Source/Apps/TEST/dskyng/Clean.cmd b/Source/Apps/Test/inttest/Clean.cmd
similarity index 100%
rename from Source/Apps/TEST/dskyng/Clean.cmd
rename to Source/Apps/Test/inttest/Clean.cmd
diff --git a/Source/Apps/Test/inttest/Makefile b/Source/Apps/Test/inttest/Makefile
new file mode 100644
index 00000000..04222fbd
--- /dev/null
+++ b/Source/Apps/Test/inttest/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = inttest.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/TEST/inttst/inttest.asm b/Source/Apps/Test/inttest/inttest.asm
similarity index 100%
rename from Source/Apps/TEST/inttst/inttest.asm
rename to Source/Apps/Test/inttest/inttest.asm
diff --git a/Source/Apps/TEST/ppidetst/Build.cmd b/Source/Apps/Test/ppidetst/Build.cmd
similarity index 71%
rename from Source/Apps/TEST/ppidetst/Build.cmd
rename to Source/Apps/Test/ppidetst/Build.cmd
index fcad27d3..5b7becb0 100644
--- a/Source/Apps/TEST/ppidetst/Build.cmd
+++ b/Source/Apps/Test/ppidetst/Build.cmd
@@ -7,5 +7,5 @@ set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF ppidetst.asm ppidetst.com ppidetst.lst || exit /b
 
-copy /Y ppidetst.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y ppidetst.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 
diff --git a/Source/Apps/TEST/inttst/Clean.cmd b/Source/Apps/Test/ppidetst/Clean.cmd
similarity index 100%
rename from Source/Apps/TEST/inttst/Clean.cmd
rename to Source/Apps/Test/ppidetst/Clean.cmd
diff --git a/Source/Apps/Test/ppidetst/Makefile b/Source/Apps/Test/ppidetst/Makefile
new file mode 100644
index 00000000..74f9615f
--- /dev/null
+++ b/Source/Apps/Test/ppidetst/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = ppidetst.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/TEST/ppidetst/ppidetst.asm b/Source/Apps/Test/ppidetst/ppidetst.asm
similarity index 100%
rename from Source/Apps/TEST/ppidetst/ppidetst.asm
rename to Source/Apps/Test/ppidetst/ppidetst.asm
diff --git a/Source/Apps/TEST/ramtest/Build.cmd b/Source/Apps/Test/ramtest/Build.cmd
similarity index 79%
rename from Source/Apps/TEST/ramtest/Build.cmd
rename to Source/Apps/Test/ramtest/Build.cmd
index 6f8bfe95..aac36c4b 100644
--- a/Source/Apps/TEST/ramtest/Build.cmd
+++ b/Source/Apps/Test/ramtest/Build.cmd
@@ -10,4 +10,4 @@ tasm -t80 -b -fFF dbgmon.asm dbgmon.bin dbgmon.lst || exit /b
 
 copy /Y /b loader.bin+dbgmon.bin ramtest.com || exit /b
 
-copy /Y ramtest.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y ramtest.com ..\..\..\..\Binary\Apps\Test\ || exit /b
diff --git a/Source/Apps/TEST/ramtest/Clean.cmd b/Source/Apps/Test/ramtest/Clean.cmd
similarity index 100%
rename from Source/Apps/TEST/ramtest/Clean.cmd
rename to Source/Apps/Test/ramtest/Clean.cmd
diff --git a/Source/Apps/TEST/ramtest/Makefile b/Source/Apps/Test/ramtest/Makefile
similarity index 57%
rename from Source/Apps/TEST/ramtest/Makefile
rename to Source/Apps/Test/ramtest/Makefile
index 7e910bca..3c5e6515 100644
--- a/Source/Apps/TEST/ramtest/Makefile
+++ b/Source/Apps/Test/ramtest/Makefile
@@ -1,7 +1,7 @@
 OBJECTS = ramtest.com
-DEST = ../../../Binary/Apps
-DOCDEST = ../../../Doc
-TOOLS = ../../../Tools
+DEST = ../../../../Binary/Apps/Test
+DOCDEST = ../../../../Doc
+TOOLS = ../../../../Tools
 OTHERS = loader.bin dbgmon.bin
 include $(TOOLS)/Makefile.inc
 
diff --git a/Source/Apps/TEST/ramtest/dbgmon.asm b/Source/Apps/Test/ramtest/dbgmon.asm
similarity index 100%
rename from Source/Apps/TEST/ramtest/dbgmon.asm
rename to Source/Apps/Test/ramtest/dbgmon.asm
diff --git a/Source/Apps/TEST/ramtest/loader.asm b/Source/Apps/Test/ramtest/loader.asm
similarity index 100%
rename from Source/Apps/TEST/ramtest/loader.asm
rename to Source/Apps/Test/ramtest/loader.asm
diff --git a/Source/Apps/TEST/ramtest/ramtest.bat b/Source/Apps/Test/ramtest/ramtest.bat
similarity index 100%
rename from Source/Apps/TEST/ramtest/ramtest.bat
rename to Source/Apps/Test/ramtest/ramtest.bat
diff --git a/Source/Apps/TEST/ramtest/ramtest.sh b/Source/Apps/Test/ramtest/ramtest.sh
similarity index 100%
rename from Source/Apps/TEST/ramtest/ramtest.sh
rename to Source/Apps/Test/ramtest/ramtest.sh
diff --git a/Source/Apps/TEST/dskyng/Build.cmd b/Source/Apps/Test/tstdskng/Build.cmd
similarity index 71%
rename from Source/Apps/TEST/dskyng/Build.cmd
rename to Source/Apps/Test/tstdskng/Build.cmd
index 114b3a44..a56e8dbc 100644
--- a/Source/Apps/TEST/dskyng/Build.cmd
+++ b/Source/Apps/Test/tstdskng/Build.cmd
@@ -7,5 +7,5 @@ set TASMTABS=%TOOLS%\tasm32
 
 tasm -t180 -g3 -fFF tstdskng.asm tstdskng.com tstdskng.lst || exit /b
 
-copy /Y tstdskng.com ..\..\..\..\Binary\Apps\ || exit /b
+copy /Y tstdskng.com ..\..\..\..\Binary\Apps\Test\ || exit /b
 
diff --git a/Source/Apps/TEST/ppidetst/Clean.cmd b/Source/Apps/Test/tstdskng/Clean.cmd
similarity index 100%
rename from Source/Apps/TEST/ppidetst/Clean.cmd
rename to Source/Apps/Test/tstdskng/Clean.cmd
diff --git a/Source/Apps/Test/tstdskng/Makefile b/Source/Apps/Test/tstdskng/Makefile
new file mode 100644
index 00000000..c32a43eb
--- /dev/null
+++ b/Source/Apps/Test/tstdskng/Makefile
@@ -0,0 +1,7 @@
+OBJECTS = tstdskng.com
+DEST = ../../../../Binary/Apps/Test
+TOOLS =../../../../Tools
+
+USETASM=1
+
+include $(TOOLS)/Makefile.inc
\ No newline at end of file
diff --git a/Source/Apps/TEST/dskyng/tstdskng.asm b/Source/Apps/Test/tstdskng/tstdskng.asm
similarity index 100%
rename from Source/Apps/TEST/dskyng/tstdskng.asm
rename to Source/Apps/Test/tstdskng/tstdskng.asm
diff --git a/Source/Images/d_bp.txt b/Source/Images/d_bp.txt
index be17824c..d51015a6 100644
--- a/Source/Images/d_bp.txt
+++ b/Source/Images/d_bp.txt
@@ -16,7 +16,6 @@
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/format.com 15:
-../../Binary/Apps/inttest.com 15:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
@@ -34,13 +33,15 @@
 ../../Binary/Apps/zminit.ovr 15:
 ../../Binary/Apps/zmconfig.ovr 15:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
+Test/*.* 2:
 #
 # Add Tune sample files
 #
diff --git a/Source/Images/d_cpm22.txt b/Source/Images/d_cpm22.txt
index a5c06252..41b7907c 100644
--- a/Source/Images/d_cpm22.txt
+++ b/Source/Images/d_cpm22.txt
@@ -10,7 +10,6 @@ d_cpm22/ReadMe.txt 0:
 ../../Binary/Apps/fat.com 0:
 ../../Binary/Apps/fdu.com 0:
 ../../Binary/Apps/format.com 0:
-../../Binary/Apps/inttest.com 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
@@ -28,13 +27,14 @@ d_cpm22/ReadMe.txt 0:
 ../../Binary/Apps/zminit.ovr 0:
 ../../Binary/Apps/zmconfig.ovr 0:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
 Test/*.* 2:
 #
 # Add Tune sample files
diff --git a/Source/Images/d_cpm3.txt b/Source/Images/d_cpm3.txt
index 6c5eef3b..e3f5b26d 100644
--- a/Source/Images/d_cpm3.txt
+++ b/Source/Images/d_cpm3.txt
@@ -26,7 +26,6 @@
 ../../Binary/Apps/fat.com 0:
 ../../Binary/Apps/fdu.com 0:
 ../../Binary/Apps/format.com 0:
-../../Binary/Apps/inttest.com 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
@@ -44,13 +43,15 @@
 ../../Binary/Apps/zminit.ovr 0:
 ../../Binary/Apps/zmconfig.ovr 0:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
+Test/*.* 2:
 #
 # Add Tune sample files
 #
diff --git a/Source/Images/d_nzcom.txt b/Source/Images/d_nzcom.txt
index 4f1b1064..cea46e38 100644
--- a/Source/Images/d_nzcom.txt
+++ b/Source/Images/d_nzcom.txt
@@ -27,7 +27,6 @@ d_zsdos/u0/*.* 0:
 ../../Binary/Apps/fat.com 0:
 ../../Binary/Apps/fdu.com 0:
 ../../Binary/Apps/format.com 0:
-../../Binary/Apps/inttest.com 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
@@ -45,13 +44,14 @@ d_zsdos/u0/*.* 0:
 ../../Binary/Apps/zminit.ovr 0:
 ../../Binary/Apps/zmconfig.ovr 0:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
 Test/*.* 2:
 #
 # Add Tune sample files
diff --git a/Source/Images/d_zpm3.txt b/Source/Images/d_zpm3.txt
index 85d4eb5b..9813ea22 100644
--- a/Source/Images/d_zpm3.txt
+++ b/Source/Images/d_zpm3.txt
@@ -25,7 +25,6 @@
 ../../Binary/Apps/fat.com 15:
 ../../Binary/Apps/fdu.com 15:
 ../../Binary/Apps/format.com 15:
-../../Binary/Apps/inttest.com 15:
 ../../Binary/Apps/mode.com 15:
 ../../Binary/Apps/rtc.com 15:
 ../../Binary/Apps/survey.com 15:
@@ -43,13 +42,15 @@
 ../../Binary/Apps/zminit.ovr 15:
 ../../Binary/Apps/zmconfig.ovr 15:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
+Test/*.* 2:
 #
 # Add Tune sample files
 #
diff --git a/Source/Images/d_zsdos.txt b/Source/Images/d_zsdos.txt
index 449b47b3..8c4631df 100644
--- a/Source/Images/d_zsdos.txt
+++ b/Source/Images/d_zsdos.txt
@@ -23,7 +23,6 @@ d_cpm22/u0/XSUB.COM 0:
 ../../Binary/Apps/fat.com 0:
 ../../Binary/Apps/fdu.com 0:
 ../../Binary/Apps/format.com 0:
-../../Binary/Apps/inttest.com 0:
 ../../Binary/Apps/mode.com 0:
 ../../Binary/Apps/rtc.com 0:
 ../../Binary/Apps/survey.com 0:
@@ -41,13 +40,14 @@ d_cpm22/u0/XSUB.COM 0:
 ../../Binary/Apps/zminit.ovr 0:
 ../../Binary/Apps/zmconfig.ovr 0:
 #
-../../Binary/Apps/i2clcd.com 2:
-../../Binary/Apps/i2cscan.com 2:
-../../Binary/Apps/rtcds7.com 2:
-../../Binary/Apps/rtchb.com 2:
-../../Binary/Apps/ppidetst.com 2:
-../../Binary/Apps/ramtest.com 2:
-../../Binary/Apps/tstdskng.com 2:
+#../../Binary/Apps/i2clcd.com 2:
+#../../Binary/Apps/i2cscan.com 2:
+#../../Binary/Apps/rtcds7.com 2:
+#../../Binary/Apps/rtchb.com 2:
+#../../Binary/Apps/ppidetst.com 2:
+#../../Binary/Apps/ramtest.com 2:
+#../../Binary/Apps/tstdskng.com 2:
+../../Binary/Apps/Test/*.com 2:
 Test/*.* 2:
 #
 # Add Tune sample files
diff --git a/Source/RomDsk/Build.cmd b/Source/RomDsk/Build.cmd
index 5e784779..1a5295b9 100644
--- a/Source/RomDsk/Build.cmd
+++ b/Source/RomDsk/Build.cmd
@@ -12,7 +12,7 @@ set ZXLIBDIR=%TOOLS%/cpm/lib/
 set ZXINCDIR=%TOOLS%/cpm/include/
 
 set RomApps1=assign mode rtc syscopy xm
-set RomApps2=fdu format survey sysgen talk timer inttest
+set RomApps2=fdu format survey sysgen talk timer
 
 ::
 :: Make all variants of the ROM Disk contents image.  Three sizes are
diff --git a/Source/RomDsk/Makefile b/Source/RomDsk/Makefile
index 7f4837ac..4f899321 100644
--- a/Source/RomDsk/Makefile
+++ b/Source/RomDsk/Makefile
@@ -7,7 +7,7 @@ include $(TOOLS)/Makefile.inc
 .SHELLFLAGS = -ce
 
 ROMAPPS1 := assign mode rtc syscopy xm
-ROMAPPS2 := fdu format survey sysgen talk timer inttest
+ROMAPPS2 := fdu format survey sysgen talk timer
 
 rom256_%.dat: ROMSIZ=256
 rom512_%.dat: ROMSIZ=512
diff --git a/Source/ver.inc b/Source/ver.inc
index 3af4b31e..5a6f03b7 100644
--- a/Source/ver.inc
+++ b/Source/ver.inc
@@ -2,4 +2,4 @@
 #DEFINE	RMN	1
 #DEFINE	RUP	1
 #DEFINE	RTP	0
-#DEFINE BIOSVER	"3.1.1-pre.120"
+#DEFINE BIOSVER	"3.1.1-pre.121"
diff --git a/Source/ver.lib b/Source/ver.lib
index b7f6f4f1..c53abf7e 100644
--- a/Source/ver.lib
+++ b/Source/ver.lib
@@ -3,5 +3,5 @@ rmn	equ	1
 rup	equ	1
 rtp	equ	0
 biosver	macro
-	db	"3.1.1-pre.120"
+	db	"3.1.1-pre.121"
 	endm