diff --git a/svrunit.xml b/svrunit.xml
index 11577069..4f8c0e7c 100644
--- a/svrunit.xml
+++ b/svrunit.xml
@@ -3,10 +3,12 @@
 
         <testsuite name="bin" executable="php bin/phpunuhi">
             <directory>tests/svrunit/tests</directory>
+            <directory>tests/svrunit/tests/commands</directory>
         </testsuite>
 
         <testsuite name="phar" executable="php ./build/phpunuhi.phar">
             <directory>tests/svrunit/tests</directory>
+            <directory>tests/svrunit/tests/commands</directory>
         </testsuite>
 
     </testsuites>
diff --git a/tests/svrunit/formats/ini/de.ini b/tests/svrunit/fixtures/ini/de.ini
similarity index 100%
rename from tests/svrunit/formats/ini/de.ini
rename to tests/svrunit/fixtures/ini/de.ini
diff --git a/tests/svrunit/formats/ini/en.ini b/tests/svrunit/fixtures/ini/en.ini
similarity index 100%
rename from tests/svrunit/formats/ini/en.ini
rename to tests/svrunit/fixtures/ini/en.ini
diff --git a/tests/svrunit/formats/ini/ini_sections.ini b/tests/svrunit/fixtures/ini/ini_sections.ini
similarity index 100%
rename from tests/svrunit/formats/ini/ini_sections.ini
rename to tests/svrunit/fixtures/ini/ini_sections.ini
diff --git a/tests/svrunit/formats/ini/phpunuhi.xml b/tests/svrunit/fixtures/ini/phpunuhi.xml
similarity index 100%
rename from tests/svrunit/formats/ini/phpunuhi.xml
rename to tests/svrunit/fixtures/ini/phpunuhi.xml
diff --git a/tests/svrunit/formats/json/de.json b/tests/svrunit/fixtures/json/de.json
similarity index 100%
rename from tests/svrunit/formats/json/de.json
rename to tests/svrunit/fixtures/json/de.json
diff --git a/tests/svrunit/formats/json/en.json b/tests/svrunit/fixtures/json/en.json
similarity index 100%
rename from tests/svrunit/formats/json/en.json
rename to tests/svrunit/fixtures/json/en.json
diff --git a/tests/svrunit/formats/json/nl.json b/tests/svrunit/fixtures/json/nl.json
similarity index 100%
rename from tests/svrunit/formats/json/nl.json
rename to tests/svrunit/fixtures/json/nl.json
diff --git a/tests/svrunit/formats/json/phpunuhi.xml b/tests/svrunit/fixtures/json/phpunuhi.xml
similarity index 100%
rename from tests/svrunit/formats/json/phpunuhi.xml
rename to tests/svrunit/fixtures/json/phpunuhi.xml
diff --git a/tests/svrunit/formats/json/templates/index.twig b/tests/svrunit/fixtures/json/templates/subfolder/index.mjml
similarity index 100%
rename from tests/svrunit/formats/json/templates/index.twig
rename to tests/svrunit/fixtures/json/templates/subfolder/index.mjml
diff --git a/tests/svrunit/fixtures/json/templates/subfolder/index.twig b/tests/svrunit/fixtures/json/templates/subfolder/index.twig
new file mode 100644
index 00000000..e69de29b
diff --git a/tests/svrunit/formats/php/de.php b/tests/svrunit/fixtures/php/de.php
similarity index 100%
rename from tests/svrunit/formats/php/de.php
rename to tests/svrunit/fixtures/php/de.php
diff --git a/tests/svrunit/formats/php/en.php b/tests/svrunit/fixtures/php/en.php
similarity index 100%
rename from tests/svrunit/formats/php/en.php
rename to tests/svrunit/fixtures/php/en.php
diff --git a/tests/svrunit/formats/php/phpunuhi.xml b/tests/svrunit/fixtures/php/phpunuhi.xml
similarity index 100%
rename from tests/svrunit/formats/php/phpunuhi.xml
rename to tests/svrunit/fixtures/php/phpunuhi.xml
diff --git a/tests/svrunit/formats/shopware6/phpunuhi.xml b/tests/svrunit/fixtures/shopware6/phpunuhi.xml
similarity index 100%
rename from tests/svrunit/formats/shopware6/phpunuhi.xml
rename to tests/svrunit/fixtures/shopware6/phpunuhi.xml
diff --git a/tests/svrunit/formats/yaml/de.yaml b/tests/svrunit/fixtures/yaml/de.yaml
similarity index 100%
rename from tests/svrunit/formats/yaml/de.yaml
rename to tests/svrunit/fixtures/yaml/de.yaml
diff --git a/tests/svrunit/formats/yaml/en.yaml b/tests/svrunit/fixtures/yaml/en.yaml
similarity index 100%
rename from tests/svrunit/formats/yaml/en.yaml
rename to tests/svrunit/fixtures/yaml/en.yaml
diff --git a/tests/svrunit/formats/yaml/nl.yaml b/tests/svrunit/fixtures/yaml/nl.yaml
similarity index 100%
rename from tests/svrunit/formats/yaml/nl.yaml
rename to tests/svrunit/fixtures/yaml/nl.yaml
diff --git a/tests/svrunit/formats/yaml/phpunuhi.xml b/tests/svrunit/fixtures/yaml/phpunuhi.xml
similarity index 100%
rename from tests/svrunit/formats/yaml/phpunuhi.xml
rename to tests/svrunit/fixtures/yaml/phpunuhi.xml
diff --git a/tests/svrunit/tests/commands.yml b/tests/svrunit/tests/commands/commands.yml
similarity index 67%
rename from tests/svrunit/tests/commands.yml
rename to tests/svrunit/tests/commands/commands.yml
index 73014614..b63c4eaa 100644
--- a/tests/svrunit/tests/commands.yml
+++ b/tests/svrunit/tests/commands/commands.yml
@@ -1,32 +1,28 @@
 commands:
   - name: "Status"
-    command: "(($EXEC)) status --configuration=./tests/svrunit/formats/json/phpunuhi.xml"
+    command: "(($EXEC)) status --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
     expected: "Coverage: 100%"
 
   - name: "List Translations"
-    command: "(($EXEC)) list:translations --configuration=./tests/svrunit/formats/json/phpunuhi.xml"
+    command: "(($EXEC)) list:translations --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
     expected: "[~] card.description"
 
   - name: "Validate (deprecated))"
-    command: "(($EXEC)) validate --configuration=./tests/svrunit/formats/json/phpunuhi.xml"
+    command: "(($EXEC)) validate --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
     expected: "All translations are valid"
 
   - name: "Validate All"
-    command: "(($EXEC)) validate:all --configuration=./tests/svrunit/formats/json/phpunuhi.xml"
+    command: "(($EXEC)) validate:all --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
     expected: "All translations are valid"
 
   - name: "Validate Coverage"
-    command: "(($EXEC)) validate:coverage --configuration=./tests/svrunit/formats/json/phpunuhi.xml"
+    command: "(($EXEC)) validate:coverage --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
     expected: "Checking minimum coverage..."
 
   - name: "Validate Mess"
-    command: "(($EXEC)) validate:mess --configuration=./tests/svrunit/formats/json/phpunuhi.xml"
+    command: "(($EXEC)) validate:mess --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
     expected: "All translations are valid"
 
   - name: "Export"
-    command: "(($EXEC)) export --configuration=./tests/svrunit/formats/json/phpunuhi.xml --dir=.svrunit"
+    command: "(($EXEC)) export --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml --dir=.svrunit"
     expected: "All translations exported"
-
-  - name: "Scan Usage"
-    command: "(($EXEC)) scan:usage --configuration=./tests/svrunit/formats/json/phpunuhi.xml --dir=./tests/svrunit/formats/json/templates --scanner=twig"
-    expected: "Key not found in any file"
\ No newline at end of file
diff --git a/tests/svrunit/tests/commands/export.yml b/tests/svrunit/tests/commands/export.yml
new file mode 100644
index 00000000..67d47e12
--- /dev/null
+++ b/tests/svrunit/tests/commands/export.yml
@@ -0,0 +1,5 @@
+commands:
+
+  - name: "Export"
+    command: "(($EXEC)) export --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml --dir=.svrunit"
+    expected: "All translations exported"
diff --git a/tests/svrunit/tests/commands/list-translations.yml b/tests/svrunit/tests/commands/list-translations.yml
new file mode 100644
index 00000000..7735cf70
--- /dev/null
+++ b/tests/svrunit/tests/commands/list-translations.yml
@@ -0,0 +1,5 @@
+commands:
+
+  - name: "List Translations"
+    command: "(($EXEC)) list:translations --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
+    expected: "[~] card.description"
diff --git a/tests/svrunit/tests/commands/scanner.yml b/tests/svrunit/tests/commands/scanner.yml
new file mode 100644
index 00000000..fbf03c76
--- /dev/null
+++ b/tests/svrunit/tests/commands/scanner.yml
@@ -0,0 +1,13 @@
+commands:
+
+  - name: "Scan Usage TWIG"
+    command: "(($EXEC)) scan:usage --scanner=twig --dir=./tests/svrunit/fixtures/json/templates --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml "
+    expected: "Key not found in any file"
+
+  - name: "Scan Usage MJML"
+    command: "(($EXEC)) scan:usage --scanner=mjml --dir=./tests/svrunit/fixtures/json/templates --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
+    expected: "Key not found in any file"
+
+  - name: "Scan Usage with verbose mode shows scanned files"
+    command: "(($EXEC)) scan:usage --scanner=mjml --dir=./tests/svrunit/fixtures/json/templates --verbose --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
+    expected: "/app/tests/svrunit/fixtures/json/templates/subfolder/index.mjml"
\ No newline at end of file
diff --git a/tests/svrunit/tests/version.yml b/tests/svrunit/tests/commands/status.yml
similarity index 63%
rename from tests/svrunit/tests/version.yml
rename to tests/svrunit/tests/commands/status.yml
index 7ea116ba..246aca74 100644
--- a/tests/svrunit/tests/version.yml
+++ b/tests/svrunit/tests/commands/status.yml
@@ -1,5 +1,5 @@
 commands:
 
   - name: "Version is correct (command header)"
-    command: "(($EXEC)) status --configuration=./tests/svrunit/formats/json/phpunuhi.xml"
-    expected: "PHPUnuhi Framework, v1.16.0"
\ No newline at end of file
+    command: "(($EXEC)) status --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
+    expected: "PHPUnuhi Framework, v1.17.0"
\ No newline at end of file
diff --git a/tests/svrunit/tests/commands/validate-all.yml b/tests/svrunit/tests/commands/validate-all.yml
new file mode 100644
index 00000000..53936c94
--- /dev/null
+++ b/tests/svrunit/tests/commands/validate-all.yml
@@ -0,0 +1,9 @@
+commands:
+
+  - name: "Validate (deprecated))"
+    command: "(($EXEC)) validate --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
+    expected: "All translations are valid"
+
+  - name: "Validate All"
+    command: "(($EXEC)) validate:all --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
+    expected: "All translations are valid"
diff --git a/tests/svrunit/tests/commands/validate-coverage.yml b/tests/svrunit/tests/commands/validate-coverage.yml
new file mode 100644
index 00000000..f2e82bdb
--- /dev/null
+++ b/tests/svrunit/tests/commands/validate-coverage.yml
@@ -0,0 +1,5 @@
+commands:
+
+  - name: "Validate Coverage"
+    command: "(($EXEC)) validate:coverage --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
+    expected: "Checking minimum coverage..."
diff --git a/tests/svrunit/tests/commands/validate-mess.yml b/tests/svrunit/tests/commands/validate-mess.yml
new file mode 100644
index 00000000..97b1d73c
--- /dev/null
+++ b/tests/svrunit/tests/commands/validate-mess.yml
@@ -0,0 +1,5 @@
+commands:
+
+  - name: "Validate Mess"
+    command: "(($EXEC)) validate:mess --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
+    expected: "All translations are valid"
diff --git a/tests/svrunit/tests/commands/validate-structure.yml b/tests/svrunit/tests/commands/validate-structure.yml
new file mode 100644
index 00000000..bda53908
--- /dev/null
+++ b/tests/svrunit/tests/commands/validate-structure.yml
@@ -0,0 +1,5 @@
+commands:
+
+  - name: "Validate Structure"
+    command: "(($EXEC)) validate:structure --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
+    expected: "All translations are valid"
diff --git a/tests/svrunit/tests/ini.yml b/tests/svrunit/tests/ini.yml
index 0688d9a4..64c9fb2f 100644
--- a/tests/svrunit/tests/ini.yml
+++ b/tests/svrunit/tests/ini.yml
@@ -1,10 +1,10 @@
 commands:
   - name: "Status"
-    command: "(($EXEC)) status --configuration=./tests/svrunit/formats/ini/phpunuhi.xml"
+    command: "(($EXEC)) status --configuration=./tests/svrunit/fixtures/ini/phpunuhi.xml"
     expected: "Coverage: 100%"
   - name: "Validate"
-    command: "(($EXEC)) validate --configuration=./tests/svrunit/formats/ini/phpunuhi.xml"
+    command: "(($EXEC)) validate --configuration=./tests/svrunit/fixtures/ini/phpunuhi.xml"
     expected: "All translations are valid"
   - name: "Export"
-    command: "(($EXEC)) export --configuration=./tests/svrunit/formats/ini/phpunuhi.xml --dir=.svrunit"
+    command: "(($EXEC)) export --configuration=./tests/svrunit/fixtures/ini/phpunuhi.xml --dir=.svrunit"
     expected: "All translations exported"
\ No newline at end of file
diff --git a/tests/svrunit/tests/json.yml b/tests/svrunit/tests/json.yml
index f4bf3d3f..4d3daf23 100644
--- a/tests/svrunit/tests/json.yml
+++ b/tests/svrunit/tests/json.yml
@@ -1,10 +1,10 @@
 commands:
   - name: "Status"
-    command: "(($EXEC)) status --configuration=./tests/svrunit/formats/json/phpunuhi.xml"
+    command: "(($EXEC)) status --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
     expected: "Coverage: 100%"
   - name: "Validate"
-    command: "(($EXEC)) validate --configuration=./tests/svrunit/formats/json/phpunuhi.xml"
+    command: "(($EXEC)) validate --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml"
     expected: "All translations are valid"
   - name: "Export"
-    command: "(($EXEC)) export --configuration=./tests/svrunit/formats/json/phpunuhi.xml --dir=.svrunit"
+    command: "(($EXEC)) export --configuration=./tests/svrunit/fixtures/json/phpunuhi.xml --dir=.svrunit"
     expected: "All translations exported"
\ No newline at end of file
diff --git a/tests/svrunit/tests/php.yml b/tests/svrunit/tests/php.yml
index 454ae8a8..11e7f5e5 100644
--- a/tests/svrunit/tests/php.yml
+++ b/tests/svrunit/tests/php.yml
@@ -1,10 +1,10 @@
 commands:
   - name: "Status"
-    command: "(($EXEC)) status --configuration=./tests/svrunit/formats/php/phpunuhi.xml"
+    command: "(($EXEC)) status --configuration=./tests/svrunit/fixtures/php/phpunuhi.xml"
     expected: "Coverage: 100%"
   - name: "Validate"
-    command: "(($EXEC)) validate --configuration=./tests/svrunit/formats/php/phpunuhi.xml"
+    command: "(($EXEC)) validate --configuration=./tests/svrunit/fixtures/php/phpunuhi.xml"
     expected: "All translations are valid"
   - name: "Export"
-    command: "(($EXEC)) export --configuration=./tests/svrunit/formats/php/phpunuhi.xml --dir=.svrunit"
+    command: "(($EXEC)) export --configuration=./tests/svrunit/fixtures/php/phpunuhi.xml --dir=.svrunit"
     expected: "All translations exported"
\ No newline at end of file
diff --git a/tests/svrunit/tests/shopware6.yml b/tests/svrunit/tests/shopware6.yml
index 6554541f..8b3f143b 100644
--- a/tests/svrunit/tests/shopware6.yml
+++ b/tests/svrunit/tests/shopware6.yml
@@ -1,4 +1,4 @@
 commands:
   - name: "Format requires database"
-    command: "(($EXEC)) status --configuration=./tests/svrunit/formats/shopware6/phpunuhi.xml"
+    command: "(($EXEC)) status --configuration=./tests/svrunit/fixtures/shopware6/phpunuhi.xml"
     expected: "Connection refused"
\ No newline at end of file
diff --git a/tests/svrunit/tests/yaml.yml b/tests/svrunit/tests/yaml.yml
index 41403f1b..d23a8fb2 100644
--- a/tests/svrunit/tests/yaml.yml
+++ b/tests/svrunit/tests/yaml.yml
@@ -1,10 +1,10 @@
 commands:
   - name: "Status"
-    command: "(($EXEC)) status --configuration=./tests/svrunit/formats/yaml/phpunuhi.xml"
+    command: "(($EXEC)) status --configuration=./tests/svrunit/fixtures/yaml/phpunuhi.xml"
     expected: "Coverage: 100%"
   - name: "Validate"
-    command: "(($EXEC)) validate --configuration=./tests/svrunit/formats/yaml/phpunuhi.xml"
+    command: "(($EXEC)) validate --configuration=./tests/svrunit/fixtures/yaml/phpunuhi.xml"
     expected: "All translations are valid"
   - name: "Export"
-    command: "(($EXEC)) export --configuration=./tests/svrunit/formats/yaml/phpunuhi.xml --dir=.svrunit"
+    command: "(($EXEC)) export --configuration=./tests/svrunit/fixtures/yaml/phpunuhi.xml --dir=.svrunit"
     expected: "All translations exported"