diff --git a/chain/tests/chain_test_helper.rs b/chain/tests/chain_test_helper.rs
index 2776414f..0b82a56b 100644
--- a/chain/tests/chain_test_helper.rs
+++ b/chain/tests/chain_test_helper.rs
@@ -42,6 +42,7 @@ pub fn init_chain(dir_name: &str, genesis: Block) -> Chain {
 		genesis,
 		pow::verify_size,
 		false,
+		None,
 	)
 	.unwrap()
 }
diff --git a/chain/tests/mine_simple_chain.rs b/chain/tests/mine_simple_chain.rs
index 257a9dce..abf92baf 100644
--- a/chain/tests/mine_simple_chain.rs
+++ b/chain/tests/mine_simple_chain.rs
@@ -67,6 +67,7 @@ fn setup_with_status_adapter(dir_name: &str, genesis: Block, adapter: Arc<Status
 		genesis,
 		pow::verify_size,
 		false,
+		None,
 	)
 	.unwrap();
 
@@ -1057,6 +1058,7 @@ fn actual_diff_iter_output() {
 		genesis_block,
 		pow::verify_size,
 		false,
+		None,
 	)
 	.unwrap();
 	let iter = chain.difficulty_iter().unwrap();
diff --git a/chain/tests/store_kernel_pos_index.rs b/chain/tests/store_kernel_pos_index.rs
index d7cf6d30..0ffef938 100644
--- a/chain/tests/store_kernel_pos_index.rs
+++ b/chain/tests/store_kernel_pos_index.rs
@@ -38,7 +38,7 @@ fn test_store_kernel_idx() {
 
 	let commit = Commitment::from_vec(vec![]);
 
-	let store = ChainStore::new(chain_dir).unwrap();
+	let store = ChainStore::new(chain_dir, None).unwrap();
 	let mut batch = store.batch().unwrap();
 	let index = store::nrd_recent_kernel_index();
 
@@ -185,7 +185,7 @@ fn test_store_kernel_idx_pop_back() {
 
 	let commit = Commitment::from_vec(vec![]);
 
-	let store = ChainStore::new(chain_dir).unwrap();
+	let store = ChainStore::new(chain_dir, None).unwrap();
 	let mut batch = store.batch().unwrap();
 	let index = store::nrd_recent_kernel_index();
 
@@ -293,7 +293,7 @@ fn test_store_kernel_idx_rewind() {
 
 	let commit = Commitment::from_vec(vec![]);
 
-	let store = ChainStore::new(chain_dir).unwrap();
+	let store = ChainStore::new(chain_dir, None).unwrap();
 	let mut batch = store.batch().unwrap();
 	let index = store::nrd_recent_kernel_index();
 
@@ -395,7 +395,7 @@ fn test_store_kernel_idx_multiple_commits() {
 	let commit = Commitment::from_vec(vec![]);
 	let commit2 = Commitment::from_vec(vec![1]);
 
-	let store = ChainStore::new(chain_dir).unwrap();
+	let store = ChainStore::new(chain_dir, None).unwrap();
 	let mut batch = store.batch().unwrap();
 	let index = store::nrd_recent_kernel_index();
 
@@ -483,7 +483,7 @@ fn test_store_kernel_idx_clear() -> Result<(), Error> {
 	let commit = Commitment::from_vec(vec![]);
 	let commit2 = Commitment::from_vec(vec![1]);
 
-	let store = ChainStore::new(chain_dir)?;
+	let store = ChainStore::new(chain_dir, None)?;
 	let index = store::nrd_recent_kernel_index();
 
 	// Add a couple of single entries to the index and commit the batch.
diff --git a/chain/tests/test_coinbase_maturity.rs b/chain/tests/test_coinbase_maturity.rs
index 48d1f3a6..17e7dc64 100644
--- a/chain/tests/test_coinbase_maturity.rs
+++ b/chain/tests/test_coinbase_maturity.rs
@@ -47,6 +47,7 @@ fn test_coinbase_maturity() {
 			genesis_block,
 			pow::verify_size,
 			false,
+			None,
 		)
 		.unwrap();
 
diff --git a/chain/tests/test_header_perf.rs b/chain/tests/test_header_perf.rs
index f948606b..ec34c256 100644
--- a/chain/tests/test_header_perf.rs
+++ b/chain/tests/test_header_perf.rs
@@ -50,6 +50,7 @@ fn test_header_perf_impl(is_test_chain: bool, src_root_dir: &str, dest_root_dir:
 				genesis.clone(),
 				pow::verify_size,
 				false,
+				None,
 			)
 			.unwrap(),
 		);
@@ -62,6 +63,7 @@ fn test_header_perf_impl(is_test_chain: bool, src_root_dir: &str, dest_root_dir:
 				genesis.clone(),
 				pow::verify_size,
 				false,
+				None,
 			)
 			.unwrap(),
 		);
diff --git a/chain/tests/test_pibd_copy.rs b/chain/tests/test_pibd_copy.rs
index 9af63583..06b7965e 100644
--- a/chain/tests/test_pibd_copy.rs
+++ b/chain/tests/test_pibd_copy.rs
@@ -74,6 +74,7 @@ impl SegmenterResponder {
 					genesis,
 					pow::verify_size,
 					false,
+					None,
 				)
 				.unwrap(),
 			),
@@ -134,6 +135,7 @@ impl DesegmenterRequestor {
 					genesis,
 					pow::verify_size,
 					false,
+					None,
 				)
 				.unwrap(),
 			),
diff --git a/chain/tests/test_pibd_validation.rs b/chain/tests/test_pibd_validation.rs
index 5f67b07a..7cc7deff 100644
--- a/chain/tests/test_pibd_validation.rs
+++ b/chain/tests/test_pibd_validation.rs
@@ -52,6 +52,7 @@ fn test_pibd_chain_validation_impl(is_test_chain: bool, src_root_dir: &str) {
 				genesis.clone(),
 				pow::verify_size,
 				false,
+				None,
 			)
 			.unwrap(),
 		);
diff --git a/chain/tests/test_txhashset.rs b/chain/tests/test_txhashset.rs
index 36b23e84..af045cda 100644
--- a/chain/tests/test_txhashset.rs
+++ b/chain/tests/test_txhashset.rs
@@ -38,7 +38,7 @@ fn test_unexpected_zip() {
 	let db_root = format!(".grin_txhashset_zip");
 	clean_output_dir(&db_root);
 	{
-		let chain_store = ChainStore::new(&db_root).unwrap();
+		let chain_store = ChainStore::new(&db_root, None).unwrap();
 		let store = Arc::new(chain_store);
 		txhashset::TxHashSet::open(db_root.clone(), store.clone(), None).unwrap();
 		let head = BlockHeader::default();
diff --git a/pool/tests/common.rs b/pool/tests/common.rs
index c3f3ab91..55a230d1 100644
--- a/pool/tests/common.rs
+++ b/pool/tests/common.rs
@@ -55,6 +55,7 @@ pub fn init_chain(dir_name: &str, genesis: Block) -> Chain {
 		genesis,
 		pow::verify_size,
 		false,
+		None,
 	)
 	.unwrap()
 }
diff --git a/store/tests/lmdb.rs b/store/tests/lmdb.rs
index 7aebb528..ea70d428 100644
--- a/store/tests/lmdb.rs
+++ b/store/tests/lmdb.rs
@@ -79,7 +79,7 @@ fn test_exists() -> Result<(), store::Error> {
 	setup(test_dir);
 
 	let prefix = b'P';
-	let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None)?;
+	let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None, None)?;
 
 	let key = [0, 0, 0, 1];
 	let value = [1, 1, 1, 1];
@@ -109,7 +109,7 @@ fn test_iter() -> Result<(), store::Error> {
 	setup(test_dir);
 
 	let prefix = b'P';
-	let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None)?;
+	let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None, None)?;
 
 	let key = [0, 0, 0, 1];
 	let value = [1, 1, 1, 1];
@@ -148,7 +148,7 @@ fn lmdb_allocate() -> Result<(), store::Error> {
 	// Allocate more than the initial chunk, ensuring
 	// the DB resizes underneath
 	{
-		let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None)?;
+		let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None, None)?;
 
 		for i in 0..WRITE_CHUNK_SIZE * 2 {
 			println!("Allocating chunk: {}", i);
@@ -164,7 +164,7 @@ fn lmdb_allocate() -> Result<(), store::Error> {
 	println!("***********************************");
 	// Open env again and keep adding
 	{
-		let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None)?;
+		let store = store::Store::new(test_dir, Some("test1"), None, vec![prefix], None, None)?;
 		for i in 0..WRITE_CHUNK_SIZE * 2 {
 			println!("Allocating chunk: {}", i);
 			let chunk = PhatChunkStruct::new();
@@ -253,6 +253,7 @@ fn test_migration() -> Result<(), store::Error> {
 		Some(DEFAULT_ENV_NAME),
 		vec![test_prefix_1, test_prefix_2],
 		None,
+		None,
 	)?;
 
 	// Check we can see key value.