diff --git a/core b/core
index 79fb0ce..65c558a 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 79fb0ced05d752f6e9260afddb38cc0d50e80c6d
+Subproject commit 65c558a3025bc4ab1701c51a15427ccbf9d86cd3
diff --git a/plugins/amda/CMakeLists.txt b/plugins/amda/CMakeLists.txt
index b772957..6007101 100644
--- a/plugins/amda/CMakeLists.txt
+++ b/plugins/amda/CMakeLists.txt
@@ -39,46 +39,50 @@ declare_test(TestAmdaResultParser TestAmdaResultParser tests/TestAmdaResultParse
 declare_test(TestAmdaAcquisition TestAmdaAcquisition tests/TestAmdaAcquisition.cpp "amdaplugin;Qt5::Test")
 declare_test(TestAmdaFuzzing TestAmdaFuzzing "tests/TestAmdaFuzzing.cpp;tests/FuzzingValidators.cpp;tests/FuzzingUtils.cpp;tests/FuzzingOperations.cpp;tests/FuzzingDefs.cpp" "amdaplugin;Qt5::Test")
 
-pybind11_add_module(pytestamda tests/PyTestAmdaWrapper.cpp)
-target_link_libraries(pytestamda PUBLIC amdaplugin)
-target_link_libraries(pytestamda PUBLIC pysciqlop)
 
+if(PyWrappers)
+    pybind11_add_module(pytestamda tests/PyTestAmdaWrapper.cpp)
+    target_link_libraries(pytestamda PUBLIC amdaplugin)
+    target_link_libraries(pytestamda PUBLIC pysciqlop)
 
-#pybind11_add_module(pytestamdalib SHARED tests/PyTestAmdaWrapper.cpp)
-add_library(pytestamdalib tests/PyTestAmdaWrapper.cpp)
-target_link_libraries(pytestamdalib PUBLIC pybind11::module)
-target_link_libraries(pytestamdalib PUBLIC pybind11::embed)
-target_link_libraries(pytestamdalib PUBLIC amdaplugin)
-target_link_libraries(pytestamdalib PUBLIC pysciqlop)
 
-GET_PROPERTY(CORE_PYTHON_PATH GLOBAL PROPERTY CORE_PYTHON_PATH)
+    #pybind11_add_module(pytestamdalib SHARED tests/PyTestAmdaWrapper.cpp)
+    add_library(pytestamdalib tests/PyTestAmdaWrapper.cpp)
+    target_link_libraries(pytestamdalib PUBLIC pybind11::module)
+    target_link_libraries(pytestamdalib PUBLIC pybind11::embed)
+    target_link_libraries(pytestamdalib PUBLIC amdaplugin)
+    target_link_libraries(pytestamdalib PUBLIC pysciqlop)
 
-declare_test(TestAmdaFileParserEmbed TestAmdaFileParserEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
-target_compile_definitions(TestAmdaFileParserEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py")
-set_tests_properties(TestAmdaFileParserEmbed  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
+    GET_PROPERTY(CORE_PYTHON_PATH GLOBAL PROPERTY CORE_PYTHON_PATH)
 
+    declare_test(TestAmdaFileParserEmbed TestAmdaFileParserEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
+    target_compile_definitions(TestAmdaFileParserEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py")
+    set_tests_properties(TestAmdaFileParserEmbed  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
 
-declare_test(TestAmdaDownloadEmbed TestAmdaDownloadEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
-target_compile_definitions(TestAmdaDownloadEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py")
-set_tests_properties(TestAmdaDownloadEmbed  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
 
+    declare_test(TestAmdaDownloadEmbed TestAmdaDownloadEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
+    target_compile_definitions(TestAmdaDownloadEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py")
+    set_tests_properties(TestAmdaDownloadEmbed  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
 
-declare_test(TestAmdaMiniFuzzEmbed TestAmdaMiniFuzzEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
-target_compile_definitions(TestAmdaMiniFuzzEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaMiniFuzz.py")
-set_tests_properties(TestAmdaMiniFuzzEmbed  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
 
+    declare_test(TestAmdaMiniFuzzEmbed TestAmdaMiniFuzzEmbed "tests/PyTestAmdaWrapperExe.cpp" "pytestamdalib")
+    target_compile_definitions(TestAmdaMiniFuzzEmbed PRIVATE -DPYTESTAMDA_SCRIPT="${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaMiniFuzz.py")
+    set_tests_properties(TestAmdaMiniFuzzEmbed  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
 
-find_package(PythonInterp 3 REQUIRED)
 
-add_test(NAME TestAmdaFileParser
-  COMMAND ${PYTHON_EXECUTABLE}
-    ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py
-    TestAmdaFileParser)
-set_tests_properties(TestAmdaFileParser  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
+    find_package(PythonInterp 3 REQUIRED)
 
+    add_test(NAME TestAmdaFileParser
+      COMMAND ${PYTHON_EXECUTABLE}
+        ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaFileParser.py
+        TestAmdaFileParser)
+    set_tests_properties(TestAmdaFileParser  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
 
-add_test(NAME TestAmdaDownload
-  COMMAND ${PYTHON_EXECUTABLE}
-    ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py
-    TestAmdaDownload)
-set_tests_properties(TestAmdaDownload  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
+
+    add_test(NAME TestAmdaDownload
+      COMMAND ${PYTHON_EXECUTABLE}
+        ${CMAKE_CURRENT_LIST_DIR}/tests/TestAmdaDownload.py
+        TestAmdaDownload)
+    set_tests_properties(TestAmdaDownload  PROPERTIES ENVIRONMENT PYTHONPATH=${CMAKE_CURRENT_BINARY_DIR}:${CORE_PYTHON_PATH})
+
+endif(PyWrappers)
diff --git a/plugins/mockplugin/CMakeLists.txt b/plugins/mockplugin/CMakeLists.txt
index 260a379..6757863 100644
--- a/plugins/mockplugin/CMakeLists.txt
+++ b/plugins/mockplugin/CMakeLists.txt
@@ -26,6 +26,8 @@ include(sciqlop_tests)
 add_definitions(-DMOCKPLUGIN_TESTS_RESOURCES_DIR="${CMAKE_CURRENT_LIST_DIR}/tests-resources")
 
 #declare_test(TestCosinusAcquisition TestCosinusAcquisition tests/TestCosinusAcquisition.cpp "mockplugin;Qt5::Test")
-pybind11_add_module(pytestmockplugin tests/PyTestMockPluginWrapper.cpp)
-target_link_libraries(pytestmockplugin PUBLIC mockplugin)
-target_link_libraries(pytestmockplugin PUBLIC pysciqlop)
+if(PyWrappers)
+    pybind11_add_module(pytestmockplugin tests/PyTestMockPluginWrapper.cpp)
+    target_link_libraries(pytestmockplugin PUBLIC mockplugin)
+    target_link_libraries(pytestmockplugin PUBLIC pysciqlop)
+endif()