diff --git a/core/database_util_test.go b/core/database_util_test.go
index 9d7c549b0792..2f434093ae01 100644
--- a/core/database_util_test.go
+++ b/core/database_util_test.go
@@ -27,86 +27,6 @@ import (
 	"github.com/XinFinOrg/XDPoSChain/rlp"
 )
 
-// Tests block total difficulty storage and retrieval operations.
-func TestTdStorage(t *testing.T) {
-	db := rawdb.NewMemoryDatabase()
-
-	// Create a test TD to move around the database and make sure it's really new
-	hash, td := common.Hash{}, big.NewInt(314)
-	if entry := rawdb.ReadTd(db, hash, 0); entry != nil {
-		t.Fatalf("Non existent TD returned: %v", entry)
-	}
-	// Write and verify the TD in the database
-	rawdb.WriteTd(db, hash, 0, td)
-	if entry := rawdb.ReadTd(db, hash, 0); entry == nil {
-		t.Fatalf("Stored TD not found")
-	} else if entry.Cmp(td) != 0 {
-		t.Fatalf("Retrieved TD mismatch: have %v, want %v", entry, td)
-	}
-	// Delete the TD and verify the execution
-	rawdb.DeleteTd(db, hash, 0)
-	if entry := rawdb.ReadTd(db, hash, 0); entry != nil {
-		t.Fatalf("Deleted TD returned: %v", entry)
-	}
-}
-
-// Tests that canonical numbers can be mapped to hashes and retrieved.
-func TestCanonicalMappingStorage(t *testing.T) {
-	db := rawdb.NewMemoryDatabase()
-
-	// Create a test canonical number and assinged hash to move around
-	hash, number := common.Hash{0: 0xff}, uint64(314)
-	if entry := rawdb.ReadCanonicalHash(db, number); entry != (common.Hash{}) {
-		t.Fatalf("Non existent canonical mapping returned: %v", entry)
-	}
-	// Write and verify the TD in the database
-	rawdb.WriteCanonicalHash(db, hash, number)
-	if entry := rawdb.ReadCanonicalHash(db, number); entry == (common.Hash{}) {
-		t.Fatalf("Stored canonical mapping not found")
-	} else if entry != hash {
-		t.Fatalf("Retrieved canonical mapping mismatch: have %v, want %v", entry, hash)
-	}
-	// Delete the TD and verify the execution
-	rawdb.DeleteCanonicalHash(db, number)
-	if entry := rawdb.ReadCanonicalHash(db, number); entry != (common.Hash{}) {
-		t.Fatalf("Deleted canonical mapping returned: %v", entry)
-	}
-}
-
-// Tests that head headers and head blocks can be assigned, individually.
-func TestHeadStorage(t *testing.T) {
-	db := rawdb.NewMemoryDatabase()
-
-	blockHead := types.NewBlockWithHeader(&types.Header{Extra: []byte("test block header")})
-	blockFull := types.NewBlockWithHeader(&types.Header{Extra: []byte("test block full")})
-	blockFast := types.NewBlockWithHeader(&types.Header{Extra: []byte("test block fast")})
-
-	// Check that no head entries are in a pristine database
-	if entry := rawdb.ReadHeadHeaderHash(db); entry != (common.Hash{}) {
-		t.Fatalf("Non head header entry returned: %v", entry)
-	}
-	if entry := rawdb.ReadHeadBlockHash(db); entry != (common.Hash{}) {
-		t.Fatalf("Non head block entry returned: %v", entry)
-	}
-	if entry := rawdb.ReadHeadFastBlockHash(db); entry != (common.Hash{}) {
-		t.Fatalf("Non fast head block entry returned: %v", entry)
-	}
-	// Assign separate entries for the head header and block
-	rawdb.WriteHeadHeaderHash(db, blockHead.Hash())
-	rawdb.WriteHeadBlockHash(db, blockFull.Hash())
-	rawdb.WriteHeadFastBlockHash(db, blockFast.Hash())
-	// Check that both heads are present, and different (i.e. two heads maintained)
-	if entry := rawdb.ReadHeadHeaderHash(db); entry != blockHead.Hash() {
-		t.Fatalf("Head header hash mismatch: have %v, want %v", entry, blockHead.Hash())
-	}
-	if entry := rawdb.ReadHeadBlockHash(db); entry != blockFull.Hash() {
-		t.Fatalf("Head block hash mismatch: have %v, want %v", entry, blockFull.Hash())
-	}
-	if entry := rawdb.ReadHeadFastBlockHash(db); entry != blockFast.Hash() {
-		t.Fatalf("Fast head block hash mismatch: have %v, want %v", entry, blockFast.Hash())
-	}
-}
-
 // Tests that positional lookup metadata can be stored and retrieved.
 func TestLookupStorage(t *testing.T) {
 	db := rawdb.NewMemoryDatabase()
diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go
index a79f56866c88..67dddc2909ad 100644
--- a/core/rawdb/accessors_chain_test.go
+++ b/core/rawdb/accessors_chain_test.go
@@ -208,6 +208,86 @@ func TestPartialBlockStorage(t *testing.T) {
 	}
 }
 
+// Tests block total difficulty storage and retrieval operations.
+func TestTdStorage(t *testing.T) {
+	db := NewMemoryDatabase()
+
+	// Create a test TD to move around the database and make sure it's really new
+	hash, td := common.Hash{}, big.NewInt(314)
+	if entry := ReadTd(db, hash, 0); entry != nil {
+		t.Fatalf("Non existent TD returned: %v", entry)
+	}
+	// Write and verify the TD in the database
+	WriteTd(db, hash, 0, td)
+	if entry := ReadTd(db, hash, 0); entry == nil {
+		t.Fatalf("Stored TD not found")
+	} else if entry.Cmp(td) != 0 {
+		t.Fatalf("Retrieved TD mismatch: have %v, want %v", entry, td)
+	}
+	// Delete the TD and verify the execution
+	DeleteTd(db, hash, 0)
+	if entry := ReadTd(db, hash, 0); entry != nil {
+		t.Fatalf("Deleted TD returned: %v", entry)
+	}
+}
+
+// Tests that canonical numbers can be mapped to hashes and retrieved.
+func TestCanonicalMappingStorage(t *testing.T) {
+	db := NewMemoryDatabase()
+
+	// Create a test canonical number and assinged hash to move around
+	hash, number := common.Hash{0: 0xff}, uint64(314)
+	if entry := ReadCanonicalHash(db, number); entry != (common.Hash{}) {
+		t.Fatalf("Non existent canonical mapping returned: %v", entry)
+	}
+	// Write and verify the TD in the database
+	WriteCanonicalHash(db, hash, number)
+	if entry := ReadCanonicalHash(db, number); entry == (common.Hash{}) {
+		t.Fatalf("Stored canonical mapping not found")
+	} else if entry != hash {
+		t.Fatalf("Retrieved canonical mapping mismatch: have %v, want %v", entry, hash)
+	}
+	// Delete the TD and verify the execution
+	DeleteCanonicalHash(db, number)
+	if entry := ReadCanonicalHash(db, number); entry != (common.Hash{}) {
+		t.Fatalf("Deleted canonical mapping returned: %v", entry)
+	}
+}
+
+// Tests that head headers and head blocks can be assigned, individually.
+func TestHeadStorage(t *testing.T) {
+	db := NewMemoryDatabase()
+
+	blockHead := types.NewBlockWithHeader(&types.Header{Extra: []byte("test block header")})
+	blockFull := types.NewBlockWithHeader(&types.Header{Extra: []byte("test block full")})
+	blockFast := types.NewBlockWithHeader(&types.Header{Extra: []byte("test block fast")})
+
+	// Check that no head entries are in a pristine database
+	if entry := ReadHeadHeaderHash(db); entry != (common.Hash{}) {
+		t.Fatalf("Non head header entry returned: %v", entry)
+	}
+	if entry := ReadHeadBlockHash(db); entry != (common.Hash{}) {
+		t.Fatalf("Non head block entry returned: %v", entry)
+	}
+	if entry := ReadHeadFastBlockHash(db); entry != (common.Hash{}) {
+		t.Fatalf("Non fast head block entry returned: %v", entry)
+	}
+	// Assign separate entries for the head header and block
+	WriteHeadHeaderHash(db, blockHead.Hash())
+	WriteHeadBlockHash(db, blockFull.Hash())
+	WriteHeadFastBlockHash(db, blockFast.Hash())
+	// Check that both heads are present, and different (i.e. two heads maintained)
+	if entry := ReadHeadHeaderHash(db); entry != blockHead.Hash() {
+		t.Fatalf("Head header hash mismatch: have %v, want %v", entry, blockHead.Hash())
+	}
+	if entry := ReadHeadBlockHash(db); entry != blockFull.Hash() {
+		t.Fatalf("Head block hash mismatch: have %v, want %v", entry, blockFull.Hash())
+	}
+	if entry := ReadHeadFastBlockHash(db); entry != blockFast.Hash() {
+		t.Fatalf("Fast head block hash mismatch: have %v, want %v", entry, blockFast.Hash())
+	}
+}
+
 // Tests that logs associated with a single block can be retrieved.
 func TestReadLogs(t *testing.T) {
 	db := NewMemoryDatabase()