diff --git a/client/experimental_client_with_swig/02a_run_test_lua.sh b/client/experimental_client_with_swig/02a_run_test_lua.sh
new file mode 100755
index 000000000..8e04b30f5
--- /dev/null
+++ b/client/experimental_client_with_swig/02a_run_test_lua.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+../../pm3 -c "script run testembedded.lua"
diff --git a/client/experimental_client_with_swig/02a_run_test_lua_cmake.sh b/client/experimental_client_with_swig/02a_run_test_lua_cmake.sh
deleted file mode 100755
index 08ed58b6b..000000000
--- a/client/experimental_client_with_swig/02a_run_test_lua_cmake.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-../build/proxmark3 /dev/ttyACM0 -c "script run testembedded.lua"
diff --git a/client/experimental_client_with_swig/02a_run_test_lua_makefile.sh b/client/experimental_client_with_swig/02a_run_test_lua_makefile.sh
deleted file mode 100755
index bc19e7dfe..000000000
--- a/client/experimental_client_with_swig/02a_run_test_lua_makefile.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-../proxmark3 /dev/ttyACM0 -c "script run testembedded.lua"
diff --git a/client/experimental_client_with_swig/02b_run_test_py_makefile.sh b/client/experimental_client_with_swig/02b_run_test_py.sh
similarity index 61%
rename from client/experimental_client_with_swig/02b_run_test_py_makefile.sh
rename to client/experimental_client_with_swig/02b_run_test_py.sh
index 838331382..a962c7b22 100755
--- a/client/experimental_client_with_swig/02b_run_test_py_makefile.sh
+++ b/client/experimental_client_with_swig/02b_run_test_py.sh
@@ -4,4 +4,4 @@
 #/usr/lib/python3/dist-packages/pm3.py
 
 # need access to pm3.py
-PYTHONPATH=../src ../proxmark3 /dev/ttyACM0 -c "script run testembedded.py"
+PYTHONPATH=../src ../../pm3 -c "script run testembedded.py"
diff --git a/client/experimental_client_with_swig/02b_run_test_py_cmake.sh b/client/experimental_client_with_swig/02b_run_test_py_grabber.sh
similarity index 59%
rename from client/experimental_client_with_swig/02b_run_test_py_cmake.sh
rename to client/experimental_client_with_swig/02b_run_test_py_grabber.sh
index 4ef059045..06dc31717 100755
--- a/client/experimental_client_with_swig/02b_run_test_py_cmake.sh
+++ b/client/experimental_client_with_swig/02b_run_test_py_grabber.sh
@@ -4,4 +4,4 @@
 #/usr/lib/python3/dist-packages/pm3.py
 
 # need access to pm3.py
-PYTHONPATH=../src ../build/proxmark3 /dev/ttyACM0 -c "script run testembedded.py"
+PYTHONPATH=../src ../../pm3 -c "script run testembedded_grab.py" -i
diff --git a/client/experimental_client_with_swig/02b_run_test_py_grabber_cmake.sh b/client/experimental_client_with_swig/02b_run_test_py_grabber_cmake.sh
deleted file mode 100755
index 2f13a6628..000000000
--- a/client/experimental_client_with_swig/02b_run_test_py_grabber_cmake.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-#/usr/local/lib/python3/dist-packages/pm3.py
-#/usr/lib/python3/dist-packages/pm3.py
-
-# need access to pm3.py
-PYTHONPATH=../src ../build/proxmark3 /dev/ttyACM1 -c "script run testembedded_grab.py" -i
diff --git a/client/experimental_client_with_swig/02b_run_test_py_grabber_makefile.sh b/client/experimental_client_with_swig/02b_run_test_py_grabber_makefile.sh
deleted file mode 100755
index 59013cc22..000000000
--- a/client/experimental_client_with_swig/02b_run_test_py_grabber_makefile.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-#/usr/local/lib/python3/dist-packages/pm3.py
-#/usr/lib/python3/dist-packages/pm3.py
-
-# need access to pm3.py
-PYTHONPATH=../src ../proxmark3 /dev/ttyACM0 -c "script run testembedded_grab.py" -i
-