diff --git a/backend/go.mod b/backend/go.mod
index a177efd4..47e54ac0 100644
--- a/backend/go.mod
+++ b/backend/go.mod
@@ -1,6 +1,6 @@
module github.com/Wikid82/charon/backend
-go 1.26.0
+go 1.26
require (
github.com/containrrr/shoutrrr v0.8.0
diff --git a/go.work b/go.work
index 1f9018ac..ca05e7d8 100644
--- a/go.work
+++ b/go.work
@@ -1,3 +1,3 @@
-go 1.25.0
+go 1.26.0
use ./backend
diff --git a/tests/phase4-uat/01-admin-onboarding.spec.ts b/tests/core/admin-onboarding.spec.ts
similarity index 100%
rename from tests/phase4-uat/01-admin-onboarding.spec.ts
rename to tests/core/admin-onboarding.spec.ts
diff --git a/tests/phase3/security-enforcement.spec.ts b/tests/core/auth-api-enforcement.spec.ts
similarity index 100%
rename from tests/phase3/security-enforcement.spec.ts
rename to tests/core/auth-api-enforcement.spec.ts
diff --git a/tests/phase3/auth-long-session.spec.ts b/tests/core/auth-long-session.spec.ts
similarity index 100%
rename from tests/phase3/auth-long-session.spec.ts
rename to tests/core/auth-long-session.spec.ts
diff --git a/tests/phase3/cerberus-acl.spec.ts b/tests/core/authorization-rbac.spec.ts
similarity index 100%
rename from tests/phase3/cerberus-acl.spec.ts
rename to tests/core/authorization-rbac.spec.ts
diff --git a/tests/phase4-integration/05-data-consistency.spec.ts b/tests/core/data-consistency.spec.ts
similarity index 100%
rename from tests/phase4-integration/05-data-consistency.spec.ts
rename to tests/core/data-consistency.spec.ts
diff --git a/tests/phase4-uat/05-domain-dns-management.spec.ts b/tests/core/domain-dns-management.spec.ts
similarity index 100%
rename from tests/phase4-uat/05-domain-dns-management.spec.ts
rename to tests/core/domain-dns-management.spec.ts
diff --git a/tests/phase4-integration/07-multi-component-workflows.spec.ts b/tests/core/multi-component-workflows.spec.ts
similarity index 100%
rename from tests/phase4-integration/07-multi-component-workflows.spec.ts
rename to tests/core/multi-component-workflows.spec.ts
diff --git a/tests/phase3/coraza-waf.spec.ts b/tests/phase3/coraza-waf.spec.ts
deleted file mode 100644
index f526c8ad..00000000
--- a/tests/phase3/coraza-waf.spec.ts
+++ /dev/null
@@ -1,436 +0,0 @@
-/**
- * Phase 3 - Coraza WAF (Attack Prevention) Tests
- *
- * Validates that Coraza module correctly blocks malicious payloads:
- * - SQL Injection attacks
- * - Cross-Site Scripting (XSS) attacks
- * - CSRF token attacks
- * - Malformed requests
- * - Path traversal attempts
- * - Command injection
- *
- * Total Tests: 18
- * Expected Duration: ~10 minutes
- *
- * Expected Behavior:
- * - Malicious payloads → 403 Forbidden (WAF block)
- * - Benign requests → 200/201/400 OK (allowed through)
- */
-
-import { test, expect } from '@playwright/test';
-import { request as playwrightRequest } from '@playwright/test';
-
-const BASE_URL = process.env.PLAYWRIGHT_BASE_URL || 'http://localhost:8080';
-const VALID_TOKEN = process.env.VALID_TEST_TOKEN || 'test-token-12345';
-
-// SQL Injection Payloads
-const SQL_INJECTION_PAYLOADS = [
- "' OR '1'='1",
- "' OR '1'='1' --",
- "admin' --",
- "' UNION SELECT * FROM users --",
- "'; DROP TABLE users; --",
- "1' AND SLEEP(5) --",
- "1; DELETE FROM users --",
-];
-
-// XSS Payloads
-const XSS_PAYLOADS = [
- '',
- '
',
- 'javascript:alert("xss")',
- '