diff --git a/build-image.bat b/build-image.bat
new file mode 100644
index 0000000..c59dce0
--- /dev/null
+++ b/build-image.bat
@@ -0,0 +1,17 @@
+echo off
+
+REM Copy all of the assets into the ProDOS image for emulator testing
+REM
+REM Pass the path of the Cadius tool as the first argument (%1)
+
+set CADIUS="%1"
+set IMAGE="emu\\Target.2mg"
+set FOLDER="/GTEDEV/Build"
+
+REM Cadius does not overwrite files, so clear the root folder first
+%CADIUS% DELETEFOLDER %IMAGE% %FOLDER%
+%CADIUS% CREATEFOLDER %IMAGE% %FOLDER%
+
+REM Now copy files and folders as needed
+%CADIUS% ADDFILE %IMAGE% %FOLDER% test\\GTETestApp
+%CADIUS% ADDFILE %IMAGE% %FOLDER% src\\GTETool
diff --git a/emu/Target.2mg b/emu/Target.2mg
index 1b2fce8..99ab3d0 100644
Binary files a/emu/Target.2mg and b/emu/Target.2mg differ
diff --git a/package-lock.json b/package-lock.json
index 77d68c8..07f2ab0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,15 +14,15 @@
       }
     },
     "merge": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz",
-      "integrity": "sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.1.tgz",
+      "integrity": "sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==",
       "dev": true
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "watch": {
diff --git a/package.json b/package.json
index 8112dda..1b06b7f 100644
--- a/package.json
+++ b/package.json
@@ -9,11 +9,9 @@
     "gsport": "C:\\Programs\\gsport\\gsport_0.31\\GSPort.exe"
   },
   "scripts": {
-    "test": "npm run build:test && npm run build:test:copy && %npm_package_config_gsport%",
+    "test": "npm run build && build-image.bat %npm_package_config_cadius% && %npm_package_config_gsport%",
+    "build": "npm run build:tool && npm run build:test",
     "build:test": "%npm_package_config_merlin32% -V macros test/App.s",
-    "build:test:copy": "%npm_package_config_cadius% ADDFILE emu\\Target.2mg /GTEDEV test/GTETestApp",
-    "build": "npm run build:tool && npm run build:copy",
-    "build:copy": "%npm_package_config_cadius% ADDFILE emu\\Target.2mg /GTEDEV src\\GTETool",
     "build:tool": "%npm_package_config_merlin32% -V C:\\Programs\\BrutalDeluxe\\Merlin32\\Library src\\Tool.s",
     "build:watch": "watch \"npm run build\" src"
   },