diff --git a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/structures/HeterogeneousList.java b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/structures/HeterogeneousList.java
index 4826f9112..aa5821a32 100644
--- a/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/structures/HeterogeneousList.java
+++ b/apis/api-mal/src/main/java/org/ccsds/moims/mo/mal/structures/HeterogeneousList.java
@@ -28,7 +28,7 @@
 import org.ccsds.moims.mo.mal.MALListEncoder;
 
 /**
- * The polymorphic list allows elements of different types to be added on the
+ * The HeterogeneousList allows elements of different types to be added on the
  * same list.
  */
 public class HeterogeneousList extends java.util.ArrayList<Element> implements ElementList<Element> {
@@ -38,16 +38,6 @@ public class HeterogeneousList extends java.util.ArrayList<Element> implements E
     // Note: All the testbeds are passing even when the enforcement is enabled!
     private final static boolean ENFORCE_NON_NULLABLE_ENTRIES = false;
 
-    /**
-     * Default constructor.
-     *
-     * @param element An element to be added to the list.
-     */
-    public HeterogeneousList(Element element) {
-        super();
-        this.add(element);
-    }
-
     /**
      * Default constructor.
      */
diff --git a/testbeds/testbed-mal/src/main/fitnesse/FitNesseRoot/MalTests/TestDocument/content.txt b/testbeds/testbed-mal/src/main/fitnesse/FitNesseRoot/MalTests/TestDocument/content.txt
index 517fb0f93..93824d19b 100644
--- a/testbeds/testbed-mal/src/main/fitnesse/FitNesseRoot/MalTests/TestDocument/content.txt
+++ b/testbeds/testbed-mal/src/main/fitnesse/FitNesseRoot/MalTests/TestDocument/content.txt
@@ -27,7 +27,7 @@
 !see TestScenarios.Section4Scenarios.PubSubTestCase
 !see TestScenarios.Section4Scenarios.PubSubTestCase.PublishRegisterTestProcedure
 # the following test is commented out as it must be redesigned
-#!see TestScenarios.Section4Scenarios.PubSubTestCase.EntityRequestTestProcedure
+!see TestScenarios.Section4Scenarios.PubSubTestCase.EntityRequestTestProcedure
 !see TestScenarios.Section4Scenarios.PubSubTestCase.HeaderTestProcedure
 !see TestScenarios.Section4Scenarios.PubSubTestCase.SubscriptionDomainTestProcedure
 !see TestScenarios.Section4Scenarios.PubSubTestCase.SubscriptionIdTestProcedure
diff --git a/testbeds/testbed-mal/src/main/fitnesse/FitNesseRoot/MalTests/TestScenarios/Section4Scenarios/PubSubTestCase/EntityRequestTestProcedure/content.txt b/testbeds/testbed-mal/src/main/fitnesse/FitNesseRoot/MalTests/TestScenarios/Section4Scenarios/PubSubTestCase/EntityRequestTestProcedure/content.txt
index aa26566e0..9dd5c92ef 100644
--- a/testbeds/testbed-mal/src/main/fitnesse/FitNesseRoot/MalTests/TestScenarios/Section4Scenarios/PubSubTestCase/EntityRequestTestProcedure/content.txt
+++ b/testbeds/testbed-mal/src/main/fitnesse/FitNesseRoot/MalTests/TestScenarios/Section4Scenarios/PubSubTestCase/EntityRequestTestProcedure/content.txt
@@ -44,21 +44,26 @@ At first, publishRegister() is called to instantiate the broker with four subscr
 
 This test checks that the subscription requests are correctly interpreted by the broker, in particular the expression used to define the expected entities.
 A list of subscription key values is defined:
- * A.[null].[null].[null]
- * A.2.[null].[null]
- * A.2.3.[null]
+ * A.0.0.0
+ * A.2.0.0
+ * A.2.3.0
  * A.2.3.4
- * B.[null].[null].[null]
- * Q.2.3.[null]
+ * B.0.0.0
+ * Q.2.3.0
 
-A list of subscription request expressions is defined:
- * A.[null].[null].[null]
- * A.*.[null].[null]
+A list of subscription key values to match is defined:
+ * A.0.0.0
+ * A.*.0.0
  * A.*.*.*
- * A.2.[null].[null]
- * A.2.*.[null]
- * *.2.*.[null]
+ * A.2.0.0
+ * A.2.*.0
+ * *.2.*.0
  * B.*.*.*
+ * A.0.0.0 (select keys: K1.K2.K3.K4)
+ * A.0.0.0 (select keys: K1.K2.K3)
+ * A.0.0.0 (select keys: K1.K2)
+ * A.0.0.0 (select keys: K4.K3.K2.K1)
+ * A.0.0.0 (select keys: K4.K3.K1)
 
 The consumer does the following actions:
  * Creation of one subscription for each expression and registration.
@@ -68,19 +73,19 @@ The consumer checks that the expected keys are received and only them (see table
 
 !*> Sub scenario definitions
 |scenario| entity request with shared broker | shared |
-|ensure |prepare test to use the following subscription key values | A.[null].[null].[null],A.2.[null].[null],A.2.3.[null],A.2.3.4,B.[null].[null].[null],Q.2.3.[null] | and shared broker | @shared |
-|ensure |subscribe to key values | A.[null].[null].[null] | and select keys | [null] | and expected key values | A.[null].[null].[null] |
-|ensure |subscribe to key values | A.*.[null].[null] | and select keys | [null] | and expected key values | A.[null].[null].[null],A.2.[null].[null] |
-|ensure |subscribe to key values | A.*.*.*| and select keys | [null] | and expected key values | A.[null].[null].[null],A.2.[null].[null],A.2.3.[null],A.2.3.4 |
-|ensure |subscribe to key values | A.2.[null].[null] | and select keys | [null] | and expected key values | A.2.[null].[null] |
-|ensure |subscribe to key values | A.2.*.[null] | and select keys | [null] | and expected key values | A.2.[null].[null],A.2.3.[null] |
-|ensure |subscribe to key values | *.2.*.[null] | and select keys | [null] | and expected key values | A.2.[null].[null],A.2.3.[null],Q.2.3.[null] |
-|ensure |subscribe to key values | B.*.*.* | and select keys | [null] | and expected key values | B.[null].[null].[null] |
-|ensure |subscribe to key values | A.2.[null].[null] | and select keys | K1.K2.K3.K4 | and expected key values | A.2.[null].[null] |
-|ensure |subscribe to key values | A.2.[null].[null] | and select keys | K1.K2.K3 | and expected key values | A.2.[null] |
-|ensure |subscribe to key values | A.2.[null].[null] | and select keys | K1.K2 | and expected key values | A.2 |
-|ensure |subscribe to key values | A.2.[null].[null] | and select keys | K4.K3.K2.K1 | and expected key values | [null].[null].2.A |
-|ensure |subscribe to key values | A.2.[null].[null] | and select keys | K4.K3.K1 | and expected key values | [null].[null].A |
+|ensure |prepare test to use the following subscription key values | A.0.0.0,A.2.0.0,A.2.3.0,A.2.3.4,B.0.0.0,Q.2.3.0 | and shared broker | @shared |
+|ensure |subscribe to key values | A.0.0.0 | and select keys | [null] | and expected key values | A.0.0.0 |
+|ensure |subscribe to key values | A.*.0.0 | and select keys | [null] | and expected key values | A.0.0.0,A.2.0.0 |
+|ensure |subscribe to key values | A.*.*.*| and select keys | [null] | and expected key values | A.0.0.0,A.2.0.0,A.2.3.0,A.2.3.4 |
+|ensure |subscribe to key values | A.2.0.0 | and select keys | [null] | and expected key values | A.2.0.0 |
+|ensure |subscribe to key values | A.2.*.0 | and select keys | [null] | and expected key values | A.2.0.0,A.2.3.0 |
+|ensure |subscribe to key values | *.2.*.0 | and select keys | [null] | and expected key values | A.2.0.0,A.2.3.0,Q.2.3.0 |
+|ensure |subscribe to key values | B.*.*.* | and select keys | [null] | and expected key values | B.0.0.0 |
+|ensure |subscribe to key values | A.2.0.0 | and select keys | K1.K2.K3.K4 | and expected key values | A.2.0.0 |
+|ensure |subscribe to key values | A.2.0.0 | and select keys | K1.K2.K3 | and expected key values | A.2.0 |
+|ensure |subscribe to key values | A.2.0.0 | and select keys | K1.K2 | and expected key values | A.2 |
+|ensure |subscribe to key values | A.2.0.0 | and select keys | K4.K3.K2.K1 | and expected key values | 0.0.2.A |
+|ensure |subscribe to key values | A.2.0.0 | and select keys | K4.K3.K1 | and expected key values | 0.0.A |
 |ensure |publish deregister |
 ***********!