diff --git a/README.md b/README.md
index 55e7119..12d5f34 100644
--- a/README.md
+++ b/README.md
@@ -799,11 +799,10 @@ The `.github/workflows/quality-gate.yml` workflow automatically runs all validat
 ### Test Structure
 ```
 tests/
-├── laborious/
-│   ├── activities/      # Activity implementation tests
-│   ├── workflows/       # Workflow orchestration tests
-│   ├── utils/          # Utility function tests
-│   └── worker/         # Worker tests
+├── activities/      # Activity implementation tests
+├── workflows/       # Workflow orchestration tests
+├── utils/          # Utility function tests
+└── worker/         # Worker tests
 ```
 
 ### Test Execution
@@ -815,8 +814,8 @@ pip install pytest pytest-cov pytest-asyncio
 pytest --cov=model_manager --cov-report=html
 
 # Run specific test modules
-pytest tests/laborious/activities/test_gates.py
-pytest tests/laborious/workflows/test_predictions_batch.py
+pytest tests/activities/test_gates.py
+pytest tests/workflows/test_predictions_batch.py
 ```
 
 ## Monitoring and Metrics
@@ -981,7 +980,7 @@ The project maintains **99%+ code coverage** with comprehensive unit and integra
 pytest tests/ --cov=model_manager --cov-report=term-missing --cov-report=xml --cov-report=html
 
 # Run specific test file
-pytest tests/laborious/activities/test_gates.py -v
+pytest tests/activities/test_gates.py -v
 
 # Run with coverage visualization
 pytest tests/ --cov=model_manager --cov-report=xml
@@ -1089,11 +1088,10 @@ model_manager/
 - **Test structure**:
   ```
   tests/
-  ├── laborious/
-  │   ├── activities/      # Activity tests
-  │   ├── workflows/       # Workflow tests
-  │   ├── utils/          # Utility tests
-  │   └── worker/         # Worker tests
+  ├── activities/      # Activity tests
+  ├── workflows/       # Workflow tests
+  ├── utils/          # Utility tests
+  └── worker/         # Worker tests
   ```
 
 ## Troubleshooting
diff --git a/tests/laborious/__init__.py b/tests/activities/__init__.py
similarity index 100%
rename from tests/laborious/__init__.py
rename to tests/activities/__init__.py
diff --git a/tests/laborious/activities/test_activities.py b/tests/activities/test_activities.py
similarity index 100%
rename from tests/laborious/activities/test_activities.py
rename to tests/activities/test_activities.py
diff --git a/tests/laborious/activities/test_gates.py b/tests/activities/test_gates.py
similarity index 100%
rename from tests/laborious/activities/test_gates.py
rename to tests/activities/test_gates.py
diff --git a/tests/laborious/activities/test_minio.py b/tests/activities/test_minio.py
similarity index 100%
rename from tests/laborious/activities/test_minio.py
rename to tests/activities/test_minio.py
diff --git a/tests/laborious/activities/test_mlflow.py b/tests/activities/test_mlflow.py
similarity index 100%
rename from tests/laborious/activities/test_mlflow.py
rename to tests/activities/test_mlflow.py
diff --git a/tests/laborious/utils/models/__init__.py b/tests/laborious/utils/models/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/laborious/activities/__init__.py b/tests/utils/__init__.py
similarity index 100%
rename from tests/laborious/activities/__init__.py
rename to tests/utils/__init__.py
diff --git a/tests/laborious/utils/__init__.py b/tests/utils/filters/__init__.py
similarity index 100%
rename from tests/laborious/utils/__init__.py
rename to tests/utils/filters/__init__.py
diff --git a/tests/laborious/utils/filters/test_conditional_filters.py b/tests/utils/filters/test_conditional_filters.py
similarity index 100%
rename from tests/laborious/utils/filters/test_conditional_filters.py
rename to tests/utils/filters/test_conditional_filters.py
diff --git a/tests/laborious/utils/filters/test_mlflow_filters.py b/tests/utils/filters/test_mlflow_filters.py
similarity index 100%
rename from tests/laborious/utils/filters/test_mlflow_filters.py
rename to tests/utils/filters/test_mlflow_filters.py
diff --git a/tests/laborious/utils/filters/__init__.py b/tests/utils/models/__init__.py
similarity index 100%
rename from tests/laborious/utils/filters/__init__.py
rename to tests/utils/models/__init__.py
diff --git a/tests/laborious/utils/models/test_experiment_status.py b/tests/utils/models/test_experiment_status.py
similarity index 100%
rename from tests/laborious/utils/models/test_experiment_status.py
rename to tests/utils/models/test_experiment_status.py
diff --git a/tests/laborious/utils/models/test_init.py b/tests/utils/models/test_init.py
similarity index 100%
rename from tests/laborious/utils/models/test_init.py
rename to tests/utils/models/test_init.py
diff --git a/tests/laborious/utils/models/test_train_model_params.py b/tests/utils/models/test_train_model_params.py
similarity index 100%
rename from tests/laborious/utils/models/test_train_model_params.py
rename to tests/utils/models/test_train_model_params.py
diff --git a/tests/laborious/utils/models/test_train_model_result.py b/tests/utils/models/test_train_model_result.py
similarity index 100%
rename from tests/laborious/utils/models/test_train_model_result.py
rename to tests/utils/models/test_train_model_result.py
diff --git a/tests/laborious/utils/repository/test_model_repository.py b/tests/utils/repository/test_model_repository.py
similarity index 100%
rename from tests/laborious/utils/repository/test_model_repository.py
rename to tests/utils/repository/test_model_repository.py
diff --git a/tests/laborious/utils/test_connectors_config.py b/tests/utils/test_connectors_config.py
similarity index 100%
rename from tests/laborious/utils/test_connectors_config.py
rename to tests/utils/test_connectors_config.py
diff --git a/tests/laborious/worker/test_worker.py b/tests/worker/test_worker.py
similarity index 100%
rename from tests/laborious/worker/test_worker.py
rename to tests/worker/test_worker.py
diff --git a/tests/laborious/workflows/subworkflows/test_format_and_export_prediction.py b/tests/workflows/subworkflows/test_format_and_export_prediction.py
similarity index 100%
rename from tests/laborious/workflows/subworkflows/test_format_and_export_prediction.py
rename to tests/workflows/subworkflows/test_format_and_export_prediction.py
diff --git a/tests/laborious/workflows/subworkflows/test_prediction_process.py b/tests/workflows/subworkflows/test_prediction_process.py
similarity index 100%
rename from tests/laborious/workflows/subworkflows/test_prediction_process.py
rename to tests/workflows/subworkflows/test_prediction_process.py
diff --git a/tests/laborious/workflows/test_minimal_retrain.py b/tests/workflows/test_minimal_retrain.py
similarity index 100%
rename from tests/laborious/workflows/test_minimal_retrain.py
rename to tests/workflows/test_minimal_retrain.py
diff --git a/tests/laborious/workflows/test_predictions_batch.py b/tests/workflows/test_predictions_batch.py
similarity index 100%
rename from tests/laborious/workflows/test_predictions_batch.py
rename to tests/workflows/test_predictions_batch.py