diff --git a/bin/run_unittests.bat b/bin/run_unittests.bat
index d8d60c0..9bf0d3b 100644
--- a/bin/run_unittests.bat
+++ b/bin/run_unittests.bat
@@ -13,12 +13,7 @@ if %ERRORLEVEL% NEQ 0 (
     exit /B 1
 )
 
-
-REM Iterate through all CSV files in testdata directory
-for %%f in (%PROJECT_LIB%\Elemente\*.py) do (
-    echo Processing: %%~nxf
-    python "%%f"
-)
+python -m unittest discover -t %PROJECT_LIB% -s lib\Elemente -p "*_tests.py" -v
 if %ERRORLEVEL% NEQ 0 (
     echo.
     echo Tests failed!
diff --git a/cfg/shapes.cfg b/cfg/shapes.cfg
index cacdf44..e7ebf32 100644
--- a/cfg/shapes.cfg
+++ b/cfg/shapes.cfg
@@ -25,16 +25,19 @@ esoffset = 479.95
 Umlenkstation = 500.0, 0.0, 0.0
 Motorstation = 500.0, 0.0, 0.0
 vario_abstand = 66.5
+
 [Ils 2.0 core winkel]
 winkel_boegen = 3
 winkel_motor = 3.0
 winkel_umlenk = 3.0
 winkel_as = 3.0
 winkel_es = 3.0
+
 [Omniflo]
 OFgeradesivas = 821106002
 Tefgeradesivas = 0_B10030
 OFfoerderer = 2
+
 [Scanner_Stoper_namen]
 Omniflo_stopper = 827062022
 Omniflo_scanner = _DUMMY_SCANNER