diff --git a/manifest b/manifest
index 3a662b3768..f9a34233fc 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\strunk\senhancements\sinto\sthe\sautovacuum-pages-callback\sbranch.
-D 2021-10-19T18:00:05.736
+C Merge\smulti-module\stest\slogic\simprovements\sfrom\strunk.
+D 2021-10-19T19:26:27.711
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -1123,8 +1123,8 @@ F test/interrupt.test 16ea879ec728cb76414c148c5f24afd5d1f91054
 F test/interrupt2.test e4408ca770a6feafbadb0801e54a0dcd1a8d108d
 F test/intpkey.test aee694afed1a65c86c4e69ad030224b3fc268113d00685234d40079fca16bad3
 F test/intreal.test 2a87e85a5949bd55e41ef04c58f5800587c5380bdbc559ff1c79b614b0e6a533
-F test/io.test f95bca1783b01ea7761671560d023360d2dfa4cc
-F test/ioerr.test 470fcc78e9cd352d162baf782fe301ea807d764241f58a48fc58109c2dfcdb6b
+F test/io.test f138f3fe696d1ed8c51dfea5b325910d319a1b29e1d25ea57231a02092f02cca
+F test/ioerr.test 530d05801ff1b6327018b2e140da34a74effa2773a844ddb8dc79c32e9567318
 F test/ioerr2.test 2593563599e2cc6b6b4fcf5878b177bdd5d8df26
 F test/ioerr3.test d3cec5e1a11ad6d27527d0d38573fbff14c71bdd
 F test/ioerr4.test f130fe9e71008577b342b8874d52984bd04ede2c
@@ -1275,7 +1275,7 @@ F test/parser1.test 6ccdf5e459a5dc4673d3273dc311a7e9742ca952dd0551a6a6320d27035c
 F test/pcache.test c8acbedd3b6fd0f9a7ca887a83b11d24a007972b
 F test/pcache2.test af7f3deb1a819f77a6d0d81534e97d1cf62cd442
 F test/percentile.test 4243af26b8f3f4555abe166f723715a1f74c77ff
-F test/permutations.test 536ab91e3d8fda6086ae6a3a0087d0750c95a412a9f3fb661e5a58de6d1b1224
+F test/permutations.test 68b6dcd2667acdc643140d502c0b6c503abe444495cf5d16aa3a4f0391604020
 F test/pg_common.tcl 3b27542224db1e713ae387459b5d117c836a5f6e328846922993b6d2b7640d9f
 F test/pragma.test cae534c12a033a5c319ccc94f50b32811acdef9f67bf19a82ff42697caccd69f
 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f
@@ -1462,7 +1462,7 @@ F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30
 F test/temptable2.test d2940417496e2b9548e01d09990763fbe88c316504033256d51493e1f1a5ce6a
 F test/temptable3.test d11a0974e52b347e45ee54ef1923c91ed91e4637
 F test/temptrigger.test 38f0ca479b1822d3117069e014daabcaacefffcc
-F test/tester.tcl 9426f7385393fbb6ba90e12ca51d0caf65e48b6a98c0dd169676d93b8c79d34c
+F test/tester.tcl 2b55f29390d187026f187b5b82849a4001763960e5e90797ba2dc95c70fe77a6
 F test/thread001.test b61a29dd87cf669f5f6ac96124a7c97d71b0c80d9012746072055877055cf9ef
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -1930,7 +1930,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P bb6f2b8b486c225043bc64e5f74ff6bbad6c5d1f337f0c81eeb6172b087bb943 03dff7196bb00f8e32f574f65745ceafb33ee3fdd169263121342859c362eca5
-R ea45a0ce3c28a03ec711229b14f24e63
+P c26c9e5040ef4c52f2a99597e3a7c3eabd52c905d874fc76ca10fd54b749fa97 3658417bf300e004e5166ee69aa2d8c70697b87ea7456cb6337b0ad6d60257d5
+R cef68242e5282392d1b565c1664937af
 U drh
-Z ee1e455afa1bfa2d6ff7d572ca1b5b4c
+Z 51c1251fe159b92025649ec2f4e8d588
diff --git a/manifest.uuid b/manifest.uuid
index e2dba84613..c1ff877a47 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c26c9e5040ef4c52f2a99597e3a7c3eabd52c905d874fc76ca10fd54b749fa97
\ No newline at end of file
+e00a44ac10d68b7bdaff1d9c237b598696eddc2d7392574aee1a95d94b4f165a
\ No newline at end of file
diff --git a/test/io.test b/test/io.test
index e1af808a3f..dfadcd1362 100644
--- a/test/io.test
+++ b/test/io.test
@@ -640,4 +640,6 @@ foreach {tn sql} {
 }
 
 sqlite3_simulate_device -char {} -sectorsize 0
+unregister_devsim
+
 finish_test
diff --git a/test/ioerr.test b/test/ioerr.test
index f42beef5b4..29a3dede8a 100644
--- a/test/ioerr.test
+++ b/test/ioerr.test
@@ -334,6 +334,7 @@ do_ioerr_test ioerr-12 -ckrefcount true -erc 1 -tclprep {
 }
 sqlite3_simulate_device -char {} -sectorsize 0
 catch {db close}
+unregister_devsim
 
 do_ioerr_test ioerr-13 -ckrefcount true -erc 1 -sqlprep {
   PRAGMA auto_vacuum = incremental;
diff --git a/test/permutations.test b/test/permutations.test
index 7d2a0e58a7..0987daeb1d 100644
--- a/test/permutations.test
+++ b/test/permutations.test
@@ -1219,6 +1219,7 @@ if {[file tail $argv0] == "permutations.test"} {
         set S $::testspec($suite)
         set i 1
       } else {
+        set suite default
         set S [list]
         set i 0
       }
@@ -1239,7 +1240,7 @@ if {[file tail $argv0] == "permutations.test"} {
         set extra [list -files $files]
       }
 
-      eval run_tests $suite $S $extra
+      eval [list run_tests $suite] $S $extra
     }
   }
   main $argv
diff --git a/test/tester.tcl b/test/tester.tcl
index 349a5d1232..68bff929cd 100644
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -1203,14 +1203,29 @@ proc speed_trial_summary {name} {
   }
 }
 
+# Clear out left-over configuration setup from the end of a test
+#
+proc finish_test_precleanup {} {
+  catch {db1 close}
+  catch {db2 close}
+  catch {db3 close}
+  unregister_devsim
+  unregister_jt_vfs
+  unregister_demovfs
+}
+
 # Run this routine last
 #
 proc finish_test {} {
   global argv
+  finish_test_precleanup
   if {[llength $argv]>0} {
     # If additional test scripts are specified on the command-line, 
     # run them also, before quitting.
-    proc finish_test {} {return}
+    proc finish_test {} {
+      finish_test_precleanup
+      return
+    }
     foreach extra $argv {
       puts "Running \"$extra\""
       db_delete_and_reopen
@@ -1218,9 +1233,6 @@ proc finish_test {} {
     }
   }
   catch {db close}
-  catch {db1 close}
-  catch {db2 close}
-  catch {db3 close}
   if {0==[info exists ::SLAVE]} { finalize_testing }
 }
 proc finalize_testing {} {