diff --git a/Makefile b/Makefile
index 6fc886b..a2b456f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,24 @@ clean:
 
 subdirs: $(SUBDIRS)
 
+test:
+	@echo ""
+	@echo ""
+	@echo ""
+	@echo "Testing tools/makeadf..."	
+	@echo "------------------------"
+	make -C tools/makeadf test
+	@echo ""
+	@echo ""
+	@echo ""
+	@echo "Testing tools/imagecon..."	
+	@echo "-------------------------"
+	make -C tools/imagecon test
+	@echo ""
+	@echo ""
+	@echo ""
+
 $(SUBDIRS):
 	@echo ""
 	make -C $@
 
-
-
diff --git a/tools/makeadf/Makefile b/tools/makeadf/Makefile
index 8cbb045..6bade6c 100644
--- a/tools/makeadf/Makefile
+++ b/tools/makeadf/Makefile
@@ -13,4 +13,14 @@ bin:
 	mkdir bin
 
 clean:
-	rm -r out bin
\ No newline at end of file
+	rm -r out bin *~
+
+test: $(MAKEADF)
+	$(MAKEADF) reference/bootblock.bin > out/test.adf
+	diff reference/test.adf out/test.adf
+	@echo "______  ___   _____ _____ ___________  "
+	@echo "| ___ \/ _ \ /  ___/  ___|  ___|  _  \ "
+	@echo "| |_/ / /_\ \\\\\ \`--.\ \`--.| |__ | | | | "
+	@echo "|  __/|  _  | \`--. \\\`--. \  __|| | | | "
+	@echo "| |   | | | |/\__/ /\__/ / |___| |/ /  "
+	@echo "\_|   \_| |_/\____/\____/\____/|___/   "
\ No newline at end of file
diff --git a/tools/makeadf/makeadf.c b/tools/makeadf/makeadf.c
index 500dce8..84d40b6 100644
--- a/tools/makeadf/makeadf.c
+++ b/tools/makeadf/makeadf.c
@@ -46,20 +46,21 @@ int main(int argc,char *argv[])
     if ((f = fopen(argv[1],"rb"))) {
       len = fread(image,1,DISKSIZE,f);
       if (len > 0) {
-        if (len < DISKSIZE)
+        if (len < DISKSIZE) {
           memset(image+len,0,DISKSIZE-len);
+	}
         boot_chksum(image);
         fwrite(image,1,DISKSIZE,stdout);
         rc = 0;
       }
       else
-        fprintf(stderr,"Image read error!\n");
+        fprintf(stderr,"%s: image read error!\n", argv[0]);
     }
     else
-      fprintf(stderr,"Cannot open '%s'!\n",argv[0]);  
+      fprintf(stderr,"%s: file to open open %s\n", argv[0], argv[1]);  
   }
   else
-    fprintf(stderr,"Usage: %s <image data>\n",argv[0]);
+    fprintf(stderr,"usage: %s <image data>\n", argv[0]);
 
   return rc;
 }
diff --git a/tools/makeadf/reference/bootblock.bin b/tools/makeadf/reference/bootblock.bin
new file mode 100755
index 0000000..51d7457
Binary files /dev/null and b/tools/makeadf/reference/bootblock.bin differ
diff --git a/tools/makeadf/reference/test.adf b/tools/makeadf/reference/test.adf
new file mode 100644
index 0000000..d001a6e
Binary files /dev/null and b/tools/makeadf/reference/test.adf differ