diff --git a/Classes/Package.php b/Classes/Package.php
index 06276a7..b4026d1 100644
--- a/Classes/Package.php
+++ b/Classes/Package.php
@@ -32,7 +32,7 @@ class Package extends BasePackage
         $dispatcher = $bootstrap->getSignalSlotDispatcher();
         $dispatcher->connect(ConfigurationManager::class, 'configurationManagerReady',
             function ($configurationManager) {
-                /** @var ConfigurationManager $configurationManager */
+                /* @var ConfigurationManager $configurationManager */
                 $configurationManager->registerConfigurationType(
                     static::CONFIGURATION_TYPE_VALIDATION,
                     ConfigurationManager::CONFIGURATION_PROCESSING_TYPE_DEFAULT,
diff --git a/Classes/Validation/Validator/SettingsValidator.php b/Classes/Validation/Validator/SettingsValidator.php
index 1db1d4c..dec549f 100644
--- a/Classes/Validation/Validator/SettingsValidator.php
+++ b/Classes/Validation/Validator/SettingsValidator.php
@@ -163,6 +163,7 @@ class SettingsValidator extends AbstractValidator
      * Check whether at least one configured group does match, if any is configured.
      *
      * @param array $validatorConfig
+     *
      * @return bool
      */
     protected function doesValidationGroupsMatch(array &$validatorConfig)
diff --git a/Configuration/Testing/Validation.yaml b/Configuration/Testing/Validation.yaml
index e61cfb0..45d895e 100644
--- a/Configuration/Testing/Validation.yaml
+++ b/Configuration/Testing/Validation.yaml
@@ -16,12 +16,12 @@ TrueValidator:
 DigiComp\SettingValidator\Tests\Functional\Fixtures\TestValidationGroupsCustomObject:
   self:
     DigiComp.SettingValidator:Settings:
-      name: GroupValidatorCustom
+      name: 'GroupValidatorCustom'
 
 DigiComp\SettingValidator\Tests\Functional\Fixtures\TestValidationGroupsDefaultObject:
   self:
     DigiComp.SettingValidator:Settings:
-      name: GroupValidatorDefault
+      name: 'GroupValidatorDefault'
 
 GroupValidatorDefault:
   properties:
@@ -35,4 +35,4 @@ GroupValidatorCustom:
       BooleanValue:
         expectedValue: false
         validationGroups:
-          - Custom
+          - 'Custom'
diff --git a/Tests/Functional/Fixtures/TestValidationGroupsCustomObject.php b/Tests/Functional/Fixtures/TestValidationGroupsCustomObject.php
index 29df333..9fa7227 100644
--- a/Tests/Functional/Fixtures/TestValidationGroupsCustomObject.php
+++ b/Tests/Functional/Fixtures/TestValidationGroupsCustomObject.php
@@ -1,8 +1,6 @@
 <?php
 namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
 
-use Neos\Flow\Annotations as Flow;
-
 class TestValidationGroupsCustomObject
 {
     /**
diff --git a/Tests/Functional/Fixtures/TestValidationGroupsDefaultObject.php b/Tests/Functional/Fixtures/TestValidationGroupsDefaultObject.php
index 4d4197c..605dbc7 100644
--- a/Tests/Functional/Fixtures/TestValidationGroupsDefaultObject.php
+++ b/Tests/Functional/Fixtures/TestValidationGroupsDefaultObject.php
@@ -1,8 +1,6 @@
 <?php
 namespace DigiComp\SettingValidator\Tests\Functional\Fixtures;
 
-use Neos\Flow\Annotations as Flow;
-
 class TestValidationGroupsDefaultObject
 {
     /**