diff --git a/blueprint-test-utils/src/mpc.rs b/blueprint-test-utils/src/mpc.rs
index 3613059c2..4b36765a3 100644
--- a/blueprint-test-utils/src/mpc.rs
+++ b/blueprint-test-utils/src/mpc.rs
@@ -5,10 +5,10 @@ macro_rules! mpc_generate_keygen_and_signing_tests {
         $N:tt,
         $T:tt,
         $keygen_job_id:tt,
-        [$($keygen_inputs:expr),+],
+        [$($keygen_inputs:expr),*],
         [$($expected_keygen_outputs:expr),*],
         $signing_job_id:tt,
-        [$($signing_inputs:expr),+],
+        [$($signing_inputs:expr),*],
         [$($expected_signing_outputs:expr),*],
         $atomic_keygen_call_id_store:expr,
     ) => {
@@ -24,13 +24,13 @@ macro_rules! mpc_generate_keygen_and_signing_tests {
                     "Submitting KEYGEN job {} with service ID {service_id}", $keygen_job_id
                 );
 
-                let job_args = vec![$($keygen_inputs),+];
+                let job_args = vec![$($keygen_inputs),*];
 
                 let job = submit_job(
                     client,
                     &keypair,
                     service_id,
-                    Job::from($keygen_job_id as u8),
+                    Job::from(0),
                     job_args,
                 )
                 .await
@@ -64,7 +64,7 @@ macro_rules! mpc_generate_keygen_and_signing_tests {
                 log::info!("Keygen job completed successfully! Moving on to signing ...");
 
                 // ~~~~~ Now, run a signing job ~~~~~
-                let service = &blueprint.services[$keygen_job_id as usize];
+                let service = &blueprint.services[0];
 
                 let service_id = service.id;
                 gadget_sdk::info!(
@@ -72,13 +72,13 @@ macro_rules! mpc_generate_keygen_and_signing_tests {
                 );
 
                 // Pass the arguments
-                let job_args = vec![$($signing_inputs),+];
+                let job_args = vec![$($signing_inputs),*];
 
                  let job = submit_job(
                     client,
                     &keypair,
                     service_id,
-                    Job::from($signing_job_id as u8),
+                    Job::from(0),
                     job_args,
                 )
                 .await
diff --git a/blueprint-test-utils/src/tangle/mod.rs b/blueprint-test-utils/src/tangle/mod.rs
index edf709472..8433a3a15 100644
--- a/blueprint-test-utils/src/tangle/mod.rs
+++ b/blueprint-test-utils/src/tangle/mod.rs
@@ -90,28 +90,28 @@ macro_rules! test_tangle_blueprint {
         $N:tt,
         $T:tt,
         $job_id:tt,
-        [$($inputs:expr),+],
-        [$($expected_output:expr),+]
+        [$($inputs:expr),*],
+        [$($expected_output:expr),*]
     ) => {
         tangle_blueprint_test_template!(
             $blueprint_path,
             $N,
             |client, handles, blueprint| async move {
                 let keypair = handles[0].sr25519_id().clone();
-                let selected_service = &blueprint.services[$job_id];
+                let selected_service = &blueprint.services[0];
                 let service_id = selected_service.id;
 
                 gadget_sdk::info!(
                     "Submitting job {} with service ID {service_id}", $job_id
                 );
 
-                let job_args = vec![$($inputs),+];
+                let job_args = vec![$($inputs),*];
 
                 let job = submit_job(
                     client,
                     &keypair,
                     service_id,
-                    Job::from($job_id as u8),
+                    Job::from(0),
                     job_args,
                 )
                 .await
@@ -130,7 +130,7 @@ macro_rules! test_tangle_blueprint {
                 assert_eq!(job_results.service_id, service_id);
                 assert_eq!(job_results.call_id, call_id);
 
-                let expected_outputs = vec![$($expected_output),+];
+                let expected_outputs = vec![$($expected_output),*];
                 if expected_outputs.is_empty() {
                     gadget_sdk::info!("No expected outputs specified, skipping verification");
                     return
@@ -148,8 +148,8 @@ macro_rules! test_tangle_blueprint {
         $blueprint_path:expr,
         $N:tt,
         $job_id:tt,
-        [$($input:expr),+],
-        [$($expected_output:expr),+]
+        [$($input:expr),*],
+        [$($expected_output:expr),*]
     ) => {
         test_tangle_blueprint!($blueprint_path, $N, $N, $job_id, [$($input),+], [$($expected_output),+]);
     };
diff --git a/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std b/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std
index 1de6eecf8..1eea5bae1 160000
--- a/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std
+++ b/blueprints/incredible-squaring-eigenlayer/contracts/lib/forge-std
@@ -1 +1 @@
-Subproject commit 1de6eecf821de7fe2c908cc48d3ab3dced20717f
+Subproject commit 1eea5bae12ae557d589f9f0f0edae2faa47cb262
diff --git a/blueprints/incredible-squaring/contracts/lib/forge-std b/blueprints/incredible-squaring/contracts/lib/forge-std
index 1de6eecf8..1eea5bae1 160000
--- a/blueprints/incredible-squaring/contracts/lib/forge-std
+++ b/blueprints/incredible-squaring/contracts/lib/forge-std
@@ -1 +1 @@
-Subproject commit 1de6eecf821de7fe2c908cc48d3ab3dced20717f
+Subproject commit 1eea5bae12ae557d589f9f0f0edae2faa47cb262