diff --git a/.github/workflows/test-android.yaml b/.github/workflows/test-android.yaml
index c5ef1bcc..48abe6b1 100644
--- a/.github/workflows/test-android.yaml
+++ b/.github/workflows/test-android.yaml
@@ -55,11 +55,12 @@ jobs:
       - name: "Build Android library"
         run: |
           cd bdk-android
-          ./gradlew buildAndroidLib
+          ./gradlew buildAndroidLib --console=plain
 
-# There are currently no unit tests for bdk-android and the integration tests require the macOS image
-# which is not working with the older NDK version we are using, so for now we just make sure that the library builds.
-#      - name: "Run Android unit tests"
+# There are currently no unit tests for bdk-android (see the tests in bdk-jvm instead) and the 
+# integration tests require the macOS image which is not working with the older NDK version we
+# are using, so for now we just make sure that the library builds and omit the connectedTest
+#      - name: "Run Android connected tests"
 #        run: |
 #          cd bdk-android
-#          ./gradlew test --console=rich
+#          ./gradlew connectedAndroidTest --console=plain
diff --git a/.github/workflows/test-jvm.yaml b/.github/workflows/test-jvm.yaml
index caf07a54..e2c0aa8c 100644
--- a/.github/workflows/test-jvm.yaml
+++ b/.github/workflows/test-jvm.yaml
@@ -38,4 +38,4 @@ jobs:
       - name: "Run JVM tests"
         run: |
           cd bdk-jvm
-          ./gradlew test
+          ./gradlew test -P excludeConnectedTests
diff --git a/.github/workflows/test-python.yaml b/.github/workflows/test-python.yaml
index 8d6b3691..0108e7aa 100644
--- a/.github/workflows/test-python.yaml
+++ b/.github/workflows/test-python.yaml
@@ -54,7 +54,7 @@ jobs:
         run: ${PYBIN}/pip install ./dist/*.whl
 
       - name: "Run tests"
-        run: ${PYBIN}/python -m unittest tests/test_bdk.py --verbose
+        run: ${PYBIN}/python -m unittest discover --start "./tests/" --pattern "test_offline_*.py" --verbose
 
       - name: "Upload artifact test"
         uses: actions/upload-artifact@v3
@@ -97,7 +97,7 @@ jobs:
       # - name: "Install wheel and run tests"
       #   run: |
       #     pip3 install ./dist/*.whl
-      #     python3 -m unittest tests/test_bdk.py --verbose
+      #     python3 -m unittest discover --start "./tests/" --pattern "test_offline_*.py" --verbose
 
       - name: "Upload artifact test"
         uses: actions/upload-artifact@v3
@@ -138,7 +138,7 @@ jobs:
         run: pip3 install ./dist/*.whl
 
       - name: "Run tests"
-        run: python3 -m unittest tests/test_bdk.py --verbose
+        run: python3 -m unittest discover --start "./tests/" --pattern "test_offline_*.py" --verbose
 
       - name: "Upload artifact test"
         uses: actions/upload-artifact@v3
@@ -186,4 +186,4 @@ jobs:
         shell: powershell
 
       - name: "Run tests"
-        run: python -m unittest tests/test_bdk.py --verbose
+        run: python -m unittest discover --start "./tests/" --pattern "test_offline_*.py" --verbose
diff --git a/.github/workflows/test-swift.yaml b/.github/workflows/test-swift.yaml
index fad668f7..d74728a2 100644
--- a/.github/workflows/test-swift.yaml
+++ b/.github/workflows/test-swift.yaml
@@ -23,4 +23,4 @@ jobs:
 
       - name: "Run Swift tests"
         working-directory: bdk-swift
-        run: swift test
+        run: swift test --skip LiveWalletTests --skip LiveTxBuilderTests
diff --git a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt
new file mode 100644
index 00000000..6b72e06e
--- /dev/null
+++ b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt
@@ -0,0 +1,30 @@
+package org.bitcoindevkit
+
+import org.junit.Test
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.runner.RunWith
+import kotlin.test.assertTrue
+
+@RunWith(AndroidJUnit4::class)
+class LiveTxBuilderTest {
+    @Test
+    fun testTxBuilder() {
+        val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
+        val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
+        val esploraClient = EsploraClient("https://mempool.space/testnet/api")
+        val update = esploraClient.scan(wallet, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.getBalance().total()}")
+
+        assert(wallet.getBalance().total() > 0uL)
+
+        val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.TESTNET)
+        val psbt: PartiallySignedTransaction = TxBuilder()
+            .addRecipient(recipient.scriptPubkey(), 4200uL)
+            .feeRate(2.0f)
+            .finish(wallet)
+
+        println(psbt.serialize())
+        assertTrue(psbt.serialize().startsWith("cHNi"), "PSBT should start with 'cHNi'")
+    }
+}
diff --git a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt
new file mode 100644
index 00000000..0fd4fb30
--- /dev/null
+++ b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/LiveWalletTest.kt
@@ -0,0 +1,21 @@
+package org.bitcoindevkit
+
+import org.junit.Test
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class LiveWalletTest {
+    @Test
+    fun testSyncedBalance() {
+        val descriptor: Descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
+        val wallet: Wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
+        val esploraClient: EsploraClient = EsploraClient("https://mempool.space/testnet/api")
+        // val esploraClient = EsploraClient("https://blockstream.info/testnet/api")
+        val update = esploraClient.scan(wallet, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.getBalance().total()}")
+
+        assert(wallet.getBalance().total() > 0uL)
+    }
+}
diff --git a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt
new file mode 100644
index 00000000..22fcb717
--- /dev/null
+++ b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt
@@ -0,0 +1,21 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+import kotlin.test.assertTrue
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class OfflineDescriptorTest {
+    @Test
+    fun testDescriptorBip86() {
+        val mnemonic: Mnemonic = Mnemonic.fromString("space echo position wrist orient erupt relief museum myself grain wisdom tumble")
+        val descriptorSecretKey: DescriptorSecretKey = DescriptorSecretKey(Network.TESTNET, mnemonic, null)
+        val descriptor: Descriptor = Descriptor.newBip86(descriptorSecretKey, KeychainKind.EXTERNAL, Network.TESTNET)
+
+        assertEquals(
+            expected = "tr([be1eec8f/86'/1'/0']tpubDCTtszwSxPx3tATqDrsSyqScPNnUChwQAVAkanuDUCJQESGBbkt68nXXKRDifYSDbeMa2Xg2euKbXaU3YphvGWftDE7ozRKPriT6vAo3xsc/0/*)#m7puekcx",
+            actual = descriptor.asString()
+        )
+    }
+}
diff --git a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineWalletTest.kt
similarity index 83%
rename from bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
rename to bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineWalletTest.kt
index 394c60f1..5a3206a0 100644
--- a/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/AndroidLibTest.kt
+++ b/bdk-android/lib/src/androidTest/kotlin/org/bitcoindevkit/OfflineWalletTest.kt
@@ -1,19 +1,13 @@
 package org.bitcoindevkit
 
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import org.junit.runner.RunWith
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.runner.RunWith
 
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
 @RunWith(AndroidJUnit4::class)
-class WalletTest {
-
+class OfflineWalletTest {
     @Test
     fun testDescriptorBip86() {
         val mnemonic: Mnemonic = Mnemonic(WordCount.WORDS12)
@@ -36,7 +30,10 @@ class WalletTest {
         )
         val addressInfo: AddressInfo = wallet.getAddress(AddressIndex.New)
 
-        assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", addressInfo.address.asString())
+        assertEquals(
+            expected = "tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e",
+            actual = addressInfo.address.asString()
+        )
     }
 
     @Test
@@ -51,7 +48,9 @@ class WalletTest {
             Network.TESTNET
         )
 
-        assertEquals(0uL, wallet.getBalance().total())
+        assertEquals(
+            expected = 0uL,
+            actual = wallet.getBalance().total()
+        )
     }
-
-}
\ No newline at end of file
+}
diff --git a/bdk-ffi/src/bdk.udl b/bdk-ffi/src/bdk.udl
index af03f6c8..caabbaaf 100644
--- a/bdk-ffi/src/bdk.udl
+++ b/bdk-ffi/src/bdk.udl
@@ -1,7 +1,7 @@
 namespace bdk {};
 
 // ------------------------------------------------------------------------
-// bdk crate
+// bdk crate - root module
 // ------------------------------------------------------------------------
 
 enum KeychainKind {
@@ -76,16 +76,31 @@ interface Wallet {
 
   AddressInfo get_address(AddressIndex address_index);
 
+  AddressInfo get_internal_address(AddressIndex address_index);
+
   Network network();
 
   Balance get_balance();
 
+  boolean is_mine(Script script);
+
   [Throws=BdkError]
   void apply_update(Update update);
 };
 
 interface Update {};
 
+interface TxBuilder {
+  constructor();
+
+  TxBuilder add_recipient(Script script, u64 amount);
+
+  TxBuilder fee_rate(float sat_per_vbyte);
+
+  [Throws=BdkError]
+  PartiallySignedTransaction finish([ByRef] Wallet wallet);
+};
+
 // ------------------------------------------------------------------------
 // bdk crate - descriptor module
 // ------------------------------------------------------------------------
@@ -214,7 +229,37 @@ interface Address {
 
   Network network();
 
+  Script script_pubkey();
+
   string to_qr_uri();
 
   string as_string();
 };
+
+interface Transaction {
+  [Throws=BdkError]
+  constructor(sequence<u8> transaction_bytes);
+
+  string txid();
+
+  u64 size();
+
+  u64 vsize();
+
+  boolean is_coin_base();
+
+  boolean is_explicitly_rbf();
+
+  boolean is_lock_time_enabled();
+
+  i32 version();
+};
+
+interface PartiallySignedTransaction {
+  [Throws=BdkError]
+  constructor(string psbt_base64);
+
+  string serialize();
+
+  Transaction extract_tx();
+};
diff --git a/bdk-ffi/src/bitcoin.rs b/bdk-ffi/src/bitcoin.rs
index 587e6e74..2730e20f 100644
--- a/bdk-ffi/src/bitcoin.rs
+++ b/bdk-ffi/src/bitcoin.rs
@@ -1,4 +1,15 @@
+use bdk::bitcoin::address::{NetworkChecked, NetworkUnchecked};
 use bdk::bitcoin::blockdata::script::ScriptBuf as BdkScriptBuf;
+use bdk::bitcoin::consensus::Decodable;
+use bdk::bitcoin::network::constants::Network as BdkNetwork;
+use bdk::bitcoin::psbt::PartiallySignedTransaction as BdkPartiallySignedTransaction;
+use bdk::bitcoin::Address as BdkAddress;
+use bdk::bitcoin::Transaction as BdkTransaction;
+use bdk::Error as BdkError;
+
+use std::io::Cursor;
+use std::str::FromStr;
+use std::sync::{Arc, Mutex};
 
 /// A Bitcoin script.
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -20,3 +31,251 @@ impl From<BdkScriptBuf> for Script {
         Script(script)
     }
 }
+
+pub enum Network {
+    /// Mainnet Bitcoin.
+    Bitcoin,
+    /// Bitcoin's testnet network.
+    Testnet,
+    /// Bitcoin's signet network.
+    Signet,
+    /// Bitcoin's regtest network.
+    Regtest,
+}
+
+impl From<Network> for BdkNetwork {
+    fn from(network: Network) -> Self {
+        match network {
+            Network::Bitcoin => BdkNetwork::Bitcoin,
+            Network::Testnet => BdkNetwork::Testnet,
+            Network::Signet => BdkNetwork::Signet,
+            Network::Regtest => BdkNetwork::Regtest,
+        }
+    }
+}
+
+impl From<BdkNetwork> for Network {
+    fn from(network: BdkNetwork) -> Self {
+        match network {
+            BdkNetwork::Bitcoin => Network::Bitcoin,
+            BdkNetwork::Testnet => Network::Testnet,
+            BdkNetwork::Signet => Network::Signet,
+            BdkNetwork::Regtest => Network::Regtest,
+            _ => panic!("Network {} not supported", network),
+        }
+    }
+}
+
+/// A Bitcoin address.
+#[derive(Debug, PartialEq, Eq)]
+pub struct Address {
+    inner: BdkAddress<NetworkChecked>,
+}
+
+impl Address {
+    pub fn new(address: String, network: Network) -> Result<Self, BdkError> {
+        Ok(Address {
+            inner: address
+                .parse::<bdk::bitcoin::Address<NetworkUnchecked>>()
+                .unwrap() // TODO 11: Handle error correctly by rethrowing it as a BdkError
+                .require_network(network.into())
+                .map_err(|e| BdkError::Generic(e.to_string()))?,
+        })
+    }
+
+    /// alternative constructor
+    // fn from_script(script: Arc<Script>, network: Network) -> Result<Self, BdkError> {
+    //     BdkAddress::from_script(&script.inner, network)
+    //         .map(|a| Address { inner: a })
+    //         .map_err(|e| BdkError::Generic(e.to_string()))
+    // }
+    //
+    // fn payload(&self) -> Payload {
+    //     match &self.inner.payload.clone() {
+    //         BdkPayload::PubkeyHash(pubkey_hash) => Payload::PubkeyHash {
+    //             pubkey_hash: pubkey_hash.to_vec(),
+    //         },
+    //         BdkPayload::ScriptHash(script_hash) => Payload::ScriptHash {
+    //             script_hash: script_hash.to_vec(),
+    //         },
+    //         BdkPayload::WitnessProgram { version, program } => Payload::WitnessProgram {
+    //             version: *version,
+    //             program: program.clone(),
+    //         },
+    //     }
+    // }
+
+    pub fn network(&self) -> Network {
+        self.inner.network.into()
+    }
+
+    pub fn script_pubkey(&self) -> Arc<Script> {
+        Arc::new(Script(self.inner.script_pubkey()))
+    }
+
+    pub fn to_qr_uri(&self) -> String {
+        self.inner.to_qr_uri()
+    }
+
+    pub fn as_string(&self) -> String {
+        self.inner.to_string()
+    }
+}
+
+impl From<Address> for BdkAddress {
+    fn from(address: Address) -> Self {
+        address.inner
+    }
+}
+
+impl From<BdkAddress> for Address {
+    fn from(address: BdkAddress) -> Self {
+        Address { inner: address }
+    }
+}
+
+/// A Bitcoin transaction.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Transaction {
+    inner: BdkTransaction,
+}
+
+impl Transaction {
+    pub fn new(transaction_bytes: Vec<u8>) -> Result<Self, BdkError> {
+        let mut decoder = Cursor::new(transaction_bytes);
+        let tx: BdkTransaction = BdkTransaction::consensus_decode(&mut decoder)
+            .map_err(|e| BdkError::Generic(e.to_string()))?;
+        Ok(Transaction { inner: tx })
+    }
+
+    pub fn txid(&self) -> String {
+        self.inner.txid().to_string()
+    }
+
+    // fn weight(&self) -> u64 {
+    //     self.inner.weight() as u64
+    // }
+
+    pub fn size(&self) -> u64 {
+        self.inner.size() as u64
+    }
+
+    pub fn vsize(&self) -> u64 {
+        self.inner.vsize() as u64
+    }
+
+    // fn serialize(&self) -> Vec<u8> {
+    //     self.inner.serialize()
+    // }
+
+    pub fn is_coin_base(&self) -> bool {
+        self.inner.is_coin_base()
+    }
+
+    pub fn is_explicitly_rbf(&self) -> bool {
+        self.inner.is_explicitly_rbf()
+    }
+
+    pub fn is_lock_time_enabled(&self) -> bool {
+        self.inner.is_lock_time_enabled()
+    }
+
+    pub fn version(&self) -> i32 {
+        self.inner.version
+    }
+
+    // fn lock_time(&self) -> u32 {
+    //     self.inner.lock_time.0
+    // }
+
+    // fn input(&self) -> Vec<TxIn> {
+    //     self.inner.input.iter().map(|x| x.into()).collect()
+    // }
+    //
+    // fn output(&self) -> Vec<TxOut> {
+    //     self.inner.output.iter().map(|x| x.into()).collect()
+    // }
+}
+
+impl From<BdkTransaction> for Transaction {
+    fn from(tx: BdkTransaction) -> Self {
+        Transaction { inner: tx }
+    }
+}
+
+pub(crate) struct PartiallySignedTransaction {
+    pub(crate) inner: Mutex<BdkPartiallySignedTransaction>,
+}
+
+impl PartiallySignedTransaction {
+    pub(crate) fn new(psbt_base64: String) -> Result<Self, BdkError> {
+        let psbt: BdkPartiallySignedTransaction =
+            BdkPartiallySignedTransaction::from_str(&psbt_base64)
+                .map_err(|e| BdkError::Generic(e.to_string()))?;
+
+        Ok(PartiallySignedTransaction {
+            inner: Mutex::new(psbt),
+        })
+    }
+
+    pub(crate) fn serialize(&self) -> String {
+        let psbt = self.inner.lock().unwrap().clone();
+        psbt.to_string()
+    }
+
+    // pub(crate) fn txid(&self) -> String {
+    //     let tx = self.inner.lock().unwrap().clone().extract_tx();
+    //     let txid = tx.txid();
+    //     txid.to_hex()
+    // }
+
+    /// Return the transaction.
+    pub(crate) fn extract_tx(&self) -> Arc<Transaction> {
+        let tx = self.inner.lock().unwrap().clone().extract_tx();
+        Arc::new(tx.into())
+    }
+
+    // /// Combines this PartiallySignedTransaction with other PSBT as described by BIP 174.
+    // ///
+    // /// In accordance with BIP 174 this function is commutative i.e., `A.combine(B) == B.combine(A)`
+    // pub(crate) fn combine(
+    //     &self,
+    //     other: Arc<PartiallySignedTransaction>,
+    // ) -> Result<Arc<PartiallySignedTransaction>, BdkError> {
+    //     let other_psbt = other.inner.lock().unwrap().clone();
+    //     let mut original_psbt = self.inner.lock().unwrap().clone();
+    //
+    //     original_psbt.combine(other_psbt)?;
+    //     Ok(Arc::new(PartiallySignedTransaction {
+    //         inner: Mutex::new(original_psbt),
+    //     }))
+    // }
+
+    // /// The total transaction fee amount, sum of input amounts minus sum of output amounts, in Sats.
+    // /// If the PSBT is missing a TxOut for an input returns None.
+    // pub(crate) fn fee_amount(&self) -> Option<u64> {
+    //     self.inner.lock().unwrap().fee_amount()
+    // }
+
+    // /// The transaction's fee rate. This value will only be accurate if calculated AFTER the
+    // /// `PartiallySignedTransaction` is finalized and all witness/signature data is added to the
+    // /// transaction.
+    // /// If the PSBT is missing a TxOut for an input returns None.
+    // pub(crate) fn fee_rate(&self) -> Option<Arc<FeeRate>> {
+    //     self.inner.lock().unwrap().fee_rate().map(Arc::new)
+    // }
+
+    // /// Serialize the PSBT data structure as a String of JSON.
+    // pub(crate) fn json_serialize(&self) -> String {
+    //     let psbt = self.inner.lock().unwrap();
+    //     serde_json::to_string(psbt.deref()).unwrap()
+    // }
+}
+
+impl From<BdkPartiallySignedTransaction> for PartiallySignedTransaction {
+    fn from(psbt: BdkPartiallySignedTransaction) -> Self {
+        PartiallySignedTransaction {
+            inner: Mutex::new(psbt),
+        }
+    }
+}
diff --git a/bdk-ffi/src/descriptor.rs b/bdk-ffi/src/descriptor.rs
index 2e33c847..06245bce 100644
--- a/bdk-ffi/src/descriptor.rs
+++ b/bdk-ffi/src/descriptor.rs
@@ -1,3 +1,7 @@
+use crate::keys::DescriptorPublicKey;
+use crate::keys::DescriptorSecretKey;
+use crate::Network;
+
 use bdk::bitcoin::bip32::Fingerprint;
 use bdk::bitcoin::key::Secp256k1;
 use bdk::descriptor::{ExtendedDescriptor, IntoWalletDescriptor};
@@ -9,13 +13,10 @@ use bdk::template::{
 };
 use bdk::Error as BdkError;
 use bdk::KeychainKind;
+
 use std::str::FromStr;
 use std::sync::Arc;
 
-use crate::keys::DescriptorPublicKey;
-use crate::keys::DescriptorSecretKey;
-use crate::Network;
-
 #[derive(Debug)]
 pub struct Descriptor {
     pub extended_descriptor: ExtendedDescriptor,
diff --git a/bdk-ffi/src/esplora.rs b/bdk-ffi/src/esplora.rs
index 6a8646e6..284f368e 100644
--- a/bdk-ffi/src/esplora.rs
+++ b/bdk-ffi/src/esplora.rs
@@ -1,8 +1,10 @@
 use crate::wallet::{Update, Wallet};
+
 use bdk::wallet::Update as BdkUpdate;
 use bdk::Error as BdkError;
 use bdk_esplora::esplora_client::{BlockingClient, Builder};
 use bdk_esplora::EsploraExt;
+
 use std::sync::Arc;
 
 pub struct EsploraClient(BlockingClient);
diff --git a/bdk-ffi/src/keys.rs b/bdk-ffi/src/keys.rs
index 41e01b69..45b7dee6 100644
--- a/bdk-ffi/src/keys.rs
+++ b/bdk-ffi/src/keys.rs
@@ -1,3 +1,5 @@
+use crate::Network;
+
 use bdk::bitcoin::bip32::DerivationPath as BdkDerivationPath;
 use bdk::bitcoin::key::Secp256k1;
 use bdk::bitcoin::secp256k1::rand;
@@ -11,14 +13,13 @@ use bdk::keys::{
 use bdk::miniscript::descriptor::{DescriptorXKey, Wildcard};
 use bdk::miniscript::BareCtx;
 use bdk::Error as BdkError;
+
 use std::ops::Deref;
 use std::str::FromStr;
 use std::sync::{Arc, Mutex};
 
-use crate::Network;
-
-// /// Mnemonic phrases are a human-readable version of the private keys.
-// /// Supported number of words are 12, 15, 18, 21 and 24.
+/// Mnemonic phrases are a human-readable version of the private keys.
+/// Supported number of words are 12, 15, 18, 21 and 24.
 pub(crate) struct Mnemonic {
     inner: BdkMnemonic,
 }
diff --git a/bdk-ffi/src/lib.rs b/bdk-ffi/src/lib.rs
index 80a92487..5bc4e30f 100644
--- a/bdk-ffi/src/lib.rs
+++ b/bdk-ffi/src/lib.rs
@@ -2,73 +2,41 @@ mod bitcoin;
 mod descriptor;
 mod esplora;
 mod keys;
-mod psbt;
 mod wallet;
 
-use bdk::bitcoin::address::{NetworkChecked, NetworkUnchecked};
-use bdk::bitcoin::Address as BdkAddress;
-use bdk::bitcoin::Network as BdkNetwork;
-use bdk::wallet::AddressIndex as BdkAddressIndex;
-use bdk::wallet::AddressInfo as BdkAddressInfo;
-use bdk::wallet::Balance as BdkBalance;
-use bdk::Error as BdkError;
-use bdk::KeychainKind;
-use std::sync::Arc;
-
 // TODO 6: Why are these imports required?
+use crate::bitcoin::Address;
+use crate::bitcoin::Network;
+use crate::bitcoin::PartiallySignedTransaction;
 use crate::bitcoin::Script;
+use crate::bitcoin::Transaction;
 use crate::descriptor::Descriptor;
 use crate::esplora::EsploraClient;
 use crate::keys::DerivationPath;
 use crate::keys::DescriptorPublicKey;
 use crate::keys::DescriptorSecretKey;
 use crate::keys::Mnemonic;
+use crate::wallet::TxBuilder;
 use crate::wallet::Update;
 use crate::wallet::Wallet;
-use bdk::keys::bip39::WordCount;
 
-uniffi::include_scaffolding!("bdk");
-
-pub enum Network {
-    /// Mainnet Bitcoin.
-    Bitcoin,
-    /// Bitcoin's testnet network.
-    Testnet,
-    /// Bitcoin's signet network.
-    Signet,
-    /// Bitcoin's regtest network.
-    Regtest,
-}
+use bdk::keys::bip39::WordCount;
+use bdk::wallet::AddressIndex as BdkAddressIndex;
+use bdk::wallet::AddressInfo as BdkAddressInfo;
+use bdk::wallet::Balance as BdkBalance;
+use bdk::Error as BdkError;
+use bdk::KeychainKind;
 
-impl From<Network> for BdkNetwork {
-    fn from(network: Network) -> Self {
-        match network {
-            Network::Bitcoin => BdkNetwork::Bitcoin,
-            Network::Testnet => BdkNetwork::Testnet,
-            Network::Signet => BdkNetwork::Signet,
-            Network::Regtest => BdkNetwork::Regtest,
-        }
-    }
-}
+use std::sync::Arc;
 
-impl From<BdkNetwork> for Network {
-    fn from(network: BdkNetwork) -> Self {
-        match network {
-            BdkNetwork::Bitcoin => Network::Bitcoin,
-            BdkNetwork::Testnet => Network::Testnet,
-            BdkNetwork::Signet => Network::Signet,
-            BdkNetwork::Regtest => Network::Regtest,
-            _ => panic!("Network {} not supported", network),
-        }
-    }
-}
+uniffi::include_scaffolding!("bdk");
 
-// /// A output script and an amount of satoshis.
+/// A output script and an amount of satoshis.
 // pub struct ScriptAmount {
 //     pub script: Arc<Script>,
 //     pub amount: u64,
 // }
-//
+
 /// A derived address and the index it was found at.
 pub struct AddressInfo {
     /// Child index of this address.
@@ -341,144 +309,6 @@ impl Balance {
 //         }
 //     }
 // }
-//
-// /// A Bitcoin transaction.
-// #[derive(Debug, Clone, PartialEq, Eq)]
-// pub struct Transaction {
-//     inner: BdkTransaction,
-// }
-//
-// impl Transaction {
-//     fn new(transaction_bytes: Vec<u8>) -> Result<Self, BdkError> {
-//         let mut decoder = Cursor::new(transaction_bytes);
-//         let tx: BdkTransaction = BdkTransaction::consensus_decode(&mut decoder)?;
-//         Ok(Transaction { inner: tx })
-//     }
-//
-//     fn txid(&self) -> String {
-//         self.inner.txid().to_string()
-//     }
-//
-//     fn weight(&self) -> u64 {
-//         self.inner.weight() as u64
-//     }
-//
-//     fn size(&self) -> u64 {
-//         self.inner.size() as u64
-//     }
-//
-//     fn vsize(&self) -> u64 {
-//         self.inner.vsize() as u64
-//     }
-//
-//     fn serialize(&self) -> Vec<u8> {
-//         self.inner.serialize()
-//     }
-//
-//     fn is_coin_base(&self) -> bool {
-//         self.inner.is_coin_base()
-//     }
-//
-//     fn is_explicitly_rbf(&self) -> bool {
-//         self.inner.is_explicitly_rbf()
-//     }
-//
-//     fn is_lock_time_enabled(&self) -> bool {
-//         self.inner.is_lock_time_enabled()
-//     }
-//
-//     fn version(&self) -> i32 {
-//         self.inner.version
-//     }
-//
-//     fn lock_time(&self) -> u32 {
-//         self.inner.lock_time.0
-//     }
-//
-//     fn input(&self) -> Vec<TxIn> {
-//         self.inner.input.iter().map(|x| x.into()).collect()
-//     }
-//
-//     fn output(&self) -> Vec<TxOut> {
-//         self.inner.output.iter().map(|x| x.into()).collect()
-//     }
-// }
-
-// impl From<BdkTransaction> for Transaction {
-//     fn from(tx: BdkTransaction) -> Self {
-//         Transaction { inner: tx }
-//     }
-// }
-
-/// A Bitcoin address.
-#[derive(Debug, PartialEq, Eq)]
-pub struct Address {
-    inner: BdkAddress<NetworkChecked>,
-}
-
-impl Address {
-    fn new(address: String, network: Network) -> Result<Self, BdkError> {
-        Ok(Address {
-            inner: address
-                .parse::<bdk::bitcoin::Address<NetworkUnchecked>>()
-                .unwrap() // TODO 11: Handle error correctly by rethrowing it as a BdkError
-                .require_network(network.into())
-                .map_err(|e| BdkError::Generic(e.to_string()))?,
-        })
-    }
-
-    /// alternative constructor
-    // fn from_script(script: Arc<Script>, network: Network) -> Result<Self, BdkError> {
-    //     BdkAddress::from_script(&script.inner, network)
-    //         .map(|a| Address { inner: a })
-    //         .map_err(|e| BdkError::Generic(e.to_string()))
-    // }
-    //
-    // fn payload(&self) -> Payload {
-    //     match &self.inner.payload.clone() {
-    //         BdkPayload::PubkeyHash(pubkey_hash) => Payload::PubkeyHash {
-    //             pubkey_hash: pubkey_hash.to_vec(),
-    //         },
-    //         BdkPayload::ScriptHash(script_hash) => Payload::ScriptHash {
-    //             script_hash: script_hash.to_vec(),
-    //         },
-    //         BdkPayload::WitnessProgram { version, program } => Payload::WitnessProgram {
-    //             version: *version,
-    //             program: program.clone(),
-    //         },
-    //     }
-    // }
-
-    fn network(&self) -> Network {
-        self.inner.network.into()
-    }
-
-    // fn script_pubkey(&self) -> Arc<Script> {
-    //     Arc::new(Script {
-    //         inner: self.inner.script_pubkey(),
-    //     })
-    // }
-
-    fn to_qr_uri(&self) -> String {
-        self.inner.to_qr_uri()
-    }
-
-    fn as_string(&self) -> String {
-        self.inner.to_string()
-    }
-}
-
-impl From<BdkAddress> for Address {
-    fn from(address: BdkAddress) -> Self {
-        Address { inner: address }
-    }
-}
-
-impl From<Address> for BdkAddress {
-    fn from(address: Address) -> Self {
-        address.inner
-    }
-}
 
 // /// The method used to produce an address.
 // #[derive(Debug)]
@@ -495,24 +325,7 @@ impl From<Address> for BdkAddress {
 //         program: Vec<u8>,
 //     },
 // }
-//
-// /// A Bitcoin script.
-// #[derive(Clone, Debug, PartialEq, Eq)]
-// pub struct Script {
-//     inner: BdkScript,
-// }
-//
-// impl Script {
-//     fn new(raw_output_script: Vec<u8>) -> Self {
-//         let script: BdkScript = BdkScript::from(raw_output_script);
-//         Script { inner: script }
-//     }
-//
-//     fn to_bytes(&self) -> Vec<u8> {
-//         self.inner.to_bytes()
-//     }
-// }
-//
+
 // impl From<BdkScript> for Script {
 //     fn from(bdk_script: BdkScript) -> Self {
 //         Script { inner: bdk_script }
diff --git a/bdk-ffi/src/psbt.rs b/bdk-ffi/src/psbt.rs
deleted file mode 100644
index e150db5d..00000000
--- a/bdk-ffi/src/psbt.rs
+++ /dev/null
@@ -1,119 +0,0 @@
-// use bdk::bitcoin::hashes::hex::ToHex;
-// use bdk::bitcoin::util::psbt::PartiallySignedTransaction as BdkPartiallySignedTransaction;
-// use bdk::bitcoincore_rpc::jsonrpc::serde_json;
-// use bdk::psbt::PsbtUtils;
-// use std::ops::Deref;
-// use std::str::FromStr;
-// use std::sync::{Arc, Mutex};
-//
-// use crate::{BdkError, FeeRate, Transaction};
-//
-// #[derive(Debug)]
-// pub(crate) struct PartiallySignedTransaction {
-//     pub(crate) inner: Mutex<BdkPartiallySignedTransaction>,
-// }
-//
-// impl PartiallySignedTransaction {
-//     pub(crate) fn new(psbt_base64: String) -> Result<Self, BdkError> {
-//         let psbt: BdkPartiallySignedTransaction =
-//             BdkPartiallySignedTransaction::from_str(&psbt_base64)?;
-//         Ok(PartiallySignedTransaction {
-//             inner: Mutex::new(psbt),
-//         })
-//     }
-//
-//     pub(crate) fn serialize(&self) -> String {
-//         let psbt = self.inner.lock().unwrap().clone();
-//         psbt.to_string()
-//     }
-//
-//     pub(crate) fn txid(&self) -> String {
-//         let tx = self.inner.lock().unwrap().clone().extract_tx();
-//         let txid = tx.txid();
-//         txid.to_hex()
-//     }
-//
-//     /// Return the transaction.
-//     pub(crate) fn extract_tx(&self) -> Arc<Transaction> {
-//         let tx = self.inner.lock().unwrap().clone().extract_tx();
-//         Arc::new(tx.into())
-//     }
-//
-//     /// Combines this PartiallySignedTransaction with other PSBT as described by BIP 174.
-//     ///
-//     /// In accordance with BIP 174 this function is commutative i.e., `A.combine(B) == B.combine(A)`
-//     pub(crate) fn combine(
-//         &self,
-//         other: Arc<PartiallySignedTransaction>,
-//     ) -> Result<Arc<PartiallySignedTransaction>, BdkError> {
-//         let other_psbt = other.inner.lock().unwrap().clone();
-//         let mut original_psbt = self.inner.lock().unwrap().clone();
-//
-//         original_psbt.combine(other_psbt)?;
-//         Ok(Arc::new(PartiallySignedTransaction {
-//             inner: Mutex::new(original_psbt),
-//         }))
-//     }
-//
-//     /// The total transaction fee amount, sum of input amounts minus sum of output amounts, in Sats.
-//     /// If the PSBT is missing a TxOut for an input returns None.
-//     pub(crate) fn fee_amount(&self) -> Option<u64> {
-//         self.inner.lock().unwrap().fee_amount()
-//     }
-//
-//     /// The transaction's fee rate. This value will only be accurate if calculated AFTER the
-//     /// `PartiallySignedTransaction` is finalized and all witness/signature data is added to the
-//     /// transaction.
-//     /// If the PSBT is missing a TxOut for an input returns None.
-//     pub(crate) fn fee_rate(&self) -> Option<Arc<FeeRate>> {
-//         self.inner.lock().unwrap().fee_rate().map(Arc::new)
-//     }
-//
-//     /// Serialize the PSBT data structure as a String of JSON.
-//     pub(crate) fn json_serialize(&self) -> String {
-//         let psbt = self.inner.lock().unwrap();
-//         serde_json::to_string(psbt.deref()).unwrap()
-//     }
-// }
-//
-// // The goal of these tests to to ensure `bdk-ffi` intermediate code correctly calls `bdk` APIs.
-// // These tests should not be used to verify `bdk` behavior that is already tested in the `bdk`
-// // crate.
-// #[cfg(test)]
-// mod test {
-//     use crate::wallet::{TxBuilder, Wallet};
-//     use bdk::wallet::get_funded_wallet;
-//     use std::sync::Mutex;
-//
-//     #[test]
-//     fn test_psbt_fee() {
-//         let test_wpkh = "wpkh(cVpPVruEDdmutPzisEsYvtST1usBR3ntr8pXSyt6D2YYqXRyPcFW)";
-//         let (funded_wallet, _, _) = get_funded_wallet(test_wpkh);
-//         let test_wallet = Wallet {
-//             inner_mutex: Mutex::new(funded_wallet),
-//         };
-//         let drain_to_address = "tb1ql7w62elx9ucw4pj5lgw4l028hmuw80sndtntxt".to_string();
-//         let drain_to_script = crate::Address::new(drain_to_address)
-//             .unwrap()
-//             .script_pubkey();
-//
-//         let tx_builder = TxBuilder::new()
-//             .fee_rate(2.0)
-//             .drain_wallet()
-//             .drain_to(drain_to_script.clone());
-//         //dbg!(&tx_builder);
-//         assert!(tx_builder.drain_wallet);
-//         assert_eq!(tx_builder.drain_to, Some(drain_to_script.inner.clone()));
-//
-//         let tx_builder_result = tx_builder.finish(&test_wallet).unwrap();
-//
-//         assert!(tx_builder_result.psbt.fee_rate().is_some());
-//         assert_eq!(
-//             tx_builder_result.psbt.fee_rate().unwrap().as_sat_per_vb(),
-//             2.682927
-//         );
-//
-//         assert!(tx_builder_result.psbt.fee_amount().is_some());
-//         assert_eq!(tx_builder_result.psbt.fee_amount().unwrap(), 220);
-//     }
-// }
diff --git a/bdk-ffi/src/wallet.rs b/bdk-ffi/src/wallet.rs
index ae708b3c..c8d3d34f 100644
--- a/bdk-ffi/src/wallet.rs
+++ b/bdk-ffi/src/wallet.rs
@@ -1,9 +1,13 @@
+use crate::bitcoin::PartiallySignedTransaction;
 use crate::descriptor::Descriptor;
-use crate::Balance;
 use crate::{AddressIndex, AddressInfo, Network};
+use crate::{Balance, Script};
+
+use bdk::bitcoin::blockdata::script::ScriptBuf as BdkScriptBuf;
 use bdk::wallet::Update as BdkUpdate;
-use bdk::Error as BdkError;
 use bdk::Wallet as BdkWallet;
+use bdk::{Error as BdkError, FeeRate};
+
 use std::sync::{Arc, Mutex, MutexGuard};
 
 #[derive(Debug)]
@@ -34,28 +38,22 @@ impl Wallet {
         self.inner_mutex.lock().expect("wallet")
     }
 
-    // pub fn get_address(&self, address_index: AddressIndex) -> Result<AddressInfo, BdkError> {
     pub fn get_address(&self, address_index: AddressIndex) -> AddressInfo {
         self.get_wallet().get_address(address_index.into()).into()
-        // NOTE: I prefer this:
-        // AddressInfo::from(
-        //     self.get_wallet().get_address(address_index.into())
-        // )
     }
 
     pub fn network(&self) -> Network {
         self.get_wallet().network().into()
     }
 
-    // fn get_internal_address(&mut self, address_index: AddressIndex) -> AddressInfo {
-    //     self.get_wallet()
-    //         .get_internal_address(address_index.into())
-    //         .into()
-    // }
+    pub fn get_internal_address(&self, address_index: AddressIndex) -> AddressInfo {
+        self.get_wallet()
+            .get_internal_address(address_index.into())
+            .into()
+    }
 
     // TODO 16: Why is the Arc required here?
     pub fn get_balance(&self) -> Arc<Balance> {
-        // Arc::new(self.get_wallet().get_balance().into())
         let bdk_balance = self.get_wallet().get_balance();
         let balance = Balance { inner: bdk_balance };
         Arc::new(balance)
@@ -67,11 +65,11 @@ impl Wallet {
             .map_err(|e| BdkError::Generic(e.to_string()))
     }
 
-    // pub fn commit(&self) -> Result<(), BdkError> {}
-
-    // fn is_mine(&self, script: Arc<Script>) -> bool {
-    //     self.get_wallet().is_mine(&script.inner)
-    // }
+    pub fn is_mine(&self, script: Arc<Script>) -> bool {
+        // TODO: Both of the following lines work. Which is better?
+        self.get_wallet().is_mine(&script.0)
+        // self.get_wallet().is_mine(script.0.clone().as_script())
+    }
 }
 
 pub struct Update(pub(crate) BdkUpdate);
@@ -94,63 +92,6 @@ pub struct Update(pub(crate) BdkUpdate);
 //     }
 // }
 
-// impl Wallet {
-//     // pub(crate) fn new(
-//     //     descriptor: Arc<Descriptor>,
-//     //     change_descriptor: Option<Arc<Descriptor>>,
-//     //     db: PersistBackend<ChangeSet>,
-//     //     network: Network,
-//     // ) -> Result<Self, BdkError> {
-//     //     let any_database_config = match database_config {
-//     //         DatabaseConfig::Memory => AnyDatabaseConfig::Memory(()),
-//     //         DatabaseConfig::Sled { config } => AnyDatabaseConfig::Sled(config),
-//     //         DatabaseConfig::Sqlite { config } => AnyDatabaseConfig::Sqlite(config),
-//     //     };
-//     //     let database = AnyDatabase::from_config(&any_database_config)?;
-//     //     let descriptor: String = descriptor.as_string_private();
-//     //     let change_descriptor: Option<String> = change_descriptor.map(|d| d.as_string_private());
-//     //
-//     //     let wallet_mutex = Mutex::new(BdkWallet::new(
-//     //         &descriptor,
-//     //         change_descriptor.as_ref(),
-//     //         network,
-//     //         database,
-//     //     )?);
-//     //     Ok(Wallet {
-//     //         inner_mutex: wallet_mutex,
-//     //     })
-//     // }
-//
-//     pub(crate) fn new_no_persist(
-//         descriptor: Arc<Descriptor>,
-//         change_descriptor: Option<Arc<Descriptor>>,
-//         network: Network,
-//     ) -> Result<Self, BdkError> {
-//         let descriptor: String = descriptor.as_string_private();
-//         let change_descriptor: Option<String> = change_descriptor.map(|d| d.as_string_private());
-//
-//         let wallet = BdkWallet::new_no_persist(
-//             &descriptor,
-//             change_descriptor.as_ref(),
-//             network,
-//         )?;
-//
-//         Ok(Wallet {
-//             inner: wallet,
-//         })
-//     }
-//
-//     // MIGRATION 1.0: This function is no longer needed right? If I remove the mutex on the wallet,
-//     //                I can just access the wallet directly without causing trouble me thinks.
-//     pub(crate) fn get_wallet(&self) -> MutexGuard<BdkWallet<AnyDatabase>> {
-//         self.inner_mutex.lock().expect("wallet")
-//     }
-//
-//     /// Get the Bitcoin network the wallet is using.
-//     pub(crate) fn network(&self) -> Network {
-//         self.inner.network()
-//     }
-//
 //     /// Return whether or not a script is part of this wallet (either internal or external).
 //     pub(crate) fn is_mine(&self, script: Arc<Script>) -> bool {
 //         self.inner.is_mine(&script.inner)
@@ -314,247 +255,252 @@ pub struct Update(pub(crate) BdkUpdate);
 //     }
 // }
 //
-// /// A transaction builder.
-// /// After creating the TxBuilder, you set options on it until finally calling finish to consume the builder and generate the transaction.
-// /// Each method on the TxBuilder returns an instance of a new TxBuilder with the option set/added.
-// #[derive(Clone, Debug)]
-// pub(crate) struct TxBuilder {
-//     pub(crate) recipients: Vec<(BdkScript, u64)>,
-//     pub(crate) utxos: Vec<OutPoint>,
-//     pub(crate) unspendable: HashSet<OutPoint>,
-//     pub(crate) change_policy: ChangeSpendPolicy,
-//     pub(crate) manually_selected_only: bool,
-//     pub(crate) fee_rate: Option<f32>,
-//     pub(crate) fee_absolute: Option<u64>,
-//     pub(crate) drain_wallet: bool,
-//     pub(crate) drain_to: Option<BdkScript>,
-//     pub(crate) rbf: Option<RbfValue>,
-//     pub(crate) data: Vec<u8>,
-// }
-//
-// impl TxBuilder {
-//     pub(crate) fn new() -> Self {
-//         TxBuilder {
-//             recipients: Vec::new(),
-//             utxos: Vec::new(),
-//             unspendable: HashSet::new(),
-//             change_policy: ChangeSpendPolicy::ChangeAllowed,
-//             manually_selected_only: false,
-//             fee_rate: None,
-//             fee_absolute: None,
-//             drain_wallet: false,
-//             drain_to: None,
-//             rbf: None,
-//             data: Vec::new(),
-//         }
-//     }
-//
-//     /// Add a recipient to the internal list.
-//     pub(crate) fn add_recipient(&self, script: Arc<Script>, amount: u64) -> Arc<Self> {
-//         let mut recipients: Vec<(BdkScript, u64)> = self.recipients.clone();
-//         recipients.append(&mut vec![(script.inner.clone(), amount)]);
-//         Arc::new(TxBuilder {
-//             recipients,
-//             ..self.clone()
-//         })
-//     }
-//
-//     pub(crate) fn set_recipients(&self, recipients: Vec<ScriptAmount>) -> Arc<Self> {
-//         let recipients = recipients
-//             .iter()
-//             .map(|script_amount| (script_amount.script.inner.clone(), script_amount.amount))
-//             .collect();
-//         Arc::new(TxBuilder {
-//             recipients,
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Add a utxo to the internal list of unspendable utxos. It’s important to note that the "must-be-spent"
-//     /// utxos added with [TxBuilder.addUtxo] have priority over this. See the Rust docs of the two linked methods for more details.
-//     pub(crate) fn add_unspendable(&self, unspendable: OutPoint) -> Arc<Self> {
-//         let mut unspendable_hash_set = self.unspendable.clone();
-//         unspendable_hash_set.insert(unspendable);
-//         Arc::new(TxBuilder {
-//             unspendable: unspendable_hash_set,
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Add an outpoint to the internal list of UTXOs that must be spent. These have priority over the "unspendable"
-//     /// utxos, meaning that if a utxo is present both in the "utxos" and the "unspendable" list, it will be spent.
-//     pub(crate) fn add_utxo(&self, outpoint: OutPoint) -> Arc<Self> {
-//         self.add_utxos(vec![outpoint])
-//     }
-//
-//     /// Add the list of outpoints to the internal list of UTXOs that must be spent. If an error occurs while adding
-//     /// any of the UTXOs then none of them are added and the error is returned. These have priority over the "unspendable"
-//     /// utxos, meaning that if a utxo is present both in the "utxos" and the "unspendable" list, it will be spent.
-//     pub(crate) fn add_utxos(&self, mut outpoints: Vec<OutPoint>) -> Arc<Self> {
-//         let mut utxos = self.utxos.to_vec();
-//         utxos.append(&mut outpoints);
-//         Arc::new(TxBuilder {
-//             utxos,
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Do not spend change outputs. This effectively adds all the change outputs to the "unspendable" list. See TxBuilder.unspendable.
-//     pub(crate) fn do_not_spend_change(&self) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             change_policy: ChangeSpendPolicy::ChangeForbidden,
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Only spend utxos added by [add_utxo]. The wallet will not add additional utxos to the transaction even if they are
-//     /// needed to make the transaction valid.
-//     pub(crate) fn manually_selected_only(&self) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             manually_selected_only: true,
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Only spend change outputs. This effectively adds all the non-change outputs to the "unspendable" list. See TxBuilder.unspendable.
-//     pub(crate) fn only_spend_change(&self) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             change_policy: ChangeSpendPolicy::OnlyChange,
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Replace the internal list of unspendable utxos with a new list. It’s important to note that the "must-be-spent" utxos added with
-//     /// TxBuilder.addUtxo have priority over these. See the Rust docs of the two linked methods for more details.
-//     pub(crate) fn unspendable(&self, unspendable: Vec<OutPoint>) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             unspendable: unspendable.into_iter().collect(),
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Set a custom fee rate.
-//     pub(crate) fn fee_rate(&self, sat_per_vb: f32) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             fee_rate: Some(sat_per_vb),
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Set an absolute fee.
-//     pub(crate) fn fee_absolute(&self, fee_amount: u64) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             fee_absolute: Some(fee_amount),
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Spend all the available inputs. This respects filters like TxBuilder.unspendable and the change policy.
-//     pub(crate) fn drain_wallet(&self) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             drain_wallet: true,
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Sets the address to drain excess coins to. Usually, when there are excess coins they are sent to a change address
-//     /// generated by the wallet. This option replaces the usual change address with an arbitrary ScriptPubKey of your choosing.
-//     /// Just as with a change output, if the drain output is not needed (the excess coins are too small) it will not be included
-//     /// in the resulting transaction. The only difference is that it is valid to use drain_to without setting any ordinary recipients
-//     /// with add_recipient (but it is perfectly fine to add recipients as well). If you choose not to set any recipients, you should
-//     /// either provide the utxos that the transaction should spend via add_utxos, or set drain_wallet to spend all of them.
-//     /// When bumping the fees of a transaction made with this option, you probably want to use BumpFeeTxBuilder.allow_shrinking
-//     /// to allow this output to be reduced to pay for the extra fees.
-//     pub(crate) fn drain_to(&self, script: Arc<Script>) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             drain_to: Some(script.inner.clone()),
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Enable signaling RBF. This will use the default `nsequence` value of `0xFFFFFFFD`.
-//     pub(crate) fn enable_rbf(&self) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             rbf: Some(RbfValue::Default),
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Enable signaling RBF with a specific nSequence value. This can cause conflicts if the wallet's descriptors contain an
-//     /// "older" (OP_CSV) operator and the given `nsequence` is lower than the CSV value. If the `nsequence` is higher than `0xFFFFFFFD`
-//     /// an error will be thrown, since it would not be a valid nSequence to signal RBF.
-//     pub(crate) fn enable_rbf_with_sequence(&self, nsequence: u32) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             rbf: Some(RbfValue::Value(nsequence)),
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Add data as an output using OP_RETURN.
-//     pub(crate) fn add_data(&self, data: Vec<u8>) -> Arc<Self> {
-//         Arc::new(TxBuilder {
-//             data,
-//             ..self.clone()
-//         })
-//     }
-//
-//     /// Finish building the transaction. Returns the BIP174 PSBT.
-//     pub(crate) fn finish(&self, wallet: &Wallet) -> Result<TxBuilderResult, BdkError> {
-//         let wallet = wallet.get_wallet();
-//         let mut tx_builder = wallet.build_tx();
-//         for (script, amount) in &self.recipients {
-//             tx_builder.add_recipient(script.clone(), *amount);
-//         }
-//         tx_builder.change_policy(self.change_policy);
-//         if !self.utxos.is_empty() {
-//             let bdk_utxos: Vec<BdkOutPoint> = self.utxos.iter().map(BdkOutPoint::from).collect();
-//             let utxos: &[BdkOutPoint] = &bdk_utxos;
-//             tx_builder.add_utxos(utxos)?;
-//         }
-//         if !self.unspendable.is_empty() {
-//             let bdk_unspendable: Vec<BdkOutPoint> =
-//                 self.unspendable.iter().map(BdkOutPoint::from).collect();
-//             tx_builder.unspendable(bdk_unspendable);
-//         }
-//         if self.manually_selected_only {
-//             tx_builder.manually_selected_only();
-//         }
-//         if let Some(sat_per_vb) = self.fee_rate {
-//             tx_builder.fee_rate(FeeRate::from_sat_per_vb(sat_per_vb));
-//         }
-//         if let Some(fee_amount) = self.fee_absolute {
-//             tx_builder.fee_absolute(fee_amount);
-//         }
-//         if self.drain_wallet {
-//             tx_builder.drain_wallet();
-//         }
-//         if let Some(script) = &self.drain_to {
-//             tx_builder.drain_to(script.clone());
-//         }
-//         if let Some(rbf) = &self.rbf {
-//             match *rbf {
-//                 RbfValue::Default => {
-//                     tx_builder.enable_rbf();
-//                 }
-//                 RbfValue::Value(nsequence) => {
-//                     tx_builder.enable_rbf_with_sequence(Sequence(nsequence));
-//                 }
-//             }
-//         }
-//         if !&self.data.is_empty() {
-//             tx_builder.add_data(self.data.as_slice());
-//         }
-//
-//         tx_builder
-//             .finish()
-//             .map(|(psbt, tx_details)| TxBuilderResult {
-//                 psbt: Arc::new(PartiallySignedTransaction {
-//                     inner: Mutex::new(psbt),
-//                 }),
-//                 transaction_details: TransactionDetails::from(tx_details),
-//             })
-//     }
-// }
+/// A transaction builder.
+/// After creating the TxBuilder, you set options on it until finally calling finish to consume the builder and generate the transaction.
+/// Each method on the TxBuilder returns an instance of a new TxBuilder with the option set/added.
+#[derive(Clone, Debug)]
+pub(crate) struct TxBuilder {
+    pub(crate) recipients: Vec<(BdkScriptBuf, u64)>,
+    // pub(crate) utxos: Vec<OutPoint>,
+    // pub(crate) unspendable: HashSet<OutPoint>,
+    // pub(crate) change_policy: ChangeSpendPolicy,
+    // pub(crate) manually_selected_only: bool,
+    pub(crate) fee_rate: Option<f32>,
+    // pub(crate) fee_absolute: Option<u64>,
+    // pub(crate) drain_wallet: bool,
+    // pub(crate) drain_to: Option<BdkScript>,
+    // pub(crate) rbf: Option<RbfValue>,
+    // pub(crate) data: Vec<u8>,
+}
+
+impl TxBuilder {
+    pub(crate) fn new() -> Self {
+        TxBuilder {
+            recipients: Vec::new(),
+            // utxos: Vec::new(),
+            // unspendable: HashSet::new(),
+            // change_policy: ChangeSpendPolicy::ChangeAllowed,
+            // manually_selected_only: false,
+            fee_rate: None,
+            // fee_absolute: None,
+            // drain_wallet: false,
+            // drain_to: None,
+            // rbf: None,
+            // data: Vec::new(),
+        }
+    }
+
+    /// Add a recipient to the internal list.
+    pub(crate) fn add_recipient(&self, script: Arc<Script>, amount: u64) -> Arc<Self> {
+        let mut recipients: Vec<(BdkScriptBuf, u64)> = self.recipients.clone();
+        recipients.append(&mut vec![(script.0.clone(), amount)]);
+
+        Arc::new(TxBuilder {
+            recipients,
+            ..self.clone()
+        })
+    }
+
+    // pub(crate) fn set_recipients(&self, recipients: Vec<ScriptAmount>) -> Arc<Self> {
+    //     let recipients = recipients
+    //         .iter()
+    //         .map(|script_amount| (script_amount.script.inner.clone(), script_amount.amount))
+    //         .collect();
+    //     Arc::new(TxBuilder {
+    //         recipients,
+    //         ..self.clone()
+    //     })
+    // }
+
+    //     /// Add a utxo to the internal list of unspendable utxos. It’s important to note that the "must-be-spent"
+    //     /// utxos added with [TxBuilder.addUtxo] have priority over this. See the Rust docs of the two linked methods for more details.
+    //     pub(crate) fn add_unspendable(&self, unspendable: OutPoint) -> Arc<Self> {
+    //         let mut unspendable_hash_set = self.unspendable.clone();
+    //         unspendable_hash_set.insert(unspendable);
+    //         Arc::new(TxBuilder {
+    //             unspendable: unspendable_hash_set,
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Add an outpoint to the internal list of UTXOs that must be spent. These have priority over the "unspendable"
+    //     /// utxos, meaning that if a utxo is present both in the "utxos" and the "unspendable" list, it will be spent.
+    //     pub(crate) fn add_utxo(&self, outpoint: OutPoint) -> Arc<Self> {
+    //         self.add_utxos(vec![outpoint])
+    //     }
+    //
+    //     /// Add the list of outpoints to the internal list of UTXOs that must be spent. If an error occurs while adding
+    //     /// any of the UTXOs then none of them are added and the error is returned. These have priority over the "unspendable"
+    //     /// utxos, meaning that if a utxo is present both in the "utxos" and the "unspendable" list, it will be spent.
+    //     pub(crate) fn add_utxos(&self, mut outpoints: Vec<OutPoint>) -> Arc<Self> {
+    //         let mut utxos = self.utxos.to_vec();
+    //         utxos.append(&mut outpoints);
+    //         Arc::new(TxBuilder {
+    //             utxos,
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Do not spend change outputs. This effectively adds all the change outputs to the "unspendable" list. See TxBuilder.unspendable.
+    //     pub(crate) fn do_not_spend_change(&self) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             change_policy: ChangeSpendPolicy::ChangeForbidden,
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Only spend utxos added by [add_utxo]. The wallet will not add additional utxos to the transaction even if they are
+    //     /// needed to make the transaction valid.
+    //     pub(crate) fn manually_selected_only(&self) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             manually_selected_only: true,
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Only spend change outputs. This effectively adds all the non-change outputs to the "unspendable" list. See TxBuilder.unspendable.
+    //     pub(crate) fn only_spend_change(&self) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             change_policy: ChangeSpendPolicy::OnlyChange,
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Replace the internal list of unspendable utxos with a new list. It’s important to note that the "must-be-spent" utxos added with
+    //     /// TxBuilder.addUtxo have priority over these. See the Rust docs of the two linked methods for more details.
+    //     pub(crate) fn unspendable(&self, unspendable: Vec<OutPoint>) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             unspendable: unspendable.into_iter().collect(),
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    /// Set a custom fee rate.
+    pub(crate) fn fee_rate(&self, sat_per_vb: f32) -> Arc<Self> {
+        Arc::new(TxBuilder {
+            fee_rate: Some(sat_per_vb),
+            ..self.clone()
+        })
+    }
+    //
+    //     /// Set an absolute fee.
+    //     pub(crate) fn fee_absolute(&self, fee_amount: u64) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             fee_absolute: Some(fee_amount),
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Spend all the available inputs. This respects filters like TxBuilder.unspendable and the change policy.
+    //     pub(crate) fn drain_wallet(&self) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             drain_wallet: true,
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Sets the address to drain excess coins to. Usually, when there are excess coins they are sent to a change address
+    //     /// generated by the wallet. This option replaces the usual change address with an arbitrary ScriptPubKey of your choosing.
+    //     /// Just as with a change output, if the drain output is not needed (the excess coins are too small) it will not be included
+    //     /// in the resulting transaction. The only difference is that it is valid to use drain_to without setting any ordinary recipients
+    //     /// with add_recipient (but it is perfectly fine to add recipients as well). If you choose not to set any recipients, you should
+    //     /// either provide the utxos that the transaction should spend via add_utxos, or set drain_wallet to spend all of them.
+    //     /// When bumping the fees of a transaction made with this option, you probably want to use BumpFeeTxBuilder.allow_shrinking
+    //     /// to allow this output to be reduced to pay for the extra fees.
+    //     pub(crate) fn drain_to(&self, script: Arc<Script>) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             drain_to: Some(script.inner.clone()),
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Enable signaling RBF. This will use the default `nsequence` value of `0xFFFFFFFD`.
+    //     pub(crate) fn enable_rbf(&self) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             rbf: Some(RbfValue::Default),
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Enable signaling RBF with a specific nSequence value. This can cause conflicts if the wallet's descriptors contain an
+    //     /// "older" (OP_CSV) operator and the given `nsequence` is lower than the CSV value. If the `nsequence` is higher than `0xFFFFFFFD`
+    //     /// an error will be thrown, since it would not be a valid nSequence to signal RBF.
+    //     pub(crate) fn enable_rbf_with_sequence(&self, nsequence: u32) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             rbf: Some(RbfValue::Value(nsequence)),
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    //     /// Add data as an output using OP_RETURN.
+    //     pub(crate) fn add_data(&self, data: Vec<u8>) -> Arc<Self> {
+    //         Arc::new(TxBuilder {
+    //             data,
+    //             ..self.clone()
+    //         })
+    //     }
+    //
+    /// Finish building the transaction. Returns the BIP174 PSBT.
+    /// TODO: The TxBuilder in bdk returns a Psbt type
+    pub(crate) fn finish(
+        &self,
+        wallet: &Wallet,
+    ) -> Result<Arc<PartiallySignedTransaction>, BdkError> {
+        // TODO: I had to change the wallet here to be mutable. Why is that now required with the 1.0 API?
+        let mut wallet = wallet.get_wallet();
+        let mut tx_builder = wallet.build_tx();
+        // TODO: I'm not yet clear on the Script/ScriptBuf differences and whether this is the best
+        //       way to do this.
+        for (script, amount) in &self.recipients {
+            tx_builder.add_recipient(script.clone(), *amount);
+        }
+        // tx_builder.change_policy(self.change_policy);
+        // if !self.utxos.is_empty() {
+        //     let bdk_utxos: Vec<BdkOutPoint> = self.utxos.iter().map(BdkOutPoint::from).collect();
+        //     let utxos: &[BdkOutPoint] = &bdk_utxos;
+        //     tx_builder.add_utxos(utxos)?;
+        // }
+        // if !self.unspendable.is_empty() {
+        //     let bdk_unspendable: Vec<BdkOutPoint> =
+        //         self.unspendable.iter().map(BdkOutPoint::from).collect();
+        //     tx_builder.unspendable(bdk_unspendable);
+        // }
+        // if self.manually_selected_only {
+        //     tx_builder.manually_selected_only();
+        // }
+        if let Some(sat_per_vb) = self.fee_rate {
+            tx_builder.fee_rate(FeeRate::from_sat_per_vb(sat_per_vb));
+        }
+        // if let Some(fee_amount) = self.fee_absolute {
+        //     tx_builder.fee_absolute(fee_amount);
+        // }
+        // if self.drain_wallet {
+        //     tx_builder.drain_wallet();
+        // }
+        // if let Some(script) = &self.drain_to {
+        //     tx_builder.drain_to(script.clone());
+        // }
+        // if let Some(rbf) = &self.rbf {
+        //     match *rbf {
+        //         RbfValue::Default => {
+        //             tx_builder.enable_rbf();
+        //         }
+        //         RbfValue::Value(nsequence) => {
+        //             tx_builder.enable_rbf_with_sequence(Sequence(nsequence));
+        //         }
+        //     }
+        // }
+        // if !&self.data.is_empty() {
+        //     tx_builder.add_data(self.data.as_slice());
+        // }
+
+        // tx_builder.finish().map(|psbt| psbt.serialize_hex())
+        // tx_builder.finish().into()
+        let psbt = tx_builder.finish()?;
+
+        Ok(Arc::new(psbt.into()))
+    }
+}
 //
 // /// The BumpFeeTxBuilder is used to bump the fee on a transaction that has been broadcast and has its RBF flag set to true.
 // #[derive(Clone)]
diff --git a/bdk-jvm/lib/build.gradle.kts b/bdk-jvm/lib/build.gradle.kts
index 41b9bd0b..a3551e06 100644
--- a/bdk-jvm/lib/build.gradle.kts
+++ b/bdk-jvm/lib/build.gradle.kts
@@ -26,6 +26,18 @@ java {
     withJavadocJar()
 }
 
+// This block ensures that the tests that require access to a blockchain are not
+// run if the -P excludeConnectedTests flag is passed to gradle.
+// This ensures our CI runs are not fickle by not requiring access to testnet.
+// This is a workaround until we have a proper regtest setup for the CI.
+// Note that the command in the CI is ./gradlew test -P excludeConnectedTests
+tasks.test {
+    if (project.hasProperty("excludeConnectedTests")) {
+        exclude("**/LiveWalletTest.class")
+        exclude("**/LiveTxBuilderTest.class")
+    }
+}
+
 testing {
     suites {
         val test by getting(JvmTestSuite::class) {
diff --git a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt
new file mode 100644
index 00000000..ca8cd197
--- /dev/null
+++ b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveTxBuilderTest.kt
@@ -0,0 +1,29 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+import kotlin.test.assertTrue
+
+class LiveTxBuilderTest {
+    @Test
+    fun testTxBuilder() {
+        val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
+        val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
+        val esploraClient = EsploraClient("https://mempool.space/testnet/api")
+        val update = esploraClient.scan(wallet, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.getBalance().total()}")
+
+        assert(wallet.getBalance().total() > 0uL)
+
+        val recipient: Address = Address("tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", Network.TESTNET)
+        val psbt: PartiallySignedTransaction = TxBuilder()
+            .addRecipient(recipient.scriptPubkey(), 4200uL)
+            .feeRate(2.0f)
+            .finish(wallet)
+
+        println(psbt.serialize())
+
+        assertTrue(psbt.serialize().startsWith("cHNi"), "PSBT should start with 'cHNi'")
+    }
+}
diff --git a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt
new file mode 100644
index 00000000..44f6dca4
--- /dev/null
+++ b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/LiveWalletTest.kt
@@ -0,0 +1,18 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+
+class LiveWalletTest {
+    @Test
+    fun testSyncedBalance() {
+        val descriptor: Descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
+        val wallet: Wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
+        val esploraClient: EsploraClient = EsploraClient("https://mempool.space/testnet/api")
+        // val esploraClient = EsploraClient("https://blockstream.info/testnet/api")
+        val update = esploraClient.scan(wallet, 10uL, 1uL)
+        wallet.applyUpdate(update)
+        println("Balance: ${wallet.getBalance().total()}")
+
+        assert(wallet.getBalance().total() > 0uL)
+    }
+}
diff --git a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt
new file mode 100644
index 00000000..1954d9c3
--- /dev/null
+++ b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/OfflineDescriptorTest.kt
@@ -0,0 +1,18 @@
+package org.bitcoindevkit
+
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class OfflineDescriptorTest {
+    @Test
+    fun testDescriptorBip86() {
+        val mnemonic: Mnemonic = Mnemonic.fromString("space echo position wrist orient erupt relief museum myself grain wisdom tumble")
+        val descriptorSecretKey: DescriptorSecretKey = DescriptorSecretKey(Network.TESTNET, mnemonic, null)
+        val descriptor: Descriptor = Descriptor.newBip86(descriptorSecretKey, KeychainKind.EXTERNAL, Network.TESTNET)
+
+        assertEquals(
+            expected = "tr([be1eec8f/86'/1'/0']tpubDCTtszwSxPx3tATqDrsSyqScPNnUChwQAVAkanuDUCJQESGBbkt68nXXKRDifYSDbeMa2Xg2euKbXaU3YphvGWftDE7ozRKPriT6vAo3xsc/0/*)#m7puekcx",
+            actual = descriptor.asString()
+        )
+    }
+}
diff --git a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/OfflineWalletTest.kt
similarity index 63%
rename from bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
rename to bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/OfflineWalletTest.kt
index 0d158679..19b71d96 100644
--- a/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/JvmLibTest.kt
+++ b/bdk-jvm/lib/src/test/kotlin/org/bitcoindevkit/OfflineWalletTest.kt
@@ -4,8 +4,7 @@ import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertTrue
 
-class WalletTest {
-
+class OfflineWalletTest {
     @Test
     fun testDescriptorBip86() {
         val mnemonic: Mnemonic = Mnemonic(WordCount.WORDS12)
@@ -28,7 +27,10 @@ class WalletTest {
         )
         val addressInfo: AddressInfo = wallet.getAddress(AddressIndex.New)
 
-        assertEquals("tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e", addressInfo.address.asString())
+        assertEquals(
+            expected = "tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e",
+            actual = addressInfo.address.asString()
+        )
     }
 
     @Test
@@ -43,18 +45,9 @@ class WalletTest {
             Network.TESTNET
         )
 
-        assertEquals(0uL, wallet.getBalance().total())
+        assertEquals(
+            expected = 0uL,
+            actual = wallet.getBalance().total()
+        )
     }
-
-    // @Test
-    // fun testSyncedBalance() {
-    //     val descriptor = Descriptor("wpkh(tprv8ZgxMBicQKsPf2qfrEygW6fdYseJDDrVnDv26PH5BHdvSuG6ecCbHqLVof9yZcMoM31z9ur3tTYbSnr1WBqbGX97CbXcmp5H6qeMpyvx35B/84h/1h/0h/0/*)", Network.TESTNET)
-    //     val wallet = Wallet.newNoPersist(descriptor, null, Network.TESTNET)
-    //     val esploraClient = EsploraClient("https://mempool.space/testnet/api")
-    //     // val esploraClient = EsploraClient("https://blockstream.info/testnet/api")
-    //     val update = esploraClient.scan(wallet, 10uL, 1uL)
-    //     wallet.applyUpdate(update)
-    //     println("Balance: ${wallet.getBalance().total()}")
-    // }
-
 }
diff --git a/bdk-python/tests/test_live_tx_builder.py b/bdk-python/tests/test_live_tx_builder.py
new file mode 100644
index 00000000..55bbe390
--- /dev/null
+++ b/bdk-python/tests/test_live_tx_builder.py
@@ -0,0 +1,38 @@
+import bdkpython as bdk
+import unittest
+
+class TestLiveTxBuilder(unittest.TestCase):
+
+    def test_tx_builder(self):
+        descriptor: bdk.Descriptor = bdk.Descriptor(
+            "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
+            bdk.Network.TESTNET
+        )
+        wallet: bdk.Wallet = bdk.Wallet.new_no_persist(
+            descriptor,
+            None,
+            bdk.Network.TESTNET
+        )
+        esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
+        update = esploraClient.scan(
+            wallet = wallet,
+            stop_gap = 10,
+            parallel_requests = 1
+        )
+        wallet.apply_update(update)
+
+        self.assertGreater(wallet.get_balance().total(), 0)
+
+        recipient = bdk.Address(
+            address = "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989",
+            network = bdk.Network.TESTNET
+        )
+
+        psbt = bdk.TxBuilder().add_recipient(script=recipient.script_pubkey(), amount=4200).fee_rate(2.0).finish(wallet)
+        # print(psbt.serialize())
+        
+        self.assertTrue(psbt.serialize().startswith("cHNi"), "The PSBT should start with cHNi")
+
+    
+if __name__ == '__main__':
+    unittest.main()
diff --git a/bdk-python/tests/test_live_wallet.py b/bdk-python/tests/test_live_wallet.py
new file mode 100644
index 00000000..16ee1e90
--- /dev/null
+++ b/bdk-python/tests/test_live_wallet.py
@@ -0,0 +1,28 @@
+import bdkpython as bdk
+import unittest
+
+class TestLiveWallet(unittest.TestCase):
+
+    def test_synced_balance(self):
+        descriptor: bdk.Descriptor = bdk.Descriptor(
+            "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
+            bdk.Network.TESTNET
+        )
+        wallet: bdk.Wallet = bdk.Wallet.new_no_persist(
+            descriptor,
+            None,
+            bdk.Network.TESTNET
+        )
+        esploraClient: bdk.EsploraClient = bdk.EsploraClient(url = "https://mempool.space/testnet/api")
+        update = esploraClient.scan(
+            wallet = wallet,
+            stop_gap = 10,
+            parallel_requests = 1
+        )
+        wallet.apply_update(update)
+
+        self.assertGreater(wallet.get_balance().total(), 0)
+
+    
+if __name__ == '__main__':
+    unittest.main()
diff --git a/bdk-python/tests/test_offline_descriptor.py b/bdk-python/tests/test_offline_descriptor.py
new file mode 100644
index 00000000..15f49180
--- /dev/null
+++ b/bdk-python/tests/test_offline_descriptor.py
@@ -0,0 +1,18 @@
+import bdkpython as bdk
+import unittest
+
+class TestSimpleWallet(unittest.TestCase):
+
+    def test_descriptor_bip86(self):
+        mnemonic: bdk.Mnemonic = bdk.Mnemonic.from_string("space echo position wrist orient erupt relief museum myself grain wisdom tumble")
+        descriptor_secret_key: bdk.DescriptorSecretKey = bdk.DescriptorSecretKey(bdk.Network.TESTNET, mnemonic, None)
+        descriptor: bdk.Descriptor = bdk.Descriptor.new_bip86(descriptor_secret_key, bdk.KeychainKind.EXTERNAL, bdk.Network.TESTNET)
+
+        self.assertEqual(
+            "tr([be1eec8f/86'/1'/0']tpubDCTtszwSxPx3tATqDrsSyqScPNnUChwQAVAkanuDUCJQESGBbkt68nXXKRDifYSDbeMa2Xg2euKbXaU3YphvGWftDE7ozRKPriT6vAo3xsc/0/*)#m7puekcx",
+            descriptor.as_string()
+        )
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/bdk-python/tests/test_bdk.py b/bdk-python/tests/test_offline_wallet.py
similarity index 69%
rename from bdk-python/tests/test_bdk.py
rename to bdk-python/tests/test_offline_wallet.py
index d50b6354..49e3c909 100644
--- a/bdk-python/tests/test_bdk.py
+++ b/bdk-python/tests/test_offline_wallet.py
@@ -3,13 +3,6 @@
 
 class TestSimpleWallet(unittest.TestCase):
 
-    def test_descriptor_bip86(self):
-        mnemonic: bdk.Mnemonic = bdk.Mnemonic(bdk.WordCount.WORDS12)
-        descriptor_secret_key: bdk.DescriptorSecretKey = bdk.DescriptorSecretKey(bdk.Network.TESTNET, mnemonic, None)
-        descriptor: bdk.Descriptor = bdk.Descriptor.new_bip86(descriptor_secret_key, bdk.KeychainKind.EXTERNAL, bdk.Network.TESTNET)
-
-        self.assertTrue(descriptor.as_string().startswith("tr"), "Bip86 Descriptor does not start with 'tr'")
-
     def test_new_address(self):
         descriptor: bdk.Descriptor = bdk.Descriptor(
             "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
@@ -29,7 +22,7 @@ def test_balance(self):
             "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
             bdk.Network.TESTNET
         )
-        wallet: Wallet = bdk.Wallet.new_no_persist(
+        wallet: bdk.Wallet = bdk.Wallet.new_no_persist(
             descriptor,
             None,
             bdk.Network.TESTNET
diff --git a/bdk-swift/Tests/BitcoinDevKitTests/BitcoinDevKitTests.swift b/bdk-swift/Tests/BitcoinDevKitTests/BitcoinDevKitTests.swift
deleted file mode 100644
index 5fd1a4b7..00000000
--- a/bdk-swift/Tests/BitcoinDevKitTests/BitcoinDevKitTests.swift
+++ /dev/null
@@ -1,68 +0,0 @@
-import XCTest
-@testable import BitcoinDevKit
-
-final class BitcoinDevKitTests: XCTestCase {
-    
-    func testDescriptorBip86() {
-        let mnemonic: Mnemonic = Mnemonic(wordCount: WordCount.words12)
-        let descriptorSecretKey: DescriptorSecretKey = DescriptorSecretKey(
-            network: Network.testnet,
-            mnemonic: mnemonic,
-            password: nil
-        )
-        let descriptor: Descriptor = Descriptor.newBip86(
-            secretKey: descriptorSecretKey,
-            keychain: KeychainKind.external,
-            network: Network.testnet
-        )
-
-        XCTAssertTrue(descriptor.asString().hasPrefix("tr"), "Bip86 Descriptor does not start with 'tr'")
-    }
-    
-    func testNewAddress() throws {
-        let descriptor: Descriptor = try Descriptor(
-            descriptor: "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
-            network: Network.testnet
-        )
-        let wallet: Wallet = try Wallet.newNoPersist(
-            descriptor: descriptor,
-            changeDescriptor: nil,
-            network: .testnet
-        )
-        let addressInfo: AddressInfo = wallet.getAddress(addressIndex: AddressIndex.new)
-        
-        XCTAssertEqual(addressInfo.address.asString(), "tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e")
-    }
-    
-    func testBalance() throws {
-        let descriptor: Descriptor = try Descriptor(
-            descriptor: "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
-            network: Network.testnet
-        )
-        let wallet: Wallet = try Wallet.newNoPersist(
-            descriptor: descriptor,
-            changeDescriptor: nil,
-            network: .testnet
-        )
-
-        XCTAssertEqual(wallet.getBalance().total(), 0)
-    }
-
-//    func testSyncedBalance() throws {
-//        let descriptor = try Descriptor(
-//            descriptor: "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
-//            network: Network.testnet
-//        )
-//        let wallet = try Wallet.newNoPersist(
-//            descriptor: descriptor,
-//            changeDescriptor: nil,
-//            network: .testnet
-//        )
-//        let esploraClient = EsploraClient("https://mempool.space/testnet/api")
-//        let update = esploraClient.scan(wallet, 10, 1)
-//        wallet.applyUpdate(update)
-//
-//        XCTAssertEqual(wallet.getBalance().total(), 0)
-//    }
-
-}
diff --git a/bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift b/bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift
new file mode 100644
index 00000000..d0aee18e
--- /dev/null
+++ b/bdk-swift/Tests/BitcoinDevKitTests/LiveTxBuilderTests.swift
@@ -0,0 +1,34 @@
+import XCTest
+@testable import BitcoinDevKit
+
+final class LiveTxBuilderTests: XCTestCase {
+    func testTxBuilder() throws {
+        let descriptor = try Descriptor(
+            descriptor: "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
+            network: Network.testnet
+        )
+        let wallet = try Wallet.newNoPersist(
+            descriptor: descriptor,
+            changeDescriptor: nil,
+            network: .testnet
+        )
+        let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
+        let update = try esploraClient.scan(
+            wallet: wallet,
+            stopGap: 10,
+            parallelRequests: 1
+        )
+        try wallet.applyUpdate(update: update)
+
+        XCTAssertGreaterThan(wallet.getBalance().total(), UInt64(0), "Wallet must have positive balance, please add funds")
+
+        let recipient: Address = try Address(address: "tb1qrnfslnrve9uncz9pzpvf83k3ukz22ljgees989", network: .testnet)
+        let psbt: PartiallySignedTransaction = try TxBuilder()
+            .addRecipient(script: recipient.scriptPubkey(), amount: 4200)
+            .feeRate(satPerVbyte: 2.0)
+            .finish(wallet: wallet)
+
+        print(psbt.serialize())
+        XCTAssertTrue(psbt.serialize().hasPrefix("cHNi"), "PSBT should start with cHNI")
+    }
+}
diff --git a/bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift b/bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift
new file mode 100644
index 00000000..b8b6fabd
--- /dev/null
+++ b/bdk-swift/Tests/BitcoinDevKitTests/LiveWalletTests.swift
@@ -0,0 +1,25 @@
+import XCTest
+@testable import BitcoinDevKit
+
+final class LiveWalletTests: XCTestCase {
+    func testSyncedBalance() throws {
+        let descriptor = try Descriptor(
+            descriptor: "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
+            network: Network.testnet
+        )
+        let wallet = try Wallet.newNoPersist(
+            descriptor: descriptor,
+            changeDescriptor: nil,
+            network: .testnet
+        )
+        let esploraClient = EsploraClient(url: "https://mempool.space/testnet/api")
+        let update = try esploraClient.scan(
+            wallet: wallet,
+            stopGap: 10,
+            parallelRequests: 1
+        )
+        try wallet.applyUpdate(update: update)
+
+        XCTAssertGreaterThan(wallet.getBalance().total(), UInt64(0))
+    }
+}
diff --git a/bdk-swift/Tests/BitcoinDevKitTests/OfflineDescriptorTests.swift b/bdk-swift/Tests/BitcoinDevKitTests/OfflineDescriptorTests.swift
new file mode 100644
index 00000000..96611589
--- /dev/null
+++ b/bdk-swift/Tests/BitcoinDevKitTests/OfflineDescriptorTests.swift
@@ -0,0 +1,20 @@
+import XCTest
+@testable import BitcoinDevKit
+
+final class OfflineDescriptorTests: XCTestCase {
+    func testDescriptorBip86() throws {
+        let mnemonic: Mnemonic = try Mnemonic.fromString(mnemonic: "space echo position wrist orient erupt relief museum myself grain wisdom tumble")
+        let descriptorSecretKey: DescriptorSecretKey = DescriptorSecretKey(
+            network: Network.testnet,
+            mnemonic: mnemonic,
+            password: nil
+        )
+        let descriptor: Descriptor = Descriptor.newBip86(
+            secretKey: descriptorSecretKey,
+            keychain: KeychainKind.external,
+            network: Network.testnet
+        )
+
+        XCTAssertEqual(descriptor.asString(), "tr([be1eec8f/86'/1'/0']tpubDCTtszwSxPx3tATqDrsSyqScPNnUChwQAVAkanuDUCJQESGBbkt68nXXKRDifYSDbeMa2Xg2euKbXaU3YphvGWftDE7ozRKPriT6vAo3xsc/0/*)#m7puekcx")
+    }
+}
diff --git a/bdk-swift/Tests/BitcoinDevKitTests/OfflineWalletTests.swift b/bdk-swift/Tests/BitcoinDevKitTests/OfflineWalletTests.swift
new file mode 100644
index 00000000..441f032f
--- /dev/null
+++ b/bdk-swift/Tests/BitcoinDevKitTests/OfflineWalletTests.swift
@@ -0,0 +1,33 @@
+import XCTest
+@testable import BitcoinDevKit
+
+final class OfflineWalletTests: XCTestCase {
+    func testNewAddress() throws {
+        let descriptor: Descriptor = try Descriptor(
+            descriptor: "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
+            network: Network.testnet
+        )
+        let wallet: Wallet = try Wallet.newNoPersist(
+            descriptor: descriptor,
+            changeDescriptor: nil,
+            network: .testnet
+        )
+        let addressInfo: AddressInfo = wallet.getAddress(addressIndex: AddressIndex.new)
+        
+        XCTAssertEqual(addressInfo.address.asString(), "tb1qzg4mckdh50nwdm9hkzq06528rsu73hjxxzem3e")
+    }
+    
+    func testBalance() throws {
+        let descriptor: Descriptor = try Descriptor(
+            descriptor: "wpkh([c258d2e4/84h/1h/0h]tpubDDYkZojQFQjht8Tm4jsS3iuEmKjTiEGjG6KnuFNKKJb5A6ZUCUZKdvLdSDWofKi4ToRCwb9poe1XdqfUnP4jaJjCB2Zwv11ZLgSbnZSNecE/0/*)",
+            network: Network.testnet
+        )
+        let wallet: Wallet = try Wallet.newNoPersist(
+            descriptor: descriptor,
+            changeDescriptor: nil,
+            network: .testnet
+        )
+
+        XCTAssertEqual(wallet.getBalance().total(), 0)
+    }
+}