Index: test/uri.test
==================================================================
--- test/uri.test
+++ test/uri.test
@@ -44,11 +44,11 @@
   9      test.db#boris                        test.db#boris
   10     file:test%2Edb                       test.db
   11     file                                 file
   12     http:test.db                         http:test.db
   13     file:test.db%00extra                 test.db
-  14     file:test%00.db%00extra              test
+  14     file:testdb%00.db%00extra            testdb
 
   15     test.db?mork=1#boris                 test.db?mork=1#boris
   16     file://localhostPWD/test.db%3Fhello  test.db?hello
 } {
   
@@ -57,10 +57,11 @@
     set uri  [string map [list PWD /[pwd]] $uri]
   } else {
     set uri  [string map [list PWD [pwd]] $uri]
   }
 
+  if {[file isdir $file]} {error "$file is a directory"}
   forcedelete $file
   do_test 1.$tn.1 { file exists $file } 0
   set DB [sqlite3_open $uri]
   do_test 1.$tn.2 { file exists $file } 1
   sqlite3_close $DB
@@ -88,13 +89,13 @@
   1      file:test.db?hello=world                     {hello world}
   2      file:test.db?hello&world                     {hello {} world {}}
   3      file:test.db?hello=1&world=2&vfs=tvfs        {hello 1 world 2 vfs tvfs}
   4      file:test.db?hello=1&world=2&vfs=tvfs2        {}
   5      file:test.db?%68%65%6C%6C%6F=%77%6F%72%6C%64 {hello world}
-  6      file:test%00.db?hello%00extra=world%00ex     {hello world}
-  7      file:test%00.db?hello%00=world%00            {hello world}
-  8      file:test%00.db?=world&xyz=abc               {xyz abc}
+  6      file:testdb%00.db?hello%00extra=world%00ex   {hello world}
+  7      file:testdb%00.db?hello%00=world%00          {hello world}
+  8      file:testdb%00.db?=world&xyz=abc             {xyz abc}
   9      file:test.db?%00hello=world&xyz=abc          {xyz abc}
   10     file:test.db?hello=%00world&xyz=             {hello {} xyz {}}
   11     file:test.db?=#ravada                        {}
   12     file:test.db?&&&&&&&&hello=world&&&&&&&      {hello world}