diff --git a/test/.cvsignore b/test/.cvsignore
index 9a1de8a2..07d318c8 100644
--- a/test/.cvsignore
+++ b/test/.cvsignore
@@ -8,6 +8,7 @@ check_iso.sh
 check_nrg.sh
 check_sizeof
 testassert
+testbincue
 testdefault
 testischar
 testiso9660
diff --git a/test/Makefile.am b/test/Makefile.am
index a7f9d940..86498c89 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.25 2004/07/09 20:47:08 rocky Exp $
+#   $Id: Makefile.am,v 1.26 2004/07/10 01:18:02 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -51,9 +51,10 @@ check_DATA = vcd_demo.right \
 	     isofs-m1-read.right cdda-read.right \
 	     t1.toc t2.toc t3.toc t4.toc t5.toc t6.toc t7.toc t8.toc t9.toc \
 	     data1.toc data2.toc data5.toc data6.toc data7.toc \
-	     bad-mode1.toc bad-msf-1.toc bad-msf-2.toc \
-	     bad-cat1.toc bad-cat2.toc bad-cat3.toc \
+	     bad-mode1.cue bad-msf-1.cue bad-msf-2.cue bad-msf-3.cue \
+	     bad-mode1.toc bad-msf-1.toc bad-msf-2.toc bad-msf-3.toc \
 	     bad-cat1.cue bad-cat2.cue bad-cat3.cue \
+	     bad-cat1.toc bad-cat2.toc bad-cat3.toc \
 	     copying.iso copying.right
 
 EXTRA_DIST = $(check_SCRIPTS) $(check_DATA) \
diff --git a/test/bad-cat3.cue b/test/bad-cat3.cue
index 92442e3d..0e65e3bf 100644
--- a/test/bad-cat3.cue
+++ b/test/bad-cat3.cue
@@ -1,7 +1,7 @@
-REM $Id: bad-cat3.cue,v 1.1 2004/07/09 20:47:08 rocky Exp $
-REM test catalog number. -- not enough digits
+REM $Id: bad-cat3.cue,v 1.2 2004/07/10 01:18:02 rocky Exp $
+REM test catalog number. -- invalid decimal digit
 
-CATALOG 123456789A123
+CATALOG 123456789b123
 
 FILE "cdda.bin" BINARY
 
diff --git a/test/bad-mode1.cue b/test/bad-mode1.cue
new file mode 100644
index 00000000..589de652
--- /dev/null
+++ b/test/bad-mode1.cue
@@ -0,0 +1,7 @@
+REM $Id: bad-mode1.cue,v 1.1 2004/07/10 01:18:02 rocky Exp $
+REM "MODE1_FORM45" is not a valid mode.
+
+FILE "cdda.bin" BINARY
+
+TRACK 01 MODE3_FORM1
+    INDEX 01 00:00:00
diff --git a/test/bad-msf-2.cue b/test/bad-msf-2.cue
new file mode 100644
index 00000000..fdd4bfc2
--- /dev/null
+++ b/test/bad-msf-2.cue
@@ -0,0 +1,7 @@
+REM $Id: bad-msf-2.cue,v 1.1 2004/07/10 01:18:02 rocky Exp $
+REM bad MSF in second field - seconds should be less than 60
+
+FILE "cdda.bin" BINARY
+
+TRACK 01 AUDIO
+    INDEX 01 00:90:00
diff --git a/test/bad-msf-3.toc b/test/bad-msf-3.toc
new file mode 100644
index 00000000..b1cfac1a
--- /dev/null
+++ b/test/bad-msf-3.toc
@@ -0,0 +1,6 @@
+// $Id: bad-msf-3.toc,v 1.1 2004/07/10 01:18:02 rocky Exp $
+// bad MSF in second field
+
+TRACK AUDIO
+NO COPY       // so that all CTL flags are 0
+FILE "cdda.bin" xx:yy:zz  // Should be digits
diff --git a/test/testbincue.c b/test/testbincue.c
index 47f67671..68fd3bc5 100644
--- a/test/testbincue.c
+++ b/test/testbincue.c
@@ -1,5 +1,5 @@
 /*
-  $Id: testbincue.c,v 1.1 2004/07/09 20:47:08 rocky Exp $
+  $Id: testbincue.c,v 1.2 2004/07/10 01:18:02 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   
@@ -39,7 +39,7 @@
 #include <string.h>
 
 #define NUM_GOOD_CUES 2
-#define NUM_BAD_CUES 3
+#define NUM_BAD_CUES 7
 int
 main(int argc, const char *argv[])
 {
@@ -52,6 +52,10 @@ main(int argc, const char *argv[])
     "bad-cat1.cue", 
     "bad-cat2.cue", 
     "bad-cat3.cue", 
+    "bad-mode1.cue", 
+    "bad-msf-1.cue", 
+    "bad-msf-2.cue", 
+    "bad-msf-3.cue", 
   };
   int ret=0;
   unsigned int i;
diff --git a/test/testtoc.c b/test/testtoc.c
index 9429249a..b500e46d 100644
--- a/test/testtoc.c
+++ b/test/testtoc.c
@@ -1,5 +1,5 @@
 /*
-  $Id: testtoc.c,v 1.2 2004/05/08 20:36:02 rocky Exp $
+  $Id: testtoc.c,v 1.3 2004/07/10 01:18:02 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   
@@ -39,7 +39,7 @@
 #include <string.h>
 
 #define NUM_GOOD_TOCS 14
-#define NUM_BAD_TOCS 6
+#define NUM_BAD_TOCS 7
 int
 main(int argc, const char *argv[])
 {
@@ -63,6 +63,7 @@ main(int argc, const char *argv[])
   const char *badtoc_file[NUM_BAD_TOCS] = {
     "bad-msf-1.toc", 
     "bad-msf-2.toc",
+    "bad-msf-3.toc",
     "bad-cat1.toc", 
     "bad-cat2.toc",
     "bad-cat3.toc",
@@ -71,7 +72,7 @@ main(int argc, const char *argv[])
   int ret=0;
   unsigned int i;
   
-  cdio_loglevel_default = CDIO_LOG_INFO;
+  cdio_loglevel_default = (argc > 1) ? CDIO_LOG_DEBUG : CDIO_LOG_INFO;
   for (i=0; i<NUM_GOOD_TOCS; i++) {
     if (!cdio_is_tocfile(toc_file[i])) {
       printf("Incorrect: %s doesn't parse as a cdrdao TOC file.\n",