diff --git a/.gitignore b/.gitignore
index 8aec0edeadc..39f4fbe1266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,5 +20,5 @@ result
 *.vk
 **/Verifier.toml
 **/target
-!crates/nargo_cli/tests/test_data/*/target
-!crates/nargo_cli/tests/test_data/*/target/witness.tr
+!crates/nargo_cli/tests/execution_success/*/target
+!crates/nargo_cli/tests/execution_success/*/target/witness.tr
diff --git a/crates/nargo_cli/build.rs b/crates/nargo_cli/build.rs
index f3493148a7f..6d8dae136e2 100644
--- a/crates/nargo_cli/build.rs
+++ b/crates/nargo_cli/build.rs
@@ -1,5 +1,4 @@
 use rustc_version::{version, Version};
-use std::collections::BTreeMap;
 use std::fs::File;
 use std::io::Write;
 use std::path::{Path, PathBuf};
@@ -32,43 +31,25 @@ fn main() {
     let destination = Path::new(&out_dir).join("execute.rs");
     let mut test_file = File::create(destination).unwrap();
 
-    generate_tests(&mut test_file);
-}
-
-fn load_conf(conf_path: &Path) -> BTreeMap<String, Vec<String>> {
-    let config_str = std::fs::read_to_string(conf_path).unwrap();
-
-    let mut conf_data = match toml::from_str(&config_str) {
-        Ok(t) => t,
-        Err(_) => {
-            BTreeMap::from([("exclude".to_string(), Vec::new()), ("fail".to_string(), Vec::new())])
-        }
-    };
-    if conf_data.get("exclude").is_none() {
-        conf_data.insert("exclude".to_string(), Vec::new());
-    }
-    if conf_data.get("fail").is_none() {
-        conf_data.insert("fail".to_string(), Vec::new());
-    }
-    conf_data
-}
-
-fn generate_tests(test_file: &mut File) {
     // Try to find the directory that Cargo sets when it is running; otherwise fallback to assuming the CWD
     // is the root of the repository and append the crate path
     let manifest_dir = match std::env::var("CARGO_MANIFEST_DIR") {
         Ok(dir) => PathBuf::from(dir),
         Err(_) => std::env::current_dir().unwrap().join("crates").join("nargo_cli"),
     };
-    let test_sub_dir = "test_data";
-    let test_data_dir = manifest_dir.join("tests").join(test_sub_dir);
-    let config_path = test_data_dir.join("config.toml");
+    let test_dir = manifest_dir.join("tests");
+
+    generate_execution_success_tests(&mut test_file, &test_dir);
+    generate_compile_success_tests(&mut test_file, &test_dir);
+    generate_compile_failure_tests(&mut test_file, &test_dir);
+}
 
-    // Load config.toml file from `test_data` directory
-    let config_data: BTreeMap<String, Vec<String>> = load_conf(&config_path);
+fn generate_execution_success_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "execution_success";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
 
     let test_case_dirs =
-        fs::read_dir(&test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
 
     for test_dir in test_case_dirs {
         let test_name =
@@ -80,28 +61,93 @@ fn generate_tests(test_file: &mut File) {
         };
         let test_dir = &test_dir.path();
 
-        let exclude_macro =
-            if config_data["exclude"].contains(&test_name) { "#[ignore]" } else { "" };
+        write!(
+            test_file,
+            r#"
+#[test]
+fn execution_success_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
 
-        let should_fail = config_data["fail"].contains(&test_name);
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("execute");
+
+    cmd.assert().success();
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
+fn generate_compile_success_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "compile_success";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
+
+        write!(
+            test_file,
+            r#"
+#[test]
+fn compile_success_{test_name}() {{
+    let test_program_dir = PathBuf::from("{test_dir}");
+
+    let mut cmd = Command::cargo_bin("nargo").unwrap();
+    cmd.arg("--program-dir").arg(test_program_dir);
+    cmd.arg("info");
+
+    // `compile_success` tests should be able to compile down to an empty circuit.
+    cmd.assert().stdout(predicate::str::contains("Total ACIR opcodes generated for language PLONKCSat {{ width: 3 }}: 0"));
+}}
+            "#,
+            test_dir = test_dir.display(),
+        )
+        .expect("Could not write templated test file.");
+    }
+}
+
+fn generate_compile_failure_tests(test_file: &mut File, test_data_dir: &Path) {
+    let test_sub_dir = "compile_failure";
+    let test_data_dir = test_data_dir.join(test_sub_dir);
+
+    let test_case_dirs =
+        fs::read_dir(test_data_dir).unwrap().flatten().filter(|c| c.path().is_dir());
+
+    for test_dir in test_case_dirs {
+        let test_name =
+            test_dir.file_name().into_string().expect("Directory can't be converted to string");
+        if test_name.contains('-') {
+            panic!(
+                "Invalid test directory: {test_name}. Cannot include `-`, please convert to `_`"
+            );
+        };
+        let test_dir = &test_dir.path();
 
         write!(
             test_file,
             r#"
-{exclude_macro}
 #[test]
-fn execute_{test_sub_dir}_{test_name}() {{
+fn compile_failure_{test_name}() {{
     let test_program_dir = PathBuf::from("{test_dir}");
 
     let mut cmd = Command::cargo_bin("nargo").unwrap();
     cmd.arg("--program-dir").arg(test_program_dir);
     cmd.arg("execute");
 
-    if {should_fail} {{
-        cmd.assert().failure();
-    }} else {{
-        cmd.assert().success();
-    }}
+    cmd.assert().failure();
 }}
             "#,
             test_dir = test_dir.display(),
diff --git a/crates/nargo_cli/tests/test_data/brillig_assert_fail/Nargo.toml b/crates/nargo_cli/tests/compile_failure/brillig_assert_fail/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_assert_fail/Nargo.toml
rename to crates/nargo_cli/tests/compile_failure/brillig_assert_fail/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/Prover.toml b/crates/nargo_cli/tests/compile_failure/brillig_assert_fail/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/Prover.toml
rename to crates/nargo_cli/tests/compile_failure/brillig_assert_fail/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_assert/src/main.nr b/crates/nargo_cli/tests/compile_failure/brillig_assert_fail/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_assert/src/main.nr
rename to crates/nargo_cli/tests/compile_failure/brillig_assert_fail/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/custom_entry_not_found/Nargo.toml b/crates/nargo_cli/tests/compile_failure/custom_entry_not_found/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/custom_entry_not_found/Nargo.toml
rename to crates/nargo_cli/tests/compile_failure/custom_entry_not_found/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/assert/Prover.toml b/crates/nargo_cli/tests/compile_failure/custom_entry_not_found/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert/Prover.toml
rename to crates/nargo_cli/tests/compile_failure/custom_entry_not_found/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/assert/src/main.nr b/crates/nargo_cli/tests/compile_failure/custom_entry_not_found/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert/src/main.nr
rename to crates/nargo_cli/tests/compile_failure/custom_entry_not_found/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/dep_impl_primitive/Nargo.toml b/crates/nargo_cli/tests/compile_failure/dep_impl_primitive/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/dep_impl_primitive/Nargo.toml
rename to crates/nargo_cli/tests/compile_failure/dep_impl_primitive/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/dep_impl_primitive/Prover.toml b/crates/nargo_cli/tests/compile_failure/dep_impl_primitive/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/dep_impl_primitive/Prover.toml
rename to crates/nargo_cli/tests/compile_failure/dep_impl_primitive/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/dep_impl_primitive/src/main.nr b/crates/nargo_cli/tests/compile_failure/dep_impl_primitive/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/dep_impl_primitive/src/main.nr
rename to crates/nargo_cli/tests/compile_failure/dep_impl_primitive/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/depend_on_bin/Nargo.toml b/crates/nargo_cli/tests/compile_failure/depend_on_bin/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/depend_on_bin/Nargo.toml
rename to crates/nargo_cli/tests/compile_failure/depend_on_bin/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/depend_on_bin/Prover.toml b/crates/nargo_cli/tests/compile_failure/depend_on_bin/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/depend_on_bin/Prover.toml
rename to crates/nargo_cli/tests/compile_failure/depend_on_bin/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/depend_on_bin/src/main.nr b/crates/nargo_cli/tests/compile_failure/depend_on_bin/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/depend_on_bin/src/main.nr
rename to crates/nargo_cli/tests/compile_failure/depend_on_bin/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/workspace/Nargo.toml b/crates/nargo_cli/tests/compile_failure/workspace_fail/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace/Nargo.toml
rename to crates/nargo_cli/tests/compile_failure/workspace_fail/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace/crates/a/Nargo.toml b/crates/nargo_cli/tests/compile_failure/workspace_fail/crates/a/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace/crates/a/Nargo.toml
rename to crates/nargo_cli/tests/compile_failure/workspace_fail/crates/a/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_fail/crates/a/Prover.toml b/crates/nargo_cli/tests/compile_failure/workspace_fail/crates/a/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_fail/crates/a/Prover.toml
rename to crates/nargo_cli/tests/compile_failure/workspace_fail/crates/a/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace/crates/a/src/main.nr b/crates/nargo_cli/tests/compile_failure/workspace_fail/crates/a/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace/crates/a/src/main.nr
rename to crates/nargo_cli/tests/compile_failure/workspace_fail/crates/a/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/workspace/crates/b/Nargo.toml b/crates/nargo_cli/tests/compile_failure/workspace_fail/crates/b/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace/crates/b/Nargo.toml
rename to crates/nargo_cli/tests/compile_failure/workspace_fail/crates/b/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/bool_or/Prover.toml b/crates/nargo_cli/tests/compile_failure/workspace_fail/crates/b/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_or/Prover.toml
rename to crates/nargo_cli/tests/compile_failure/workspace_fail/crates/b/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace/crates/b/src/main.nr b/crates/nargo_cli/tests/compile_failure/workspace_fail/crates/b/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace/crates/b/src/main.nr
rename to crates/nargo_cli/tests/compile_failure/workspace_fail/crates/b/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/workspace_fail/Nargo.toml b/crates/nargo_cli/tests/compile_failure/workspace_missing_toml/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_fail/Nargo.toml
rename to crates/nargo_cli/tests/compile_failure/workspace_missing_toml/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/pred_eq/Prover.toml b/crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/a/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pred_eq/Prover.toml
rename to crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/a/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/a/src/main.nr b/crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/a/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/a/src/main.nr
rename to crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/a/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/b/Nargo.toml b/crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/b/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/b/Nargo.toml
rename to crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/b/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_not/Prover.toml b/crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/b/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_not/Prover.toml
rename to crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/b/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/b/src/main.nr b/crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/b/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/b/src/main.nr
rename to crates/nargo_cli/tests/compile_failure/workspace_missing_toml/crates/b/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/ec_baby_jubjub/Nargo.toml b/crates/nargo_cli/tests/compile_success/ec_baby_jubjub/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ec_baby_jubjub/Nargo.toml
rename to crates/nargo_cli/tests/compile_success/ec_baby_jubjub/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/ec_baby_jubjub/src/main.nr b/crates/nargo_cli/tests/compile_success/ec_baby_jubjub/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ec_baby_jubjub/src/main.nr
rename to crates/nargo_cli/tests/compile_success/ec_baby_jubjub/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/higher_order_fn_selector/Nargo.toml b/crates/nargo_cli/tests/compile_success/higher_order_fn_selector/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/higher_order_fn_selector/Nargo.toml
rename to crates/nargo_cli/tests/compile_success/higher_order_fn_selector/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/higher_order_fn_selector/src/main.nr b/crates/nargo_cli/tests/compile_success/higher_order_fn_selector/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/higher_order_fn_selector/src/main.nr
rename to crates/nargo_cli/tests/compile_success/higher_order_fn_selector/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/inner_outer_cl/Nargo.toml b/crates/nargo_cli/tests/compile_success/inner_outer_cl/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/inner_outer_cl/Nargo.toml
rename to crates/nargo_cli/tests/compile_success/inner_outer_cl/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/inner_outer_cl/src/main.nr b/crates/nargo_cli/tests/compile_success/inner_outer_cl/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/inner_outer_cl/src/main.nr
rename to crates/nargo_cli/tests/compile_success/inner_outer_cl/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/let_stmt/Nargo.toml b/crates/nargo_cli/tests/compile_success/let_stmt/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/let_stmt/Nargo.toml
rename to crates/nargo_cli/tests/compile_success/let_stmt/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_cast/Prover.toml b/crates/nargo_cli/tests/compile_success/let_stmt/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_cast/Prover.toml
rename to crates/nargo_cli/tests/compile_success/let_stmt/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/let_stmt/src/main.nr b/crates/nargo_cli/tests/compile_success/let_stmt/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/let_stmt/src/main.nr
rename to crates/nargo_cli/tests/compile_success/let_stmt/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/numeric_generics/Nargo.toml b/crates/nargo_cli/tests/compile_success/numeric_generics/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/numeric_generics/Nargo.toml
rename to crates/nargo_cli/tests/compile_success/numeric_generics/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_field_binary_operations/Prover.toml b/crates/nargo_cli/tests/compile_success/numeric_generics/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_field_binary_operations/Prover.toml
rename to crates/nargo_cli/tests/compile_success/numeric_generics/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/numeric_generics/src/main.nr b/crates/nargo_cli/tests/compile_success/numeric_generics/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/numeric_generics/src/main.nr
rename to crates/nargo_cli/tests/compile_success/numeric_generics/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/option/Nargo.toml b/crates/nargo_cli/tests/compile_success/option/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/option/Nargo.toml
rename to crates/nargo_cli/tests/compile_success/option/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/option/src/main.nr b/crates/nargo_cli/tests/compile_success/option/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/option/src/main.nr
rename to crates/nargo_cli/tests/compile_success/option/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/to_bits/Nargo.toml b/crates/nargo_cli/tests/compile_success/to_bits/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_bits/Nargo.toml
rename to crates/nargo_cli/tests/compile_success/to_bits/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/to_bits/src/main.nr b/crates/nargo_cli/tests/compile_success/to_bits/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_bits/src/main.nr
rename to crates/nargo_cli/tests/compile_success/to_bits/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/unit/Nargo.toml b/crates/nargo_cli/tests/compile_success/unit/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/unit/Nargo.toml
rename to crates/nargo_cli/tests/compile_success/unit/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/unit/src/main.nr b/crates/nargo_cli/tests/compile_success/unit/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/unit/src/main.nr
rename to crates/nargo_cli/tests/compile_success/unit/src/main.nr
diff --git a/crates/nargo_cli/tests/execute.rs b/crates/nargo_cli/tests/execute.rs
index f0ada378698..e53ad068c01 100644
--- a/crates/nargo_cli/tests/execute.rs
+++ b/crates/nargo_cli/tests/execute.rs
@@ -3,6 +3,7 @@
 mod tests {
     // Some of these imports are consumed by the injected tests
     use assert_cmd::prelude::*;
+    use predicates::prelude::*;
     use tempdir::TempDir;
 
     use std::collections::BTreeMap;
diff --git a/crates/nargo_cli/tests/test_data/1327_concrete_in_generic/Nargo.toml b/crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1327_concrete_in_generic/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/1327_concrete_in_generic/Prover.toml b/crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1327_concrete_in_generic/Prover.toml
rename to crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/1327_concrete_in_generic/src/main.nr b/crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1327_concrete_in_generic/src/main.nr
rename to crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/1327_concrete_in_generic/target/1327_concrete_in_generic.json b/crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/target/1327_concrete_in_generic.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1327_concrete_in_generic/target/1327_concrete_in_generic.json
rename to crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/target/1327_concrete_in_generic.json
diff --git a/crates/nargo_cli/tests/test_data/1327_concrete_in_generic/target/witness.tr b/crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1327_concrete_in_generic/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/1327_concrete_in_generic/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/1_mul/Nargo.toml b/crates/nargo_cli/tests/execution_success/1_mul/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1_mul/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/1_mul/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/1_mul/Prover.toml b/crates/nargo_cli/tests/execution_success/1_mul/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1_mul/Prover.toml
rename to crates/nargo_cli/tests/execution_success/1_mul/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/1_mul/src/main.nr b/crates/nargo_cli/tests/execution_success/1_mul/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1_mul/src/main.nr
rename to crates/nargo_cli/tests/execution_success/1_mul/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/1_mul/target/1_mul.json b/crates/nargo_cli/tests/execution_success/1_mul/target/1_mul.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1_mul/target/1_mul.json
rename to crates/nargo_cli/tests/execution_success/1_mul/target/1_mul.json
diff --git a/crates/nargo_cli/tests/test_data/1_mul/target/witness.tr b/crates/nargo_cli/tests/execution_success/1_mul/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/1_mul/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/1_mul/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/2_div/Nargo.toml b/crates/nargo_cli/tests/execution_success/2_div/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/2_div/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/2_div/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/2_div/Prover.toml b/crates/nargo_cli/tests/execution_success/2_div/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/2_div/Prover.toml
rename to crates/nargo_cli/tests/execution_success/2_div/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/2_div/src/main.nr b/crates/nargo_cli/tests/execution_success/2_div/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/2_div/src/main.nr
rename to crates/nargo_cli/tests/execution_success/2_div/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/2_div/target/2_div.json b/crates/nargo_cli/tests/execution_success/2_div/target/2_div.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/2_div/target/2_div.json
rename to crates/nargo_cli/tests/execution_success/2_div/target/2_div.json
diff --git a/crates/nargo_cli/tests/test_data/2_div/target/witness.tr b/crates/nargo_cli/tests/execution_success/2_div/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/2_div/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/2_div/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/3_add/Nargo.toml b/crates/nargo_cli/tests/execution_success/3_add/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/3_add/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/3_add/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/3_add/Prover.toml b/crates/nargo_cli/tests/execution_success/3_add/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/3_add/Prover.toml
rename to crates/nargo_cli/tests/execution_success/3_add/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/3_add/src/main.nr b/crates/nargo_cli/tests/execution_success/3_add/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/3_add/src/main.nr
rename to crates/nargo_cli/tests/execution_success/3_add/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/3_add/target/3_add.json b/crates/nargo_cli/tests/execution_success/3_add/target/3_add.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/3_add/target/3_add.json
rename to crates/nargo_cli/tests/execution_success/3_add/target/3_add.json
diff --git a/crates/nargo_cli/tests/test_data/3_add/target/witness.tr b/crates/nargo_cli/tests/execution_success/3_add/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/3_add/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/3_add/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/4_sub/Nargo.toml b/crates/nargo_cli/tests/execution_success/4_sub/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/4_sub/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/4_sub/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/4_sub/Prover.toml b/crates/nargo_cli/tests/execution_success/4_sub/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/4_sub/Prover.toml
rename to crates/nargo_cli/tests/execution_success/4_sub/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/4_sub/src/main.nr b/crates/nargo_cli/tests/execution_success/4_sub/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/4_sub/src/main.nr
rename to crates/nargo_cli/tests/execution_success/4_sub/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/4_sub/target/4_sub.json b/crates/nargo_cli/tests/execution_success/4_sub/target/4_sub.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/4_sub/target/4_sub.json
rename to crates/nargo_cli/tests/execution_success/4_sub/target/4_sub.json
diff --git a/crates/nargo_cli/tests/test_data/4_sub/target/witness.tr b/crates/nargo_cli/tests/execution_success/4_sub/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/4_sub/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/4_sub/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/5_over/Nargo.toml b/crates/nargo_cli/tests/execution_success/5_over/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/5_over/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/5_over/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/5_over/Prover.toml b/crates/nargo_cli/tests/execution_success/5_over/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/5_over/Prover.toml
rename to crates/nargo_cli/tests/execution_success/5_over/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/5_over/src/main.nr b/crates/nargo_cli/tests/execution_success/5_over/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/5_over/src/main.nr
rename to crates/nargo_cli/tests/execution_success/5_over/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/5_over/target/5_over.json b/crates/nargo_cli/tests/execution_success/5_over/target/5_over.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/5_over/target/5_over.json
rename to crates/nargo_cli/tests/execution_success/5_over/target/5_over.json
diff --git a/crates/nargo_cli/tests/test_data/5_over/target/witness.tr b/crates/nargo_cli/tests/execution_success/5_over/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/5_over/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/5_over/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/6/Nargo.toml b/crates/nargo_cli/tests/execution_success/6/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/6/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/6/Prover.toml b/crates/nargo_cli/tests/execution_success/6/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6/Prover.toml
rename to crates/nargo_cli/tests/execution_success/6/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/6/src/main.nr b/crates/nargo_cli/tests/execution_success/6/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6/src/main.nr
rename to crates/nargo_cli/tests/execution_success/6/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/6/target/6.json b/crates/nargo_cli/tests/execution_success/6/target/6.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6/target/6.json
rename to crates/nargo_cli/tests/execution_success/6/target/6.json
diff --git a/crates/nargo_cli/tests/test_data/6/target/witness.tr b/crates/nargo_cli/tests/execution_success/6/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/6/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/6_array/Nargo.toml b/crates/nargo_cli/tests/execution_success/6_array/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6_array/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/6_array/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/6_array/Prover.toml b/crates/nargo_cli/tests/execution_success/6_array/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6_array/Prover.toml
rename to crates/nargo_cli/tests/execution_success/6_array/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/6_array/src/main.nr b/crates/nargo_cli/tests/execution_success/6_array/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6_array/src/main.nr
rename to crates/nargo_cli/tests/execution_success/6_array/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/6_array/target/6_array.json b/crates/nargo_cli/tests/execution_success/6_array/target/6_array.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6_array/target/6_array.json
rename to crates/nargo_cli/tests/execution_success/6_array/target/6_array.json
diff --git a/crates/nargo_cli/tests/test_data/6_array/target/witness.tr b/crates/nargo_cli/tests/execution_success/6_array/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/6_array/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/6_array/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/7/Nargo.toml b/crates/nargo_cli/tests/execution_success/7/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/7/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/7/Prover.toml b/crates/nargo_cli/tests/execution_success/7/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7/Prover.toml
rename to crates/nargo_cli/tests/execution_success/7/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/7/src/main.nr b/crates/nargo_cli/tests/execution_success/7/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7/src/main.nr
rename to crates/nargo_cli/tests/execution_success/7/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/7/target/7.json b/crates/nargo_cli/tests/execution_success/7/target/7.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7/target/7.json
rename to crates/nargo_cli/tests/execution_success/7/target/7.json
diff --git a/crates/nargo_cli/tests/test_data/7/target/witness.tr b/crates/nargo_cli/tests/execution_success/7/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/7/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/7_function/Nargo.toml b/crates/nargo_cli/tests/execution_success/7_function/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7_function/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/7_function/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/7_function/Prover.toml b/crates/nargo_cli/tests/execution_success/7_function/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7_function/Prover.toml
rename to crates/nargo_cli/tests/execution_success/7_function/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/7_function/src/main.nr b/crates/nargo_cli/tests/execution_success/7_function/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7_function/src/main.nr
rename to crates/nargo_cli/tests/execution_success/7_function/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/7_function/target/7_function.json b/crates/nargo_cli/tests/execution_success/7_function/target/7_function.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7_function/target/7_function.json
rename to crates/nargo_cli/tests/execution_success/7_function/target/7_function.json
diff --git a/crates/nargo_cli/tests/test_data/7_function/target/witness.tr b/crates/nargo_cli/tests/execution_success/7_function/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/7_function/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/7_function/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/8_integration/Nargo.toml b/crates/nargo_cli/tests/execution_success/8_integration/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/8_integration/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/8_integration/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/8_integration/Prover.toml b/crates/nargo_cli/tests/execution_success/8_integration/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/8_integration/Prover.toml
rename to crates/nargo_cli/tests/execution_success/8_integration/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/8_integration/src/main.nr b/crates/nargo_cli/tests/execution_success/8_integration/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/8_integration/src/main.nr
rename to crates/nargo_cli/tests/execution_success/8_integration/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/8_integration/target/8_integration.json b/crates/nargo_cli/tests/execution_success/8_integration/target/8_integration.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/8_integration/target/8_integration.json
rename to crates/nargo_cli/tests/execution_success/8_integration/target/8_integration.json
diff --git a/crates/nargo_cli/tests/test_data/8_integration/target/witness.tr b/crates/nargo_cli/tests/execution_success/8_integration/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/8_integration/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/8_integration/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/9_conditional/Nargo.toml b/crates/nargo_cli/tests/execution_success/9_conditional/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/9_conditional/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/9_conditional/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/9_conditional/Prover.toml b/crates/nargo_cli/tests/execution_success/9_conditional/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/9_conditional/Prover.toml
rename to crates/nargo_cli/tests/execution_success/9_conditional/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/9_conditional/src/main.nr b/crates/nargo_cli/tests/execution_success/9_conditional/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/9_conditional/src/main.nr
rename to crates/nargo_cli/tests/execution_success/9_conditional/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/9_conditional/target/9_conditional.json b/crates/nargo_cli/tests/execution_success/9_conditional/target/9_conditional.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/9_conditional/target/9_conditional.json
rename to crates/nargo_cli/tests/execution_success/9_conditional/target/9_conditional.json
diff --git a/crates/nargo_cli/tests/test_data/9_conditional/target/witness.tr b/crates/nargo_cli/tests/execution_success/9_conditional/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/9_conditional/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/9_conditional/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/arithmetic_binary_operations/Nargo.toml b/crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/arithmetic_binary_operations/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/arithmetic_binary_operations/Prover.toml b/crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/arithmetic_binary_operations/Prover.toml
rename to crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/arithmetic_binary_operations/src/main.nr b/crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/arithmetic_binary_operations/src/main.nr
rename to crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/arithmetic_binary_operations/target/arithmetic_binary_operations.json b/crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/target/arithmetic_binary_operations.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/arithmetic_binary_operations/target/arithmetic_binary_operations.json
rename to crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/target/arithmetic_binary_operations.json
diff --git a/crates/nargo_cli/tests/test_data/arithmetic_binary_operations/target/witness.tr b/crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/arithmetic_binary_operations/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/arithmetic_binary_operations/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/array_dynamic/Nargo.toml b/crates/nargo_cli/tests/execution_success/array_dynamic/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_dynamic/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/array_dynamic/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/array_dynamic/Prover.toml b/crates/nargo_cli/tests/execution_success/array_dynamic/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_dynamic/Prover.toml
rename to crates/nargo_cli/tests/execution_success/array_dynamic/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/array_dynamic/src/main.nr b/crates/nargo_cli/tests/execution_success/array_dynamic/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_dynamic/src/main.nr
rename to crates/nargo_cli/tests/execution_success/array_dynamic/src/main.nr
diff --git a/crates/nargo_cli/tests/execution_success/array_dynamic/target/array_dynamic.json b/crates/nargo_cli/tests/execution_success/array_dynamic/target/array_dynamic.json
new file mode 100644
index 00000000000..23fd96f294a
--- /dev/null
+++ b/crates/nargo_cli/tests/execution_success/array_dynamic/target/array_dynamic.json
@@ -0,0 +1 @@
+{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"array","length":5,"type":{"kind":"integer","sign":"unsigned","width":32}},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"t","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"index","type":{"kind":"array","length":5,"type":{"kind":"field"}},"visibility":"private"},{"name":"index2","type":{"kind":"array","length":5,"type":{"kind":"field"}},"visibility":"private"},{"name":"offset","type":{"kind":"field"},"visibility":"private"},{"name":"sublen","type":{"kind":"field"},"visibility":"private"}],"param_witnesses":{"index":[8,9,10,11,12],"index2":[13,14,15,16,17],"offset":[18],"sublen":[19],"t":[7],"x":[1,2,3,4,5],"z":[6]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/+1d6XITRxBuS7LBHAZibOxwbUziAAG8q8OWCAkYCDnIfd8BgWRsCAFCpUIVyQ/yFnm4vArZxrNidr0yRc3XU9vFTtXUHpZ7vj7m69lxa/0PEf1L620k7hVzDKzrSua6mrmuZa5HzfWokTuakV81vzNq3RvLyNhiyRixZGyN+3jct8V9e9x3mJ9VrM/sjPtE3HfFfXfc95gxq7SxjZjjOXMM3VprC05WmAPXVXYkKHswRsWSudccp6x74+aYxBa3McsfiZ84RpZpo69GrPOK+Ux1k8+MDJEzbt1Lfn/CwkI4m4RjBI+1cMKSiQYcJRORHRjQ04k5Za4px3igsVOTqBEuNpu9pXovakRXw3qn226FzVZ3sR21o1a7db3ebjR67WZ7qdPtLIWdqNnoRf1Wp943eux1l9UwssIpnI7hMEKqgP04Viz9JQnIO7lNm+M+697zkNuc9XvDyG2Onk1ueXJKchveBuQ2bRmTr9mRQWZMMLmJTUhXWX/gdAw3s58roU8Ddd4H9CvAfgMC87RajRD699dbNweuOkKfMcdZ615J6BiZXgh9htKEzo4MMmOiCd2eRK7kNkM4cpsl3OSuUX5zlZ+0RB6a4Gap+BhfFsDIrSKI0zU29wNk9Z6EZqdepRxiEfDTfpys0MZ7wDqvZXzHLeErAVKOKDNO1o6ipC3lpAMCcg8SLvil9D6I91GKUIpu06ShiW8WiPMQoYiv39OalA8pwHiYSEVSPgyMzQAWm51rvpJyQDJJ+RXrvEzKjjIDY1C03DkqdlJmvefwPhJNymibJq3ISfkI4ZLyZr5xxfkqzn6h8OIhkorPI1T8xYMiP73QOy+vCWDkVhHE6coh84TiOn87L/Mks8h73TovF3mOMueNQdFyj1KxF3ms91G8j0QXeWibDsPpKvsYUGetifSYAozHgRh9JRUkZhvvG9Z5mVQcZR43BkXLPUHFTiqs9wm8j0STCtKmvgpgJJ5SCOc37wUwJ83xlHXveQpgHtNGX2ULYB7Tswtg8uSUBTDD26AAhh34Hz0tgGFHBpkx0QUwgK24QQHMScKRyCnCrkp8EBICsynaWcyBq46QFhKZ1r2yIg8j0wshLVC6Io8dGWTGRBOSPYlcCWmBcIQUEm5yl/vCchgj0pc4EJj7OX/DAsWV98RRN8eGda9MHBiZXhJHndKJgx0ZZMZEJw57ErkmjjrhEkeDZCY3er+2ifOF2j98Im0ghbElgFEinhaBOmuNp0UFGJdIRzy1cTjrWuOprQBjh3TE02kczobWeDqtAOObpCOezuBwNrXG0xkFGN8CYuS3FvFzTPL2Il6bcT5lDuS45bFqlL+JgNJHyk4aNnsapIMb3gbi1Fr8qyGekH4iwXg6S9hcI8hPYr46qwDjOdIRT8vgeCKF8bSsAON5komnCjiekH94u0DY3Ib2Cet6nvBz8k+wryW47YKA3g9IJsarYJwXgbYE+jp6ANDRfEmk6aueF2jLVD3vO9Z5Wc/rKPOiMSha7iXCTUopvS/hfSRaz4u26TCcrrLfhemcLplD43wPhrPTl8T5PgxnXdTvH8BwdkVxXobhDNu8SZi8Op0bxz7HFfuM7XHZ/DzvAQqEQezBZKsCjB8KYJSIuY9IByd+TDo48RPSwYmfkg5O/IywnJh0bhz7HFfsM7YHj2Vzpt1AGMT4ZlwBxs8FMErE3BekgxO/JB2c+BXp4MSvSQcnfkNYTuQNiYTzOPY5rthnbA8eq0bpimPK6BM6tmF2Ct1atE0Bxm8FMErE3HekgxO/Jx2c+APp4MQfSQcn/kRYTuT/LJRwIsc+xxX7jO3BY9XMZ7INhEGMb7YrwPizAEaJmPuFdHDiFdLBiVdJByd2SQcnXiMsJ/K+W8KJHPtX4s4+Y3vwWDXzmWwDYRDjmx0KMF4XwMgN/cU44L5nar/AdS48VGI/4PNAKo+62u8vJfYDzpPoIdB+f3uynyvOHtB+wJiJkPbzVWgCtGWq0MRehJWFJo4ye8agaLkrVOxCE9Z7Be8j0QXtCmFJwMfrNiaFbAvym/fXbdwwx1XrXvniOIxML6/bYAfaL45jRwaZMdGrOnsSub5u4wbhCGmV/BNSATAnpNHIgauOkNbM8aZ1r3z/D0amF0Jao/T7f9iRQWZM9GPSKuEIaQ2I6ybJTO4K2HcvAXW+hcP15N0KeY+GIPli24O3FGD8VQAjN/Tc3i2ksyuu24RdbPjYAkFitvH+Zp2XWyCOMm8bg6Ll3qFib4Gw3nfwPhL9sitysXC34HHJvrlL+CegR+QnEYVuDbowvAfE9QiIy1ciAuqfSkS/W+dlInKUec8YFC33PhU7EbHe9/E+Ev3SJ9KmkxZGnjwczMkXMXjicKEdF5bwdggX9XIRGxdt7KT1IN8Vd16174k7P1lO0sb2P98kYSDAlAAA","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/execution_success/array_dynamic/target/witness.tr b/crates/nargo_cli/tests/execution_success/array_dynamic/target/witness.tr
new file mode 100644
index 00000000000..e2ef1e6b213
Binary files /dev/null and b/crates/nargo_cli/tests/execution_success/array_dynamic/target/witness.tr differ
diff --git a/crates/nargo_cli/tests/test_data/array_len/Nargo.toml b/crates/nargo_cli/tests/execution_success/array_len/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_len/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/array_len/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/array_len/Prover.toml b/crates/nargo_cli/tests/execution_success/array_len/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_len/Prover.toml
rename to crates/nargo_cli/tests/execution_success/array_len/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/array_len/src/main.nr b/crates/nargo_cli/tests/execution_success/array_len/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_len/src/main.nr
rename to crates/nargo_cli/tests/execution_success/array_len/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/array_len/target/array_len.json b/crates/nargo_cli/tests/execution_success/array_len/target/array_len.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_len/target/array_len.json
rename to crates/nargo_cli/tests/execution_success/array_len/target/array_len.json
diff --git a/crates/nargo_cli/tests/test_data/array_len/target/witness.tr b/crates/nargo_cli/tests/execution_success/array_len/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_len/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/array_len/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/array_neq/Nargo.toml b/crates/nargo_cli/tests/execution_success/array_neq/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_neq/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/array_neq/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/array_neq/Prover.toml b/crates/nargo_cli/tests/execution_success/array_neq/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_neq/Prover.toml
rename to crates/nargo_cli/tests/execution_success/array_neq/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/array_neq/src/main.nr b/crates/nargo_cli/tests/execution_success/array_neq/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_neq/src/main.nr
rename to crates/nargo_cli/tests/execution_success/array_neq/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/array_neq/target/array_neq.json b/crates/nargo_cli/tests/execution_success/array_neq/target/array_neq.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_neq/target/array_neq.json
rename to crates/nargo_cli/tests/execution_success/array_neq/target/array_neq.json
diff --git a/crates/nargo_cli/tests/test_data/array_neq/target/witness.tr b/crates/nargo_cli/tests/execution_success/array_neq/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_neq/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/array_neq/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/array_sort/Nargo.toml b/crates/nargo_cli/tests/execution_success/array_sort/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_sort/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/array_sort/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/array_sort/Prover.toml b/crates/nargo_cli/tests/execution_success/array_sort/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_sort/Prover.toml
rename to crates/nargo_cli/tests/execution_success/array_sort/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/array_sort/src/main.nr b/crates/nargo_cli/tests/execution_success/array_sort/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_sort/src/main.nr
rename to crates/nargo_cli/tests/execution_success/array_sort/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/array_sort/target/array_sort.json b/crates/nargo_cli/tests/execution_success/array_sort/target/array_sort.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_sort/target/array_sort.json
rename to crates/nargo_cli/tests/execution_success/array_sort/target/array_sort.json
diff --git a/crates/nargo_cli/tests/test_data/array_sort/target/witness.tr b/crates/nargo_cli/tests/execution_success/array_sort/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/array_sort/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/array_sort/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/assert/Nargo.toml b/crates/nargo_cli/tests/execution_success/assert/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/assert/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/bool_not/Prover.toml b/crates/nargo_cli/tests/execution_success/assert/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_not/Prover.toml
rename to crates/nargo_cli/tests/execution_success/assert/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/custom_entry_not_found/src/main.nr b/crates/nargo_cli/tests/execution_success/assert/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/custom_entry_not_found/src/main.nr
rename to crates/nargo_cli/tests/execution_success/assert/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/assert/target/assert.json b/crates/nargo_cli/tests/execution_success/assert/target/assert.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert/target/assert.json
rename to crates/nargo_cli/tests/execution_success/assert/target/assert.json
diff --git a/crates/nargo_cli/tests/test_data/assert/target/witness.tr b/crates/nargo_cli/tests/execution_success/assert/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/assert/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/assert_statement/Nargo.toml b/crates/nargo_cli/tests/execution_success/assert_statement/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert_statement/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/assert_statement/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/assert_statement/Prover.toml b/crates/nargo_cli/tests/execution_success/assert_statement/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert_statement/Prover.toml
rename to crates/nargo_cli/tests/execution_success/assert_statement/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/assert_statement/src/main.nr b/crates/nargo_cli/tests/execution_success/assert_statement/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert_statement/src/main.nr
rename to crates/nargo_cli/tests/execution_success/assert_statement/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/assert_statement/target/assert_statement.json b/crates/nargo_cli/tests/execution_success/assert_statement/target/assert_statement.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert_statement/target/assert_statement.json
rename to crates/nargo_cli/tests/execution_success/assert_statement/target/assert_statement.json
diff --git a/crates/nargo_cli/tests/test_data/assert_statement/target/witness.tr b/crates/nargo_cli/tests/execution_success/assert_statement/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assert_statement/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/assert_statement/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/assign_ex/Nargo.toml b/crates/nargo_cli/tests/execution_success/assign_ex/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assign_ex/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/assign_ex/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/assign_ex/Prover.toml b/crates/nargo_cli/tests/execution_success/assign_ex/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assign_ex/Prover.toml
rename to crates/nargo_cli/tests/execution_success/assign_ex/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/assign_ex/src/main.nr b/crates/nargo_cli/tests/execution_success/assign_ex/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assign_ex/src/main.nr
rename to crates/nargo_cli/tests/execution_success/assign_ex/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/assign_ex/target/assign_ex.json b/crates/nargo_cli/tests/execution_success/assign_ex/target/assign_ex.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assign_ex/target/assign_ex.json
rename to crates/nargo_cli/tests/execution_success/assign_ex/target/assign_ex.json
diff --git a/crates/nargo_cli/tests/test_data/assign_ex/target/witness.tr b/crates/nargo_cli/tests/execution_success/assign_ex/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/assign_ex/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/assign_ex/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/bit_and/Nargo.toml b/crates/nargo_cli/tests/execution_success/bit_and/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_and/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/bit_and/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/bit_and/Prover.toml b/crates/nargo_cli/tests/execution_success/bit_and/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_and/Prover.toml
rename to crates/nargo_cli/tests/execution_success/bit_and/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/bit_and/src/main.nr b/crates/nargo_cli/tests/execution_success/bit_and/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_and/src/main.nr
rename to crates/nargo_cli/tests/execution_success/bit_and/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/bit_and/target/bit_and.json b/crates/nargo_cli/tests/execution_success/bit_and/target/bit_and.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_and/target/bit_and.json
rename to crates/nargo_cli/tests/execution_success/bit_and/target/bit_and.json
diff --git a/crates/nargo_cli/tests/test_data/bit_and/target/witness.tr b/crates/nargo_cli/tests/execution_success/bit_and/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_and/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/bit_and/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_comptime/Nargo.toml b/crates/nargo_cli/tests/execution_success/bit_shifts_comptime/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_comptime/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/bit_shifts_comptime/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_comptime/Prover.toml b/crates/nargo_cli/tests/execution_success/bit_shifts_comptime/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_comptime/Prover.toml
rename to crates/nargo_cli/tests/execution_success/bit_shifts_comptime/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_comptime/src/main.nr b/crates/nargo_cli/tests/execution_success/bit_shifts_comptime/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_comptime/src/main.nr
rename to crates/nargo_cli/tests/execution_success/bit_shifts_comptime/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_comptime/target/bit_shifts_comptime.json b/crates/nargo_cli/tests/execution_success/bit_shifts_comptime/target/bit_shifts_comptime.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_comptime/target/bit_shifts_comptime.json
rename to crates/nargo_cli/tests/execution_success/bit_shifts_comptime/target/bit_shifts_comptime.json
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_comptime/target/witness.tr b/crates/nargo_cli/tests/execution_success/bit_shifts_comptime/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_comptime/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/bit_shifts_comptime/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_runtime/Nargo.toml b/crates/nargo_cli/tests/execution_success/bit_shifts_runtime/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_runtime/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/bit_shifts_runtime/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_runtime/Prover.toml b/crates/nargo_cli/tests/execution_success/bit_shifts_runtime/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_runtime/Prover.toml
rename to crates/nargo_cli/tests/execution_success/bit_shifts_runtime/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_runtime/src/main.nr b/crates/nargo_cli/tests/execution_success/bit_shifts_runtime/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_runtime/src/main.nr
rename to crates/nargo_cli/tests/execution_success/bit_shifts_runtime/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_runtime/target/bit_shifts_runtime.json b/crates/nargo_cli/tests/execution_success/bit_shifts_runtime/target/bit_shifts_runtime.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_runtime/target/bit_shifts_runtime.json
rename to crates/nargo_cli/tests/execution_success/bit_shifts_runtime/target/bit_shifts_runtime.json
diff --git a/crates/nargo_cli/tests/test_data/bit_shifts_runtime/target/witness.tr b/crates/nargo_cli/tests/execution_success/bit_shifts_runtime/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bit_shifts_runtime/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/bit_shifts_runtime/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/blackbox_func_simple_call/Nargo.toml b/crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/blackbox_func_simple_call/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/blackbox_func_simple_call/Prover.toml b/crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/blackbox_func_simple_call/Prover.toml
rename to crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/blackbox_func_simple_call/src/main.nr b/crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/blackbox_func_simple_call/src/main.nr
rename to crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/blackbox_func_simple_call/target/blackbox_func_simple_call.json b/crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/target/blackbox_func_simple_call.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/blackbox_func_simple_call/target/blackbox_func_simple_call.json
rename to crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/target/blackbox_func_simple_call.json
diff --git a/crates/nargo_cli/tests/test_data/blackbox_func_simple_call/target/witness.tr b/crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/blackbox_func_simple_call/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/blackbox_func_simple_call/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/bool_not/Nargo.toml b/crates/nargo_cli/tests/execution_success/bool_not/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_not/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/bool_not/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_assert/Prover.toml b/crates/nargo_cli/tests/execution_success/bool_not/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_assert/Prover.toml
rename to crates/nargo_cli/tests/execution_success/bool_not/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/bool_not/src/main.nr b/crates/nargo_cli/tests/execution_success/bool_not/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_not/src/main.nr
rename to crates/nargo_cli/tests/execution_success/bool_not/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/bool_not/target/bool_not.json b/crates/nargo_cli/tests/execution_success/bool_not/target/bool_not.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_not/target/bool_not.json
rename to crates/nargo_cli/tests/execution_success/bool_not/target/bool_not.json
diff --git a/crates/nargo_cli/tests/test_data/bool_not/target/witness.tr b/crates/nargo_cli/tests/execution_success/bool_not/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_not/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/bool_not/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/bool_or/Nargo.toml b/crates/nargo_cli/tests/execution_success/bool_or/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_or/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/bool_or/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/tuples/Prover.toml b/crates/nargo_cli/tests/execution_success/bool_or/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/tuples/Prover.toml
rename to crates/nargo_cli/tests/execution_success/bool_or/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/bool_or/src/main.nr b/crates/nargo_cli/tests/execution_success/bool_or/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_or/src/main.nr
rename to crates/nargo_cli/tests/execution_success/bool_or/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/bool_or/target/bool_or.json b/crates/nargo_cli/tests/execution_success/bool_or/target/bool_or.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_or/target/bool_or.json
rename to crates/nargo_cli/tests/execution_success/bool_or/target/bool_or.json
diff --git a/crates/nargo_cli/tests/test_data/bool_or/target/witness.tr b/crates/nargo_cli/tests/execution_success/bool_or/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/bool_or/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/bool_or/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_assert_fail/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_assert_fail/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/target/brillig_acir_as_brillig.json b/crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/target/brillig_acir_as_brillig.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/target/brillig_acir_as_brillig.json
rename to crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/target/brillig_acir_as_brillig.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_acir_as_brillig/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_acir_as_brillig/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_arrays/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_arrays/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_arrays/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_arrays/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_arrays/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_arrays/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_arrays/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_arrays/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_arrays/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_arrays/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_arrays/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_arrays/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_arrays/target/brillig_arrays.json b/crates/nargo_cli/tests/execution_success/brillig_arrays/target/brillig_arrays.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_arrays/target/brillig_arrays.json
rename to crates/nargo_cli/tests/execution_success/brillig_arrays/target/brillig_arrays.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_arrays/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_arrays/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_arrays/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_arrays/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_assert/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_assert/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_assert/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_assert/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_conditional/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_assert/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_conditional/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_assert/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_assert_fail/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_assert/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_assert_fail/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_assert/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_assert/target/brillig_assert.json b/crates/nargo_cli/tests/execution_success/brillig_assert/target/brillig_assert.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_assert/target/brillig_assert.json
rename to crates/nargo_cli/tests/execution_success/brillig_assert/target/brillig_assert.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_assert/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_assert/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_assert/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_assert/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_blake2s/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_blake2s/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_blake2s/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_blake2s/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_blake2s/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_blake2s/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_blake2s/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_blake2s/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_blake2s/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_blake2s/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_blake2s/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_blake2s/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_blake2s/target/brillig_blake2s.json b/crates/nargo_cli/tests/execution_success/brillig_blake2s/target/brillig_blake2s.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_blake2s/target/brillig_blake2s.json
rename to crates/nargo_cli/tests/execution_success/brillig_blake2s/target/brillig_blake2s.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_blake2s/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_blake2s/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_blake2s/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_blake2s/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_calls/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_calls/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_calls/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_calls/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_calls/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_calls/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls/target/brillig_calls.json b/crates/nargo_cli/tests/execution_success/brillig_calls/target/brillig_calls.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls/target/brillig_calls.json
rename to crates/nargo_cli/tests/execution_success/brillig_calls/target/brillig_calls.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_calls/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_calls/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_array/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_calls_array/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_array/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_calls_array/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_array/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_calls_array/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_array/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_calls_array/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_array/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_calls_array/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_array/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_calls_array/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_array/target/brillig_calls_array.json b/crates/nargo_cli/tests/execution_success/brillig_calls_array/target/brillig_calls_array.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_array/target/brillig_calls_array.json
rename to crates/nargo_cli/tests/execution_success/brillig_calls_array/target/brillig_calls_array.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_array/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_calls_array/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_array/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_calls_array/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_conditionals/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_conditionals/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_conditionals/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_conditionals/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_conditionals/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_conditionals/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_conditionals/target/brillig_calls_conditionals.json b/crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/target/brillig_calls_conditionals.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_conditionals/target/brillig_calls_conditionals.json
rename to crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/target/brillig_calls_conditionals.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_calls_conditionals/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_calls_conditionals/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_calls_conditionals/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_cast/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_cast/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_cast/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_cast/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_cast/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_cast/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_cast/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_cast/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_cast/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_cast/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_cast/target/brillig_cast.json b/crates/nargo_cli/tests/execution_success/brillig_cast/target/brillig_cast.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_cast/target/brillig_cast.json
rename to crates/nargo_cli/tests/execution_success/brillig_cast/target/brillig_cast.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_cast/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_cast/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_cast/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_cast/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_conditional/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_conditional/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_conditional/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_conditional/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/custom_entry/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_conditional/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/custom_entry/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_conditional/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_conditional/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_conditional/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_conditional/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_conditional/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_conditional/target/brillig_conditional.json b/crates/nargo_cli/tests/execution_success/brillig_conditional/target/brillig_conditional.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_conditional/target/brillig_conditional.json
rename to crates/nargo_cli/tests/execution_success/brillig_conditional/target/brillig_conditional.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_conditional/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_conditional/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_conditional/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_conditional/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_ecdsa/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_ecdsa/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_ecdsa/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_ecdsa/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_ecdsa/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_ecdsa/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_ecdsa/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_ecdsa/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_ecdsa/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_ecdsa/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_ecdsa/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_ecdsa/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_ecdsa/target/brillig_ecdsa.json b/crates/nargo_cli/tests/execution_success/brillig_ecdsa/target/brillig_ecdsa.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_ecdsa/target/brillig_ecdsa.json
rename to crates/nargo_cli/tests/execution_success/brillig_ecdsa/target/brillig_ecdsa.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_ecdsa/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_ecdsa/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_ecdsa/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_ecdsa/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_field_binary_operations/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_field_binary_operations/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_modulo/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_modulo/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_field_binary_operations/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_field_binary_operations/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_field_binary_operations/target/brillig_field_binary_operations.json b/crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/target/brillig_field_binary_operations.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_field_binary_operations/target/brillig_field_binary_operations.json
rename to crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/target/brillig_field_binary_operations.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_field_binary_operations/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_field_binary_operations/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_field_binary_operations/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_fns_as_values/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_fns_as_values/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_fns_as_values/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_fns_as_values/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_fns_as_values/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_fns_as_values/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_fns_as_values/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_fns_as_values/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_fns_as_values/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_fns_as_values/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_fns_as_values/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_fns_as_values/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_fns_as_values/target/brillig_fns_as_values.json b/crates/nargo_cli/tests/execution_success/brillig_fns_as_values/target/brillig_fns_as_values.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_fns_as_values/target/brillig_fns_as_values.json
rename to crates/nargo_cli/tests/execution_success/brillig_fns_as_values/target/brillig_fns_as_values.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_fns_as_values/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_fns_as_values/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_fns_as_values/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_fns_as_values/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_hash_to_field/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_hash_to_field/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_hash_to_field/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_hash_to_field/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_hash_to_field/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_hash_to_field/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_hash_to_field/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_hash_to_field/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_hash_to_field/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_hash_to_field/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_hash_to_field/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_hash_to_field/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_hash_to_field/target/brillig_hash_to_field.json b/crates/nargo_cli/tests/execution_success/brillig_hash_to_field/target/brillig_hash_to_field.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_hash_to_field/target/brillig_hash_to_field.json
rename to crates/nargo_cli/tests/execution_success/brillig_hash_to_field/target/brillig_hash_to_field.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_hash_to_field/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_hash_to_field/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_hash_to_field/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_hash_to_field/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_identity_function/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_identity_function/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_identity_function/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_identity_function/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_identity_function/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_identity_function/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_identity_function/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_identity_function/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_identity_function/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_identity_function/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_identity_function/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_identity_function/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_identity_function/target/brillig_identity_function.json b/crates/nargo_cli/tests/execution_success/brillig_identity_function/target/brillig_identity_function.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_identity_function/target/brillig_identity_function.json
rename to crates/nargo_cli/tests/execution_success/brillig_identity_function/target/brillig_identity_function.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_identity_function/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_identity_function/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_identity_function/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_identity_function/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/higher_order_functions/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/higher_order_functions/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/target/brillig_integer_binary_operations.json b/crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/target/brillig_integer_binary_operations.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/target/brillig_integer_binary_operations.json
rename to crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/target/brillig_integer_binary_operations.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_integer_binary_operations/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_integer_binary_operations/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_keccak/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_keccak/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_keccak/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_keccak/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_keccak/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_keccak/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_keccak/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_keccak/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_keccak/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_keccak/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_keccak/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_keccak/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_keccak/target/brillig_keccak.json b/crates/nargo_cli/tests/execution_success/brillig_keccak/target/brillig_keccak.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_keccak/target/brillig_keccak.json
rename to crates/nargo_cli/tests/execution_success/brillig_keccak/target/brillig_keccak.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_keccak/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_keccak/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_keccak/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_keccak/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_loop/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_loop/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_loop/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_loop/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_loop/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_loop/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_loop/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_loop/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_loop/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_loop/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_loop/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_loop/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_loop/target/brillig_loop.json b/crates/nargo_cli/tests/execution_success/brillig_loop/target/brillig_loop.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_loop/target/brillig_loop.json
rename to crates/nargo_cli/tests/execution_success/brillig_loop/target/brillig_loop.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_loop/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_loop/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_loop/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_loop/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_modulo/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_modulo/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_modulo/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_modulo/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/let_stmt/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_modulo/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/let_stmt/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_modulo/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_modulo/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_modulo/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_modulo/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_modulo/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_modulo/target/brillig_modulo.json b/crates/nargo_cli/tests/execution_success/brillig_modulo/target/brillig_modulo.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_modulo/target/brillig_modulo.json
rename to crates/nargo_cli/tests/execution_success/brillig_modulo/target/brillig_modulo.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_modulo/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_modulo/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_modulo/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_modulo/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_nested_arrays/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_nested_arrays/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_nested_arrays/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_nested_arrays/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_nested_arrays/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_nested_arrays/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_nested_arrays/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_nested_arrays/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_nested_arrays/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_nested_arrays/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_nested_arrays/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_nested_arrays/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_nested_arrays/target/brillig_nested_arrays.json b/crates/nargo_cli/tests/execution_success/brillig_nested_arrays/target/brillig_nested_arrays.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_nested_arrays/target/brillig_nested_arrays.json
rename to crates/nargo_cli/tests/execution_success/brillig_nested_arrays/target/brillig_nested_arrays.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_nested_arrays/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_nested_arrays/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_nested_arrays/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_nested_arrays/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_not/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_not/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_not/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_not/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_not/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_not/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_not/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_not/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_not/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_not/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_not/target/brillig_not.json b/crates/nargo_cli/tests/execution_success/brillig_not/target/brillig_not.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_not/target/brillig_not.json
rename to crates/nargo_cli/tests/execution_success/brillig_not/target/brillig_not.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_not/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_not/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_not/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_not/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_oracle/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_oracle/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_oracle/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_oracle/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_oracle/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_oracle/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_oracle/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_oracle/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_oracle/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_oracle/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_oracle/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_oracle/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_oracle/target/brillig_oracle.json b/crates/nargo_cli/tests/execution_success/brillig_oracle/target/brillig_oracle.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_oracle/target/brillig_oracle.json
rename to crates/nargo_cli/tests/execution_success/brillig_oracle/target/brillig_oracle.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_oracle/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_oracle/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_oracle/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_oracle/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_pedersen/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_pedersen/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_pedersen/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_pedersen/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_pedersen/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_pedersen/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_pedersen/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_pedersen/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_pedersen/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_pedersen/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_pedersen/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_pedersen/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_pedersen/target/brillig_pedersen.json b/crates/nargo_cli/tests/execution_success/brillig_pedersen/target/brillig_pedersen.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_pedersen/target/brillig_pedersen.json
rename to crates/nargo_cli/tests/execution_success/brillig_pedersen/target/brillig_pedersen.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_pedersen/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_pedersen/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_pedersen/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_pedersen/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_recursion/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_recursion/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_recursion/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_recursion/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_recursion/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_recursion/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_recursion/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_recursion/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_recursion/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_recursion/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_recursion/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_recursion/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_recursion/target/brillig_recursion.json b/crates/nargo_cli/tests/execution_success/brillig_recursion/target/brillig_recursion.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_recursion/target/brillig_recursion.json
rename to crates/nargo_cli/tests/execution_success/brillig_recursion/target/brillig_recursion.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_recursion/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_recursion/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_recursion/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_recursion/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_references/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_references/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_references/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_references/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_references/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_references/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_references/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_references/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_references/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_references/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_references/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_references/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_references/target/brillig_references.json b/crates/nargo_cli/tests/execution_success/brillig_references/target/brillig_references.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_references/target/brillig_references.json
rename to crates/nargo_cli/tests/execution_success/brillig_references/target/brillig_references.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_references/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_references/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_references/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_references/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_scalar_mul/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_scalar_mul/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_scalar_mul/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_scalar_mul/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_scalar_mul/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_scalar_mul/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_scalar_mul/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_scalar_mul/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_scalar_mul/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_scalar_mul/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_scalar_mul/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_scalar_mul/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_scalar_mul/target/brillig_scalar_mul.json b/crates/nargo_cli/tests/execution_success/brillig_scalar_mul/target/brillig_scalar_mul.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_scalar_mul/target/brillig_scalar_mul.json
rename to crates/nargo_cli/tests/execution_success/brillig_scalar_mul/target/brillig_scalar_mul.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_scalar_mul/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_scalar_mul/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_scalar_mul/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_scalar_mul/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_schnorr/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_schnorr/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_schnorr/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_schnorr/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_schnorr/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_schnorr/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_schnorr/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_schnorr/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_schnorr/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_schnorr/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_schnorr/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_schnorr/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_schnorr/target/brillig_schnorr.json b/crates/nargo_cli/tests/execution_success/brillig_schnorr/target/brillig_schnorr.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_schnorr/target/brillig_schnorr.json
rename to crates/nargo_cli/tests/execution_success/brillig_schnorr/target/brillig_schnorr.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_schnorr/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_schnorr/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_schnorr/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_schnorr/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_sha256/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_sha256/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_sha256/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_sha256/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_sha256/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_sha256/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_sha256/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_sha256/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_sha256/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_sha256/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_sha256/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_sha256/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_sha256/target/brillig_sha256.json b/crates/nargo_cli/tests/execution_success/brillig_sha256/target/brillig_sha256.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_sha256/target/brillig_sha256.json
rename to crates/nargo_cli/tests/execution_success/brillig_sha256/target/brillig_sha256.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_sha256/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_sha256/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_sha256/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_sha256/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_slices/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_slices/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_slices/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_slices/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_slices/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_slices/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_slices/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_slices/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_slices/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_slices/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_slices/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_slices/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_slices/target/brillig_slices.json b/crates/nargo_cli/tests/execution_success/brillig_slices/target/brillig_slices.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_slices/target/brillig_slices.json
rename to crates/nargo_cli/tests/execution_success/brillig_slices/target/brillig_slices.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_slices/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_slices/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_slices/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_slices/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_be_bytes/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_be_bytes/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_be_bytes/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_be_bytes/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_be_bytes/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_be_bytes/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_be_bytes/target/brillig_to_be_bytes.json b/crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/target/brillig_to_be_bytes.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_be_bytes/target/brillig_to_be_bytes.json
rename to crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/target/brillig_to_be_bytes.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_be_bytes/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_be_bytes/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_to_be_bytes/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_bits/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_to_bits/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_bits/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_to_bits/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_bits/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_to_bits/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_bits/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_to_bits/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_bits/target/brillig_to_bits.json b/crates/nargo_cli/tests/execution_success/brillig_to_bits/target/brillig_to_bits.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_bits/target/brillig_to_bits.json
rename to crates/nargo_cli/tests/execution_success/brillig_to_bits/target/brillig_to_bits.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_bits/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_to_bits/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_bits/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_to_bits/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/target/brillig_to_bytes_integration.json b/crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/target/brillig_to_bytes_integration.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/target/brillig_to_bytes_integration.json
rename to crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/target/brillig_to_bytes_integration.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_bytes_integration/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_to_bytes_integration/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_le_bytes/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_le_bytes/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_le_bytes/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_le_bytes/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_le_bytes/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_le_bytes/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_le_bytes/target/brillig_to_le_bytes.json b/crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/target/brillig_to_le_bytes.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_le_bytes/target/brillig_to_le_bytes.json
rename to crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/target/brillig_to_le_bytes.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_to_le_bytes/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_to_le_bytes/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_to_le_bytes/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/brillig_top_level/Nargo.toml b/crates/nargo_cli/tests/execution_success/brillig_top_level/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_top_level/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/brillig_top_level/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_top_level/Prover.toml b/crates/nargo_cli/tests/execution_success/brillig_top_level/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_top_level/Prover.toml
rename to crates/nargo_cli/tests/execution_success/brillig_top_level/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/brillig_top_level/src/main.nr b/crates/nargo_cli/tests/execution_success/brillig_top_level/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_top_level/src/main.nr
rename to crates/nargo_cli/tests/execution_success/brillig_top_level/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/brillig_top_level/target/brillig_top_level.json b/crates/nargo_cli/tests/execution_success/brillig_top_level/target/brillig_top_level.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_top_level/target/brillig_top_level.json
rename to crates/nargo_cli/tests/execution_success/brillig_top_level/target/brillig_top_level.json
diff --git a/crates/nargo_cli/tests/test_data/brillig_top_level/target/witness.tr b/crates/nargo_cli/tests/execution_success/brillig_top_level/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/brillig_top_level/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/brillig_top_level/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/cast_bool/Nargo.toml b/crates/nargo_cli/tests/execution_success/cast_bool/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/cast_bool/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/cast_bool/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/cast_bool/Prover.toml b/crates/nargo_cli/tests/execution_success/cast_bool/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/cast_bool/Prover.toml
rename to crates/nargo_cli/tests/execution_success/cast_bool/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/cast_bool/src/main.nr b/crates/nargo_cli/tests/execution_success/cast_bool/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/cast_bool/src/main.nr
rename to crates/nargo_cli/tests/execution_success/cast_bool/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/cast_bool/target/cast_bool.json b/crates/nargo_cli/tests/execution_success/cast_bool/target/cast_bool.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/cast_bool/target/cast_bool.json
rename to crates/nargo_cli/tests/execution_success/cast_bool/target/cast_bool.json
diff --git a/crates/nargo_cli/tests/test_data/cast_bool/target/witness.tr b/crates/nargo_cli/tests/execution_success/cast_bool/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/cast_bool/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/cast_bool/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/closures_mut_ref/Nargo.toml b/crates/nargo_cli/tests/execution_success/closures_mut_ref/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/closures_mut_ref/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/closures_mut_ref/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/closures_mut_ref/Prover.toml b/crates/nargo_cli/tests/execution_success/closures_mut_ref/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/closures_mut_ref/Prover.toml
rename to crates/nargo_cli/tests/execution_success/closures_mut_ref/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/closures_mut_ref/src/main.nr b/crates/nargo_cli/tests/execution_success/closures_mut_ref/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/closures_mut_ref/src/main.nr
rename to crates/nargo_cli/tests/execution_success/closures_mut_ref/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/closures_mut_ref/target/closures_mut_ref.json b/crates/nargo_cli/tests/execution_success/closures_mut_ref/target/closures_mut_ref.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/closures_mut_ref/target/closures_mut_ref.json
rename to crates/nargo_cli/tests/execution_success/closures_mut_ref/target/closures_mut_ref.json
diff --git a/crates/nargo_cli/tests/test_data/closures_mut_ref/target/witness.tr b/crates/nargo_cli/tests/execution_success/closures_mut_ref/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/closures_mut_ref/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/closures_mut_ref/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/comptime_array_access/Nargo.toml b/crates/nargo_cli/tests/execution_success/comptime_array_access/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_array_access/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/comptime_array_access/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/comptime_array_access/Prover.toml b/crates/nargo_cli/tests/execution_success/comptime_array_access/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_array_access/Prover.toml
rename to crates/nargo_cli/tests/execution_success/comptime_array_access/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/comptime_array_access/src/main.nr b/crates/nargo_cli/tests/execution_success/comptime_array_access/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_array_access/src/main.nr
rename to crates/nargo_cli/tests/execution_success/comptime_array_access/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/comptime_array_access/target/comptime_array_access.json b/crates/nargo_cli/tests/execution_success/comptime_array_access/target/comptime_array_access.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_array_access/target/comptime_array_access.json
rename to crates/nargo_cli/tests/execution_success/comptime_array_access/target/comptime_array_access.json
diff --git a/crates/nargo_cli/tests/test_data/comptime_array_access/target/witness.tr b/crates/nargo_cli/tests/execution_success/comptime_array_access/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_array_access/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/comptime_array_access/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/comptime_recursion_regression/Nargo.toml b/crates/nargo_cli/tests/execution_success/comptime_recursion_regression/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_recursion_regression/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/comptime_recursion_regression/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/comptime_recursion_regression/Prover.toml b/crates/nargo_cli/tests/execution_success/comptime_recursion_regression/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_recursion_regression/Prover.toml
rename to crates/nargo_cli/tests/execution_success/comptime_recursion_regression/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/comptime_recursion_regression/src/main.nr b/crates/nargo_cli/tests/execution_success/comptime_recursion_regression/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_recursion_regression/src/main.nr
rename to crates/nargo_cli/tests/execution_success/comptime_recursion_regression/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/comptime_recursion_regression/target/comptime_recursion_regression.json b/crates/nargo_cli/tests/execution_success/comptime_recursion_regression/target/comptime_recursion_regression.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_recursion_regression/target/comptime_recursion_regression.json
rename to crates/nargo_cli/tests/execution_success/comptime_recursion_regression/target/comptime_recursion_regression.json
diff --git a/crates/nargo_cli/tests/test_data/comptime_recursion_regression/target/witness.tr b/crates/nargo_cli/tests/execution_success/comptime_recursion_regression/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/comptime_recursion_regression/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/comptime_recursion_regression/target/witness.tr
diff --git a/crates/nargo_cli/tests/execution_success/config.toml b/crates/nargo_cli/tests/execution_success/config.toml
new file mode 100644
index 00000000000..3f16e941ba9
--- /dev/null
+++ b/crates/nargo_cli/tests/execution_success/config.toml
@@ -0,0 +1,3 @@
+# Dummy file included for backwards compatibility
+exclude = []
+fail = []
diff --git a/crates/nargo_cli/tests/test_data/constant_return/Nargo.toml b/crates/nargo_cli/tests/execution_success/constant_return/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/constant_return/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/constant_return/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/constant_return/Prover.toml b/crates/nargo_cli/tests/execution_success/constant_return/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/constant_return/Prover.toml
rename to crates/nargo_cli/tests/execution_success/constant_return/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/constant_return/src/main.nr b/crates/nargo_cli/tests/execution_success/constant_return/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/constant_return/src/main.nr
rename to crates/nargo_cli/tests/execution_success/constant_return/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/constant_return/target/constant_return.json b/crates/nargo_cli/tests/execution_success/constant_return/target/constant_return.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/constant_return/target/constant_return.json
rename to crates/nargo_cli/tests/execution_success/constant_return/target/constant_return.json
diff --git a/crates/nargo_cli/tests/test_data/constant_return/target/witness.tr b/crates/nargo_cli/tests/execution_success/constant_return/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/constant_return/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/constant_return/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/contracts/Nargo.toml b/crates/nargo_cli/tests/execution_success/contracts/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/contracts/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/contracts/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/contracts/Prover.toml b/crates/nargo_cli/tests/execution_success/contracts/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/contracts/Prover.toml
rename to crates/nargo_cli/tests/execution_success/contracts/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/contracts/src/main.nr b/crates/nargo_cli/tests/execution_success/contracts/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/contracts/src/main.nr
rename to crates/nargo_cli/tests/execution_success/contracts/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/contracts/target/contracts.json b/crates/nargo_cli/tests/execution_success/contracts/target/contracts.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/contracts/target/contracts.json
rename to crates/nargo_cli/tests/execution_success/contracts/target/contracts.json
diff --git a/crates/nargo_cli/tests/test_data/contracts/target/witness.tr b/crates/nargo_cli/tests/execution_success/contracts/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/contracts/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/contracts/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/custom_entry/Nargo.toml b/crates/nargo_cli/tests/execution_success/custom_entry/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/custom_entry/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/custom_entry/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/custom_entry_not_found/Prover.toml b/crates/nargo_cli/tests/execution_success/custom_entry/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/custom_entry_not_found/Prover.toml
rename to crates/nargo_cli/tests/execution_success/custom_entry/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/custom_entry/src/foobarbaz.nr b/crates/nargo_cli/tests/execution_success/custom_entry/src/foobarbaz.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/custom_entry/src/foobarbaz.nr
rename to crates/nargo_cli/tests/execution_success/custom_entry/src/foobarbaz.nr
diff --git a/crates/nargo_cli/tests/test_data/custom_entry/target/custom_entry.json b/crates/nargo_cli/tests/execution_success/custom_entry/target/custom_entry.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/custom_entry/target/custom_entry.json
rename to crates/nargo_cli/tests/execution_success/custom_entry/target/custom_entry.json
diff --git a/crates/nargo_cli/tests/test_data/custom_entry/target/witness.tr b/crates/nargo_cli/tests/execution_success/custom_entry/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/custom_entry/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/custom_entry/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/debug_logs/Nargo.toml b/crates/nargo_cli/tests/execution_success/debug_logs/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/debug_logs/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/debug_logs/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/debug_logs/Prover.toml b/crates/nargo_cli/tests/execution_success/debug_logs/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/debug_logs/Prover.toml
rename to crates/nargo_cli/tests/execution_success/debug_logs/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/debug_logs/src/main.nr b/crates/nargo_cli/tests/execution_success/debug_logs/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/debug_logs/src/main.nr
rename to crates/nargo_cli/tests/execution_success/debug_logs/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/debug_logs/target/debug_logs.json b/crates/nargo_cli/tests/execution_success/debug_logs/target/debug_logs.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/debug_logs/target/debug_logs.json
rename to crates/nargo_cli/tests/execution_success/debug_logs/target/debug_logs.json
diff --git a/crates/nargo_cli/tests/test_data/debug_logs/target/witness.tr b/crates/nargo_cli/tests/execution_success/debug_logs/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/debug_logs/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/debug_logs/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/diamond_deps_0/Nargo.toml b/crates/nargo_cli/tests/execution_success/diamond_deps_0/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/diamond_deps_0/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/diamond_deps_0/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/diamond_deps_0/Prover.toml b/crates/nargo_cli/tests/execution_success/diamond_deps_0/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/diamond_deps_0/Prover.toml
rename to crates/nargo_cli/tests/execution_success/diamond_deps_0/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/diamond_deps_0/src/main.nr b/crates/nargo_cli/tests/execution_success/diamond_deps_0/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/diamond_deps_0/src/main.nr
rename to crates/nargo_cli/tests/execution_success/diamond_deps_0/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/diamond_deps_0/target/diamond_deps_0.json b/crates/nargo_cli/tests/execution_success/diamond_deps_0/target/diamond_deps_0.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/diamond_deps_0/target/diamond_deps_0.json
rename to crates/nargo_cli/tests/execution_success/diamond_deps_0/target/diamond_deps_0.json
diff --git a/crates/nargo_cli/tests/test_data/diamond_deps_0/target/witness.tr b/crates/nargo_cli/tests/execution_success/diamond_deps_0/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/diamond_deps_0/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/diamond_deps_0/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/distinct_keyword/Nargo.toml b/crates/nargo_cli/tests/execution_success/distinct_keyword/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/distinct_keyword/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/distinct_keyword/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/distinct_keyword/Prover.toml b/crates/nargo_cli/tests/execution_success/distinct_keyword/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/distinct_keyword/Prover.toml
rename to crates/nargo_cli/tests/execution_success/distinct_keyword/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/distinct_keyword/src/main.nr b/crates/nargo_cli/tests/execution_success/distinct_keyword/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/distinct_keyword/src/main.nr
rename to crates/nargo_cli/tests/execution_success/distinct_keyword/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/distinct_keyword/target/distinct_keyword.json b/crates/nargo_cli/tests/execution_success/distinct_keyword/target/distinct_keyword.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/distinct_keyword/target/distinct_keyword.json
rename to crates/nargo_cli/tests/execution_success/distinct_keyword/target/distinct_keyword.json
diff --git a/crates/nargo_cli/tests/test_data/distinct_keyword/target/witness.tr b/crates/nargo_cli/tests/execution_success/distinct_keyword/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/distinct_keyword/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/distinct_keyword/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256k1/Nargo.toml b/crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256k1/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256k1/Prover.toml b/crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256k1/Prover.toml
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256k1/src/main.nr b/crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256k1/src/main.nr
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256k1/target/ecdsa_secp256k1.json b/crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/target/ecdsa_secp256k1.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256k1/target/ecdsa_secp256k1.json
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/target/ecdsa_secp256k1.json
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256k1/target/witness.tr b/crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256k1/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256k1/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256r1/Nargo.toml b/crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256r1/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256r1/Prover.toml b/crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256r1/Prover.toml
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256r1/src/main.nr b/crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256r1/src/main.nr
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256r1/target/ecdsa_secp256r1.json b/crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/target/ecdsa_secp256r1.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256r1/target/ecdsa_secp256r1.json
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/target/ecdsa_secp256r1.json
diff --git a/crates/nargo_cli/tests/test_data/ecdsa_secp256r1/target/witness.tr b/crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ecdsa_secp256r1/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/ecdsa_secp256r1/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/generics/Nargo.toml b/crates/nargo_cli/tests/execution_success/generics/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/generics/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/generics/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/generics/Prover.toml b/crates/nargo_cli/tests/execution_success/generics/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/generics/Prover.toml
rename to crates/nargo_cli/tests/execution_success/generics/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/generics/src/main.nr b/crates/nargo_cli/tests/execution_success/generics/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/generics/src/main.nr
rename to crates/nargo_cli/tests/execution_success/generics/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/generics/target/generics.json b/crates/nargo_cli/tests/execution_success/generics/target/generics.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/generics/target/generics.json
rename to crates/nargo_cli/tests/execution_success/generics/target/generics.json
diff --git a/crates/nargo_cli/tests/test_data/generics/target/witness.tr b/crates/nargo_cli/tests/execution_success/generics/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/generics/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/generics/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/global_consts/Nargo.toml b/crates/nargo_cli/tests/execution_success/global_consts/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/global_consts/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/global_consts/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/global_consts/Prover.toml b/crates/nargo_cli/tests/execution_success/global_consts/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/global_consts/Prover.toml
rename to crates/nargo_cli/tests/execution_success/global_consts/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/global_consts/src/baz.nr b/crates/nargo_cli/tests/execution_success/global_consts/src/baz.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/global_consts/src/baz.nr
rename to crates/nargo_cli/tests/execution_success/global_consts/src/baz.nr
diff --git a/crates/nargo_cli/tests/test_data/global_consts/src/foo.nr b/crates/nargo_cli/tests/execution_success/global_consts/src/foo.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/global_consts/src/foo.nr
rename to crates/nargo_cli/tests/execution_success/global_consts/src/foo.nr
diff --git a/crates/nargo_cli/tests/test_data/global_consts/src/foo/bar.nr b/crates/nargo_cli/tests/execution_success/global_consts/src/foo/bar.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/global_consts/src/foo/bar.nr
rename to crates/nargo_cli/tests/execution_success/global_consts/src/foo/bar.nr
diff --git a/crates/nargo_cli/tests/test_data/global_consts/src/main.nr b/crates/nargo_cli/tests/execution_success/global_consts/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/global_consts/src/main.nr
rename to crates/nargo_cli/tests/execution_success/global_consts/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/global_consts/target/global_consts.json b/crates/nargo_cli/tests/execution_success/global_consts/target/global_consts.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/global_consts/target/global_consts.json
rename to crates/nargo_cli/tests/execution_success/global_consts/target/global_consts.json
diff --git a/crates/nargo_cli/tests/test_data/global_consts/target/witness.tr b/crates/nargo_cli/tests/execution_success/global_consts/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/global_consts/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/global_consts/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/hash_to_field/Nargo.toml b/crates/nargo_cli/tests/execution_success/hash_to_field/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/hash_to_field/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/hash_to_field/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/hash_to_field/Prover.toml b/crates/nargo_cli/tests/execution_success/hash_to_field/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/hash_to_field/Prover.toml
rename to crates/nargo_cli/tests/execution_success/hash_to_field/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/hash_to_field/src/main.nr b/crates/nargo_cli/tests/execution_success/hash_to_field/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/hash_to_field/src/main.nr
rename to crates/nargo_cli/tests/execution_success/hash_to_field/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/hash_to_field/target/hash_to_field.json b/crates/nargo_cli/tests/execution_success/hash_to_field/target/hash_to_field.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/hash_to_field/target/hash_to_field.json
rename to crates/nargo_cli/tests/execution_success/hash_to_field/target/hash_to_field.json
diff --git a/crates/nargo_cli/tests/test_data/hash_to_field/target/witness.tr b/crates/nargo_cli/tests/execution_success/hash_to_field/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/hash_to_field/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/hash_to_field/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/higher_order_functions/Nargo.toml b/crates/nargo_cli/tests/execution_success/higher_order_functions/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/higher_order_functions/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/higher_order_functions/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/numeric_generics/Prover.toml b/crates/nargo_cli/tests/execution_success/higher_order_functions/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/numeric_generics/Prover.toml
rename to crates/nargo_cli/tests/execution_success/higher_order_functions/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/higher_order_functions/src/main.nr b/crates/nargo_cli/tests/execution_success/higher_order_functions/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/higher_order_functions/src/main.nr
rename to crates/nargo_cli/tests/execution_success/higher_order_functions/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/higher_order_functions/target/higher_order_functions.json b/crates/nargo_cli/tests/execution_success/higher_order_functions/target/higher_order_functions.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/higher_order_functions/target/higher_order_functions.json
rename to crates/nargo_cli/tests/execution_success/higher_order_functions/target/higher_order_functions.json
diff --git a/crates/nargo_cli/tests/test_data/higher_order_functions/target/witness.tr b/crates/nargo_cli/tests/execution_success/higher_order_functions/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/higher_order_functions/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/higher_order_functions/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/if_else_chain/Nargo.toml b/crates/nargo_cli/tests/execution_success/if_else_chain/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/if_else_chain/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/if_else_chain/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/if_else_chain/Prover.toml b/crates/nargo_cli/tests/execution_success/if_else_chain/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/if_else_chain/Prover.toml
rename to crates/nargo_cli/tests/execution_success/if_else_chain/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/if_else_chain/src/main.nr b/crates/nargo_cli/tests/execution_success/if_else_chain/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/if_else_chain/src/main.nr
rename to crates/nargo_cli/tests/execution_success/if_else_chain/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/if_else_chain/target/if_else_chain.json b/crates/nargo_cli/tests/execution_success/if_else_chain/target/if_else_chain.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/if_else_chain/target/if_else_chain.json
rename to crates/nargo_cli/tests/execution_success/if_else_chain/target/if_else_chain.json
diff --git a/crates/nargo_cli/tests/test_data/if_else_chain/target/witness.tr b/crates/nargo_cli/tests/execution_success/if_else_chain/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/if_else_chain/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/if_else_chain/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/integer_array_indexing/Nargo.toml b/crates/nargo_cli/tests/execution_success/integer_array_indexing/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/integer_array_indexing/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/integer_array_indexing/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/integer_array_indexing/Prover.toml b/crates/nargo_cli/tests/execution_success/integer_array_indexing/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/integer_array_indexing/Prover.toml
rename to crates/nargo_cli/tests/execution_success/integer_array_indexing/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/integer_array_indexing/src/main.nr b/crates/nargo_cli/tests/execution_success/integer_array_indexing/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/integer_array_indexing/src/main.nr
rename to crates/nargo_cli/tests/execution_success/integer_array_indexing/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/integer_array_indexing/target/integer_array_indexing.json b/crates/nargo_cli/tests/execution_success/integer_array_indexing/target/integer_array_indexing.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/integer_array_indexing/target/integer_array_indexing.json
rename to crates/nargo_cli/tests/execution_success/integer_array_indexing/target/integer_array_indexing.json
diff --git a/crates/nargo_cli/tests/test_data/integer_array_indexing/target/witness.tr b/crates/nargo_cli/tests/execution_success/integer_array_indexing/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/integer_array_indexing/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/integer_array_indexing/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/keccak256/Nargo.toml b/crates/nargo_cli/tests/execution_success/keccak256/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/keccak256/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/keccak256/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/keccak256/Prover.toml b/crates/nargo_cli/tests/execution_success/keccak256/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/keccak256/Prover.toml
rename to crates/nargo_cli/tests/execution_success/keccak256/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/keccak256/src/main.nr b/crates/nargo_cli/tests/execution_success/keccak256/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/keccak256/src/main.nr
rename to crates/nargo_cli/tests/execution_success/keccak256/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/keccak256/target/keccak256.json b/crates/nargo_cli/tests/execution_success/keccak256/target/keccak256.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/keccak256/target/keccak256.json
rename to crates/nargo_cli/tests/execution_success/keccak256/target/keccak256.json
diff --git a/crates/nargo_cli/tests/test_data/keccak256/target/witness.tr b/crates/nargo_cli/tests/execution_success/keccak256/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/keccak256/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/keccak256/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/main_bool_arg/Nargo.toml b/crates/nargo_cli/tests/execution_success/main_bool_arg/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_bool_arg/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/main_bool_arg/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/main_bool_arg/Prover.toml b/crates/nargo_cli/tests/execution_success/main_bool_arg/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_bool_arg/Prover.toml
rename to crates/nargo_cli/tests/execution_success/main_bool_arg/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/main_bool_arg/src/main.nr b/crates/nargo_cli/tests/execution_success/main_bool_arg/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_bool_arg/src/main.nr
rename to crates/nargo_cli/tests/execution_success/main_bool_arg/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/main_bool_arg/target/main_bool_arg.json b/crates/nargo_cli/tests/execution_success/main_bool_arg/target/main_bool_arg.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_bool_arg/target/main_bool_arg.json
rename to crates/nargo_cli/tests/execution_success/main_bool_arg/target/main_bool_arg.json
diff --git a/crates/nargo_cli/tests/test_data/main_bool_arg/target/witness.tr b/crates/nargo_cli/tests/execution_success/main_bool_arg/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_bool_arg/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/main_bool_arg/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/main_return/Nargo.toml b/crates/nargo_cli/tests/execution_success/main_return/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_return/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/main_return/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/main_return/Prover.toml b/crates/nargo_cli/tests/execution_success/main_return/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_return/Prover.toml
rename to crates/nargo_cli/tests/execution_success/main_return/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/main_return/src/main.nr b/crates/nargo_cli/tests/execution_success/main_return/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_return/src/main.nr
rename to crates/nargo_cli/tests/execution_success/main_return/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/main_return/target/main_return.json b/crates/nargo_cli/tests/execution_success/main_return/target/main_return.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_return/target/main_return.json
rename to crates/nargo_cli/tests/execution_success/main_return/target/main_return.json
diff --git a/crates/nargo_cli/tests/test_data/main_return/target/witness.tr b/crates/nargo_cli/tests/execution_success/main_return/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/main_return/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/main_return/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/merkle_insert/Nargo.toml b/crates/nargo_cli/tests/execution_success/merkle_insert/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/merkle_insert/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/merkle_insert/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/merkle_insert/Prover.toml b/crates/nargo_cli/tests/execution_success/merkle_insert/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/merkle_insert/Prover.toml
rename to crates/nargo_cli/tests/execution_success/merkle_insert/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/merkle_insert/src/main.nr b/crates/nargo_cli/tests/execution_success/merkle_insert/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/merkle_insert/src/main.nr
rename to crates/nargo_cli/tests/execution_success/merkle_insert/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/merkle_insert/target/merkle_insert.json b/crates/nargo_cli/tests/execution_success/merkle_insert/target/merkle_insert.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/merkle_insert/target/merkle_insert.json
rename to crates/nargo_cli/tests/execution_success/merkle_insert/target/merkle_insert.json
diff --git a/crates/nargo_cli/tests/test_data/merkle_insert/target/witness.tr b/crates/nargo_cli/tests/execution_success/merkle_insert/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/merkle_insert/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/merkle_insert/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/modules/Nargo.toml b/crates/nargo_cli/tests/execution_success/modules/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/modules/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/modules/Prover.toml b/crates/nargo_cli/tests/execution_success/modules/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules/Prover.toml
rename to crates/nargo_cli/tests/execution_success/modules/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/modules/src/foo.nr b/crates/nargo_cli/tests/execution_success/modules/src/foo.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules/src/foo.nr
rename to crates/nargo_cli/tests/execution_success/modules/src/foo.nr
diff --git a/crates/nargo_cli/tests/test_data/modules/src/main.nr b/crates/nargo_cli/tests/execution_success/modules/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules/src/main.nr
rename to crates/nargo_cli/tests/execution_success/modules/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/modules/target/modules.json b/crates/nargo_cli/tests/execution_success/modules/target/modules.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules/target/modules.json
rename to crates/nargo_cli/tests/execution_success/modules/target/modules.json
diff --git a/crates/nargo_cli/tests/test_data/modules/target/witness.tr b/crates/nargo_cli/tests/execution_success/modules/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/modules/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/modules_more/Nargo.toml b/crates/nargo_cli/tests/execution_success/modules_more/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules_more/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/modules_more/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/modules_more/Prover.toml b/crates/nargo_cli/tests/execution_success/modules_more/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules_more/Prover.toml
rename to crates/nargo_cli/tests/execution_success/modules_more/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/modules_more/src/foo.nr b/crates/nargo_cli/tests/execution_success/modules_more/src/foo.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules_more/src/foo.nr
rename to crates/nargo_cli/tests/execution_success/modules_more/src/foo.nr
diff --git a/crates/nargo_cli/tests/test_data/modules_more/src/foo/bar.nr b/crates/nargo_cli/tests/execution_success/modules_more/src/foo/bar.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules_more/src/foo/bar.nr
rename to crates/nargo_cli/tests/execution_success/modules_more/src/foo/bar.nr
diff --git a/crates/nargo_cli/tests/test_data/modules_more/src/main.nr b/crates/nargo_cli/tests/execution_success/modules_more/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules_more/src/main.nr
rename to crates/nargo_cli/tests/execution_success/modules_more/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/modules_more/target/modules_more.json b/crates/nargo_cli/tests/execution_success/modules_more/target/modules_more.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules_more/target/modules_more.json
rename to crates/nargo_cli/tests/execution_success/modules_more/target/modules_more.json
diff --git a/crates/nargo_cli/tests/test_data/modules_more/target/witness.tr b/crates/nargo_cli/tests/execution_success/modules_more/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modules_more/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/modules_more/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/modulus/Nargo.toml b/crates/nargo_cli/tests/execution_success/modulus/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modulus/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/modulus/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/modulus/Prover.toml b/crates/nargo_cli/tests/execution_success/modulus/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modulus/Prover.toml
rename to crates/nargo_cli/tests/execution_success/modulus/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/modulus/src/main.nr b/crates/nargo_cli/tests/execution_success/modulus/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modulus/src/main.nr
rename to crates/nargo_cli/tests/execution_success/modulus/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/modulus/target/modulus.json b/crates/nargo_cli/tests/execution_success/modulus/target/modulus.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modulus/target/modulus.json
rename to crates/nargo_cli/tests/execution_success/modulus/target/modulus.json
diff --git a/crates/nargo_cli/tests/test_data/modulus/target/witness.tr b/crates/nargo_cli/tests/execution_success/modulus/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/modulus/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/modulus/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/Nargo.toml b/crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/Prover.toml b/crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/Prover.toml
rename to crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/src/main.nr b/crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/src/main.nr
rename to crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/target/nested_arrays_from_brillig.json b/crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/target/nested_arrays_from_brillig.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/target/nested_arrays_from_brillig.json
rename to crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/target/nested_arrays_from_brillig.json
diff --git a/crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/target/witness.tr b/crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/nested_arrays_from_brillig/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/nested_arrays_from_brillig/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/pedersen_check/Nargo.toml b/crates/nargo_cli/tests/execution_success/pedersen_check/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pedersen_check/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/pedersen_check/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/pedersen_check/Prover.toml b/crates/nargo_cli/tests/execution_success/pedersen_check/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pedersen_check/Prover.toml
rename to crates/nargo_cli/tests/execution_success/pedersen_check/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/pedersen_check/src/main.nr b/crates/nargo_cli/tests/execution_success/pedersen_check/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pedersen_check/src/main.nr
rename to crates/nargo_cli/tests/execution_success/pedersen_check/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/pedersen_check/target/pedersen_check.json b/crates/nargo_cli/tests/execution_success/pedersen_check/target/pedersen_check.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pedersen_check/target/pedersen_check.json
rename to crates/nargo_cli/tests/execution_success/pedersen_check/target/pedersen_check.json
diff --git a/crates/nargo_cli/tests/test_data/pedersen_check/target/witness.tr b/crates/nargo_cli/tests/execution_success/pedersen_check/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pedersen_check/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/pedersen_check/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/poseidon_bn254_hash/Nargo.toml b/crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidon_bn254_hash/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/poseidon_bn254_hash/Prover.toml b/crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidon_bn254_hash/Prover.toml
rename to crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/poseidon_bn254_hash/src/main.nr b/crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidon_bn254_hash/src/main.nr
rename to crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/poseidon_bn254_hash/target/poseidon_bn254_hash.json b/crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/target/poseidon_bn254_hash.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidon_bn254_hash/target/poseidon_bn254_hash.json
rename to crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/target/poseidon_bn254_hash.json
diff --git a/crates/nargo_cli/tests/test_data/poseidon_bn254_hash/target/witness.tr b/crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidon_bn254_hash/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/poseidon_bn254_hash/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/Nargo.toml b/crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/Prover.toml b/crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/Prover.toml
rename to crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/src/main.nr b/crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/src/main.nr
rename to crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/target/poseidonsponge_x5_254.json b/crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/target/poseidonsponge_x5_254.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/target/poseidonsponge_x5_254.json
rename to crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/target/poseidonsponge_x5_254.json
diff --git a/crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/target/witness.tr b/crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/poseidonsponge_x5_254/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/poseidonsponge_x5_254/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/pred_eq/Nargo.toml b/crates/nargo_cli/tests/execution_success/pred_eq/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pred_eq/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/pred_eq/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace/crates/a/Prover.toml b/crates/nargo_cli/tests/execution_success/pred_eq/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace/crates/a/Prover.toml
rename to crates/nargo_cli/tests/execution_success/pred_eq/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/pred_eq/src/main.nr b/crates/nargo_cli/tests/execution_success/pred_eq/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pred_eq/src/main.nr
rename to crates/nargo_cli/tests/execution_success/pred_eq/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/pred_eq/target/pred_eq.json b/crates/nargo_cli/tests/execution_success/pred_eq/target/pred_eq.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pred_eq/target/pred_eq.json
rename to crates/nargo_cli/tests/execution_success/pred_eq/target/pred_eq.json
diff --git a/crates/nargo_cli/tests/test_data/pred_eq/target/witness.tr b/crates/nargo_cli/tests/execution_success/pred_eq/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/pred_eq/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/pred_eq/target/witness.tr
diff --git a/crates/nargo_cli/tests/execution_success/rebuild.sh b/crates/nargo_cli/tests/execution_success/rebuild.sh
new file mode 100755
index 00000000000..139660e501d
--- /dev/null
+++ b/crates/nargo_cli/tests/execution_success/rebuild.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+
+excluded_dirs=("workspace")
+
+# Loop over every directory
+for dir in ./*; do
+  if [[ ! -d $dir ]]; then
+    continue
+  fi
+
+  dir_name=$(basename "$dir")
+  if [[ ! " ${excluded_dirs[@]} " =~ " ${dir_name} " ]]; then
+      cd $dir
+      if [ -d ./target/ ]; then
+        rm -r ./target/
+      fi
+      nargo compile && nargo execute witness
+      cd ..
+  fi
+done
+
diff --git a/crates/nargo_cli/tests/test_data/references/Nargo.toml b/crates/nargo_cli/tests/execution_success/references/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/references/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/references/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/references/Prover.toml b/crates/nargo_cli/tests/execution_success/references/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/references/Prover.toml
rename to crates/nargo_cli/tests/execution_success/references/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/references/src/main.nr b/crates/nargo_cli/tests/execution_success/references/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/references/src/main.nr
rename to crates/nargo_cli/tests/execution_success/references/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/references/target/references.json b/crates/nargo_cli/tests/execution_success/references/target/references.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/references/target/references.json
rename to crates/nargo_cli/tests/execution_success/references/target/references.json
diff --git a/crates/nargo_cli/tests/test_data/references/target/witness.tr b/crates/nargo_cli/tests/execution_success/references/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/references/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/references/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/regression/Nargo.toml b/crates/nargo_cli/tests/execution_success/regression/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/regression/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/regression/Prover.toml b/crates/nargo_cli/tests/execution_success/regression/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression/Prover.toml
rename to crates/nargo_cli/tests/execution_success/regression/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/regression/src/main.nr b/crates/nargo_cli/tests/execution_success/regression/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression/src/main.nr
rename to crates/nargo_cli/tests/execution_success/regression/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/regression/target/regression.json b/crates/nargo_cli/tests/execution_success/regression/target/regression.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression/target/regression.json
rename to crates/nargo_cli/tests/execution_success/regression/target/regression.json
diff --git a/crates/nargo_cli/tests/test_data/regression/target/witness.tr b/crates/nargo_cli/tests/execution_success/regression/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/regression/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/regression_2099/Nargo.toml b/crates/nargo_cli/tests/execution_success/regression_2099/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression_2099/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/regression_2099/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/regression_2099/src/main.nr b/crates/nargo_cli/tests/execution_success/regression_2099/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression_2099/src/main.nr
rename to crates/nargo_cli/tests/execution_success/regression_2099/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/regression_2099/target/regression_2099.json b/crates/nargo_cli/tests/execution_success/regression_2099/target/regression_2099.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression_2099/target/regression_2099.json
rename to crates/nargo_cli/tests/execution_success/regression_2099/target/regression_2099.json
diff --git a/crates/nargo_cli/tests/test_data/ec_baby_jubjub/target/witness.tr b/crates/nargo_cli/tests/execution_success/regression_2099/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ec_baby_jubjub/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/regression_2099/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/Nargo.toml b/crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/Prover.toml b/crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/Prover.toml
rename to crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/src/main.nr b/crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/src/main.nr
rename to crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/target/regression_method_cannot_be_found.json b/crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/target/regression_method_cannot_be_found.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/target/regression_method_cannot_be_found.json
rename to crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/target/regression_method_cannot_be_found.json
diff --git a/crates/nargo_cli/tests/test_data/higher_order_fn_selector/target/witness.tr b/crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/higher_order_fn_selector/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/regression_method_cannot_be_found/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/ret_fn_ret_cl/Nargo.toml b/crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ret_fn_ret_cl/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/ret_fn_ret_cl/Prover.toml b/crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ret_fn_ret_cl/Prover.toml
rename to crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/ret_fn_ret_cl/src/main.nr b/crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ret_fn_ret_cl/src/main.nr
rename to crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/ret_fn_ret_cl/target/ret_fn_ret_cl.json b/crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/target/ret_fn_ret_cl.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ret_fn_ret_cl/target/ret_fn_ret_cl.json
rename to crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/target/ret_fn_ret_cl.json
diff --git a/crates/nargo_cli/tests/test_data/ret_fn_ret_cl/target/witness.tr b/crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/ret_fn_ret_cl/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/ret_fn_ret_cl/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/scalar_mul/Nargo.toml b/crates/nargo_cli/tests/execution_success/scalar_mul/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/scalar_mul/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/scalar_mul/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/scalar_mul/Prover.toml b/crates/nargo_cli/tests/execution_success/scalar_mul/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/scalar_mul/Prover.toml
rename to crates/nargo_cli/tests/execution_success/scalar_mul/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/scalar_mul/src/main.nr b/crates/nargo_cli/tests/execution_success/scalar_mul/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/scalar_mul/src/main.nr
rename to crates/nargo_cli/tests/execution_success/scalar_mul/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/scalar_mul/target/scalar_mul.json b/crates/nargo_cli/tests/execution_success/scalar_mul/target/scalar_mul.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/scalar_mul/target/scalar_mul.json
rename to crates/nargo_cli/tests/execution_success/scalar_mul/target/scalar_mul.json
diff --git a/crates/nargo_cli/tests/test_data/scalar_mul/target/witness.tr b/crates/nargo_cli/tests/execution_success/scalar_mul/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/scalar_mul/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/scalar_mul/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/schnorr/Nargo.toml b/crates/nargo_cli/tests/execution_success/schnorr/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/schnorr/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/schnorr/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/schnorr/Prover.toml b/crates/nargo_cli/tests/execution_success/schnorr/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/schnorr/Prover.toml
rename to crates/nargo_cli/tests/execution_success/schnorr/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/schnorr/src/main.nr b/crates/nargo_cli/tests/execution_success/schnorr/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/schnorr/src/main.nr
rename to crates/nargo_cli/tests/execution_success/schnorr/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/schnorr/target/schnorr.json b/crates/nargo_cli/tests/execution_success/schnorr/target/schnorr.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/schnorr/target/schnorr.json
rename to crates/nargo_cli/tests/execution_success/schnorr/target/schnorr.json
diff --git a/crates/nargo_cli/tests/test_data/schnorr/target/witness.tr b/crates/nargo_cli/tests/execution_success/schnorr/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/schnorr/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/schnorr/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/sha256/Nargo.toml b/crates/nargo_cli/tests/execution_success/sha256/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha256/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/sha256/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/sha256/Prover.toml b/crates/nargo_cli/tests/execution_success/sha256/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha256/Prover.toml
rename to crates/nargo_cli/tests/execution_success/sha256/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/sha256/src/main.nr b/crates/nargo_cli/tests/execution_success/sha256/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha256/src/main.nr
rename to crates/nargo_cli/tests/execution_success/sha256/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/sha256/target/sha256.json b/crates/nargo_cli/tests/execution_success/sha256/target/sha256.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha256/target/sha256.json
rename to crates/nargo_cli/tests/execution_success/sha256/target/sha256.json
diff --git a/crates/nargo_cli/tests/test_data/sha256/target/witness.tr b/crates/nargo_cli/tests/execution_success/sha256/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha256/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/sha256/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/sha2_blocks/Nargo.toml b/crates/nargo_cli/tests/execution_success/sha2_blocks/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_blocks/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/sha2_blocks/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/sha2_blocks/Prover.toml b/crates/nargo_cli/tests/execution_success/sha2_blocks/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_blocks/Prover.toml
rename to crates/nargo_cli/tests/execution_success/sha2_blocks/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/sha2_blocks/src/main.nr b/crates/nargo_cli/tests/execution_success/sha2_blocks/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_blocks/src/main.nr
rename to crates/nargo_cli/tests/execution_success/sha2_blocks/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/sha2_blocks/target/sha2_blocks.json b/crates/nargo_cli/tests/execution_success/sha2_blocks/target/sha2_blocks.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_blocks/target/sha2_blocks.json
rename to crates/nargo_cli/tests/execution_success/sha2_blocks/target/sha2_blocks.json
diff --git a/crates/nargo_cli/tests/test_data/sha2_blocks/target/witness.tr b/crates/nargo_cli/tests/execution_success/sha2_blocks/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_blocks/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/sha2_blocks/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/sha2_byte/Nargo.toml b/crates/nargo_cli/tests/execution_success/sha2_byte/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_byte/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/sha2_byte/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/sha2_byte/Prover.toml b/crates/nargo_cli/tests/execution_success/sha2_byte/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_byte/Prover.toml
rename to crates/nargo_cli/tests/execution_success/sha2_byte/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/sha2_byte/src/main.nr b/crates/nargo_cli/tests/execution_success/sha2_byte/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_byte/src/main.nr
rename to crates/nargo_cli/tests/execution_success/sha2_byte/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/sha2_byte/target/sha2_byte.json b/crates/nargo_cli/tests/execution_success/sha2_byte/target/sha2_byte.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_byte/target/sha2_byte.json
rename to crates/nargo_cli/tests/execution_success/sha2_byte/target/sha2_byte.json
diff --git a/crates/nargo_cli/tests/test_data/sha2_byte/target/witness.tr b/crates/nargo_cli/tests/execution_success/sha2_byte/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/sha2_byte/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/sha2_byte/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/signed_division/Nargo.toml b/crates/nargo_cli/tests/execution_success/signed_division/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/signed_division/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/signed_division/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/signed_division/Prover.toml b/crates/nargo_cli/tests/execution_success/signed_division/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/signed_division/Prover.toml
rename to crates/nargo_cli/tests/execution_success/signed_division/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/signed_division/src/main.nr b/crates/nargo_cli/tests/execution_success/signed_division/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/signed_division/src/main.nr
rename to crates/nargo_cli/tests/execution_success/signed_division/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/signed_division/target/signed_division.json b/crates/nargo_cli/tests/execution_success/signed_division/target/signed_division.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/signed_division/target/signed_division.json
rename to crates/nargo_cli/tests/execution_success/signed_division/target/signed_division.json
diff --git a/crates/nargo_cli/tests/test_data/signed_division/target/witness.tr b/crates/nargo_cli/tests/execution_success/signed_division/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/signed_division/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/signed_division/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/target/simple_add_and_ret_arr.json b/crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/target/simple_add_and_ret_arr.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/target/simple_add_and_ret_arr.json
rename to crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/target/simple_add_and_ret_arr.json
diff --git a/crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_add_and_ret_arr/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_add_and_ret_arr/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_array_param/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_array_param/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_array_param/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_array_param/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_array_param/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_array_param/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_array_param/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_array_param/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_array_param/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_array_param/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_array_param/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_array_param/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_array_param/target/simple_array_param.json b/crates/nargo_cli/tests/execution_success/simple_array_param/target/simple_array_param.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_array_param/target/simple_array_param.json
rename to crates/nargo_cli/tests/execution_success/simple_array_param/target/simple_array_param.json
diff --git a/crates/nargo_cli/tests/test_data/simple_array_param/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_array_param/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_array_param/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_array_param/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_bitwise/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_bitwise/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_bitwise/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_bitwise/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_bitwise/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_bitwise/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_bitwise/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_bitwise/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_bitwise/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_bitwise/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_bitwise/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_bitwise/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_bitwise/target/simple_bitwise.json b/crates/nargo_cli/tests/execution_success/simple_bitwise/target/simple_bitwise.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_bitwise/target/simple_bitwise.json
rename to crates/nargo_cli/tests/execution_success/simple_bitwise/target/simple_bitwise.json
diff --git a/crates/nargo_cli/tests/test_data/simple_bitwise/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_bitwise/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_bitwise/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_bitwise/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_comparison/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_comparison/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_comparison/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_comparison/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_comparison/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_comparison/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_comparison/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_comparison/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_comparison/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_comparison/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_comparison/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_comparison/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_comparison/target/simple_comparison.json b/crates/nargo_cli/tests/execution_success/simple_comparison/target/simple_comparison.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_comparison/target/simple_comparison.json
rename to crates/nargo_cli/tests/execution_success/simple_comparison/target/simple_comparison.json
diff --git a/crates/nargo_cli/tests/test_data/simple_comparison/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_comparison/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_comparison/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_comparison/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_mut/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_mut/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_mut/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_mut/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_mut/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_mut/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_mut/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_mut/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_mut/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_mut/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_mut/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_mut/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_mut/target/simple_mut.json b/crates/nargo_cli/tests/execution_success/simple_mut/target/simple_mut.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_mut/target/simple_mut.json
rename to crates/nargo_cli/tests/execution_success/simple_mut/target/simple_mut.json
diff --git a/crates/nargo_cli/tests/test_data/simple_mut/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_mut/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_mut/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_mut/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_not/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_not/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_not/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_not/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_not/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_not/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_not/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_not/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_not/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_not/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_not/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_not/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_not/target/simple_not.json b/crates/nargo_cli/tests/execution_success/simple_not/target/simple_not.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_not/target/simple_not.json
rename to crates/nargo_cli/tests/execution_success/simple_not/target/simple_not.json
diff --git a/crates/nargo_cli/tests/test_data/simple_not/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_not/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_not/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_not/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_print/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_print/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_print/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_print/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_print/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_print/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_print/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_print/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_print/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_print/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_print/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_print/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_print/target/simple_print.json b/crates/nargo_cli/tests/execution_success/simple_print/target/simple_print.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_print/target/simple_print.json
rename to crates/nargo_cli/tests/execution_success/simple_print/target/simple_print.json
diff --git a/crates/nargo_cli/tests/test_data/simple_print/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_print/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_print/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_print/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_program_addition/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_program_addition/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_addition/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_program_addition/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_program_addition/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_program_addition/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_addition/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_program_addition/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_program_addition/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_program_addition/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_addition/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_program_addition/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_program_addition/target/simple_program_addition.json b/crates/nargo_cli/tests/execution_success/simple_program_addition/target/simple_program_addition.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_addition/target/simple_program_addition.json
rename to crates/nargo_cli/tests/execution_success/simple_program_addition/target/simple_program_addition.json
diff --git a/crates/nargo_cli/tests/test_data/simple_program_addition/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_program_addition/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_addition/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_program_addition/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_program_no_body/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_program_no_body/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_no_body/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_program_no_body/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_program_no_body/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_program_no_body/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_no_body/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_program_no_body/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_program_no_body/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_program_no_body/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_no_body/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_program_no_body/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_program_no_body/target/simple_program_no_body.json b/crates/nargo_cli/tests/execution_success/simple_program_no_body/target/simple_program_no_body.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_no_body/target/simple_program_no_body.json
rename to crates/nargo_cli/tests/execution_success/simple_program_no_body/target/simple_program_no_body.json
diff --git a/crates/nargo_cli/tests/test_data/simple_program_no_body/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_program_no_body/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_program_no_body/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_program_no_body/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_radix/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_radix/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_radix/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_radix/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_radix/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_radix/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_radix/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_radix/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_radix/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_radix/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_radix/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_radix/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_radix/target/simple_radix.json b/crates/nargo_cli/tests/execution_success/simple_radix/target/simple_radix.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_radix/target/simple_radix.json
rename to crates/nargo_cli/tests/execution_success/simple_radix/target/simple_radix.json
diff --git a/crates/nargo_cli/tests/test_data/simple_radix/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_radix/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_radix/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_radix/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_range/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_range/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_range/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_range/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_range/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_range/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_range/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_range/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_range/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_range/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_range/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_range/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_range/target/simple_range.json b/crates/nargo_cli/tests/execution_success/simple_range/target/simple_range.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_range/target/simple_range.json
rename to crates/nargo_cli/tests/execution_success/simple_range/target/simple_range.json
diff --git a/crates/nargo_cli/tests/test_data/simple_range/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_range/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_range/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_range/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_shield/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_shield/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shield/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_shield/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_shield/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_shield/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shield/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_shield/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_shield/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_shield/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shield/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_shield/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_shield/target/simple_shield.json b/crates/nargo_cli/tests/execution_success/simple_shield/target/simple_shield.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shield/target/simple_shield.json
rename to crates/nargo_cli/tests/execution_success/simple_shield/target/simple_shield.json
diff --git a/crates/nargo_cli/tests/test_data/simple_shield/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_shield/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shield/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_shield/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/simple_shift_left_right/Nargo.toml b/crates/nargo_cli/tests/execution_success/simple_shift_left_right/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shift_left_right/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/simple_shift_left_right/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_shift_left_right/Prover.toml b/crates/nargo_cli/tests/execution_success/simple_shift_left_right/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shift_left_right/Prover.toml
rename to crates/nargo_cli/tests/execution_success/simple_shift_left_right/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/simple_shift_left_right/src/main.nr b/crates/nargo_cli/tests/execution_success/simple_shift_left_right/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shift_left_right/src/main.nr
rename to crates/nargo_cli/tests/execution_success/simple_shift_left_right/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/simple_shift_left_right/target/simple_shift_left_right.json b/crates/nargo_cli/tests/execution_success/simple_shift_left_right/target/simple_shift_left_right.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shift_left_right/target/simple_shift_left_right.json
rename to crates/nargo_cli/tests/execution_success/simple_shift_left_right/target/simple_shift_left_right.json
diff --git a/crates/nargo_cli/tests/test_data/simple_shift_left_right/target/witness.tr b/crates/nargo_cli/tests/execution_success/simple_shift_left_right/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/simple_shift_left_right/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/simple_shift_left_right/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/slices/Nargo.toml b/crates/nargo_cli/tests/execution_success/slices/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/slices/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/slices/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/slices/Prover.toml b/crates/nargo_cli/tests/execution_success/slices/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/slices/Prover.toml
rename to crates/nargo_cli/tests/execution_success/slices/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/slices/src/main.nr b/crates/nargo_cli/tests/execution_success/slices/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/slices/src/main.nr
rename to crates/nargo_cli/tests/execution_success/slices/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/slices/target/slices.json b/crates/nargo_cli/tests/execution_success/slices/target/slices.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/slices/target/slices.json
rename to crates/nargo_cli/tests/execution_success/slices/target/slices.json
diff --git a/crates/nargo_cli/tests/test_data/slices/target/witness.tr b/crates/nargo_cli/tests/execution_success/slices/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/slices/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/slices/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/strings/Nargo.toml b/crates/nargo_cli/tests/execution_success/strings/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/strings/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/strings/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/strings/Prover.toml b/crates/nargo_cli/tests/execution_success/strings/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/strings/Prover.toml
rename to crates/nargo_cli/tests/execution_success/strings/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/strings/src/main.nr b/crates/nargo_cli/tests/execution_success/strings/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/strings/src/main.nr
rename to crates/nargo_cli/tests/execution_success/strings/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/strings/target/strings.json b/crates/nargo_cli/tests/execution_success/strings/target/strings.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/strings/target/strings.json
rename to crates/nargo_cli/tests/execution_success/strings/target/strings.json
diff --git a/crates/nargo_cli/tests/test_data/strings/target/witness.tr b/crates/nargo_cli/tests/execution_success/strings/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/strings/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/strings/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/struct/Nargo.toml b/crates/nargo_cli/tests/execution_success/struct/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/struct/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/struct/Prover.toml b/crates/nargo_cli/tests/execution_success/struct/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct/Prover.toml
rename to crates/nargo_cli/tests/execution_success/struct/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/struct/src/main.nr b/crates/nargo_cli/tests/execution_success/struct/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct/src/main.nr
rename to crates/nargo_cli/tests/execution_success/struct/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/struct/target/struct.json b/crates/nargo_cli/tests/execution_success/struct/target/struct.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct/target/struct.json
rename to crates/nargo_cli/tests/execution_success/struct/target/struct.json
diff --git a/crates/nargo_cli/tests/test_data/struct/target/witness.tr b/crates/nargo_cli/tests/execution_success/struct/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/struct/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/struct_array_inputs/Nargo.toml b/crates/nargo_cli/tests/execution_success/struct_array_inputs/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_array_inputs/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/struct_array_inputs/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/struct_array_inputs/Prover.toml b/crates/nargo_cli/tests/execution_success/struct_array_inputs/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_array_inputs/Prover.toml
rename to crates/nargo_cli/tests/execution_success/struct_array_inputs/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/struct_array_inputs/src/main.nr b/crates/nargo_cli/tests/execution_success/struct_array_inputs/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_array_inputs/src/main.nr
rename to crates/nargo_cli/tests/execution_success/struct_array_inputs/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/struct_array_inputs/target/struct_array_inputs.json b/crates/nargo_cli/tests/execution_success/struct_array_inputs/target/struct_array_inputs.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_array_inputs/target/struct_array_inputs.json
rename to crates/nargo_cli/tests/execution_success/struct_array_inputs/target/struct_array_inputs.json
diff --git a/crates/nargo_cli/tests/test_data/struct_array_inputs/target/witness.tr b/crates/nargo_cli/tests/execution_success/struct_array_inputs/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_array_inputs/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/struct_array_inputs/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/struct_fields_ordering/Nargo.toml b/crates/nargo_cli/tests/execution_success/struct_fields_ordering/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_fields_ordering/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/struct_fields_ordering/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/struct_fields_ordering/Prover.toml b/crates/nargo_cli/tests/execution_success/struct_fields_ordering/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_fields_ordering/Prover.toml
rename to crates/nargo_cli/tests/execution_success/struct_fields_ordering/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/struct_fields_ordering/src/main.nr b/crates/nargo_cli/tests/execution_success/struct_fields_ordering/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_fields_ordering/src/main.nr
rename to crates/nargo_cli/tests/execution_success/struct_fields_ordering/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/struct_fields_ordering/target/struct_fields_ordering.json b/crates/nargo_cli/tests/execution_success/struct_fields_ordering/target/struct_fields_ordering.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_fields_ordering/target/struct_fields_ordering.json
rename to crates/nargo_cli/tests/execution_success/struct_fields_ordering/target/struct_fields_ordering.json
diff --git a/crates/nargo_cli/tests/test_data/struct_fields_ordering/target/witness.tr b/crates/nargo_cli/tests/execution_success/struct_fields_ordering/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_fields_ordering/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/struct_fields_ordering/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/struct_inputs/Nargo.toml b/crates/nargo_cli/tests/execution_success/struct_inputs/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_inputs/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/struct_inputs/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/struct_inputs/Prover.toml b/crates/nargo_cli/tests/execution_success/struct_inputs/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_inputs/Prover.toml
rename to crates/nargo_cli/tests/execution_success/struct_inputs/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/struct_inputs/src/foo.nr b/crates/nargo_cli/tests/execution_success/struct_inputs/src/foo.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_inputs/src/foo.nr
rename to crates/nargo_cli/tests/execution_success/struct_inputs/src/foo.nr
diff --git a/crates/nargo_cli/tests/test_data/struct_inputs/src/foo/bar.nr b/crates/nargo_cli/tests/execution_success/struct_inputs/src/foo/bar.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_inputs/src/foo/bar.nr
rename to crates/nargo_cli/tests/execution_success/struct_inputs/src/foo/bar.nr
diff --git a/crates/nargo_cli/tests/test_data/struct_inputs/src/main.nr b/crates/nargo_cli/tests/execution_success/struct_inputs/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_inputs/src/main.nr
rename to crates/nargo_cli/tests/execution_success/struct_inputs/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/struct_inputs/target/struct_inputs.json b/crates/nargo_cli/tests/execution_success/struct_inputs/target/struct_inputs.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_inputs/target/struct_inputs.json
rename to crates/nargo_cli/tests/execution_success/struct_inputs/target/struct_inputs.json
diff --git a/crates/nargo_cli/tests/test_data/struct_inputs/target/witness.tr b/crates/nargo_cli/tests/execution_success/struct_inputs/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/struct_inputs/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/struct_inputs/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/submodules/Nargo.toml b/crates/nargo_cli/tests/execution_success/submodules/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/submodules/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/submodules/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/submodules/Prover.toml b/crates/nargo_cli/tests/execution_success/submodules/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/submodules/Prover.toml
rename to crates/nargo_cli/tests/execution_success/submodules/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/submodules/src/main.nr b/crates/nargo_cli/tests/execution_success/submodules/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/submodules/src/main.nr
rename to crates/nargo_cli/tests/execution_success/submodules/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/submodules/target/submodules.json b/crates/nargo_cli/tests/execution_success/submodules/target/submodules.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/submodules/target/submodules.json
rename to crates/nargo_cli/tests/execution_success/submodules/target/submodules.json
diff --git a/crates/nargo_cli/tests/test_data/submodules/target/witness.tr b/crates/nargo_cli/tests/execution_success/submodules/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/submodules/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/submodules/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/to_be_bytes/Nargo.toml b/crates/nargo_cli/tests/execution_success/to_be_bytes/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_be_bytes/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/to_be_bytes/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/to_be_bytes/Prover.toml b/crates/nargo_cli/tests/execution_success/to_be_bytes/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_be_bytes/Prover.toml
rename to crates/nargo_cli/tests/execution_success/to_be_bytes/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/to_be_bytes/src/main.nr b/crates/nargo_cli/tests/execution_success/to_be_bytes/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_be_bytes/src/main.nr
rename to crates/nargo_cli/tests/execution_success/to_be_bytes/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/to_be_bytes/target/to_be_bytes.json b/crates/nargo_cli/tests/execution_success/to_be_bytes/target/to_be_bytes.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_be_bytes/target/to_be_bytes.json
rename to crates/nargo_cli/tests/execution_success/to_be_bytes/target/to_be_bytes.json
diff --git a/crates/nargo_cli/tests/test_data/to_be_bytes/target/witness.tr b/crates/nargo_cli/tests/execution_success/to_be_bytes/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_be_bytes/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/to_be_bytes/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/to_bytes_integration/Nargo.toml b/crates/nargo_cli/tests/execution_success/to_bytes_integration/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_bytes_integration/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/to_bytes_integration/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/to_bytes_integration/Prover.toml b/crates/nargo_cli/tests/execution_success/to_bytes_integration/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_bytes_integration/Prover.toml
rename to crates/nargo_cli/tests/execution_success/to_bytes_integration/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/to_bytes_integration/src/main.nr b/crates/nargo_cli/tests/execution_success/to_bytes_integration/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_bytes_integration/src/main.nr
rename to crates/nargo_cli/tests/execution_success/to_bytes_integration/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/to_bytes_integration/target/to_bytes_integration.json b/crates/nargo_cli/tests/execution_success/to_bytes_integration/target/to_bytes_integration.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_bytes_integration/target/to_bytes_integration.json
rename to crates/nargo_cli/tests/execution_success/to_bytes_integration/target/to_bytes_integration.json
diff --git a/crates/nargo_cli/tests/test_data/to_bytes_integration/target/witness.tr b/crates/nargo_cli/tests/execution_success/to_bytes_integration/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_bytes_integration/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/to_bytes_integration/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/to_le_bytes/Nargo.toml b/crates/nargo_cli/tests/execution_success/to_le_bytes/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_le_bytes/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/to_le_bytes/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/to_le_bytes/Prover.toml b/crates/nargo_cli/tests/execution_success/to_le_bytes/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_le_bytes/Prover.toml
rename to crates/nargo_cli/tests/execution_success/to_le_bytes/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/to_le_bytes/src/main.nr b/crates/nargo_cli/tests/execution_success/to_le_bytes/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_le_bytes/src/main.nr
rename to crates/nargo_cli/tests/execution_success/to_le_bytes/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/to_le_bytes/target/to_le_bytes.json b/crates/nargo_cli/tests/execution_success/to_le_bytes/target/to_le_bytes.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_le_bytes/target/to_le_bytes.json
rename to crates/nargo_cli/tests/execution_success/to_le_bytes/target/to_le_bytes.json
diff --git a/crates/nargo_cli/tests/test_data/to_le_bytes/target/witness.tr b/crates/nargo_cli/tests/execution_success/to_le_bytes/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/to_le_bytes/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/to_le_bytes/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/tuples/Nargo.toml b/crates/nargo_cli/tests/execution_success/tuples/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/tuples/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/tuples/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace/crates/b/Prover.toml b/crates/nargo_cli/tests/execution_success/tuples/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace/crates/b/Prover.toml
rename to crates/nargo_cli/tests/execution_success/tuples/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/tuples/src/main.nr b/crates/nargo_cli/tests/execution_success/tuples/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/tuples/src/main.nr
rename to crates/nargo_cli/tests/execution_success/tuples/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/tuples/target/tuples.json b/crates/nargo_cli/tests/execution_success/tuples/target/tuples.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/tuples/target/tuples.json
rename to crates/nargo_cli/tests/execution_success/tuples/target/tuples.json
diff --git a/crates/nargo_cli/tests/test_data/tuples/target/witness.tr b/crates/nargo_cli/tests/execution_success/tuples/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/tuples/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/tuples/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/type_aliases/Nargo.toml b/crates/nargo_cli/tests/execution_success/type_aliases/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/type_aliases/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/type_aliases/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/type_aliases/Prover.toml b/crates/nargo_cli/tests/execution_success/type_aliases/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/type_aliases/Prover.toml
rename to crates/nargo_cli/tests/execution_success/type_aliases/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/type_aliases/src/main.nr b/crates/nargo_cli/tests/execution_success/type_aliases/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/type_aliases/src/main.nr
rename to crates/nargo_cli/tests/execution_success/type_aliases/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/type_aliases/target/type_aliases.json b/crates/nargo_cli/tests/execution_success/type_aliases/target/type_aliases.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/type_aliases/target/type_aliases.json
rename to crates/nargo_cli/tests/execution_success/type_aliases/target/type_aliases.json
diff --git a/crates/nargo_cli/tests/test_data/type_aliases/target/witness.tr b/crates/nargo_cli/tests/execution_success/type_aliases/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/type_aliases/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/type_aliases/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/unconstrained_empty/Nargo.toml b/crates/nargo_cli/tests/execution_success/unconstrained_empty/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/unconstrained_empty/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/unconstrained_empty/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/unconstrained_empty/Prover.toml b/crates/nargo_cli/tests/execution_success/unconstrained_empty/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/unconstrained_empty/Prover.toml
rename to crates/nargo_cli/tests/execution_success/unconstrained_empty/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/unconstrained_empty/src/main.nr b/crates/nargo_cli/tests/execution_success/unconstrained_empty/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/unconstrained_empty/src/main.nr
rename to crates/nargo_cli/tests/execution_success/unconstrained_empty/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/unconstrained_empty/target/unconstrained_empty.json b/crates/nargo_cli/tests/execution_success/unconstrained_empty/target/unconstrained_empty.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/unconstrained_empty/target/unconstrained_empty.json
rename to crates/nargo_cli/tests/execution_success/unconstrained_empty/target/unconstrained_empty.json
diff --git a/crates/nargo_cli/tests/test_data/inner_outer_cl/target/witness.tr b/crates/nargo_cli/tests/execution_success/unconstrained_empty/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/inner_outer_cl/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/unconstrained_empty/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/vectors/Nargo.toml b/crates/nargo_cli/tests/execution_success/vectors/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/vectors/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/vectors/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/vectors/Prover.toml b/crates/nargo_cli/tests/execution_success/vectors/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/vectors/Prover.toml
rename to crates/nargo_cli/tests/execution_success/vectors/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/vectors/src/main.nr b/crates/nargo_cli/tests/execution_success/vectors/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/vectors/src/main.nr
rename to crates/nargo_cli/tests/execution_success/vectors/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/vectors/target/vectors.json b/crates/nargo_cli/tests/execution_success/vectors/target/vectors.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/vectors/target/vectors.json
rename to crates/nargo_cli/tests/execution_success/vectors/target/vectors.json
diff --git a/crates/nargo_cli/tests/test_data/vectors/target/witness.tr b/crates/nargo_cli/tests/execution_success/vectors/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/vectors/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/vectors/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/workspace_missing_toml/Nargo.toml b/crates/nargo_cli/tests/execution_success/workspace/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_missing_toml/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/workspace/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_fail/crates/b/Prover.toml b/crates/nargo_cli/tests/execution_success/workspace/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_fail/crates/b/Prover.toml
rename to crates/nargo_cli/tests/execution_success/workspace/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/a/Nargo.toml b/crates/nargo_cli/tests/execution_success/workspace/crates/a/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/a/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/workspace/crates/a/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/a/Prover.toml b/crates/nargo_cli/tests/execution_success/workspace/crates/a/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/a/Prover.toml
rename to crates/nargo_cli/tests/execution_success/workspace/crates/a/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_fail/crates/a/src/main.nr b/crates/nargo_cli/tests/execution_success/workspace/crates/a/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_fail/crates/a/src/main.nr
rename to crates/nargo_cli/tests/execution_success/workspace/crates/a/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/workspace_fail/crates/b/Nargo.toml b/crates/nargo_cli/tests/execution_success/workspace/crates/b/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_fail/crates/b/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/workspace/crates/b/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/b/Prover.toml b/crates/nargo_cli/tests/execution_success/workspace/crates/b/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/b/Prover.toml
rename to crates/nargo_cli/tests/execution_success/workspace/crates/b/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_fail/crates/b/src/main.nr b/crates/nargo_cli/tests/execution_success/workspace/crates/b/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_fail/crates/b/src/main.nr
rename to crates/nargo_cli/tests/execution_success/workspace/crates/b/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/Nargo.toml b/crates/nargo_cli/tests/execution_success/workspace_default_member/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/Prover.toml b/crates/nargo_cli/tests/execution_success/workspace_default_member/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/Prover.toml
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_fail/crates/a/Nargo.toml b/crates/nargo_cli/tests/execution_success/workspace_default_member/a/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_fail/crates/a/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/a/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/a/Prover.toml b/crates/nargo_cli/tests/execution_success/workspace_default_member/a/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/a/Prover.toml
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/a/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/a/src/main.nr b/crates/nargo_cli/tests/execution_success/workspace_default_member/a/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/a/src/main.nr
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/a/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/b/Nargo.toml b/crates/nargo_cli/tests/execution_success/workspace_default_member/b/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/b/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/b/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/b/Prover.toml b/crates/nargo_cli/tests/execution_success/workspace_default_member/b/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/b/Prover.toml
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/b/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/b/src/main.nr b/crates/nargo_cli/tests/execution_success/workspace_default_member/b/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_missing_toml/crates/b/src/main.nr
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/b/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/target/a.json b/crates/nargo_cli/tests/execution_success/workspace_default_member/target/a.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/target/a.json
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/target/a.json
diff --git a/crates/nargo_cli/tests/test_data/workspace_default_member/target/witness.tr b/crates/nargo_cli/tests/execution_success/workspace_default_member/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/workspace_default_member/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/workspace_default_member/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/xor/Nargo.toml b/crates/nargo_cli/tests/execution_success/xor/Nargo.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/xor/Nargo.toml
rename to crates/nargo_cli/tests/execution_success/xor/Nargo.toml
diff --git a/crates/nargo_cli/tests/test_data/xor/Prover.toml b/crates/nargo_cli/tests/execution_success/xor/Prover.toml
similarity index 100%
rename from crates/nargo_cli/tests/test_data/xor/Prover.toml
rename to crates/nargo_cli/tests/execution_success/xor/Prover.toml
diff --git a/crates/nargo_cli/tests/test_data/xor/src/main.nr b/crates/nargo_cli/tests/execution_success/xor/src/main.nr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/xor/src/main.nr
rename to crates/nargo_cli/tests/execution_success/xor/src/main.nr
diff --git a/crates/nargo_cli/tests/test_data/xor/target/witness.tr b/crates/nargo_cli/tests/execution_success/xor/target/witness.tr
similarity index 100%
rename from crates/nargo_cli/tests/test_data/xor/target/witness.tr
rename to crates/nargo_cli/tests/execution_success/xor/target/witness.tr
diff --git a/crates/nargo_cli/tests/test_data/xor/target/xor.json b/crates/nargo_cli/tests/execution_success/xor/target/xor.json
similarity index 100%
rename from crates/nargo_cli/tests/test_data/xor/target/xor.json
rename to crates/nargo_cli/tests/execution_success/xor/target/xor.json
diff --git a/crates/nargo_cli/tests/test_data b/crates/nargo_cli/tests/test_data
new file mode 120000
index 00000000000..27727832076
--- /dev/null
+++ b/crates/nargo_cli/tests/test_data
@@ -0,0 +1 @@
+execution_success/
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/array_dynamic/target/array_dynamic.json b/crates/nargo_cli/tests/test_data/array_dynamic/target/array_dynamic.json
deleted file mode 100644
index 687a56bcafd..00000000000
--- a/crates/nargo_cli/tests/test_data/array_dynamic/target/array_dynamic.json
+++ /dev/null
@@ -1 +0,0 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[{"name":"x","type":{"kind":"array","length":5,"type":{"kind":"integer","sign":"unsigned","width":32}},"visibility":"private"},{"name":"z","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"t","type":{"kind":"integer","sign":"unsigned","width":32},"visibility":"private"},{"name":"index","type":{"kind":"array","length":5,"type":{"kind":"field"}},"visibility":"private"},{"name":"index2","type":{"kind":"array","length":5,"type":{"kind":"field"}},"visibility":"private"},{"name":"offset","type":{"kind":"field"},"visibility":"private"},{"name":"sublen","type":{"kind":"field"},"visibility":"private"}],"param_witnesses":{"index":[8,9,10,11,12],"index2":[13,14,15,16,17],"offset":[18],"sublen":[19],"t":[7],"x":[1,2,3,4,5],"z":[6]},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/+1daZMURRB9Ozu7sNzIuXKNq4gIaPfM7O4MggIiKCKCyCFesLDjfZ/IKQIShkSgH/Bv+Iv8KzjJVi/VvTMQRL3smAy6Ijq6p5nNepX56mVVTXXzD4B/MVX62kfJnSve51Lmc3/mcznzecB9HnB2BzL2+93fDHj3BjM2Znk2+jwbs9vHUPuY0z7mto957t9K3nfmt48F7WNh+1jUPha7Ovsxs/S58w53jsLK6CyeragD3FDbsaLt6TpKns2l7rzMuzfkzgm3pAx68UjiJBzZiZmx6vOuS+47/ff5Tl8XO0PeveTvF3hYwPNJNAg616IFnk024DjpiBLACu51zGXuMzo4j1R3qhPVorF6fXK8OhnX4lNRtTnRGI3qoxNjjbgRjzZGz1Qbtdpko94Yb040x6NmXK9Nxq3RZrXl2rE03FbN2YqW8doYdROkEjmOg73Vfk0Byl3clrvzCu/ew4jbiPd33cRtBA8Wt052CnHrXqbFbbnnTPksgaxk6iSLm1qHDLX1B6+N0f38Fyroy4ltXkGMK8F/0wKW02g1ZrS/NVUmOsA1J+gr3XnYu1cIOsdmLoK+EmlBl0BWMnWyBd3vRKHithI8cRsGr3OX0bmE2k9KYo8tcMPofYyPK2CUUlLEGcrNVQRbk3ep2az2o4OwKMRpFc9W5ONd7V2XM7GTkuiVgijHyNST9aOqaGsFabWC3TXgkV+r3Wv4MUoJSq/7NCls4Rsm4lwLlvC1Jq0m5bUGMK4DTCTldURuVmjcbJ7OKylXoJOUn/Cui6QcaLPiHMq2O4LeTsrS7hF+jFSTMtun3XCG2n6S6E+riZTpAy2MTyEf3ofyaT2xzVb5tN4Axqdhg08beDirVvm0wQDGZ2CDTxt5OGtW+bTRAMZnYYNPm3g461b5tMkAxs1EjLJBUiaUyUZJGZtJPhUNFN5uRrr08kLaFoKtZCHNbzO7nz3H89/deUqnbQGs+HTzQRRW4i3o/X5mKE6P9K+lzytglFJSxBmqIRFYWpffr6URz1ZqYdZfHS0WZgNtRs6hbLtV9PbCrBit8mOkujDL9mk3nKG2a8Q2W02kNQMY60SMeSUVJmYf76h3XSSVQJt151C23TH0dlKRdo/xY6SaVJg+zWvTusYsBby45b5pfdydG969h9m0fgczY5XdtH4HD9603slOsWm9e5netC4B/A/3Nq1LICuZOtmb1glLcdOb1sfBE5EGuKOSPASJgdlttB/rANecIDXdeat3r3iKhmMzF0FqIv0UjQSykqmTLUh+JwoVpCZ4grQVvM5drAvrYXwB9hIHA3Orw29YJF7lnji2ufN2716RODg2c0kc25BOHBLISqZOduLwO1Fo4tgGXuLYDp3OzV6vfZEXC7M/fDJ9oIXxJQWMGnzaQWyzVT7tMIBxJ2zwaRcPZ9Uqn3YZwPgybPBpNw9nzSqfdhvA+Aps8GkPD2fdKp/2GMC4l4hRNtAmbzCVImMzyaeigcLbve7fy3qxVNusaWGxZztsaMOrRJxWtYHpAy2Mr8EGn/YR22yVT/sMYHwdNvi0n4fT7NxqvwGMb8AGnw7wcJqdWx0wgPFN2ODTQR5Os3OrgwYwHiJilDlVckiRsZnkU9FA4e0hpAubc28R2+LPERU490jPAZlxgiKfDoOrYYprCmqxOmwA49uwwacjZD4p6pNarI4YwHgUOnwqkfnE3Cx3DNzcxo6JtPUo+H3yT3KsNbTtmEK7b0KH4/1knMeJviTGOr5JaKN7sLue1zN4RF+mnsF7x7sunsELtHncOZRt9wR4nVKr3Sf4MVJ9Bo/t0244Q22/S2tz+jEXNs73aDibLU2c79NwVlXj/gEN54Qqzg9pOKOGTIok0SSTI+G+8EpiJv6QuspI7/5Gpj1RYOnmpyisxLMNYDypgFGDc6dgQxMnYEMTT8OGJp6BDU2cBFcT5X9mTTRRuC+8kpiJP6SusvtOtpAwqOnNkAGMLQWMGpz7CDY08WPY0MRPYEMTP4UNTfwMXE2U8VSiicJ94ZXETPwhdZXdd7KFhEFNb+YYwPi5AkYNzn0BG5r4JWxo4lewoYlfw4YmfgOuJsp4KtFE4b7wSmIm/pC6ykg/UY1Me6LA0s1PUViJ5xrA+K0CRg3OfQcbmvg9bGjiD7ChiT/Chib+BK4myngq0UThvvBKYib+kLrK7jvZQsKgpjfzDGD8WQGjFPbLLE4SbbWIfeGWEf8R5wOpPBrqv7+M+I/YT+JbRP/9nZP/QnGeJfqPyJmY6b+8NpoQfZnaaPKLd11sNAm0edY5lG33HHp7o4m0+xw/RqoD2nPgikAer8hbouRbUtxyf0XeeXe+4N0rXvbMsZnLK/IkgP7LniWQlUyd7FGd34lCX5F3HjxBuoD8BakHMCeiUesA15wgXXTnS9694p2dHJu5CNJFpN/ZKYGsZOpkT5MugCdIF4m4LkGnc5fIsXuM2ObLPFx3n9nvNDUk2VdbHrxsAOOvChilsPv2IqU2h+K6Au5gI48lECZmH+9v3nWxBBJo84pzKNvuVfT2Eoi0+yo/RqoPuzIHC9d6nJcSm2vgz4BuI59EFIUV6sDwOhHXbSKuvBIRsf2pRPS7d10kokCb151D2XZvoLcTkbT7Bj9Gqg99Mn26xMMonUfInLzZQzqOPJAhG5BlOUQ2mMgmNtm0MR9TJF/YPmTUvrh9yMxyCWaW/wH2zFEhKKwAAA==","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/array_dynamic/target/witness.tr b/crates/nargo_cli/tests/test_data/array_dynamic/target/witness.tr
deleted file mode 100644
index 756e5de1740..00000000000
Binary files a/crates/nargo_cli/tests/test_data/array_dynamic/target/witness.tr and /dev/null differ
diff --git a/crates/nargo_cli/tests/test_data/config.toml b/crates/nargo_cli/tests/test_data/config.toml
deleted file mode 100644
index bc858bbc7f5..00000000000
--- a/crates/nargo_cli/tests/test_data/config.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-exclude = []
-
-
-# List of tests (as their directory name) expecting to fail: if the test pass, we report an error.
-fail = ["brillig_assert_fail", "custom_entry_not_found", "dep_impl_primitive", "depend_on_bin", "workspace_fail", "workspace_missing_toml"]
diff --git a/crates/nargo_cli/tests/test_data/ec_baby_jubjub/target/ec_baby_jubjub.json b/crates/nargo_cli/tests/test_data/ec_baby_jubjub/target/ec_baby_jubjub.json
deleted file mode 100644
index 4c3bb072cb3..00000000000
--- a/crates/nargo_cli/tests/test_data/ec_baby_jubjub/target/ec_baby_jubjub.json
+++ /dev/null
@@ -1 +0,0 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[],"param_witnesses":{},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/2NkIAwAQGbG/yQAAAA=","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/higher_order_fn_selector/target/higher_order_fn_selector.json b/crates/nargo_cli/tests/test_data/higher_order_fn_selector/target/higher_order_fn_selector.json
deleted file mode 100644
index 4c3bb072cb3..00000000000
--- a/crates/nargo_cli/tests/test_data/higher_order_fn_selector/target/higher_order_fn_selector.json
+++ /dev/null
@@ -1 +0,0 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[],"param_witnesses":{},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/2NkIAwAQGbG/yQAAAA=","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/inner_outer_cl/target/inner_outer_cl.json b/crates/nargo_cli/tests/test_data/inner_outer_cl/target/inner_outer_cl.json
deleted file mode 100644
index 4c3bb072cb3..00000000000
--- a/crates/nargo_cli/tests/test_data/inner_outer_cl/target/inner_outer_cl.json
+++ /dev/null
@@ -1 +0,0 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[],"param_witnesses":{},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/2NkIAwAQGbG/yQAAAA=","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/let_stmt/target/let_stmt.json b/crates/nargo_cli/tests/test_data/let_stmt/target/let_stmt.json
deleted file mode 100644
index 4c3bb072cb3..00000000000
--- a/crates/nargo_cli/tests/test_data/let_stmt/target/let_stmt.json
+++ /dev/null
@@ -1 +0,0 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[],"param_witnesses":{},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/2NkIAwAQGbG/yQAAAA=","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/let_stmt/target/witness.tr b/crates/nargo_cli/tests/test_data/let_stmt/target/witness.tr
deleted file mode 100644
index 4e90289d5e1..00000000000
Binary files a/crates/nargo_cli/tests/test_data/let_stmt/target/witness.tr and /dev/null differ
diff --git a/crates/nargo_cli/tests/test_data/numeric_generics/target/numeric_generics.json b/crates/nargo_cli/tests/test_data/numeric_generics/target/numeric_generics.json
deleted file mode 100644
index 4c3bb072cb3..00000000000
--- a/crates/nargo_cli/tests/test_data/numeric_generics/target/numeric_generics.json
+++ /dev/null
@@ -1 +0,0 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[],"param_witnesses":{},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/2NkIAwAQGbG/yQAAAA=","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/numeric_generics/target/witness.tr b/crates/nargo_cli/tests/test_data/numeric_generics/target/witness.tr
deleted file mode 100644
index 4e90289d5e1..00000000000
Binary files a/crates/nargo_cli/tests/test_data/numeric_generics/target/witness.tr and /dev/null differ
diff --git a/crates/nargo_cli/tests/test_data/option/target/option.json b/crates/nargo_cli/tests/test_data/option/target/option.json
deleted file mode 100644
index 4c3bb072cb3..00000000000
--- a/crates/nargo_cli/tests/test_data/option/target/option.json
+++ /dev/null
@@ -1 +0,0 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[],"param_witnesses":{},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/2NkIAwAQGbG/yQAAAA=","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/option/target/witness.tr b/crates/nargo_cli/tests/test_data/option/target/witness.tr
deleted file mode 100644
index 4e90289d5e1..00000000000
Binary files a/crates/nargo_cli/tests/test_data/option/target/witness.tr and /dev/null differ
diff --git a/crates/nargo_cli/tests/test_data/rebuild.sh b/crates/nargo_cli/tests/test_data/rebuild.sh
deleted file mode 100755
index 53d18e5cc93..00000000000
--- a/crates/nargo_cli/tests/test_data/rebuild.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-set -e
-
-# Parse exclude and fail directories from cargo.toml
-exclude_dirs=$(grep "^exclude" config.toml | sed 's/exclude = \[//;s/\]//;s/\"//g;s/ //g' | tr ',' '\n')
-fail_dirs=$(grep "^fail" config.toml | sed 's/fail = \[//;s/\]//;s/\"//g;s/ //g' | tr ',' '\n')
-
-# Convert them to array
-exclude_array=($exclude_dirs)
-fail_array=($fail_dirs)
-
-# Merge exclude and fail arrays
-exclude_fail_dirs=("${exclude_array[@]}" "${fail_array[@]}" "workspace")
-
-# Loop over every directory
-for dir in ./*; do
-  if [[ ! -d $dir ]]; then
-    continue
-  fi
-
-  dir_name=$(basename "$dir")
-  if [[ ! " ${exclude_fail_dirs[@]} " =~ " ${dir_name} " ]]; then
-      cd $dir
-      if [ -d ./target/ ]; then
-        rm -r ./target/
-      fi
-      nargo compile && nargo execute witness
-      cd ..
-  fi
-done
-
diff --git a/crates/nargo_cli/tests/test_data/regression_2099/target/witness.tr b/crates/nargo_cli/tests/test_data/regression_2099/target/witness.tr
deleted file mode 100644
index 4e90289d5e1..00000000000
Binary files a/crates/nargo_cli/tests/test_data/regression_2099/target/witness.tr and /dev/null differ
diff --git a/crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/target/witness.tr b/crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/target/witness.tr
deleted file mode 100644
index 4e90289d5e1..00000000000
Binary files a/crates/nargo_cli/tests/test_data/regression_method_cannot_be_found/target/witness.tr and /dev/null differ
diff --git a/crates/nargo_cli/tests/test_data/to_bits/target/to_bits.json b/crates/nargo_cli/tests/test_data/to_bits/target/to_bits.json
deleted file mode 100644
index 4c3bb072cb3..00000000000
--- a/crates/nargo_cli/tests/test_data/to_bits/target/to_bits.json
+++ /dev/null
@@ -1 +0,0 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[],"param_witnesses":{},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/2NkIAwAQGbG/yQAAAA=","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/to_bits/target/witness.tr b/crates/nargo_cli/tests/test_data/to_bits/target/witness.tr
deleted file mode 100644
index 4e90289d5e1..00000000000
Binary files a/crates/nargo_cli/tests/test_data/to_bits/target/witness.tr and /dev/null differ
diff --git a/crates/nargo_cli/tests/test_data/unconstrained_empty/target/witness.tr b/crates/nargo_cli/tests/test_data/unconstrained_empty/target/witness.tr
deleted file mode 100644
index 4e90289d5e1..00000000000
Binary files a/crates/nargo_cli/tests/test_data/unconstrained_empty/target/witness.tr and /dev/null differ
diff --git a/crates/nargo_cli/tests/test_data/unit/target/unit.json b/crates/nargo_cli/tests/test_data/unit/target/unit.json
deleted file mode 100644
index 4c3bb072cb3..00000000000
--- a/crates/nargo_cli/tests/test_data/unit/target/unit.json
+++ /dev/null
@@ -1 +0,0 @@
-{"backend":"acvm-backend-barretenberg","abi":{"parameters":[],"param_witnesses":{},"return_type":null,"return_witnesses":[]},"bytecode":"H4sIAAAAAAAA/2NkIAwAQGbG/yQAAAA=","proving_key":null,"verification_key":null}
\ No newline at end of file
diff --git a/crates/nargo_cli/tests/test_data/unit/target/witness.tr b/crates/nargo_cli/tests/test_data/unit/target/witness.tr
deleted file mode 100644
index 4e90289d5e1..00000000000
Binary files a/crates/nargo_cli/tests/test_data/unit/target/witness.tr and /dev/null differ
diff --git a/crates/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs b/crates/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
index 4e73b9885fb..03dc414f3fb 100644
--- a/crates/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
+++ b/crates/noirc_evaluator/src/ssa/acir_gen/acir_ir/acir_variable.rs
@@ -630,9 +630,6 @@ impl AcirContext {
         let rhs_expr = self.var_to_expression(rhs)?;
         let predicate_expr = self.var_to_expression(predicate)?;
 
-        // TODO: check what happens when we do (a as u8) >= (b as u32)
-        // TODO: The frontend should shout in this case
-
         let is_greater_than_eq =
             self.acir_ir.more_than_eq_comparison(&lhs_expr, &rhs_expr, bit_size, predicate_expr)?;
 
diff --git a/crates/noirc_frontend/src/hir/type_check/errors.rs b/crates/noirc_frontend/src/hir/type_check/errors.rs
index 4f032503f3d..8b3623db3c3 100644
--- a/crates/noirc_frontend/src/hir/type_check/errors.rs
+++ b/crates/noirc_frontend/src/hir/type_check/errors.rs
@@ -71,6 +71,8 @@ pub enum TypeCheckError {
     IntegerBitWidth { bit_width_x: u32, bit_width_y: u32, span: Span },
     #[error("{kind} cannot be used in an infix operation")]
     InvalidInfixOp { kind: &'static str, span: Span },
+    #[error("{kind} cannot be used in a unary operation")]
+    InvalidUnaryOp { kind: String, span: Span },
     #[error("Bitwise operations are invalid on Field types. Try casting the operands to a sized integer type first.")]
     InvalidBitwiseOperationOnField { span: Span },
     #[error("Integer cannot be used with type {typ}")]
@@ -174,6 +176,7 @@ impl From<TypeCheckError> for Diagnostic {
             | TypeCheckError::IntegerSignedness { span, .. }
             | TypeCheckError::IntegerBitWidth { span, .. }
             | TypeCheckError::InvalidInfixOp { span, .. }
+            | TypeCheckError::InvalidUnaryOp { span, .. }
             | TypeCheckError::InvalidBitwiseOperationOnField { span, .. }
             | TypeCheckError::IntegerTypeMismatch { span, .. }
             | TypeCheckError::FieldComparison { span, .. }
diff --git a/crates/noirc_frontend/src/hir/type_check/expr.rs b/crates/noirc_frontend/src/hir/type_check/expr.rs
index 6c111a1d6a0..5bc6aa45359 100644
--- a/crates/noirc_frontend/src/hir/type_check/expr.rs
+++ b/crates/noirc_frontend/src/hir/type_check/expr.rs
@@ -1088,7 +1088,13 @@ impl<'interner> TypeChecker<'interner> {
         };
 
         match op {
-            crate::UnaryOp::Minus => unify(Type::polymorphic_integer(self.interner)),
+            crate::UnaryOp::Minus => {
+                let expected = Type::polymorphic_integer(self.interner);
+                rhs_type.unify(&expected, span, &mut self.errors, || {
+                    TypeCheckError::InvalidUnaryOp { kind: rhs_type.to_string(), span }
+                });
+                expected
+            }
             crate::UnaryOp::Not => {
                 let rhs_type = rhs_type.follow_bindings();