diff --git a/PDF_A/1b/6.2 Graphics/6.2.8 Extended graphics state/verapdf-profile-6-2-8-t01.xml b/PDF_A/1b/6.2 Graphics/6.2.8 Extended graphics state/verapdf-profile-6-2-8-t01.xml
index 46022621..1467bef2 100644
--- a/PDF_A/1b/6.2 Graphics/6.2.8 Extended graphics state/verapdf-profile-6-2-8-t01.xml	
+++ b/PDF_A/1b/6.2 Graphics/6.2.8 Extended graphics state/verapdf-profile-6-2-8-t01.xml	
@@ -9,7 +9,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.2.8" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
diff --git a/PDF_A/1b/6.2 Graphics/6.2.8 Extended graphics state/verapdf-profile-6-2-8-t02.xml b/PDF_A/1b/6.2 Graphics/6.2.8 Extended graphics state/verapdf-profile-6-2-8-t02.xml
index 460ebdc8..ca8ce733 100644
--- a/PDF_A/1b/6.2 Graphics/6.2.8 Extended graphics state/verapdf-profile-6-2-8-t02.xml	
+++ b/PDF_A/1b/6.2 Graphics/6.2.8 Extended graphics state/verapdf-profile-6-2-8-t02.xml	
@@ -9,12 +9,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.2.8" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == &quot;Default&quot;</test>
+            <test>containsTR2 == false || TR2NameValue == &quot;Default&quot;</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t01.xml b/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t01.xml
index 99768ba0..733948e7 100644
--- a/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t01.xml	
+++ b/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t01.xml	
@@ -9,12 +9,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="1"/>
             <description>If an SMask key appears in an ExtGState dictionary, its value shall be None</description>
-            <test>SMask == null || SMask == &quot;None&quot;</test>
+            <test>containsSMask == false || SMaskNameValue == &quot;None&quot;</test>
             <error>
-                <message>An ExtGState contains SMask key with value %1 instead of None</message>
-                <arguments>
-                    <argument>SMask</argument>
-                </arguments>
+                <message>An ExtGState contains SMask key with a value other than None</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t04.xml b/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t04.xml
index 15d96809..e6a7a981 100644
--- a/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t04.xml	
+++ b/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t04.xml	
@@ -2,14 +2,14 @@
 <profile xmlns="http://www.verapdf.org/ValidationProfile" flavour="PDFA_1_A">
     <details creator="veraPDF Consortium" created="2016-02-15T10:58:06.408+03:00">
         <name>ISO 19005-1:2005 - 6.4 Transparency - Blend mode</name>
-        <description>The following keys, if present in an ExtGState object, shall have the values shown: BM - Normal or Compatible</description>
+        <description>If a BM key is present in an ExtGState object, its value shall be Normal or Compatible</description>
     </details>
     <hash></hash>
     <rules>
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="4"/>
-            <description>The following keys, if present in an ExtGState object, shall have the values shown: BM - Normal or Compatible</description>
-            <test>BM == null || BM == &quot;Normal&quot; || BM == &quot;Compatible&quot;</test>
+            <description>If a BM key is present in an ExtGState object, its value shall be Normal or Compatible</description>
+            <test>containsBM == false || BMNameValue == &quot;Normal&quot; || BMNameValue == &quot;Compatible&quot;</test>
             <error>
                 <message>An ExtGState dictionary contains the BM key (blend mode) with value %1 that is neither Normal or Compatible</message>
                 <arguments>
diff --git a/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t05.xml b/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t05.xml
index 1ae5eaa6..d778c605 100644
--- a/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t05.xml	
+++ b/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t05.xml	
@@ -2,13 +2,13 @@
 <profile xmlns="http://www.verapdf.org/ValidationProfile" flavour="PDFA_1_A">
     <details creator="veraPDF Consortium" created="2016-02-15T10:58:06.428+03:00">
         <name>ISO 19005-1:2005 - 6.4 Transparency - Stroke alpha</name>
-        <description>The following keys, if present in an ExtGState object, shall have the values shown: CA - 1.0</description>
+        <description>If a CA key is present in an ExtGState object, its value shall be 1.0</description>
     </details>
     <hash></hash>
     <rules>
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="5"/>
-            <description>The following keys, if present in an ExtGState object, shall have the values shown: CA - 1.0</description>
+            <description>If a CA key is present in an ExtGState object, its value shall be 1.0</description>
             <test>CA == null || CA - 1.0 &lt; 0.000001 &amp;&amp; CA - 1.0 &gt; -0.000001</test>
             <error>
                 <message>An ExtGState dictionary contains the CA key (stroke alpha) with value %1 other than 1.0</message>
diff --git a/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t06.xml b/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t06.xml
index 645b5e90..67d07b39 100644
--- a/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t06.xml	
+++ b/PDF_A/1b/6.4 Transparency/verapdf-profile-6-4-t06.xml	
@@ -2,13 +2,13 @@
 <profile xmlns="http://www.verapdf.org/ValidationProfile" flavour="PDFA_1_A">
     <details creator="veraPDF Consortium" created="2016-02-15T10:58:06.455+03:00">
         <name>ISO 19005-1:2005 - 6.4 Transparency - Fill alpha</name>
-        <description>The following keys, if present in an ExtGState object, shall have the values shown: ca - 1.0</description>
+        <description>If a ca key is present in an ExtGState object, its value shall be 1.0</description>
     </details>
     <hash></hash>
     <rules>
         <rule object="PDExtGState">
             <id specification="ISO_19005_1" clause="6.4" testNumber="6"/>
-            <description>The following keys, if present in an ExtGState object, shall have the values shown: ca - 1.0</description>
+            <description>If a ca key is present in an ExtGState object, its value shall be 1.0</description>
             <test>ca == null || ca - 1.0 &lt; 0.000001 &amp;&amp; ca - 1.0 &gt; -0.000001</test>
             <error>
                 <message>An ExtGState dictionary contains the ca key (fill alpha) with value %1 other than 1.0</message>
diff --git a/PDF_A/2b/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t01.xml b/PDF_A/2b/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t01.xml
index 27db9a4a..492ba03c 100644
--- a/PDF_A/2b/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t01.xml	
+++ b/PDF_A/2b/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t01.xml	
@@ -9,7 +9,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_2" clause="6.2.5" testNumber="1"/>
             <description>An ExtGState dictionary shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>An ExtGState dictionary contains the TR key</message>
                 <arguments/>
diff --git a/PDF_A/2b/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t02.xml b/PDF_A/2b/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t02.xml
index c1f05b40..53788208 100644
--- a/PDF_A/2b/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t02.xml	
+++ b/PDF_A/2b/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t02.xml	
@@ -9,12 +9,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_2" clause="6.2.5" testNumber="2"/>
             <description>An ExtGState dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == &quot;Default&quot;</test>
+            <test>containsTR2 == false || TR2NameValue == &quot;Default&quot;</test>
             <error>
-                <message>An ExtGState dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>An ExtGState dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>
diff --git a/PDF_A/4/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t01.xml b/PDF_A/4/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t01.xml
index 9d3b8290..1c252240 100644
--- a/PDF_A/4/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t01.xml	
+++ b/PDF_A/4/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t01.xml	
@@ -9,7 +9,7 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_4" clause="6.2.5" testNumber="1"/>
             <description>A graphics state parameter dictionary (ISO 32000-2:2020, 8.4.5) shall not contain the TR key</description>
-            <test>TR == null</test>
+            <test>containsTR == false</test>
             <error>
                 <message>A graphics state parameter dictionary contains the TR key</message>
                 <arguments/>
diff --git a/PDF_A/4/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t02.xml b/PDF_A/4/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t02.xml
index 071c06bf..cb5e26a3 100644
--- a/PDF_A/4/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t02.xml	
+++ b/PDF_A/4/6.2 Graphics/6.2.5 Extended graphics state/verapdf-profile-6-2-5-t02.xml	
@@ -9,12 +9,10 @@
         <rule object="PDExtGState">
             <id specification="ISO_19005_4" clause="6.2.5" testNumber="2"/>
             <description>A graphics state parameter dictionary shall not contain the TR2 key with a value other than Default</description>
-            <test>TR2 == null || TR2 == &quot;Default&quot;</test>
+            <test>containsTR2 == false || TR2NameValue == &quot;Default&quot;</test>
             <error>
-                <message>A graphics state parameter dictionary contains the TR2 key with value %1 other than Default</message>
-                <arguments>
-                    <argument>TR2</argument>
-                </arguments>
+                <message>A graphics state parameter dictionary contains the TR2 key with a value other than Default</message>
+                <arguments/>
             </error>
             <references/>
         </rule>