diff --git a/charts/paradedb/test/paradedb-enterprise/02-paradedb_test.yaml b/charts/paradedb/test/paradedb-enterprise/02-paradedb_test.yaml
index 42b569591..36716e801 100644
--- a/charts/paradedb/test/paradedb-enterprise/02-paradedb_test.yaml
+++ b/charts/paradedb/test/paradedb-enterprise/02-paradedb_test.yaml
@@ -19,18 +19,18 @@ spec:
         args:
           - |
             apk --no-cache add postgresql-client
-            psql -a "$DB_URI" <<-EOSQL
+            psql "$DB_URI" <<-EOSQL
               CALL paradedb.create_bm25_test_table(
                 schema_name => 'public',
-                table_name => 'mock_items'
+                table_name => 'mock_items_paradedb_enterprise'
               );
-              CREATE INDEX paradedb_enterprise_test_search_idx ON mock_items
+              CREATE INDEX search_idx_paradedb_enterprise_ ON mock_items_paradedb_enterprise
               USING bm25 (id, description, category, rating, in_stock, created_at, metadata, weight_range)
               WITH (key_field='id');
             EOSQL
-            RESULT=$(psql -a "$DB_URI" -t) <<-EOSQL
+            RESULT=$(psql "$DB_URI" -t) <<-EOSQL
               SELECT description
-              FROM mock_items
+              FROM mock_items_paradedb_enterprise
               WHERE description @@@ '"bluetooth speaker"~1'
               LIMIT 1;
             EOSQL
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/02-paradedb_write.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/02-paradedb_write.yaml
index c560718b0..80e622b7e 100644
--- a/charts/paradedb/test/paradedb-minio-backup-restore/02-paradedb_write.yaml
+++ b/charts/paradedb/test/paradedb-minio-backup-restore/02-paradedb_write.yaml
@@ -19,12 +19,12 @@ spec:
         args:
           - |
             apk --no-cache add postgresql-client
-            psql -e "$DB_URI" <<-EOSQL
+            psql "$DB_URI" <<-EOSQL
               CALL paradedb.create_bm25_test_table(
                 schema_name => 'public',
-                table_name => 'mock_items'
+                table_name => 'mock_items_paradedb_minio_backup_restore'
               );
-              CREATE INDEX paradedb_write_search_idx ON mock_items
+              CREATE INDEX search_idx_paradedb_minio_backup_restore ON mock_items_paradedb_minio_backup_restore
               USING bm25 (id, description, category, rating, in_stock, created_at, metadata, weight_range)
               WITH (key_field='id');
             EOSQL
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/03-paradedb_test.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/03-paradedb_test.yaml
index 50469865e..502be690f 100644
--- a/charts/paradedb/test/paradedb-minio-backup-restore/03-paradedb_test.yaml
+++ b/charts/paradedb/test/paradedb-minio-backup-restore/03-paradedb_test.yaml
@@ -19,9 +19,9 @@ spec:
         args:
           - |
             apk --no-cache add postgresql-client
-            RESULT=$(psql -e "$DB_URI" -t) <<-EOSQL
+            RESULT=$(psql "$DB_URI" -t) <<-EOSQL
               SELECT description
-              FROM mock_items
+              FROM mock_items_paradedb_minio_backup_restore
               WHERE description @@@ '"bluetooth speaker"~1'
               LIMIT 1;
             EOSQL
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/04-data_write.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/04-data_write.yaml
index b48929591..c215d365f 100644
--- a/charts/paradedb/test/paradedb-minio-backup-restore/04-data_write.yaml
+++ b/charts/paradedb/test/paradedb-minio-backup-restore/04-data_write.yaml
@@ -47,7 +47,7 @@ spec:
          - |
            apk --no-cache add postgresql-client kubectl coreutils
            DB_URI=$(echo $DB_URI | sed "s|/\*|/|" )
-           psql -e "$DB_URI" -c "CREATE TABLE mygoodtable (id serial PRIMARY KEY);"
+           psql "$DB_URI" -c "CREATE TABLE mygoodtable (id serial PRIMARY KEY);"
            sleep 5
            DATE_NO_BAD_TABLE=$(date --rfc-3339=ns)
            kubectl create configmap date-no-bad-table --from-literal=date="$DATE_NO_BAD_TABLE"
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/05-checkpoint.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/05-checkpoint.yaml
index cdb20c554..e59ff1f70 100644
--- a/charts/paradedb/test/paradedb-minio-backup-restore/05-checkpoint.yaml
+++ b/charts/paradedb/test/paradedb-minio-backup-restore/05-checkpoint.yaml
@@ -22,6 +22,6 @@ spec:
            DB_URI=$(echo $DB_URI | sed "s|/\*|/|" )
            END_TIME=$(( $(date +%s) + 30 ))
            while [ $(date +%s) -lt $END_TIME ]; do
-             psql -e "$DB_URI" -c "SELECT pg_switch_wal();CHECKPOINT;"
+             psql "$DB_URI" -c "SELECT pg_switch_wal();CHECKPOINT;"
              sleep 5
            done
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml
index 2924621fc..582104f7d 100644
--- a/charts/paradedb/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml
+++ b/charts/paradedb/test/paradedb-minio-backup-restore/06-post_backup_data_write.yaml
@@ -24,4 +24,4 @@ spec:
          - |
            apk --no-cache add postgresql-client
            DB_URI=$(echo $DB_URI | sed "s|/\*|/|" )
-           psql -e "$DB_URI" -c "CREATE TABLE mybadtable (id serial PRIMARY KEY);"
+           psql "$DB_URI" -c "CREATE TABLE mybadtable (id serial PRIMARY KEY);"
diff --git a/charts/paradedb/test/paradedb-minio-backup-restore/chainsaw-test.yaml b/charts/paradedb/test/paradedb-minio-backup-restore/chainsaw-test.yaml
index 282e1b114..553e3723a 100644
--- a/charts/paradedb/test/paradedb-minio-backup-restore/chainsaw-test.yaml
+++ b/charts/paradedb/test/paradedb-minio-backup-restore/chainsaw-test.yaml
@@ -98,16 +98,6 @@ spec:
         - podLogs:
             name: post-init-backup
             container: backup-container
-        # - describe:
-        #     apiVersion: postgresql.cnpg.io/v1
-        #     kind: Cluster
-        # - podLogs:
-        #     selector: cnpg.io/cluster=paradedb-paradedb
-        # - describe:
-        #     apiVersion: batch/v1
-        #     kind: Job
-        # - podLogs:
-        #     selector: batch.kubernetes.io/job-name=backup-checkpoint
     - name: Write more data to the database after the backup
       try:
         - apply:
diff --git a/charts/paradedb/test/postgresql-import/01-data_write.yaml b/charts/paradedb/test/postgresql-import/01-data_write.yaml
index f20ded8d1..9d538f6cd 100644
--- a/charts/paradedb/test/postgresql-import/01-data_write.yaml
+++ b/charts/paradedb/test/postgresql-import/01-data_write.yaml
@@ -26,6 +26,6 @@ spec:
         args:
          - |
            apk --no-cache add postgresql-client
-           psql -e "$DB_URI" -c "CREATE DATABASE mygooddb;"
-           psql -e "$DB_URI/mygooddb" -c "CREATE TABLE mygoodtable (id serial PRIMARY KEY);"
-           psql -e "$DB_URI/mygooddb" -c "INSERT INTO mygoodtable VALUES (314159265);"
+           psql "$DB_URI" -c "CREATE DATABASE mygooddb;"
+           psql "$DB_URI/mygooddb" -c "CREATE TABLE mygoodtable (id serial PRIMARY KEY);"
+           psql "$DB_URI/mygooddb" -c "INSERT INTO mygoodtable VALUES (314159265);"
diff --git a/charts/paradedb/test/postgresql-import/03-data_test.yaml b/charts/paradedb/test/postgresql-import/03-data_test.yaml
index ec548f511..716f6e4b8 100644
--- a/charts/paradedb/test/postgresql-import/03-data_test.yaml
+++ b/charts/paradedb/test/postgresql-import/03-data_test.yaml
@@ -20,5 +20,5 @@ spec:
          - |
            apk --no-cache add postgresql-client
            DB_URI=$(echo $DB_URI | sed "s|/\*|/|" )
-           test "$(psql -e "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_name = $$mygoodtable$$)' --csv -q 2>/dev/null)" = "t"
-           test "$(psql -e "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM mygoodtable WHERE id = 314159265)' --csv -q 2>/dev/null)" = "t"
+           test "$(psql "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_name = $$mygoodtable$$)' --csv -q 2>/dev/null)" = "t"
+           test "$(psql "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM mygoodtable WHERE id = 314159265)' --csv -q 2>/dev/null)" = "t"
diff --git a/charts/paradedb/test/postgresql-import/05-data_test.yaml b/charts/paradedb/test/postgresql-import/05-data_test.yaml
index 96a7a8329..5e1f05f6e 100644
--- a/charts/paradedb/test/postgresql-import/05-data_test.yaml
+++ b/charts/paradedb/test/postgresql-import/05-data_test.yaml
@@ -20,5 +20,5 @@ spec:
          - |
            apk --no-cache add postgresql-client
            DB_URI=$(echo $DB_URI | sed "s|/\*|/|" )
-           test "$(psql -e "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_name = $$mygoodtable$$)' --csv -q 2>/dev/null)" = "t"
-           test "$(psql -e "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM mygoodtable WHERE id = 314159265)' --csv -q 2>/dev/null)" = "f"
+           test "$(psql "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_name = $$mygoodtable$$)' --csv -q 2>/dev/null)" = "t"
+           test "$(psql "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM mygoodtable WHERE id = 314159265)' --csv -q 2>/dev/null)" = "f"
diff --git a/charts/paradedb/test/postgresql-pg_basebackup/01-data_write.yaml b/charts/paradedb/test/postgresql-pg_basebackup/01-data_write.yaml
index f1cde1fd7..17f92db89 100644
--- a/charts/paradedb/test/postgresql-pg_basebackup/01-data_write.yaml
+++ b/charts/paradedb/test/postgresql-pg_basebackup/01-data_write.yaml
@@ -26,5 +26,5 @@ spec:
         args:
          - |
            apk --no-cache add postgresql-client
-           psql -e "$DB_URI" -c "CREATE DATABASE mygooddb;"
-           psql -e "$DB_URI/mygooddb" -c "CREATE TABLE mygoodtable (id serial PRIMARY KEY);"
+           psql "$DB_URI" -c "CREATE DATABASE mygooddb;"
+           psql "$DB_URI/mygooddb" -c "CREATE TABLE mygoodtable (id serial PRIMARY KEY);"
diff --git a/charts/paradedb/test/postgresql-pg_basebackup/03-data_test.yaml b/charts/paradedb/test/postgresql-pg_basebackup/03-data_test.yaml
index d56ec751e..487e25bf2 100644
--- a/charts/paradedb/test/postgresql-pg_basebackup/03-data_test.yaml
+++ b/charts/paradedb/test/postgresql-pg_basebackup/03-data_test.yaml
@@ -20,4 +20,4 @@ spec:
          - |
            apk --no-cache add postgresql-client
            DB_URI=$(echo $DB_URI | sed "s|/\*|/|" )
-           test "$(psql -e "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_name = $$mygoodtable$$)' --csv -q 2>/dev/null)" = "t"
+           test "$(psql "${DB_URI}mygooddb" -t -c 'SELECT EXISTS (SELECT FROM information_schema.tables WHERE table_name = $$mygoodtable$$)' --csv -q 2>/dev/null)" = "t"