diff --git a/test/functional/feature_fastprune.py b/test/functional/feature_fastprune.py
index c913c4f93a..705d3d2717 100755
--- a/test/functional/feature_fastprune.py
+++ b/test/functional/feature_fastprune.py
@@ -3,14 +3,14 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test fastprune mode."""
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.util import (
     assert_equal
 )
 from test_framework.wallet import MiniWallet
 
 
-class FeatureFastpruneTest(BitcoinTestFramework):
+class FeatureFastpruneTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.extra_args = [["-fastprune"]]
diff --git a/test/functional/feature_posix_fs_permissions.py b/test/functional/feature_posix_fs_permissions.py
index 40528779e6..941bd89d3a 100755
--- a/test/functional/feature_posix_fs_permissions.py
+++ b/test/functional/feature_posix_fs_permissions.py
@@ -8,10 +8,10 @@
 import os
 import stat
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 
 
-class PosixFsPermissionsTest(BitcoinTestFramework):
+class PosixFsPermissionsTest(BGLTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
diff --git a/test/functional/feature_remove_pruned_files_on_startup.py b/test/functional/feature_remove_pruned_files_on_startup.py
index c128587949..3b88705baa 100755
--- a/test/functional/feature_remove_pruned_files_on_startup.py
+++ b/test/functional/feature_remove_pruned_files_on_startup.py
@@ -5,9 +5,9 @@
 """Test removing undeleted pruned blk files on startup."""
 
 import os
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 
-class FeatureRemovePrunedFilesOnStartupTest(BitcoinTestFramework):
+class FeatureRemovePrunedFilesOnStartupTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.extra_args = [["-fastprune", "-prune=1"]]
diff --git a/test/functional/interface_usdt_mempool.py b/test/functional/interface_usdt_mempool.py
index 67cf649830..454e32dc61 100755
--- a/test/functional/interface_usdt_mempool.py
+++ b/test/functional/interface_usdt_mempool.py
@@ -18,7 +18,7 @@
 from test_framework.blocktools import COINBASE_MATURITY
 from test_framework.messages import COIN, DEFAULT_MEMPOOL_EXPIRY_HOURS
 from test_framework.p2p import P2PDataStore
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.util import assert_equal
 from test_framework.wallet import MiniWallet
 
@@ -122,14 +122,14 @@
 """
 
 
-class MempoolTracepointTest(BitcoinTestFramework):
+class MempoolTracepointTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.setup_clean_chain = True
 
     def skip_test_if_missing_module(self):
         self.skip_if_platform_not_linux()
-        self.skip_if_no_bitcoind_tracepoints()
+        self.skip_if_no_BGLd_tracepoints()
         self.skip_if_no_python_bcc()
         self.skip_if_no_bpf_permissions()
 
diff --git a/test/functional/mempool_datacarrier.py b/test/functional/mempool_datacarrier.py
index 951bf37ae8..c4a262190e 100755
--- a/test/functional/mempool_datacarrier.py
+++ b/test/functional/mempool_datacarrier.py
@@ -11,7 +11,7 @@
     CScript,
     OP_RETURN,
 )
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.test_node import TestNode
 from test_framework.util import (
     assert_raises_rpc_error,
@@ -20,7 +20,7 @@
 from test_framework.wallet import MiniWallet
 
 
-class DataCarrierTest(BitcoinTestFramework):
+class DataCarrierTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 4
         self.extra_args = [
diff --git a/test/functional/mempool_dust.py b/test/functional/mempool_dust.py
index f4e385a112..478dfb91f5 100755
--- a/test/functional/mempool_dust.py
+++ b/test/functional/mempool_dust.py
@@ -24,7 +24,7 @@
     script_to_p2sh_script,
     script_to_p2wsh_script,
 )
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.test_node import TestNode
 from test_framework.util import (
     assert_equal,
@@ -37,7 +37,7 @@
 DUST_RELAY_TX_FEE = 3000  # default setting [sat/kvB]
 
 
-class DustRelayFeeTest(BitcoinTestFramework):
+class DustRelayFeeTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
 
diff --git a/test/functional/mempool_sigoplimit.py b/test/functional/mempool_sigoplimit.py
index 962b2b19bd..b1daaae2af 100755
--- a/test/functional/mempool_sigoplimit.py
+++ b/test/functional/mempool_sigoplimit.py
@@ -27,7 +27,7 @@
 from test_framework.script_util import (
     script_to_p2wsh_script,
 )
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.util import (
     assert_equal,
     assert_greater_than,
@@ -39,7 +39,7 @@
 DEFAULT_BYTES_PER_SIGOP = 20  # default setting
 
 
-class BytesPerSigOpTest(BitcoinTestFramework):
+class BytesPerSigOpTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         # allow large datacarrier output to pad transactions
diff --git a/test/functional/p2p_ibd_stalling.py b/test/functional/p2p_ibd_stalling.py
index aca98ceb3f..7ee79707da 100755
--- a/test/functional/p2p_ibd_stalling.py
+++ b/test/functional/p2p_ibd_stalling.py
@@ -22,7 +22,7 @@
         msg_headers,
         P2PDataStore,
 )
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.util import (
         assert_equal,
 )
@@ -44,7 +44,7 @@ def on_getheaders(self, message):
         pass
 
 
-class P2PIBDStallingTest(BitcoinTestFramework):
+class P2PIBDStallingTest(BGLTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 1
diff --git a/test/functional/p2p_net_deadlock.py b/test/functional/p2p_net_deadlock.py
index f69fe52146..461117590c 100755
--- a/test/functional/p2p_net_deadlock.py
+++ b/test/functional/p2p_net_deadlock.py
@@ -4,11 +4,11 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 import threading
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.util import random_bytes
 
 
-class NetDeadlockTest(BitcoinTestFramework):
+class NetDeadlockTest(BGLTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 2
diff --git a/test/functional/p2p_orphan_handling.py b/test/functional/p2p_orphan_handling.py
index 6166c62aa2..476cf79dc4 100755
--- a/test/functional/p2p_orphan_handling.py
+++ b/test/functional/p2p_orphan_handling.py
@@ -27,7 +27,7 @@
 from test_framework.util import (
     assert_equal,
 )
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.wallet import (
     MiniWallet,
     MiniWalletMode,
@@ -108,7 +108,7 @@ def assert_never_requested(self, txhash):
             for request in getdata.inv:
                 assert request.hash != txhash
 
-class OrphanHandlingTest(BitcoinTestFramework):
+class OrphanHandlingTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.extra_args = [[]]
diff --git a/test/functional/p2p_sendtxrcncl.py b/test/functional/p2p_sendtxrcncl.py
index 0e349ef70c..a47f836421 100755
--- a/test/functional/p2p_sendtxrcncl.py
+++ b/test/functional/p2p_sendtxrcncl.py
@@ -18,7 +18,7 @@
     P2P_SUBVERSION,
     P2P_VERSION,
 )
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.util import assert_equal
 
 class PeerNoVerack(P2PInterface):
@@ -61,7 +61,7 @@ def create_sendtxrcncl_msg():
     sendtxrcncl_msg.salt = 2
     return sendtxrcncl_msg
 
-class SendTxRcnclTest(BitcoinTestFramework):
+class SendTxRcnclTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
         self.extra_args = [['-txreconciliation']]
diff --git a/test/functional/p2p_tx_privacy.py b/test/functional/p2p_tx_privacy.py
index e674f6c3eb..9c16910ba7 100755
--- a/test/functional/p2p_tx_privacy.py
+++ b/test/functional/p2p_tx_privacy.py
@@ -30,7 +30,7 @@
 from test_framework.p2p import (
     P2PInterface,
 )
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.wallet import MiniWallet
 
 class P2PTxSpy(P2PInterface):
@@ -47,7 +47,7 @@ def on_inv(self, message):
     def wait_for_inv_match(self, expected_inv):
         self.wait_until(lambda: len(self.all_invs) == 1 and self.all_invs[0] == expected_inv)
 
-class TxPrivacyTest(BitcoinTestFramework):
+class TxPrivacyTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
 
diff --git a/test/functional/rpc_validateaddress.py b/test/functional/rpc_validateaddress.py
index d87ba098c3..14b9fd243b 100755
--- a/test/functional/rpc_validateaddress.py
+++ b/test/functional/rpc_validateaddress.py
@@ -4,7 +4,7 @@
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 """Test validateaddress for main chain"""
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 
 from test_framework.util import assert_equal
 
@@ -169,7 +169,7 @@
 ]
 
 
-class ValidateAddressMainTest(BitcoinTestFramework):
+class ValidateAddressMainTest(BGLTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.chain = ""  # main
diff --git a/test/functional/test_framework/address.py b/test/functional/test_framework/address.py
index bd1f15448a..7c1431ac67 100644
--- a/test/functional/test_framework/address.py
+++ b/test/functional/test_framework/address.py
@@ -81,6 +81,7 @@ def base58_to_byte(s):
     if not s:
         return b''
     n = 0
+    print(s)
     for c in s:
         n *= 58
         assert c in b58chars
diff --git a/test/functional/wallet_basic.py b/test/functional/wallet_basic.py
index ebb5f76c36..3654b580ee 100755
--- a/test/functional/wallet_basic.py
+++ b/test/functional/wallet_basic.py
@@ -8,15 +8,11 @@
 
 from test_framework.blocktools import COINBASE_MATURITY
 from test_framework.descriptors import descsum_create
-<<<<<<< HEAD
-from test_framework.test_framework import BGLTestFramework
-=======
 from test_framework.messages import (
     COIN,
     DEFAULT_ANCESTOR_LIMIT,
 )
-from test_framework.test_framework import BitcoinTestFramework
->>>>>>> ffffe622e9... test: Move test_chain_listunspent wallet check from mempool_packages to wallet_basic
+from test_framework.test_framework import BGLTestFramework
 from test_framework.util import (
     assert_array_result,
     assert_equal,
diff --git a/test/functional/wallet_blank.py b/test/functional/wallet_blank.py
index 4836eba3b2..a5704ab6cc 100755
--- a/test/functional/wallet_blank.py
+++ b/test/functional/wallet_blank.py
@@ -5,7 +5,7 @@
 
 import os
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.address import (
     ADDRESS_BCRT1_UNSPENDABLE,
     ADDRESS_BCRT1_UNSPENDABLE_DESCRIPTOR,
@@ -16,7 +16,7 @@
 from test_framework.wallet_util import generate_keypair
 
 
-class WalletBlankTest(BitcoinTestFramework):
+class WalletBlankTest(BGLTestFramework):
     def set_test_params(self):
         self.num_nodes = 1
 
diff --git a/test/functional/wallet_change_address.py b/test/functional/wallet_change_address.py
index f8bfe9eebf..c087dadc24 100755
--- a/test/functional/wallet_change_address.py
+++ b/test/functional/wallet_change_address.py
@@ -7,13 +7,13 @@
 import re
 
 from test_framework.blocktools import COINBASE_MATURITY
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.util import (
     assert_equal,
 )
 
 
-class WalletChangeAddressTest(BitcoinTestFramework):
+class WalletChangeAddressTest(BGLTestFramework):
     def add_options(self, parser):
         self.add_wallet_options(parser)
 
diff --git a/test/functional/wallet_conflicts.py b/test/functional/wallet_conflicts.py
index 802b718cd5..4e4681d353 100755
--- a/test/functional/wallet_conflicts.py
+++ b/test/functional/wallet_conflicts.py
@@ -9,12 +9,12 @@
 
 from decimal import Decimal
 
-from test_framework.test_framework import BitcoinTestFramework
+from test_framework.test_framework import BGLTestFramework
 from test_framework.util import (
         assert_equal,
 )
 
-class TxConflicts(BitcoinTestFramework):
+class TxConflicts(BGLTestFramework):
     def add_options(self, parser):
         self.add_wallet_options(parser)