diff --git a/makefile b/makefile
index dd2c041138fbf568f49257dfb2e7e89f1c392a6f..aef1e7fb34688afb3b0fd6fb4d3ff037c35abbea 100644
--- a/makefile
+++ b/makefile
@@ -71,7 +71,7 @@ DMA_PRODUCT ?= DMA_230
 
 # ADP command File
 # Defaultly set to demo adp command file
-DEFAULT_ADP_FILE = $(TESTCODES_DIR)/adp_demo/adp.cmd
+DEFAULT_ADP_FILE = $(SIM_DIR)/adp.cmd
 ADP_FILE ?= $(DEFAULT_ADP_FILE)
 ADP_PATH := $(shell realpath $(ADP_FILE))
 ADP_OPTIONS := -define ADP_FILE=\"$(ADP_PATH)\"
@@ -387,6 +387,7 @@ endif
 	  if [ -e  $(TESTNAME).hex ] ; then \
 	    mkdir -p $(SIM_DIR) ; \
 	    cp $(TESTNAME).hex $(SIM_DIR)/image.hex ; \
+	    cp adp.cmd $(SIM_DIR)/adp.cmd ; \
 	  else \
 	    while [ ! -e $(TESTNAME).hex ] ; do \
 	      echo Wait for $(TESTNAME).hex file ...; \
@@ -412,6 +413,7 @@ endif
 	  if [ -e  $(TESTNAME).hex ] ; then \
 	    mkdir -p $(SIM_DIR) ; \
 	    cp $(TESTNAME).hex $(SIM_DIR)/image.hex ; \
+	    cp adp.cmd $(SIM_DIR)/adp.cmd ; \
 	  else \
 	    while [ ! -e $(TESTNAME).hex ] ; do \
 	      echo Wait for $(TESTNAME).hex file ...; \
diff --git a/testcodes/adp_demo/adp.cmd b/testcodes/adp_demo/adp.cmd
deleted file mode 100644
index 89934e9acde45e350ffdfebc5917cc2e8f229333..0000000000000000000000000000000000000000
--- a/testcodes/adp_demo/adp.cmd
+++ /dev/null
@@ -1,84 +0,0 @@
-A
-A 0
-R
-R
-A
-A
-S 7e
-A 
-a 1000000
-r 10
-a 20000000
-r
-r
-a 30000000
-r
-r
-a 40006000
-r
-r
-r
-r
-A
-
-a 0x80000000
-a
-w 0xb0
-a
-w 0xb1
-a
-w 0xb3b2
-a
-w 0xb7b6b5b4
-a
-a 0x80000000
-a
-r 0x8
-a
-a 0x80000000
-a
-r 0x004
-a
-a 0x80000000
-a
-r 0x000002
-a
-a 0x80000000
-a
-r
-r
-a
-
-v 0xe5e5e5e5
-a 80000000
-f 4000
-A
-a 90000000
-U 0x0f
-0123456789ABCDE
-A
-A 0x90000000
-R 5
-A e0000000
-w 1
-r
-A
-A 0x10000000
-R 
-m 0xf0000000
-V 0x30000000
-P 1fff
-A
-A 0x10000000
-M
-V
-P 200
-A
-! illegal
-C
-C ff
-C 200
-C 201
-  A
-X
-!
diff --git a/testcodes/apb_mux_tests/adp.cmd b/testcodes/apb_mux_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/bootloader/adp.cmd b/testcodes/bootloader/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/debug_tests/adp.cmd b/testcodes/debug_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/default_slaves_tests/adp.cmd b/testcodes/default_slaves_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/dhry/adp.cmd b/testcodes/dhry/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/dma_tests/adp.cmd b/testcodes/dma_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/dualtimer_demo/adp.cmd b/testcodes/dualtimer_demo/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/generic/adp.cmd b/testcodes/generic/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/gpio_driver_tests/adp.cmd b/testcodes/gpio_driver_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/gpio_tests/adp.cmd b/testcodes/gpio_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/hello/adp.cmd b/testcodes/hello/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/interrupt_demo/adp.cmd b/testcodes/interrupt_demo/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/memory_tests/adp.cmd b/testcodes/memory_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/romtable_tests/adp.cmd b/testcodes/romtable_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/rtx_demo/adp.cmd b/testcodes/rtx_demo/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/self_reset_demo/adp.cmd b/testcodes/self_reset_demo/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/sleep_demo/adp.cmd b/testcodes/sleep_demo/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/timer_driver_tests/adp.cmd b/testcodes/timer_driver_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/timer_tests/adp.cmd b/testcodes/timer_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/uart_driver_tests/adp.cmd b/testcodes/uart_driver_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/uart_tests/adp.cmd b/testcodes/uart_tests/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/testcodes/watchdog_demo/adp.cmd b/testcodes/watchdog_demo/adp.cmd
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391