diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionMiningServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionMiningServicesRegistryTest.java
similarity index 87%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionMiningServicesRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionMiningServicesRegistryTest.java
index c53ea25a7..d8604987f 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionMiningServicesRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionMiningServicesRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class ConditionMiningServicesRegitryTest extends ReadOnlyCollectionTest<MinedConditions> {
+public abstract class ConditionMiningServicesRegistryTest extends ReadOnlyCollectionTest<MinedConditions> {
 
 	@Override
 	protected final Supplier<Collection<MinedConditions>> collection() {
diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegistryTest.java
similarity index 87%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegistryTest.java
index ebe8c2fd1..9d1467972 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ConditionTransportServicesRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class ConditionTransportServicesRegitryTest extends ReadOnlyCollectionTest<ConditionTransport> {
+public abstract class ConditionTransportServicesRegistryTest extends ReadOnlyCollectionTest<ConditionTransport> {
 
 	@Override
 	protected final Supplier<Collection<ConditionTransport>> collection() {
diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegistryTest.java
similarity index 91%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegistryTest.java
index 14a59ec1e..ad9ebf261 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionEvaluationServicesRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class ExpressionEvaluationServicesRegitryTest
+public abstract class ExpressionEvaluationServicesRegistryTest
 		extends ReadOnlyCollectionTest<ExpressionEvaluationService> {
 
 	@Override
diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegistryTest.java
similarity index 87%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegistryTest.java
index 491288e09..95c67aac1 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionParsingServicesRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class ExpressionParsingServicesRegitryTest extends ReadOnlyCollectionTest<ExpressionParsingService> {
+public abstract class ExpressionParsingServicesRegistryTest extends ReadOnlyCollectionTest<ExpressionParsingService> {
 
 	@Override
 	protected final Supplier<Collection<ExpressionParsingService>> collection() {
diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegistryTest.java
similarity index 91%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegistryTest.java
index b03bab0dc..cc3d4c7cb 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/ExpressionTokenAssessmentServicesRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class ExpressionTokenAssessmentServicesRegitryTest
+public abstract class ExpressionTokenAssessmentServicesRegistryTest
 		extends ReadOnlyCollectionTest<ExpressionTokenAssessmentService> {
 
 	@Override
diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/KeyKeepersRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/KeyKeepersRegistryTest.java
similarity index 88%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/KeyKeepersRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/KeyKeepersRegistryTest.java
index 9ef14d8ac..0d9f77f8d 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/KeyKeepersRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/KeyKeepersRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class KeyKeepersRegitryTest extends ReadOnlyCollectionTest<KeyKeeper> {
+public abstract class KeyKeepersRegistryTest extends ReadOnlyCollectionTest<KeyKeeper> {
 
 	@Override
 	protected final Supplier<Collection<KeyKeeper>> collection() {
diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegistryTest.java
similarity index 87%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegistryTest.java
index 799404f1f..4ceadac92 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/PermissionEmittingServicesRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class PermissionEmittingServicesRegitryTest extends ReadOnlyCollectionTest<PermissionEmittingService> {
+public abstract class PermissionEmittingServicesRegistryTest extends ReadOnlyCollectionTest<PermissionEmittingService> {
 
 	@Override
 	protected final Supplier<Collection<PermissionEmittingService>> collection() {
diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegistryTest.java
similarity index 91%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegistryTest.java
index 5d1827448..199b5def7 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RequirementResolutionServicesRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class RequirementResolutionServicesRegitryTest
+public abstract class RequirementResolutionServicesRegistryTest
 		extends ReadOnlyCollectionTest<PermissionEmittingService> {
 
 	@Override
diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RuntimeEnvironmentRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RuntimeEnvironmentRegistryTest.java
similarity index 88%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RuntimeEnvironmentRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RuntimeEnvironmentRegistryTest.java
index 82fc99541..a05ca4c99 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RuntimeEnvironmentRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/RuntimeEnvironmentRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class RuntimeEnvironmentRegitryTest extends ReadOnlyCollectionTest<RuntimeEnvironment> {
+public abstract class RuntimeEnvironmentRegistryTest extends ReadOnlyCollectionTest<RuntimeEnvironment> {
 
 	@Override
 	protected final Supplier<Collection<RuntimeEnvironment>> collection() {
diff --git a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/StreamCodecsRegitryTest.java b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/StreamCodecsRegistryTest.java
similarity index 88%
rename from tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/StreamCodecsRegitryTest.java
rename to tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/StreamCodecsRegistryTest.java
index 290bf55dc..1ba523833 100644
--- a/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/StreamCodecsRegitryTest.java
+++ b/tests/org.eclipse.passage.lic.api.tests/src/org/eclipse/passage/lic/api/tests/StreamCodecsRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,6 +9,7 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.lic.api.tests;
 
@@ -30,7 +31,7 @@
  * and satisfy all the demands.
  * </p>
  */
-public abstract class StreamCodecsRegitryTest extends ReadOnlyCollectionTest<StreamCodec> {
+public abstract class StreamCodecsRegistryTest extends ReadOnlyCollectionTest<StreamCodec> {
 
 	@Override
 	protected final Supplier<Collection<StreamCodec>> collection() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedCodecsRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedCodecsRegistryTest.java
index ea9e20f7c..293b0df4d 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedCodecsRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedCodecsRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.StreamCodecsRegitryTest;
+import org.eclipse.passage.lic.api.tests.StreamCodecsRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedCodecsRegistryTest extends StreamCodecsRegitryTest {
+public final class SealedCodecsRegistryTest extends StreamCodecsRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedConitionMiningServicesRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedConitionMiningServicesRegistryTest.java
index 0c80a085c..141c6d699 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedConitionMiningServicesRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedConitionMiningServicesRegistryTest.java
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.RequirementResolutionServicesRegitryTest;
+import org.eclipse.passage.lic.api.tests.RequirementResolutionServicesRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedConitionMiningServicesRegistryTest extends RequirementResolutionServicesRegitryTest {
+public final class SealedConitionMiningServicesRegistryTest extends RequirementResolutionServicesRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedExpressionEvaluatorsServiceRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedExpressionEvaluatorsServiceRegistryTest.java
index 0d39879e4..9aff69823 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedExpressionEvaluatorsServiceRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedExpressionEvaluatorsServiceRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.ExpressionParsingServicesRegitryTest;
+import org.eclipse.passage.lic.api.tests.ExpressionEvaluationServicesRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedExpressionEvaluatorsServiceRegistryTest extends ExpressionParsingServicesRegitryTest {
+public final class SealedExpressionEvaluatorsServiceRegistryTest extends ExpressionEvaluationServicesRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedExpressionParsersRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedExpressionParsersRegistryTest.java
index 722a487e6..fd268551a 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedExpressionParsersRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedExpressionParsersRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.ExpressionParsingServicesRegitryTest;
+import org.eclipse.passage.lic.api.tests.ExpressionParsingServicesRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedExpressionParsersRegistryTest extends ExpressionParsingServicesRegitryTest {
+public final class SealedExpressionParsersRegistryTest extends ExpressionParsingServicesRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedKeyKeepersRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedKeyKeepersRegistryTest.java
index c21a471db..10ad85f9c 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedKeyKeepersRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedKeyKeepersRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.KeyKeepersRegitryTest;
+import org.eclipse.passage.lic.api.tests.KeyKeepersRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedKeyKeepersRegistryTest extends KeyKeepersRegitryTest {
+public final class SealedKeyKeepersRegistryTest extends KeyKeepersRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedPermissionsExaminationServicesRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedPermissionEmittingServicesRegistryTest.java
similarity index 79%
rename from tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedPermissionsExaminationServicesRegistryTest.java
rename to tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedPermissionEmittingServicesRegistryTest.java
index cdfe27d28..830ecf17f 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedPermissionsExaminationServicesRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedPermissionEmittingServicesRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.PermissionEmittingServicesRegitryTest;
+import org.eclipse.passage.lic.api.tests.PermissionEmittingServicesRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedPermissionsExaminationServicesRegistryTest extends PermissionEmittingServicesRegitryTest {
+public final class SealedPermissionEmittingServicesRegistryTest extends PermissionEmittingServicesRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedPermissionEmttingServicesRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedPermissionEmttingServicesRegistryTest.java
deleted file mode 100644
index 69956e57d..000000000
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedPermissionEmttingServicesRegistryTest.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/.
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *     ArSysOp - initial API and implementation
- *******************************************************************************/
-package org.eclipse.passage.seal.demo.tests.registries;
-
-import java.util.Optional;
-
-import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.PermissionEmittingServicesRegitryTest;
-import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
-
-public final class SealedPermissionEmttingServicesRegistryTest extends PermissionEmittingServicesRegitryTest {
-
-	@Override
-	protected Optional<Framework> framework() {
-		return new DemoFrameworkSupplier().get();
-	}
-
-}
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedRequirementsResolutionServicesRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedRequirementsResolutionServicesRegistryTest.java
index 2473d5bd0..35ce70267 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedRequirementsResolutionServicesRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedRequirementsResolutionServicesRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.ConditionMiningServicesRegitryTest;
+import org.eclipse.passage.lic.api.tests.ConditionMiningServicesRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedRequirementsResolutionServicesRegistryTest extends ConditionMiningServicesRegitryTest {
+public final class SealedRequirementsResolutionServicesRegistryTest extends ConditionMiningServicesRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedRuntimeEnvironmentRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedRuntimeEnvironmentRegistryTest.java
index 6ddfcfe42..e04c675ae 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedRuntimeEnvironmentRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedRuntimeEnvironmentRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.RuntimeEnvironmentRegitryTest;
+import org.eclipse.passage.lic.api.tests.RuntimeEnvironmentRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedRuntimeEnvironmentRegistryTest extends RuntimeEnvironmentRegitryTest {
+public final class SealedRuntimeEnvironmentRegistryTest extends RuntimeEnvironmentRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedTokenAssessorsRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedTokenAssessorsRegistryTest.java
index 5880b6dff..d42b89d81 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedTokenAssessorsRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedTokenAssessorsRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.ExpressionTokenAssessmentServicesRegitryTest;
+import org.eclipse.passage.lic.api.tests.ExpressionTokenAssessmentServicesRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedTokenAssessorsRegistryTest extends ExpressionTokenAssessmentServicesRegitryTest {
+public final class SealedTokenAssessorsRegistryTest extends ExpressionTokenAssessmentServicesRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {
diff --git a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedTransportsRegistryTest.java b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedTransportsRegistryTest.java
index 0ef993a95..c456880c5 100644
--- a/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedTransportsRegistryTest.java
+++ b/tests/org.eclipse.passage.seal.demo.tests/src/org/eclipse/passage/seal/demo/tests/registries/SealedTransportsRegistryTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2020, 2021 ArSysOp
+ * Copyright (c) 2020, 2024 ArSysOp
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which is available at
@@ -9,16 +9,17 @@
  *
  * Contributors:
  *     ArSysOp - initial API and implementation
+ *     ArSysOp - further support and improvements
  *******************************************************************************/
 package org.eclipse.passage.seal.demo.tests.registries;
 
 import java.util.Optional;
 
 import org.eclipse.passage.lic.api.Framework;
-import org.eclipse.passage.lic.api.tests.ConditionTransportServicesRegitryTest;
+import org.eclipse.passage.lic.api.tests.ConditionTransportServicesRegistryTest;
 import org.eclipse.passage.seal.internal.demo.DemoFrameworkSupplier;
 
-public final class SealedTransportsRegistryTest extends ConditionTransportServicesRegitryTest {
+public final class SealedTransportsRegistryTest extends ConditionTransportServicesRegistryTest {
 
 	@Override
 	protected Optional<Framework> framework() {