diff --git a/package.json b/package.json
index 1e3167ff..196ff0ad 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "lint": "yarn evm:lint",
     "typechain": "yarn evm:typechain",
     "test": "yarn evm:test && yarn ciphernode:test",
-    "test:integration": "./tests/basic_integration/test.sh",
+    "test:integration": "./tests/integration/test.sh",
     "coverage": "yarn evm:coverage",
     "enclave": "cd packages/ciphernode && ./scripts/launch.sh",
     "ciphernode:lint": "cd packages/ciphernode && cargo fmt -- --check",
diff --git a/tests/basic_integration/lib/pack_e3_params.sh b/tests/basic_integration/lib/pack_e3_params.sh
deleted file mode 100755
index 78502e2e..00000000
--- a/tests/basic_integration/lib/pack_e3_params.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-cd packages/ciphernode && RUSTFLAGS="-A warnings" cargo run --bin pack_e3_params -- "$@" 
diff --git a/tests/basic_integration/README.md b/tests/integration/README.md
similarity index 100%
rename from tests/basic_integration/README.md
rename to tests/integration/README.md
diff --git a/tests/basic_integration/base.sh b/tests/integration/base.sh
similarity index 100%
rename from tests/basic_integration/base.sh
rename to tests/integration/base.sh
diff --git a/tests/basic_integration/fns.sh b/tests/integration/fns.sh
similarity index 94%
rename from tests/basic_integration/fns.sh
rename to tests/integration/fns.sh
index f44fee0b..a6cfd625 100644
--- a/tests/basic_integration/fns.sh
+++ b/tests/integration/fns.sh
@@ -56,6 +56,10 @@ heading() {
     echo ""
 }
 
+strip_ansi() {
+    sed 's/\x1b\[[0-9;]*m//g'
+}
+
 waiton() {
     local file_path="$1"
     until [ -f "$file_path" ]; do
@@ -102,7 +106,7 @@ launch_ciphernode() {
    mkdir -p "$log_dir"
    $ENCLAVE_BIN start -v \
      --tag "$name" \
-     --config "$SCRIPT_DIR/lib/$name/config.yaml" 2>&1 | tee "$log_file" & echo $! > "/tmp/enclave.${ID}_${name}.pid"
+     --config "$SCRIPT_DIR/lib/$name/config.yaml" 2>&1 | tee >(strip_ansi > "$log_file") & echo $! > "/tmp/enclave.${ID}_${name}.pid"
 }
 
 set_private_key() {
@@ -136,7 +140,7 @@ launch_aggregator() {
      --tag "$name" \
      --config "$SCRIPT_DIR/lib/$name/config.yaml" \
      --pubkey-write-path "$SCRIPT_DIR/output/pubkey.bin" \
-     --plaintext-write-path "$SCRIPT_DIR/output/plaintext.txt" 2>&1 | tee "$log_file" & echo $! > "/tmp/enclave.${ID}_${name}.pid"
+     --plaintext-write-path "$SCRIPT_DIR/output/plaintext.txt" 2>&1 | tee >(strip_ansi > "$log_file") & echo $! > "/tmp/enclave.${ID}_${name}.pid"
 }
 
 kill_proc() {
diff --git a/tests/basic_integration/lib/ag/.gitignore b/tests/integration/lib/ag/.gitignore
similarity index 100%
rename from tests/basic_integration/lib/ag/.gitignore
rename to tests/integration/lib/ag/.gitignore
diff --git a/tests/basic_integration/lib/ag/config.yaml b/tests/integration/lib/ag/config.yaml
similarity index 100%
rename from tests/basic_integration/lib/ag/config.yaml
rename to tests/integration/lib/ag/config.yaml
diff --git a/tests/basic_integration/lib/clean_folders.sh b/tests/integration/lib/clean_folders.sh
similarity index 100%
rename from tests/basic_integration/lib/clean_folders.sh
rename to tests/integration/lib/clean_folders.sh
diff --git a/tests/basic_integration/lib/cn1/.gitignore b/tests/integration/lib/cn1/.gitignore
similarity index 100%
rename from tests/basic_integration/lib/cn1/.gitignore
rename to tests/integration/lib/cn1/.gitignore
diff --git a/tests/basic_integration/lib/cn1/config.yaml b/tests/integration/lib/cn1/config.yaml
similarity index 100%
rename from tests/basic_integration/lib/cn1/config.yaml
rename to tests/integration/lib/cn1/config.yaml
diff --git a/tests/basic_integration/lib/cn2/.gitignore b/tests/integration/lib/cn2/.gitignore
similarity index 100%
rename from tests/basic_integration/lib/cn2/.gitignore
rename to tests/integration/lib/cn2/.gitignore
diff --git a/tests/basic_integration/lib/cn2/config.yaml b/tests/integration/lib/cn2/config.yaml
similarity index 100%
rename from tests/basic_integration/lib/cn2/config.yaml
rename to tests/integration/lib/cn2/config.yaml
diff --git a/tests/basic_integration/lib/cn3/.gitignore b/tests/integration/lib/cn3/.gitignore
similarity index 100%
rename from tests/basic_integration/lib/cn3/.gitignore
rename to tests/integration/lib/cn3/.gitignore
diff --git a/tests/basic_integration/lib/cn3/config.yaml b/tests/integration/lib/cn3/config.yaml
similarity index 100%
rename from tests/basic_integration/lib/cn3/config.yaml
rename to tests/integration/lib/cn3/config.yaml
diff --git a/tests/basic_integration/lib/cn4/.gitignore b/tests/integration/lib/cn4/.gitignore
similarity index 100%
rename from tests/basic_integration/lib/cn4/.gitignore
rename to tests/integration/lib/cn4/.gitignore
diff --git a/tests/basic_integration/lib/cn4/config.yaml b/tests/integration/lib/cn4/config.yaml
similarity index 100%
rename from tests/basic_integration/lib/cn4/config.yaml
rename to tests/integration/lib/cn4/config.yaml
diff --git a/tests/basic_integration/lib/fake_encrypt.sh b/tests/integration/lib/fake_encrypt.sh
similarity index 100%
rename from tests/basic_integration/lib/fake_encrypt.sh
rename to tests/integration/lib/fake_encrypt.sh
diff --git a/tests/integration/lib/pack_e3_params.sh b/tests/integration/lib/pack_e3_params.sh
new file mode 100755
index 00000000..48ed6dd6
--- /dev/null
+++ b/tests/integration/lib/pack_e3_params.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+./packages/ciphernode/target/debug/pack_e3_params "$@" 
diff --git a/tests/basic_integration/lib/prebuild.sh b/tests/integration/lib/prebuild.sh
similarity index 52%
rename from tests/basic_integration/lib/prebuild.sh
rename to tests/integration/lib/prebuild.sh
index 33c7ce39..8b8a957e 100755
--- a/tests/basic_integration/lib/prebuild.sh
+++ b/tests/integration/lib/prebuild.sh
@@ -1,3 +1,8 @@
 #!/usr/bin/env sh
-
+echo ""
+echo "PREBUILDING BINARIES..."
+echo ""
 cd packages/ciphernode && cargo build --bin fake_encrypt --bin enclave --bin pack_e3_params;
+echo ""
+echo "FINISHED PREBUILDING BINARIES"
+echo ""
diff --git a/tests/basic_integration/logs/.gitignore b/tests/integration/logs/.gitignore
similarity index 100%
rename from tests/basic_integration/logs/.gitignore
rename to tests/integration/logs/.gitignore
diff --git a/tests/basic_integration/net.sh b/tests/integration/net.sh
similarity index 100%
rename from tests/basic_integration/net.sh
rename to tests/integration/net.sh
diff --git a/tests/basic_integration/output/.gitignore b/tests/integration/output/.gitignore
similarity index 100%
rename from tests/basic_integration/output/.gitignore
rename to tests/integration/output/.gitignore
diff --git a/tests/basic_integration/persist.sh b/tests/integration/persist.sh
similarity index 100%
rename from tests/basic_integration/persist.sh
rename to tests/integration/persist.sh
diff --git a/tests/basic_integration/test.sh b/tests/integration/test.sh
similarity index 100%
rename from tests/basic_integration/test.sh
rename to tests/integration/test.sh