diff --git a/CMakeLists.txt b/CMakeLists.txt
index e24c017ad440eb764bdb96dbb5e3ba29aae62126..adfc8069e53176f3c4a6f3a253081a6e12dd0aa7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,16 @@ message (STATUS "Found cURL libraries: ${CURL_LIBRARIES}")
 message (STATUS "cURL include: ${CURL_INCLUDE_DIRS}")
 
 
+if ("${Python_EXECUTABLE}" STREQUAL "")
+    find_package (Python COMPONENTS Interpreter Development)
+    if (NOT Python_FOUND)
+        message (FATAL "Cannot find Python")
+    endif()
+endif()
+message (STATUS "Using Python: ${Python_EXECUTABLE}")
+
+
+
 # format sources
 include(astyle)
 
diff --git a/CMakeModules/CodeCoverage.cmake b/CMakeModules/CodeCoverage.cmake
index c170c6a0a938e7f73c6b530726b04a558d780893..c170a8a583bbf2ea89338fdfc664ddddfe8afef0 100644
--- a/CMakeModules/CodeCoverage.cmake
+++ b/CMakeModules/CodeCoverage.cmake
@@ -73,7 +73,6 @@ find_program( GCOV_PATH gcov )
 find_program( LCOV_PATH lcov )
 find_program( GENHTML_PATH genhtml )
 find_program( GCOVR_PATH gcovr PATHS ${CMAKE_SOURCE_DIR}/scripts/test)
-find_program( SIMPLE_PYTHON_EXECUTABLE python )
 
 if(NOT GCOV_PATH)
     message(FATAL_ERROR "gcov not found! Aborting...")
@@ -204,10 +203,6 @@ function(SETUP_TARGET_FOR_COVERAGE_COBERTURA)
     set(multiValueArgs EXECUTABLE EXECUTABLE_ARGS DEPENDENCIES)
     cmake_parse_arguments(Coverage "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
 
-    if(NOT SIMPLE_PYTHON_EXECUTABLE)
-        message(FATAL_ERROR "python not found! Aborting...")
-    endif() # NOT SIMPLE_PYTHON_EXECUTABLE
-
     if(NOT GCOVR_PATH)
         message(FATAL_ERROR "gcovr not found! Aborting...")
     endif() # NOT GCOVR_PATH
diff --git a/consumer/api/cpp/src/server_data_broker.cpp b/consumer/api/cpp/src/server_data_broker.cpp
index 01696549062e5c4a6b83a239b304ed3b31d103f0..685aafb1010dd9aff22fb265cb8442193b69f241 100644
--- a/consumer/api/cpp/src/server_data_broker.cpp
+++ b/consumer/api/cpp/src/server_data_broker.cpp
@@ -481,12 +481,12 @@ DataSet ServerDataBroker::GetDatasetById(uint64_t id, std::string group_id, std:
     return GetDatasetFromServer(GetImageServerOperation::GetID, id, std::move(group_id), std::move(substream), err);
 }
 
-std::vector<std::string> ParseSubstreamsFromResponse(std::string response,Error* err) {
+std::vector<std::string> ParseSubstreamsFromResponse(std::string response, Error* err) {
     auto parser = JsonStringParser(std::move(response));
     std::vector<std::string> substreams;
     *err = parser.GetArrayString("substreams", &substreams);
     if (*err) {
-        return std::vector<std::string>{};
+        return std::vector<std::string> {};
     }
     return substreams;
 }
@@ -500,10 +500,10 @@ std::vector<std::string> ServerDataBroker::GetSubstreamList(Error* err) {
 
     auto response = BrokerRequestWithTimeout(ri, err);
     if (*err) {
-        return std::vector<std::string>{};
+        return std::vector<std::string> {};
     }
 
-    return ParseSubstreamsFromResponse(std::move(response),err);
+    return ParseSubstreamsFromResponse(std::move(response), err);
 }
 
 }
diff --git a/consumer/api/cpp/unittests/test_server_broker.cpp b/consumer/api/cpp/unittests/test_server_broker.cpp
index f51aa3700dd6119c1811e123f84771bf63779824..4d9e641adafb775250169b3ee4f0eedfe63cd89e 100644
--- a/consumer/api/cpp/unittests/test_server_broker.cpp
+++ b/consumer/api/cpp/unittests/test_server_broker.cpp
@@ -987,17 +987,17 @@ TEST_F(ServerDataBrokerTests, GetSubstreamListUsesCorrectUri) {
     MockGetBrokerUri();
 
     EXPECT_CALL(mock_http_client, Get_t(expected_broker_uri + "/database/beamtime_id/" + expected_stream + "/0/substreams"
-     + "?token="+ expected_token, _,
+                                        + "?token=" + expected_token, _,
                                         _)).WillOnce(DoAll(
-        SetArgPointee<1>(HttpCode::OK),
-        SetArgPointee<2>(nullptr),
-        Return("{\"substreams\":[\"s1\",\"s2\"]}")));
+                                                SetArgPointee<1>(HttpCode::OK),
+                                                SetArgPointee<2>(nullptr),
+                                                Return("{\"substreams\":[\"s1\",\"s2\"]}")));
 
     asapo::Error err;
     auto substreams = data_broker->GetSubstreamList(&err);
     ASSERT_THAT(err, Eq(nullptr));
     ASSERT_THAT(substreams.size(), Eq(2));
-    ASSERT_THAT(substreams, testing::ElementsAre("s1","s2"));
+    ASSERT_THAT(substreams, testing::ElementsAre("s1", "s2"));
 
 }
 
diff --git a/docs/sphinx/CMakeLists.txt b/docs/sphinx/CMakeLists.txt
index a04cdcb697392e120ee2ac85c85236c9020a965f..77fda050e6c860103cc70fb958ef823cb0b12b5a 100644
--- a/docs/sphinx/CMakeLists.txt
+++ b/docs/sphinx/CMakeLists.txt
@@ -8,5 +8,5 @@ add_custom_target(
         WORKING_DIRECTORY sphinx
 )
 
-add_dependencies(docs-py python-lib3-producer)
-add_dependencies(docs-py python-lib3)
+add_dependencies(docs-py python-lib-producer)
+add_dependencies(docs-py python-lib)
diff --git a/examples/consumer/getnext_broker_python/CMakeLists.txt b/examples/consumer/getnext_broker_python/CMakeLists.txt
index 2e13a9d90ec9b5b6d278fd3d257a2542a38fd0f8..bf53e51c584e69ae1d900eba3295caae447c8b31 100644
--- a/examples/consumer/getnext_broker_python/CMakeLists.txt
+++ b/examples/consumer/getnext_broker_python/CMakeLists.txt
@@ -4,12 +4,12 @@ set(TARGET_NAME getnext_broker_python)
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS python-lib2 BINARY_DIR)
+    get_target_property(PYTHON_LIBS python-lib BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS asapo_consumer BINARY_DIR)
 endif()
 
-add_script_test("${TARGET_NAME}" ${PYTHON_LIBS} nomem)
+add_script_test("${TARGET_NAME}" "${PYTHON_LIBS} ${Python_EXECUTABLE}" nomem)
 
 configure_file(getnext.py getnext.py COPYONLY)
 
diff --git a/examples/consumer/getnext_broker_python/check_linux.sh b/examples/consumer/getnext_broker_python/check_linux.sh
index 2217862e5b3a3d67e4c22000a1d79390344fd4b2..b1a508025c94fade1010a2b5f40492e32c791ecb 100644
--- a/examples/consumer/getnext_broker_python/check_linux.sh
+++ b/examples/consumer/getnext_broker_python/check_linux.sh
@@ -8,8 +8,6 @@ token_test_run=K38Mqc90iRv8fC7prcFHd994mF_wfUiJnWBfIjIzieo=
 group_id=bif31l2uiddd4r0q6b40
 set -e
 
-
-
 trap Cleanup EXIT
 
 Cleanup() {
@@ -35,27 +33,19 @@ echo 'db.meta.insert({"_id":0,"meta_test":"test"})' | mongo ${database_name}
 sleep 1
 
 export PYTHONPATH=$1:${PYTHONPATH}
+Python_EXECUTABLE=$2
+
 
-python getnext.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run $group_id > out
+$Python_EXECUTABLE getnext.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run $group_id > out
 cat out
 cat out | grep '"size": 100'
 cat out | grep '"_id": 1'
 cat out | grep '"meta_test": "test"'
 
-python getnext.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run $group_id> out
+$Python_EXECUTABLE getnext.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run $group_id> out
 cat out
 cat out | grep '"_id": 2'
 
-python3 getnext.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run $group_id> out
-cat out
-cat out | grep '"_id": 3'
-
-
-python3 getnext.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run new> out
-cat out
-cat out | grep '"_id": 1'
-
-
 #echo $?
 
 
diff --git a/examples/pipeline/in_to_out_python/CMakeLists.txt b/examples/pipeline/in_to_out_python/CMakeLists.txt
index c52a878b077c79429ef7a56da9ebcd2ac3e16536..9ab39455b74d188afbe611bf05599c4e84f876f0 100644
--- a/examples/pipeline/in_to_out_python/CMakeLists.txt
+++ b/examples/pipeline/in_to_out_python/CMakeLists.txt
@@ -3,8 +3,8 @@ set(TARGET_NAME pipeline_inout_python)
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS_CONSUMER python-lib2 BINARY_DIR)
-    get_target_property(PYTHON_LIBS_PRODUCER python-lib2-producer BINARY_DIR)
+    get_target_property(PYTHON_LIBS_CONSUMER python-lib BINARY_DIR)
+    get_target_property(PYTHON_LIBS_PRODUCER python-lib-producer BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS_CONSUMER asapo_consumer BINARY_DIR)
     get_target_property(PYTHON_LIBS_PRODUCER asapo_producer BINARY_DIR)
@@ -12,5 +12,5 @@ endif()
 
 file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/in_to_out.py TEST_SCRIPT )
 
-add_script_test("${TARGET_NAME}" "python ${PYTHON_LIBS_CONSUMER} ${PYTHON_LIBS_PRODUCER} ${TEST_SCRIPT} " nomem)
+add_script_test("${TARGET_NAME}" "${Python_EXECUTABLE} ${PYTHON_LIBS_CONSUMER} ${PYTHON_LIBS_PRODUCER} ${TEST_SCRIPT} " nomem)
 
diff --git a/tests/automatic/bug_fixes/consumer_python_memleak/CMakeLists.txt b/tests/automatic/bug_fixes/consumer_python_memleak/CMakeLists.txt
index b139ef5ebdc798d675f3e90f6da10c1b8e2b764f..6c6b66006a123dac465173c7a91dd01c43c10068 100644
--- a/tests/automatic/bug_fixes/consumer_python_memleak/CMakeLists.txt
+++ b/tests/automatic/bug_fixes/consumer_python_memleak/CMakeLists.txt
@@ -4,12 +4,12 @@ set(TARGET_NAME consumer_python_memleak)
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS python-lib2 BINARY_DIR)
+    get_target_property(PYTHON_LIBS python-lib BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS asapo_consumer BINARY_DIR)
 endif()
 
-add_script_test("${TARGET_NAME}" ${PYTHON_LIBS} nomem)
+add_script_test("${TARGET_NAME}" "${PYTHON_LIBS} ${Python_EXECUTABLE}" nomem)
 
 configure_file(memleak.py memleak.py COPYONLY)
 
diff --git a/tests/automatic/bug_fixes/consumer_python_memleak/check_linux.sh b/tests/automatic/bug_fixes/consumer_python_memleak/check_linux.sh
index c3dff6e8a90e5c53c90a28d8924ca54c3e2bceb5..6b81cebc39ec499ecc2b31c09bedf4f2579b644d 100644
--- a/tests/automatic/bug_fixes/consumer_python_memleak/check_linux.sh
+++ b/tests/automatic/bug_fixes/consumer_python_memleak/check_linux.sh
@@ -32,11 +32,10 @@ echo 'db.data_default.insert({"_id":'1',"size":'$size',"name":"'$fname'","lastch
 dd if=/dev/zero of=$fname bs=$size count=1
 
 export PYTHONPATH=$1:${PYTHONPATH}
+export Python_EXECUTABLE=$2
 
-export PYTHONPATH=/home/yakubov/projects/asapo/cmake-build-debug/consumer/api/python:${PYTHONPATH}
 
-
-python memleak.py $endpoint $path $beamtime_id $token &> out &
+$Python_EXECUTABLE memleak.py $endpoint $path $beamtime_id $token &> out &
 pid=`echo $!`
 
 sleep 1
diff --git a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/CMakeLists.txt b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/CMakeLists.txt
index d3cd169bb8a1e32c906ebce529374ab50af8b06f..08bd8372ea5cd0b79f3fe94dcefebe75facd821e 100644
--- a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/CMakeLists.txt
+++ b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/CMakeLists.txt
@@ -8,7 +8,7 @@ prepare_asapo()
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS python-lib2-producer BINARY_DIR)
+    get_target_property(PYTHON_LIBS python-lib-producer BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS asapo_producer BINARY_DIR)
 endif()
@@ -16,8 +16,8 @@ endif()
 
 file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/bugfix_callback.py TEST_SCRIPT )
 
-add_script_test("${TARGET_NAME}-python2" "python ${PYTHON_LIBS} ${TEST_SCRIPT} " nomem)
+add_script_test("${TARGET_NAME}-python" "${Python_EXECUTABLE} ${PYTHON_LIBS} ${TEST_SCRIPT} " nomem)
 
-add_script_test("${TARGET_NAME}-python3" "python3 ${PYTHON_LIBS} ${TEST_SCRIPT} " nomem)
+#add_script_test("${TARGET_NAME}-python3" "python3 ${PYTHON_LIBS} ${TEST_SCRIPT} " nomem)
 
 
diff --git a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_linux.sh b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_linux.sh
index 61baf3c850964854d1c13c5f8bf1722c17782481..67bf2b9a4cd680750662368ef86fe26c7870ab67 100644
--- a/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_linux.sh
+++ b/tests/automatic/bug_fixes/error-sending-data-using-callback-method/check_linux.sh
@@ -5,7 +5,7 @@ set -e
 trap Cleanup EXIT
 
 beamtime_id=asapo_test
-stream=$1
+stream=python
 beamline=test
 receiver_root_folder=/tmp/asapo/receiver/files
 facility=test_facility
diff --git a/tests/automatic/common/cpp/src/testing.cpp b/tests/automatic/common/cpp/src/testing.cpp
index 72a0b23b52c122eab4bd08b93eefa7f6e1f5009a..ca14d633be5124850e88daf241bd26c5cebb56f4 100644
--- a/tests/automatic/common/cpp/src/testing.cpp
+++ b/tests/automatic/common/cpp/src/testing.cpp
@@ -16,7 +16,7 @@ void T_AssertEq(const T& expected, const T& got) {
 }
 
 void M_AssertTrue(bool value, std::string name) {
-    std::cout<<"asserting "<<name<<std::endl;
+    std::cout << "asserting " << name << std::endl;
     if (!value) {
         std::cerr << "Assert failed: " << name << "\n"
                   << "Expected:\t'" << "1" << "'\n"
diff --git a/tests/automatic/consumer/consumer_api/consumer_api.cpp b/tests/automatic/consumer/consumer_api/consumer_api.cpp
index d47e758124c650aa72c505aff732d6e375518dcd..9a51b41a1a331689f4336e65a64fb2e670308858 100644
--- a/tests/automatic/consumer/consumer_api/consumer_api.cpp
+++ b/tests/automatic/consumer/consumer_api/consumer_api.cpp
@@ -126,7 +126,7 @@ void TestSingle(const std::unique_ptr<asapo::DataBroker>& broker, const std::str
 
 //streams
 
-    err = broker->GetNext(&fi, group_id,"stream1", nullptr);
+    err = broker->GetNext(&fi, group_id, "stream1", nullptr);
     if (err) {
         std::cout << err->Explain() << std::endl;
     }
@@ -134,7 +134,7 @@ void TestSingle(const std::unique_ptr<asapo::DataBroker>& broker, const std::str
     M_AssertTrue(err == nullptr, "GetNext stream1 no error");
     M_AssertTrue(fi.name == "11", "GetNext stream1 filename");
 
-    err = broker->GetNext(&fi, group_id,"stream2", nullptr);
+    err = broker->GetNext(&fi, group_id, "stream2", nullptr);
     M_AssertTrue(err == nullptr, "GetNext stream2 no error");
     M_AssertTrue(fi.name == "21", "GetNext stream2 filename");
 
diff --git a/tests/automatic/consumer/consumer_api_python/CMakeLists.txt b/tests/automatic/consumer/consumer_api_python/CMakeLists.txt
index 02e91a3f390528430184f56f349813025b4a09d6..03b6ff48320be3947dcf696aa94c97a5efb63147 100644
--- a/tests/automatic/consumer/consumer_api_python/CMakeLists.txt
+++ b/tests/automatic/consumer/consumer_api_python/CMakeLists.txt
@@ -4,11 +4,11 @@ set(TARGET_NAME consumer_api_python)
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS python-lib2 BINARY_DIR)
+    get_target_property(PYTHON_LIBS python-lib BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS asapo_consumer BINARY_DIR)
 endif()
 
-add_script_test("${TARGET_NAME}" ${PYTHON_LIBS} nomem)
+add_script_test("${TARGET_NAME}" "${PYTHON_LIBS} ${Python_EXECUTABLE}" nomem)
 configure_file(consumer_api.py consumer_api.py COPYONLY)
 
diff --git a/tests/automatic/consumer/consumer_api_python/check_linux.sh b/tests/automatic/consumer/consumer_api_python/check_linux.sh
index 90b7d62f268938f8cb3ff31150295d4a80033d24..df7485701ab514ba84090defcef0fdb2807f07e7 100644
--- a/tests/automatic/consumer/consumer_api_python/check_linux.sh
+++ b/tests/automatic/consumer/consumer_api_python/check_linux.sh
@@ -44,8 +44,8 @@ done
 sleep 1
 
 export PYTHONPATH=$1:${PYTHONPATH}
-
-python consumer_api.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run single
+export Python_EXECUTABLE=$2
+$Python_EXECUTABLE consumer_api.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run single
 
 
 #check datasets
@@ -65,4 +65,4 @@ do
 done
 
 
-python consumer_api.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run datasets
+$Python_EXECUTABLE consumer_api.py 127.0.0.1:8400 $source_path $beamtime_id $token_test_run datasets
diff --git a/tests/automatic/full_chain/simple_chain_usermeta_python/CMakeLists.txt b/tests/automatic/full_chain/simple_chain_usermeta_python/CMakeLists.txt
index abb01d4f6cce9ed9c9e31682177cc82a720c5257..956e8dea68e05bdafdb875447c7dfd4d6c857475 100644
--- a/tests/automatic/full_chain/simple_chain_usermeta_python/CMakeLists.txt
+++ b/tests/automatic/full_chain/simple_chain_usermeta_python/CMakeLists.txt
@@ -6,10 +6,10 @@ set(TARGET_NAME full_chain_usermeta_python)
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS python-lib2 BINARY_DIR)
+    get_target_property(PYTHON_LIBS python-lib BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS asapo_consumer BINARY_DIR)
 endif()
 
 
-add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer> $<TARGET_PROPERTY:asapo,EXENAME> ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_LIBS}" nomem)
+add_script_test("${TARGET_NAME}" "$<TARGET_FILE:dummy-data-producer> $<TARGET_PROPERTY:asapo,EXENAME> ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_LIBS} ${Python_EXECUTABLE}" nomem)
diff --git a/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh b/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh
index fe028afa24a02e9b5feaddbc0f720de148e8bcd5..fca9fca048d39be93477e413caf1095977289158 100644
--- a/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh
+++ b/tests/automatic/full_chain/simple_chain_usermeta_python/check_linux.sh
@@ -46,9 +46,10 @@ mkdir -p ${receiver_folder}
 $1 localhost:8400 ${beamtime_id} 100 100 1 0 100
 
 export PYTHONPATH=$4:${PYTHONPATH}
+export Python_EXECUTABLE=$5
 
 
-python $3/get_user_meta.py $proxy_address $receiver_folder $beamtime_id $token new > out
+$Python_EXECUTABLE $3/get_user_meta.py $proxy_address $receiver_folder $beamtime_id $token new > out
 cat out
 cat out | grep "found images: 100"
 cat out | grep "test100"
diff --git a/tests/automatic/producer/python_api/CMakeLists.txt b/tests/automatic/producer/python_api/CMakeLists.txt
index 0fccc0377100d8aee0d253fffc19b49532903183..8e8282c914c64197afab2716f74734d94d89b0a5 100644
--- a/tests/automatic/producer/python_api/CMakeLists.txt
+++ b/tests/automatic/producer/python_api/CMakeLists.txt
@@ -8,7 +8,7 @@ prepare_asapo()
 prepare_asapo()
 
 if (UNIX)
-    get_target_property(PYTHON_LIBS python-lib2-producer BINARY_DIR)
+    get_target_property(PYTHON_LIBS python-lib-producer BINARY_DIR)
 else()
     get_target_property(PYTHON_LIBS asapo_producer BINARY_DIR)
 endif()
@@ -16,8 +16,7 @@ endif()
 
 file(TO_NATIVE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/producer_api.py TEST_SCRIPT )
 
-add_script_test("${TARGET_NAME}-python2" "python ${PYTHON_LIBS} ${TEST_SCRIPT} " nomem)
+add_script_test("${TARGET_NAME}-python" "${Python_EXECUTABLE} ${PYTHON_LIBS} ${TEST_SCRIPT} " nomem)
 
-add_script_test("${TARGET_NAME}-python3" "python3 ${PYTHON_LIBS} ${TEST_SCRIPT} " nomem)
 
 
diff --git a/tests/automatic/producer/python_api/check_linux.sh b/tests/automatic/producer/python_api/check_linux.sh
index 4989ca00ad0df537e0b4e12063e862c3d239e671..3a332e03d9866d8b987a11df9647ccedc469289c 100644
--- a/tests/automatic/producer/python_api/check_linux.sh
+++ b/tests/automatic/producer/python_api/check_linux.sh
@@ -5,7 +5,7 @@ set -e
 trap Cleanup EXIT
 
 beamtime_id=asapo_test
-stream=$1
+stream=python
 beamline=test
 receiver_root_folder=/tmp/asapo/receiver/files
 facility=test_facility
@@ -26,7 +26,7 @@ Cleanup() {
 
 export PYTHONPATH=$2:${PYTHONPATH}
 
-echo "db.${beamtime_id}_${stream}.insert({dummy:1})" | mongo ${beamtime_id}_${stream} >/dev/null
+echo "db.${beamtime_id}_${stream}.insert({dummy:1})" | mongo ${beamtime_id}_${stream}  >/dev/null
 
 nomad run authorizer.nmd >/dev/null
 nomad run nginx.nmd >/dev/null
diff --git a/tests/manual/python_tests/producer/asapo_producer.so b/tests/manual/python_tests/producer/asapo_producer.so
deleted file mode 120000
index cd186e18092ad6fd8de0e7ab30f6b7a4b5417775..0000000000000000000000000000000000000000
--- a/tests/manual/python_tests/producer/asapo_producer.so
+++ /dev/null
@@ -1 +0,0 @@
-/home/yakubov/projects/asapo/cmake-build-debug/producer/api/python/asapo_producer.so
\ No newline at end of file
diff --git a/tests/manual/python_tests/producer_wait_bug_mongo/asapo_producer.so b/tests/manual/python_tests/producer_wait_bug_mongo/asapo_producer.so
deleted file mode 120000
index cd186e18092ad6fd8de0e7ab30f6b7a4b5417775..0000000000000000000000000000000000000000
--- a/tests/manual/python_tests/producer_wait_bug_mongo/asapo_producer.so
+++ /dev/null
@@ -1 +0,0 @@
-/home/yakubov/projects/asapo/cmake-build-debug/producer/api/python/asapo_producer.so
\ No newline at end of file
diff --git a/tests/manual/python_tests/producer_wait_threads/asapo_producer.so b/tests/manual/python_tests/producer_wait_threads/asapo_producer.so
deleted file mode 120000
index cd186e18092ad6fd8de0e7ab30f6b7a4b5417775..0000000000000000000000000000000000000000
--- a/tests/manual/python_tests/producer_wait_threads/asapo_producer.so
+++ /dev/null
@@ -1 +0,0 @@
-/home/yakubov/projects/asapo/cmake-build-debug/producer/api/python/asapo_producer.so
\ No newline at end of file