diff --git a/console/executor.cpp b/console/executor.cpp
index ddf39bcc..70aeeb87 100644
--- a/console/executor.cpp
+++ b/console/executor.cpp
@@ -44,9 +44,9 @@ std::optional<std::thread> executor::poller_thread_{};
 executor& executor::factory(parser& metadata, std::istream& input,
     std::ostream& output, std::ostream& error)
 {
-    // TODO: expose fork_flags() mapping from system static chain_state method.
-    ////metadata.configured.database.fork_flags =
-    ////    metadata.configured.bitcoin.fork_flags();
+    // Pack creation settings, stored at store create and read at load.
+    metadata.configured.database.envelope = database::envelope{
+        metadata.configured.bitcoin, metadata.configured.database };
 
     // Suppress configured batch cache sizing when batching cannot run.
     if (!system::batched::accelerated())
diff --git a/test/protocols/bitcoind/bitcoind_rpc.cpp b/test/protocols/bitcoind/bitcoind_rpc.cpp
index 20cfe59f..606556e3 100644
--- a/test/protocols/bitcoind/bitcoind_rpc.cpp
+++ b/test/protocols/bitcoind/bitcoind_rpc.cpp
@@ -1167,7 +1167,7 @@ BOOST_AUTO_TEST_CASE(bitcoind_rpc__scantxoutset__status__null)
 BOOST_AUTO_TEST_CASE(bitcoind_rpc__scantxoutset__abort__false)
 {
     const auto response = rpc("scantxoutset", "[\"abort\"]");
-    REQUIRE_NO_THROW_TRUE(!response.at("result").as_bool());
+    REQUIRE_NO_THROW_FALSE(response.at("result").as_bool());
 }
 
 BOOST_AUTO_TEST_CASE(bitcoind_rpc__scantxoutset__empty_scanobjects__invalid)
diff --git a/test/test.hpp b/test/test.hpp
index a65d3afd..fab9ded7 100644
--- a/test/test.hpp
+++ b/test/test.hpp
@@ -28,6 +28,10 @@
     BOOST_REQUIRE_NO_THROW(expression); \
     BOOST_REQUIRE(expression)
 
+#define REQUIRE_NO_THROW_FALSE(expression) \
+    BOOST_REQUIRE_NO_THROW(expression); \
+    BOOST_REQUIRE(!expression)
+
 #define TEST_NAME \
     boost::unit_test::framework::current_test_case().p_name.get()
 #define SUITE_NAME \