diff --git a/ci_scripts/test-ubuntu.sh b/ci_scripts/test-ubuntu.sh
index fd6d6a8..78761df 100755
--- a/ci_scripts/test-ubuntu.sh
+++ b/ci_scripts/test-ubuntu.sh
@@ -13,8 +13,6 @@ echo "Try test valid proof at least once"
 cargo run $(pwd)/configs/debug test_success_private_transfer_to_another_owned_account
 echo "Continuing in dev mode"
 RISC0_DEV_MODE=1 cargo run $(pwd)/configs/debug all
-echo "ToDo remove after Draft"
-cargo run $(pwd)/configs/debug test_pinata_private_receiver
 cd ..
 
 cd nssa/program_methods/guest && cargo test --release
diff --git a/integration_tests/src/lib.rs b/integration_tests/src/lib.rs
index 5149516..65e8574 100644
--- a/integration_tests/src/lib.rs
+++ b/integration_tests/src/lib.rs
@@ -964,6 +964,7 @@ pub async fn main_tests_runner() -> Result<()> {
                 test_success_private_transfer_to_another_owned_account_claiming_path
             );
             test_cleanup_wrap!(home_dir, test_pinata);
+            test_cleanup_wrap!(home_dir, test_pinata_private_receiver);
         }
         "all_private" => {
             test_cleanup_wrap!(
@@ -990,6 +991,7 @@ pub async fn main_tests_runner() -> Result<()> {
                 home_dir,
                 test_success_private_transfer_to_another_owned_account_claiming_path
             );
+            test_cleanup_wrap!(home_dir, test_pinata_private_receiver);
         }
         _ => {
             anyhow::bail!("Unknown test name");
diff --git a/wallet/src/lib.rs b/wallet/src/lib.rs
index 4c7b726..b65fc8a 100644
--- a/wallet/src/lib.rs
+++ b/wallet/src/lib.rs
@@ -130,7 +130,7 @@ impl WalletCore {
 
         let winner_commitment = Commitment::new(&winner_npk, &winner_acc);
 
-        let pinata_pre = AccountWithMetadata::new(pinata_acc, false, pinata_addr);
+        let pinata_pre = AccountWithMetadata::new(pinata_acc.clone(), false, pinata_addr);
         let winner_pre = AccountWithMetadata::new(winner_acc.clone(), true, &winner_npk);
 
         let eph_holder_winner = EphemeralKeyHolder::new(&winner_npk);
@@ -156,7 +156,7 @@ impl WalletCore {
 
         let message =
             nssa::privacy_preserving_transaction::message::Message::try_from_circuit_output(
-                vec![],
+                vec![pinata_addr],
                 vec![],
                 vec![(
                     winner_npk.clone(),