diff --git a/src/database/abstraction/tests.rs b/src/database/abstraction/tests.rs
index a5cd1dd6..b9a565ea 100644
--- a/src/database/abstraction/tests.rs
+++ b/src/database/abstraction/tests.rs
@@ -1,5 +1,5 @@
 use crate::database::{
-    abstraction::{DatabaseEngine, Tree},
+    abstraction::{KeyValueDatabaseEngine, KvTree},
     Config,
 };
 use std::sync::Arc;
@@ -19,9 +19,9 @@ database_path = "{}"
 
 /// Make sure to keep the reference of the tree returned values for
 /// the length of the test, to avoid early cleanups that may create test issues
-fn open_tree<T>(test_name: &str) -> (Arc<dyn Tree>, impl DatabaseEngine, TempDir)
+fn open_tree<T>(test_name: &str) -> (Arc<dyn KvTree>, impl KeyValueDatabaseEngine, TempDir)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let db_folder = Builder::new().prefix(test_name).tempdir().unwrap();
     let config = empty_config(db_folder.path().to_str().unwrap());
@@ -32,7 +32,7 @@ where
 
 fn insert_get<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();
@@ -44,7 +44,7 @@ where
 
 fn insert_get_replace<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();
@@ -61,7 +61,7 @@ where
 
 fn insert_get_remove<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();
@@ -78,7 +78,7 @@ where
 
 fn batch_insert_get<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();
@@ -106,7 +106,7 @@ where
 
 fn insert_iter<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();
@@ -127,7 +127,7 @@ where
 
 fn insert_iter_from<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();
@@ -151,7 +151,7 @@ where
 
 fn insert_iter_prefix<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();
@@ -174,7 +174,7 @@ where
 
 fn insert_clear<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();
@@ -193,7 +193,7 @@ where
 
 fn increment<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();
@@ -207,7 +207,7 @@ where
 
 fn increment_batch<T>(name: &str)
 where
-    Arc<T>: DatabaseEngine,
+    Arc<T>: KeyValueDatabaseEngine,
 {
     let (tree, _inst, _temp_dir) = open_tree::<T>(name);
     let key = "key".as_bytes();