SciCompMod · reneSchm · Dec 3, 2025 · Dec 2, 2025 · Dec 2, 2025 · Dec 2, 2025
diff --git a/.github/actions/test-py/action.yml b/.github/actions/test-py/action.yml
@@ -50,19 +50,20 @@ runs:
       shell: bash
       run: |
         export PYTHON_VERSION_NO_DOT=$(echo "${{ inputs.version }}" | sed 's/\.//g')
-        for pkg in `ls pycode/wheelhouse/*cp$PYTHON_VERSION_NO_DOT*.whl`; do python -m pip install $pkg; done # packages that contain native extensions are version specific
-        for pkg in `ls pycode/wheelhouse/*py3*.whl`; do python -m pip install $pkg; done # pure python packages are not version specific
-        pip install -r pycode/memilio-${{ inputs.package }}/requirements-dev.txt
+        shopt -s nullglob
+        for pkg in pycode/wheelhouse/*cp$PYTHON_VERSION_NO_DOT*.whl; do python -m pip install "$pkg"; done # packages that contain native extensions are version specific
+        for pkg in pycode/wheelhouse/*py3*.whl; do python -m pip install "$pkg"; done # pure python packages are not version specific
+        python -m pip install --upgrade-strategy only-if-needed --prefer-binary --find-links pycode/wheelhouse "memilio-${{ inputs.package }}[dev]"
     - name: Run unit tests
       shell: bash
       run: |
-        cd pycode/memilio-${{inputs.package}}/memilio/${{inputs.package}}_test
+        cd pycode/memilio-${{inputs.package}}/tests
         if [[ "${{ inputs.coverage }}" == "ON" ]]; then
           python -W ignore::DeprecationWarning -m coverage run --include=**/site-packages/memilio/* -m unittest
           python -m coverage report
           python -m coverage xml -o coverage_python.xml
           python -m coverage html -d coverage_python
-          cp -r coverage_python ../../../../
+          cp -r coverage_python ../../../
         else
           python -m unittest
         fi

diff --git a/.github/actions/test-pylint/action.yml b/.github/actions/test-pylint/action.yml
@@ -23,12 +23,14 @@ runs:
       uses: actions/download-artifact@v4
       with:
         name: python-wheels-${{ inputs.package }}
+        path: pycode/wheelhouse
     - name: Install Python Wheels
       shell: bash
       run: |
-        for pkg in `ls pycode/wheelhouse/*cp311*.whl`; do python -m pip install $pkg; done # packages that contain native extensions are version specific
-        for pkg in `ls pycode/wheelhouse/*py3*.whl`; do python -m pip install $pkg; done # pure python packages are not version specific
-        pip install -r pycode/memilio-${{ inputs.package }}/requirements-dev.txt
+        shopt -s nullglob
+        for pkg in pycode/wheelhouse/*cp311*.whl; do python -m pip install "$pkg"; done # packages that contain native extensions are version specific
+        for pkg in pycode/wheelhouse/*py3*.whl; do python -m pip install "$pkg"; done # pure python packages are not version specific
+        python -m pip install --upgrade-strategy only-if-needed --prefer-binary --find-links pycode/wheelhouse "memilio-${{ inputs.package }}[dev]"
     - name: Run pylint
       shell: bash
       run: |

diff --git a/pycode/memilio-epidata/README.rst b/pycode/memilio-epidata/README.rst
@@ -84,18 +84,21 @@ The following packages are used by the tests:
 
 See Installation on how to install all these dependencies automatically.
 
-To run the tests make sure the package is installed in editable mode (``pip install -e .``) and run
-
-.. code:: sh
+To run the tests, make sure the package is installed, and you are in the source directory, then run:
 
+```bash
+    cd tests
     python -m unittest
+```
 
-Alternatively, if the package is installed normally (``pip install .``), you have to run the tests from outside the source directory to avoid import errors:
+This works with both normal (`pip install .`) and editable (`pip install -e .`) installations.
 
-.. code:: sh
+Alternatively, you can run the tests from outside the source directory:
 
-    cd /path/to/another/directory
-    python -m unittest discover -s /path/to/memilio/pycode/memilio-epidata/memilio/epidata_test
+```bash
+cd /path/to/another/directory
+python -m unittest discover -s /path/to/memilio/pycode/memilio-epidata/tests
+```
 
 To get the coverage report do
 

diff --git a/pycode/memilio-epidata/memilio/epidata_test/__init__.py b/pycode/memilio-epidata/memilio/epidata_test/__init__.py
diff --git a/pycode/memilio-epidata/pyproject.toml b/pycode/memilio-epidata/pyproject.toml
@@ -30,16 +30,20 @@ dependencies = [
   "PyQt6",
   "python-calamine",
   "python-magic-bin; sys_platform == 'win32'",
-  "python-magic; sys_platform != 'win32'"
+  "python-magic; sys_platform != 'win32'",
+  # first support of python 3.11 is 4.6
+  # 5.3.4 has conflicts with openpyxl
+  # 5.3.3 broken
+  "pyfakefs>=4.6,<5.3.3"
 ]
 
 [project.optional-dependencies]
 dev = [
-  "pyfakefs>=4.6,<5.3.3",
   "coverage>=7.0.1",
+  # pylint 2.16 creates problem with wrapt package version
   "pylint>=2.13.0,<2.16",
   "pylint_json2html==0.4.0"
-]
+  ]
 
 [project.scripts]
 getcasedata = "memilio.epidata.getCaseData:main"

diff --git a/pycode/memilio-epidata/requirements-dev.txt b/pycode/memilio-epidata/requirements-dev.txt
diff --git a/...ata_test/test_data/TestSetCaseArcgis.json → ...ta/tests/test_data/TestSetCaseArcgis.json b/...ata_test/test_data/TestSetCaseArcgis.json → ...ta/tests/test_data/TestSetCaseArcgis.json
diff --git a/...st_data/TestSetCaseEstimationsDeaths.json → ...st_data/TestSetCaseEstimationsDeaths.json b/...st_data/TestSetCaseEstimationsDeaths.json → ...st_data/TestSetCaseEstimationsDeaths.json
diff --git a/...a/TestSetCaseEstimationsDeathsWeekly.json → ...a/TestSetCaseEstimationsDeathsWeekly.json b/...a/TestSetCaseEstimationsDeathsWeekly.json → ...a/TestSetCaseEstimationsDeathsWeekly.json
diff --git a/...SetCaseEstimationsDeathsWeeklyGender.json → ...SetCaseEstimationsDeathsWeeklyGender.json b/...SetCaseEstimationsDeathsWeeklyGender.json → ...SetCaseEstimationsDeathsWeeklyGender.json
diff --git a/...ata_test/test_data/TestSetCaseGithub.json → ...ta/tests/test_data/TestSetCaseGithub.json b/...ata_test/test_data/TestSetCaseGithub.json → ...ta/tests/test_data/TestSetCaseGithub.json
diff --git a/...idata_test/test_data/TestSetCaseRead.json → ...data/tests/test_data/TestSetCaseRead.json b/...idata_test/test_data/TestSetCaseRead.json → ...data/tests/test_data/TestSetCaseRead.json
diff --git a/...a_test/test_data/TestSetFullDIVIData.json → .../tests/test_data/TestSetFullDIVIData.json b/...a_test/test_data/TestSetFullDIVIData.json → .../tests/test_data/TestSetFullDIVIData.json
diff --git a/..._data/TestSetFullHospitalizationData.json → ..._data/TestSetFullHospitalizationData.json b/..._data/TestSetFullHospitalizationData.json → ..._data/TestSetFullHospitalizationData.json
diff --git a/...a_test/test_data/TestSetNPIsCaseData.json → .../tests/test_data/TestSetNPIsCaseData.json b/...a_test/test_data/TestSetNPIsCaseData.json → .../tests/test_data/TestSetNPIsCaseData.json
diff --git a/...st/test_data/TestSetNPIsCombinations.json → ...ts/test_data/TestSetNPIsCombinations.json b/...st/test_data/TestSetNPIsCombinations.json → ...ts/test_data/TestSetNPIsCombinations.json
diff --git a/...est/test_data/TestSetNPIsDescription.json → ...sts/test_data/TestSetNPIsDescription.json b/...est/test_data/TestSetNPIsDescription.json → ...sts/test_data/TestSetNPIsDescription.json
diff --git a/.../test_data/TestSetNPIsPopulationData.json → .../test_data/TestSetNPIsPopulationData.json b/.../test_data/TestSetNPIsPopulationData.json → .../test_data/TestSetNPIsPopulationData.json
diff --git a/...test_data/TestSetNPIsUnterkategorien.json → ...test_data/TestSetNPIsUnterkategorien.json b/...test_data/TestSetNPIsUnterkategorien.json → ...test_data/TestSetNPIsUnterkategorien.json
diff --git a/...st/test_data/TestSetPopulationExport.json → ...ts/test_data/TestSetPopulationExport.json b/...st/test_data/TestSetPopulationExport.json → ...ts/test_data/TestSetPopulationExport.json
diff --git a/...est/test_data/TestSetPopulationFinal.json → ...sts/test_data/TestSetPopulationFinal.json b/...est/test_data/TestSetPopulationFinal.json → ...sts/test_data/TestSetPopulationFinal.json
diff --git a/..._test/test_data/TestSetPopulationRaw.json → ...tests/test_data/TestSetPopulationRaw.json b/..._test/test_data/TestSetPopulationRaw.json → ...tests/test_data/TestSetPopulationRaw.json
diff --git a/...io/epidata_test/test_epidata_cleandata.py → ...o-epidata/tests/test_epidata_cleandata.py b/...io/epidata_test/test_epidata_cleandata.py → ...o-epidata/tests/test_epidata_cleandata.py
diff --git a/...o/epidata_test/test_epidata_customPlot.py → ...-epidata/tests/test_epidata_customPlot.py b/...o/epidata_test/test_epidata_customPlot.py → ...-epidata/tests/test_epidata_customPlot.py
diff --git a/.../epidata_test/test_epidata_defaultDict.py → ...epidata/tests/test_epidata_defaultDict.py b/.../epidata_test/test_epidata_defaultDict.py → ...epidata/tests/test_epidata_defaultDict.py
diff --git a/...st/test_epidata_geoModificationGermany.py → ...ts/test_epidata_geoModificationGermany.py b/...st/test_epidata_geoModificationGermany.py → ...ts/test_epidata_geoModificationGermany.py
diff --git a/.../epidata_test/test_epidata_getCaseData.py → ...epidata/tests/test_epidata_getCaseData.py b/.../epidata_test/test_epidata_getCaseData.py → ...epidata/tests/test_epidata_getCaseData.py
diff --git a/..._test/test_epidata_getCommuterMobility.py → ...tests/test_epidata_getCommuterMobility.py b/..._test/test_epidata_getCommuterMobility.py → ...tests/test_epidata_getCommuterMobility.py
diff --git a/...est_epidata_getDataIntoPandasDataFrame.py → ...est_epidata_getDataIntoPandasDataFrame.py b/...est_epidata_getDataIntoPandasDataFrame.py → ...est_epidata_getDataIntoPandasDataFrame.py
diff --git a/...st/test_epidata_getHospitalizationData.py → ...ts/test_epidata_getHospitalizationData.py b/...st/test_epidata_getHospitalizationData.py → ...ts/test_epidata_getHospitalizationData.py
diff --git a/...o/epidata_test/test_epidata_getNPIData.py → ...-epidata/tests/test_epidata_getNPIData.py b/...o/epidata_test/test_epidata_getNPIData.py → ...-epidata/tests/test_epidata_getNPIData.py
diff --git a/...pidata_test/test_epidata_get_divi_data.py → ...idata/tests/test_epidata_get_divi_data.py b/...pidata_test/test_epidata_get_divi_data.py → ...idata/tests/test_epidata_get_divi_data.py
diff --git a/.../epidata_test/test_epidata_get_jh_data.py → ...epidata/tests/test_epidata_get_jh_data.py b/.../epidata_test/test_epidata_get_jh_data.py → ...epidata/tests/test_epidata_get_jh_data.py
diff --git a/..._test/test_epidata_get_population_data.py → ...tests/test_epidata_get_population_data.py b/..._test/test_epidata_get_population_data.py → ...tests/test_epidata_get_population_data.py
diff --git a/..._test/test_epidata_get_simulation_data.py → ...tests/test_epidata_get_simulation_data.py b/..._test/test_epidata_get_simulation_data.py → ...tests/test_epidata_get_simulation_data.py
diff --git a/...test/test_epidata_get_vaccination_data.py → ...ests/test_epidata_get_vaccination_data.py b/...test/test_epidata_get_vaccination_data.py → ...ests/test_epidata_get_vaccination_data.py
diff --git a/...est/test_epidata_modifyDataframeSeries.py → ...sts/test_epidata_modifyDataframeSeries.py b/...est/test_epidata_modifyDataframeSeries.py → ...sts/test_epidata_modifyDataframeSeries.py
diff --git a/...a_test/test_epidata_progress_indicator.py → .../tests/test_epidata_progress_indicator.py b/...a_test/test_epidata_progress_indicator.py → .../tests/test_epidata_progress_indicator.py
diff --git a/...t/test_epidata_transform_mobility_data.py → ...s/test_epidata_transform_mobility_data.py b/...t/test_epidata_transform_mobility_data.py → ...s/test_epidata_transform_mobility_data.py
diff --git a/pycode/memilio-generation/README.md b/pycode/memilio-generation/README.md
@@ -35,17 +35,21 @@ You can print the AST of your model into a file (Usefull for development/debuggi
 
 ## Testing
 
-The package provides a test suite in `memilio/generation_test`. To run the tests make sure the package is installed in editable mode (`pip install -e .`) and run
+The package provides a test suite in the `tests` directory.
+To run the tests, make sure the package is installed, and you are in the source directory, then run:
 
 ```bash
+cd tests
 python -m unittest
 ```
 
-Alternatively, if the package is installed normally (`pip install .`), you have to run the tests from outside the source directory to avoid import errors:
+This works with both normal (`pip install .`) and editable (`pip install -e .`) installations.
+
+Alternatively, you can run the tests from outside the source directory:
 
 ```bash
 cd /path/to/another/directory
-python -m unittest discover -s /path/to/memilio/pycode/memilio-generation/memilio/generation_test
+python -m unittest discover -s /path/to/memilio/pycode/memilio-generation/tests
 ```
 
 ## Development
@@ -58,4 +62,4 @@ When implementing new model features you can follow these steps:
 - Adjust the substitution dictionaries in the [Generator class](./memilio/generation/generator.py).
 - Write new/Adjust script in the [tool folder](./memilio/tools/) for the model and try to run.
 - Add new strings in the [Default dict](/pycode/memilio-generation/memilio/generation/default_generation_dict.py)
-- Update [tests](./memilio/generation_test/).
+- Update [tests](./tests/).
diff --git a/pycode/memilio-generation/memilio/generation_test/__init__.py b/pycode/memilio-generation/memilio/generation_test/__init__.py
diff --git a/pycode/memilio-generation/requirements-dev.txt b/pycode/memilio-generation/requirements-dev.txt
diff --git a/...eration_test/test_data/test_oseir.cpp.txt → ...ration/tests/test_data/test_oseir.cpp.txt b/...eration_test/test_data/test_oseir.cpp.txt → ...ration/tests/test_data/test_oseir.cpp.txt
diff --git a/...neration_test/test_data/test_oseir.py.txt → ...eration/tests/test_data/test_oseir.py.txt b/...neration_test/test_data/test_oseir.py.txt → ...eration/tests/test_data/test_oseir.py.txt
diff --git a/.../generation_test/test_oseir_generation.py → ...generation/tests/test_oseir_generation.py b/.../generation_test/test_oseir_generation.py → ...generation/tests/test_oseir_generation.py
diff --git a/pycode/memilio-plot/README.md b/pycode/memilio-plot/README.md
@@ -72,11 +72,22 @@ The following packages are used by the tests:
 
 See Installation on how to install all these dependencies automatically.
 
-To run the tests make 
-
-.. code:: sh
+To run the tests, make sure the package is installed, and you are in the source directory, then run:
 
+```bash
+    cd tests
     python -m unittest
+```
+
+This works with both normal (``pip install .``) and editable (``pip install -e .``) installations.
+
+Alternatively, you can run the tests from outside the source directory:
+
+```bash
+    cd /path/to/another/directory
+    python -m unittest discover -s /path/to/memilio/pycode/memilio-plot/tests
+```
+
 
 To get the coverage report do
 

diff --git a/pycode/memilio-plot/memilio/plot_test/__init__.py b/pycode/memilio-plot/memilio/plot_test/__init__.py
diff --git a/pycode/memilio-plot/pyproject.toml b/pycode/memilio-plot/pyproject.toml
@@ -27,13 +27,15 @@ dependencies = [
   "geopandas",
   "h5py",
   "imageio",
-  "datetime"
+  "datetime",
+  # first support of python 3.11
+  "pyfakefs>=4.6"
 ]
 
 [project.optional-dependencies]
 dev = [
-  "pyfakefs>=4.6",
   "coverage>=7.0.1",
+  # pylint 2.16 creates problem with wrapt package version
   "pylint>=2.13.0,<2.16",
   "pylint_json2html==0.4.0"
 ]

diff --git a/pycode/memilio-plot/requirements-dev.txt b/pycode/memilio-plot/requirements-dev.txt
diff --git a/...test_data/Synthetic_data_counties_sh.json → ...test_data/Synthetic_data_counties_sh.json b/...test_data/Synthetic_data_counties_sh.json → ...test_data/Synthetic_data_counties_sh.json
diff --git a/.../memilio/plot_test/test_plot_createGIF.py → ...memilio-plot/tests/test_plot_createGIF.py b/.../memilio/plot_test/test_plot_createGIF.py → ...memilio-plot/tests/test_plot_createGIF.py
diff --git a/...ot/memilio/plot_test/test_plot_plotMap.py → ...e/memilio-plot/tests/test_plot_plotMap.py b/...ot/memilio/plot_test/test_plot_plotMap.py → ...e/memilio-plot/tests/test_plot_plotMap.py
diff --git a/pycode/memilio-simulation/README.md b/pycode/memilio-simulation/README.md
@@ -73,17 +73,18 @@ Detailed documentation under construction. See the scripts in the [examples](../
 
 ## Testing
 
-The package provides a test suite in `memilio/simulation_test`. To run the tests make sure the package is installed in editable mode (`pip install -e .`) and run
+The package provides a test suite in `tests/`. To run the tests, make sure the package is installed, and you are in the source directory, then run:
 
 ```bash
+cd tests
 python -m unittest
 ```
 
-Alternatively, if the package is installed normally (`pip install .`), you have to run the tests from outside the source directory to avoid import errors:
+This works with both normal (`pip install .`) and editable (`pip install -e .`) installations.
+
+Alternatively, you can run the tests from outside the source directory:
 
 ```bash
 cd /path/to/another/directory
-python -m unittest discover -s /path/to/memilio/pycode/memilio-simulation/memilio/simulation_test
+python -m unittest discover -s /path/to/memilio/pycode/memilio-simulation/tests
 ```
-
-Note that these tests do not cover every case of the C++ library, they are only intended to test the binding code. To verify correctness of the C++ library itself, build and run the [C++ unit tests](../../cpp/README.md).
diff --git a/pycode/memilio-simulation/memilio/simulation_test/__init__.py b/pycode/memilio-simulation/memilio/simulation_test/__init__.py
diff --git a/pycode/memilio-simulation/pyproject.toml b/pycode/memilio-simulation/pyproject.toml
@@ -17,14 +17,16 @@ authors = [{ name = "MEmilio Team" }]
 maintainers = [
   { email = "[email protected]" }
 ]
-dependencies = []
-
-[project.optional-dependencies]
-dev = [
+dependencies = [
+  # smaller numpy versions cause a security issue, 1.25 breaks testing with pyfakefs
   "numpy>=1.22,<1.25",
+  # smaller pandas versions contain a bug that sometimes prevents reading
   "pandas>=2.0.0"
 ]
 
+[project.optional-dependencies]
+dev = []
+
 [project.urls]
 Homepage = "https://github.com/SciCompMod/memilio"
 Team = "https://memilio.readthedocs.io/en/latest/team.html"

diff --git a/pycode/memilio-simulation/requirements-dev.txt b/pycode/memilio-simulation/requirements-dev.txt
diff --git a/...test/data/ode-secihurd-ageres-compare.csv → ...ests/data/ode-secihurd-ageres-compare.csv b/...test/data/ode-secihurd-ageres-compare.csv → ...ests/data/ode-secihurd-ageres-compare.csv
diff --git a/...lation_test/data/ode-secihurd-compare.csv → ...ation/tests/data/ode-secihurd-compare.csv b/...lation_test/data/ode-secihurd-compare.csv → ...ation/tests/data/ode-secihurd-compare.csv
diff --git a/...lation_test/data/ode-secirvvs-compare.csv → ...ation/tests/data/ode-secirvvs-compare.csv b/...lation_test/data/ode-secirvvs-compare.csv → ...ation/tests/data/ode-secirvvs-compare.csv
diff --git a/...simulation_test/data/ode-seir-compare.csv → ...imulation/tests/data/ode-seir-compare.csv b/...simulation_test/data/ode-seir-compare.csv → ...imulation/tests/data/ode-seir-compare.csv
diff --git a/...ation/memilio/simulation_test/test_abm.py → pycode/memilio-simulation/tests/test_abm.py b/...ation/memilio/simulation_test/test_abm.py → pycode/memilio-simulation/tests/test_abm.py
diff --git a/...io/simulation_test/test_analyze_result.py → ...o-simulation/tests/test_analyze_result.py b/...io/simulation_test/test_analyze_result.py → ...o-simulation/tests/test_analyze_result.py
diff --git a/...imulation_test/test_custom_index_array.py → ...mulation/tests/test_custom_index_array.py b/...imulation_test/test_custom_index_array.py → ...mulation/tests/test_custom_index_array.py
diff --git a/...tion/memilio/simulation_test/test_date.py → pycode/memilio-simulation/tests/test_date.py b/...tion/memilio/simulation_test/test_date.py → pycode/memilio-simulation/tests/test_date.py
diff --git a/...lio/simulation_test/test_distributions.py → ...io-simulation/tests/test_distributions.py b/...lio/simulation_test/test_distributions.py → ...io-simulation/tests/test_distributions.py
diff --git a/...ilio/simulation_test/test_dynamic_npis.py → ...lio-simulation/tests/test_dynamic_npis.py b/...ilio/simulation_test/test_dynamic_npis.py → ...lio-simulation/tests/test_dynamic_npis.py
diff --git a/...milio/simulation_test/test_integrators.py → ...ilio-simulation/tests/test_integrators.py b/...milio/simulation_test/test_integrators.py → ...ilio-simulation/tests/test_integrators.py
diff --git a/.../memilio/simulation_test/test_mobility.py → ...memilio-simulation/tests/test_mobility.py b/.../memilio/simulation_test/test_mobility.py → ...memilio-simulation/tests/test_mobility.py
diff --git a/.../memilio/simulation_test/test_omseirs4.py → ...memilio-simulation/tests/test_omseirs4.py b/.../memilio/simulation_test/test_omseirs4.py → ...memilio-simulation/tests/test_omseirs4.py
diff --git a/...on/memilio/simulation_test/test_osecir.py → ...e/memilio-simulation/tests/test_osecir.py b/...on/memilio/simulation_test/test_osecir.py → ...e/memilio-simulation/tests/test_osecir.py
diff --git a/...lio/simulation_test/test_osecir_ageres.py → ...io-simulation/tests/test_osecir_ageres.py b/...lio/simulation_test/test_osecir_ageres.py → ...io-simulation/tests/test_osecir_ageres.py
diff --git a/...memilio/simulation_test/test_osecirvvs.py → ...emilio-simulation/tests/test_osecirvvs.py b/...memilio/simulation_test/test_osecirvvs.py → ...emilio-simulation/tests/test_osecirvvs.py
diff --git a/...ion/memilio/simulation_test/test_oseir.py → ...de/memilio-simulation/tests/test_oseir.py b/...ion/memilio/simulation_test/test_oseir.py → ...de/memilio-simulation/tests/test_oseir.py
diff --git a/...n/memilio/simulation_test/test_oseirdb.py → .../memilio-simulation/tests/test_oseirdb.py b/...n/memilio/simulation_test/test_oseirdb.py → .../memilio-simulation/tests/test_oseirdb.py
diff --git a/...tion/memilio/simulation_test/test_osir.py → pycode/memilio-simulation/tests/test_osir.py b/...tion/memilio/simulation_test/test_osir.py → pycode/memilio-simulation/tests/test_osir.py
diff --git a/...o/simulation_test/test_parameter_study.py → ...-simulation/tests/test_parameter_study.py b/...o/simulation_test/test_parameter_study.py → ...-simulation/tests/test_parameter_study.py
diff --git a/...on/memilio/simulation_test/test_pickle.py → ...e/memilio-simulation/tests/test_pickle.py b/...on/memilio/simulation_test/test_pickle.py → ...e/memilio-simulation/tests/test_pickle.py
diff --git a/...n/memilio/simulation_test/test_regions.py → .../memilio-simulation/tests/test_regions.py b/...n/memilio/simulation_test/test_regions.py → .../memilio-simulation/tests/test_regions.py
diff --git a/...tion/memilio/simulation_test/test_ssir.py → pycode/memilio-simulation/tests/test_ssir.py b/...tion/memilio/simulation_test/test_ssir.py → pycode/memilio-simulation/tests/test_ssir.py
diff --git a/...ion/memilio/simulation_test/test_ssirs.py → ...de/memilio-simulation/tests/test_ssirs.py b/...ion/memilio/simulation_test/test_ssirs.py → ...de/memilio-simulation/tests/test_ssirs.py
diff --git a/...milio/simulation_test/test_time_series.py → ...ilio-simulation/tests/test_time_series.py b/...milio/simulation_test/test_time_series.py → ...ilio-simulation/tests/test_time_series.py
diff --git a/.../simulation_test/test_uncertain_matrix.py → ...simulation/tests/test_uncertain_matrix.py b/.../simulation_test/test_uncertain_matrix.py → ...simulation/tests/test_uncertain_matrix.py
diff --git a/...o/simulation_test/test_uncertain_value.py → ...-simulation/tests/test_uncertain_value.py b/...o/simulation_test/test_uncertain_value.py → ...-simulation/tests/test_uncertain_value.py
diff --git a/pycode/memilio-surrogatemodel/README.md b/pycode/memilio-surrogatemodel/README.md
@@ -35,15 +35,18 @@ The package currently provides the following modules:
 - `tests`: this file contains all tests 
 
 ## Testing 
-The package provides a test suite in `memilio/surrogatemodel_test`. To run the tests make sure the package is installed in editable mode (`pip install -e .`) and run
+The package provides a test suite in `tests/`. To run the tests, make sure the package is installed, and you are in the source directory, then run:
 
 ```bash
+cd tests
 python -m unittest
 ```
 
-Alternatively, if the package is installed normally (`pip install .`), you have to run the tests from outside the source directory to avoid import errors:
+This works with both normal (`pip install .`) and editable (`pip install -e .`) installations.
+
+Alternatively, you can run the tests from outside the source directory:
 
 ```bash
 cd /path/to/another/directory
-python -m unittest discover -s /path/to/memilio/pycode/memilio-surrogatemodel/memilio/surrogatemodel_test
+python -m unittest discover -s /path/to/memilio/pycode/memilio-surrogatemodel/tests
 ```
diff --git a/pycode/memilio-surrogatemodel/memilio/surrogatemodel_test/__init__.py b/pycode/memilio-surrogatemodel/memilio/surrogatemodel_test/__init__.py
diff --git a/pycode/memilio-surrogatemodel/pyproject.toml b/pycode/memilio-surrogatemodel/pyproject.toml
@@ -19,12 +19,13 @@ dependencies = [
   "numpy>=1.22,<1.25",
   "tensorflow",
   "matplotlib",
-  "scikit-learn"
+  "scikit-learn",
+  # first support of python 3.11
+  "pyfakefs>=4.6"
 ]
 
 [project.optional-dependencies]
 dev = [
-  "pyfakefs>=4.6",
   "coverage>=7.0.1"
 ]