diff --git a/lib/core/src/recover/handlers/tests/handle_chain_receive_swap_tests.rs b/lib/core/src/recover/handlers/tests/handle_chain_receive_swap_tests.rs
index 98d596f..eca0482 100644
--- a/lib/core/src/recover/handlers/tests/handle_chain_receive_swap_tests.rs
+++ b/lib/core/src/recover/handlers/tests/handle_chain_receive_swap_tests.rs
@@ -9,7 +9,10 @@ mod test {
     };
     use boltz_client::boltz::PairLimits;
 
-    #[test]
+    #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+    wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_btc_lockup_and_lbtc_claim() {
         let recovered_data = RecoveredOnchainDataChainReceive {
             lbtc_server_lockup_tx_id: Some(create_history_txid("1111", 100)),
@@ -53,7 +56,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_btc_lockup_and_btc_refund() {
         // Test with confirmed refund
         let recovered_data = RecoveredOnchainDataChainReceive {
@@ -98,7 +101,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_btc_lockup_only() {
         // Test with correct lockup amount
         let recovered_data = RecoveredOnchainDataChainReceive {
@@ -145,7 +148,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_incorrect_lockup_amount() {
         let limits = PairLimits {
             minimal: 10000,
@@ -205,7 +208,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_no_txs() {
         let recovered_data = RecoveredOnchainDataChainReceive {
             lbtc_server_lockup_tx_id: None,
@@ -230,7 +233,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_claim_refund() {
         // This is an edge case where both claim and refund txs exist
         let recovered_data = RecoveredOnchainDataChainReceive {
diff --git a/lib/core/src/recover/handlers/tests/handle_chain_receive_swap_tests_integration.rs b/lib/core/src/recover/handlers/tests/handle_chain_receive_swap_tests_integration.rs
index 370750a..adf5595 100644
--- a/lib/core/src/recover/handlers/tests/handle_chain_receive_swap_tests_integration.rs
+++ b/lib/core/src/recover/handlers/tests/handle_chain_receive_swap_tests_integration.rs
@@ -20,7 +20,10 @@ mod test {
     };
     use std::{collections::HashMap, str::FromStr, sync::Arc};
 
-    #[tokio::test]
+    #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+    wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_btc_lockup_and_lbtc_claim() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
@@ -87,7 +90,7 @@ mod test {
         assert_eq!(chain_swap.refund_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_btc_lockup_only() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
@@ -129,7 +132,7 @@ mod test {
         assert_eq!(chain_swap.refund_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_btc_lockup_and_refund() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
@@ -173,7 +176,7 @@ mod test {
         assert_eq!(chain_swap.claim_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_expired_swap() {
         // Setup mock data
         let (mut chain_swap, mut recovery_context) = setup_test_data();
@@ -225,7 +228,7 @@ mod test {
         assert_eq!(chain_swap.refund_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_incorrect_amount() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
@@ -268,7 +271,7 @@ mod test {
         assert_eq!(chain_swap.actual_payer_amount_sat, Some(50000));
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_no_transactions() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
@@ -290,7 +293,7 @@ mod test {
         assert_eq!(chain_swap.claim_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recovery_within_grace_period() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
diff --git a/lib/core/src/recover/handlers/tests/handle_chain_send_swap_tests.rs b/lib/core/src/recover/handlers/tests/handle_chain_send_swap_tests.rs
index 35eeb7b..cf92087 100644
--- a/lib/core/src/recover/handlers/tests/handle_chain_send_swap_tests.rs
+++ b/lib/core/src/recover/handlers/tests/handle_chain_send_swap_tests.rs
@@ -7,7 +7,10 @@ mod test {
         },
     };
 
-    #[test]
+    #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+    wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lbtc_lockup_and_btc_claim() {
         let recovered_data = RecoveredOnchainDataChainSend {
             lbtc_user_lockup_tx_id: Some(create_history_txid("1111", 100)),
@@ -45,7 +48,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_and_refund() {
         // Test with confirmed refund
         let recovered_data = RecoveredOnchainDataChainSend {
@@ -84,7 +87,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_only() {
         let recovered_data = RecoveredOnchainDataChainSend {
             lbtc_user_lockup_tx_id: Some(create_history_txid("1111", 100)),
@@ -106,7 +109,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_no_txs() {
         let recovered_data = RecoveredOnchainDataChainSend {
             lbtc_user_lockup_tx_id: None,
@@ -125,7 +128,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_claim_refund() {
         // This is an edge case where both claim and refund txs exist
         let recovered_data = RecoveredOnchainDataChainSend {
diff --git a/lib/core/src/recover/handlers/tests/handle_chain_send_swap_tests_integration.rs b/lib/core/src/recover/handlers/tests/handle_chain_send_swap_tests_integration.rs
index 1bd990d..dfe0780 100644
--- a/lib/core/src/recover/handlers/tests/handle_chain_send_swap_tests_integration.rs
+++ b/lib/core/src/recover/handlers/tests/handle_chain_send_swap_tests_integration.rs
@@ -21,7 +21,10 @@ mod test {
 
     use std::{collections::HashMap, str::FromStr, sync::Arc};
 
-    #[tokio::test]
+    #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+    wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_lbtc_lockup_and_btc_claim() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
@@ -94,7 +97,7 @@ mod test {
         assert_eq!(chain_swap.refund_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_lbtc_lockup_only() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
@@ -137,7 +140,7 @@ mod test {
         assert_eq!(chain_swap.refund_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_lbtc_lockup_and_refund() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
@@ -190,7 +193,7 @@ mod test {
         assert_eq!(chain_swap.claim_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_expired_swap() {
         // Setup mock data
         let (mut chain_swap, mut recovery_context) = setup_test_data();
@@ -234,7 +237,7 @@ mod test {
         assert_eq!(chain_swap.refund_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_no_transactions() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
@@ -256,7 +259,7 @@ mod test {
         assert_eq!(chain_swap.claim_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recovery_within_grace_period() {
         // Setup mock data
         let (mut chain_swap, recovery_context) = setup_test_data();
diff --git a/lib/core/src/recover/handlers/tests/handle_receive_swap_tests.rs b/lib/core/src/recover/handlers/tests/handle_receive_swap_tests.rs
index dfa7fa8..3d185e0 100644
--- a/lib/core/src/recover/handlers/tests/handle_receive_swap_tests.rs
+++ b/lib/core/src/recover/handlers/tests/handle_receive_swap_tests.rs
@@ -7,7 +7,10 @@ mod test {
         },
     };
 
-    #[test]
+    #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+    wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_and_claim() {
         // Test with confirmed claim
         let recovered_data = RecoveredOnchainDataReceive {
@@ -46,7 +49,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_only() {
         let recovered_data = RecoveredOnchainDataReceive {
             lockup_tx_id: Some(create_history_txid("1111", 100)),
@@ -68,7 +71,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_mrh_tx() {
         // Test with confirmed MRH tx
         let recovered_data = RecoveredOnchainDataReceive {
@@ -107,7 +110,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_no_txs() {
         let recovered_data = RecoveredOnchainDataReceive {
             lockup_tx_id: None,
diff --git a/lib/core/src/recover/handlers/tests/handle_receive_swap_tests_integration.rs b/lib/core/src/recover/handlers/tests/handle_receive_swap_tests_integration.rs
index 1ce014a..d60520c 100644
--- a/lib/core/src/recover/handlers/tests/handle_receive_swap_tests_integration.rs
+++ b/lib/core/src/recover/handlers/tests/handle_receive_swap_tests_integration.rs
@@ -15,7 +15,10 @@ mod test {
     use lwk_wollet::WalletTx;
     use std::{collections::HashMap, str::FromStr, sync::Arc};
 
-    #[tokio::test]
+    #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+    wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_claim_tx() {
         // Setup mock data
         let (mut receive_swap, recovery_context) = setup_test_data();
@@ -55,7 +58,7 @@ mod test {
         assert_eq!(receive_swap.lockup_tx_id, Some(lockup_tx_id.to_string()));
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_mrh_tx() {
         // Setup mock data
         let (mut receive_swap, recovery_context) = setup_test_data();
@@ -87,7 +90,7 @@ mod test {
         assert_eq!(receive_swap.mrh_tx_id, Some(mrh_tx_id.to_string()));
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_expired_swap() {
         // Setup mock data
         let (mut receive_swap, mut recovery_context) = setup_test_data();
@@ -110,7 +113,7 @@ mod test {
         assert_eq!(receive_swap.mrh_tx_id, None);
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_lockup_no_claim() {
         // Setup mock data
         let (mut receive_swap, recovery_context) = setup_test_data();
@@ -141,7 +144,7 @@ mod test {
         assert_eq!(receive_swap.lockup_tx_id, Some(lockup_tx_id.to_string()));
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_lockup_expired() {
         // Setup mock data
         let (mut receive_swap, mut recovery_context) = setup_test_data();
@@ -175,7 +178,7 @@ mod test {
         assert_eq!(receive_swap.lockup_tx_id, Some(lockup_tx_id.to_string()));
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_no_transactions() {
         // Setup mock data
         let (mut receive_swap, recovery_context) = setup_test_data();
@@ -195,7 +198,7 @@ mod test {
         assert_eq!(receive_swap.lockup_tx_id, None); // No lockup tx
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recovery_within_grace_period_claim() {
         // Setup mock data
         let (mut receive_swap, recovery_context) = setup_test_data();
@@ -220,7 +223,7 @@ mod test {
         );
     }
 
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_unconfirmed_tx() {
         // Setup mock data
         let (mut receive_swap, recovery_context) = setup_test_data();
diff --git a/lib/core/src/recover/handlers/tests/handle_send_swap_tests.rs b/lib/core/src/recover/handlers/tests/handle_send_swap_tests.rs
index bc706aa..4b85ec9 100644
--- a/lib/core/src/recover/handlers/tests/handle_send_swap_tests.rs
+++ b/lib/core/src/recover/handlers/tests/handle_send_swap_tests.rs
@@ -7,7 +7,10 @@ mod test {
         },
     };
 
-    #[test]
+    #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+    wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_and_claim() {
         let recovered_data = RecoveredOnchainDataSend {
             lockup_tx_id: Some(create_history_txid("1111", 100)),
@@ -27,7 +30,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_and_refund() {
         // Test with confirmed refund
         let recovered_data = RecoveredOnchainDataSend {
@@ -66,7 +69,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_only() {
         let recovered_data = RecoveredOnchainDataSend {
             lockup_tx_id: Some(create_history_txid("1111", 100)),
@@ -88,7 +91,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_no_txs() {
         let recovered_data = RecoveredOnchainDataSend {
             lockup_tx_id: None,
@@ -107,7 +110,7 @@ mod test {
         );
     }
 
-    #[test]
+    #[sdk_macros::test_all]
     fn test_derive_partial_state_with_lockup_claim_refund() {
         // This is an edge case where both claim and refund txs exist
         let recovered_data = RecoveredOnchainDataSend {
diff --git a/lib/core/src/recover/handlers/tests/handle_send_swap_tests_integration.rs b/lib/core/src/recover/handlers/tests/handle_send_swap_tests_integration.rs
index 882616d..594583a 100644
--- a/lib/core/src/recover/handlers/tests/handle_send_swap_tests_integration.rs
+++ b/lib/core/src/recover/handlers/tests/handle_send_swap_tests_integration.rs
@@ -15,8 +15,11 @@ mod test {
     use std::str::FromStr;
     use std::sync::Arc;
 
+    #[cfg(all(target_family = "wasm", target_os = "unknown"))]
+    wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
+
     /// Test recovery with a claim transaction and preimage
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_claim_tx_and_preimage() {
         // Setup mock data
         let (mut send_swap, recovery_context) = setup_test_data();
@@ -76,7 +79,7 @@ mod test {
     }
 
     /// Test recovery with a lockup and refund transaction
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_refund_tx() {
         // Setup mock data
         let (mut send_swap, recovery_context) = setup_test_data();
@@ -119,7 +122,7 @@ mod test {
     }
 
     /// Test recovery with only a lockup tx (not expired)
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_lockup_only() {
         // Setup mock data
         let (mut send_swap, recovery_context) = setup_test_data();
@@ -152,7 +155,7 @@ mod test {
     }
 
     /// Test recovery with only a lockup tx (expired)
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_lockup_expired() {
         // Setup mock data
         let (mut send_swap, mut recovery_context) = setup_test_data();
@@ -188,7 +191,7 @@ mod test {
     }
 
     /// Test recovery with unconfirmed refund tx
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_unconfirmed_refund() {
         // Setup mock data
         let (mut send_swap, recovery_context) = setup_test_data();
@@ -231,7 +234,7 @@ mod test {
     }
 
     /// Test recovery with no transactions
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recover_with_no_transactions() {
         // Setup mock data
         let (mut send_swap, recovery_context) = setup_test_data();
@@ -252,7 +255,7 @@ mod test {
     }
 
     /// Test recovery when swap is within grace period
-    #[tokio::test]
+    #[sdk_macros::async_test_all]
     async fn test_recovery_within_grace_period() {
         // Setup mock data
         let (mut send_swap, recovery_context) = setup_test_data();