diff --git a/tests/cases/Database/SeriesMiscellany.php b/tests/cases/Database/SeriesMiscellany.php
index 0777e4e..a865029 100644
--- a/tests/cases/Database/SeriesMiscellany.php
+++ b/tests/cases/Database/SeriesMiscellany.php
@@ -27,7 +27,9 @@ trait SeriesMiscellany {
     }
 
     public function testInitializeDatabase() {
-        $this->assertSame(Database::SCHEMA_VERSION, Arsse::$db->driverSchemaVersion());
+        (static::$dbInfo->razeFunction)(static::$drv);
+        $d = new Database(true);
+        $this->assertSame(Database::SCHEMA_VERSION, $d->driverSchemaVersion());
     }
 
     public function testManuallyInitializeDatabase() {
diff --git a/tests/cases/Misc/TestContext.php b/tests/cases/Misc/TestContext.php
index 63bf953..07d6adb 100644
--- a/tests/cases/Misc/TestContext.php
+++ b/tests/cases/Misc/TestContext.php
@@ -64,6 +64,9 @@ class TestContext extends \JKingWeb\Arsse\Test\AbstractTest {
             } else {
                 $this->assertSame($c->$method, $v[$method], "Context method $method did not return the expected results");
             }
+            // clear the context option
+            $c->$method(null);
+            $this->assertFalse($c->$method());
         }
     }