diff --git a/.drone.yml b/.drone.yml
index 6d8c3cf..1a9e24e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -36,7 +36,7 @@ steps:
         pwsh -NonInteractive -c "& {
           Import-Module './tools/DroneIO.psm1';
           Invoke-InstallDependencies;
-          Invoke-UnitTest -Verbosity 'Normal' -ErrorAction 'Stop'
+          Invoke-UnitTest -Verbosity 'Normal' -ExcludeTag @( 'Integration', 'Disabled') -ErrorAction 'Stop'
         }"
 
   - name: Coverage
diff --git a/src/Formats/PSCredentialStore.Certificate.Attribute.ps1xml b/src/Formats/PSCredentialStore.Certificate.Attribute.ps1xml
index d75dee6..a9ef0fe 100644
--- a/src/Formats/PSCredentialStore.Certificate.Attribute.ps1xml
+++ b/src/Formats/PSCredentialStore.Certificate.Attribute.ps1xml
@@ -11,22 +11,28 @@
                     <ListEntry>
                         <ListItems>
                             <ListItem>
-                                <PropertyName>Country</PropertyName>
+                                <Label>Country</Label>
+                                <ScriptBlock>$_.Subject.Country</ScriptBlock>
                             </ListItem>
                             <ListItem>
-                                <PropertyName>State</PropertyName>
+                                <Label>State</Label>
+                                <ScriptBlock>$_.Subject.State</ScriptBlock>
                             </ListItem>
                             <ListItem>
-                                <PropertyName>City</PropertyName>
+                                <Label>City</Label>
+                                <ScriptBlock>$_.Subject.City</ScriptBlock>
                             </ListItem>
                             <ListItem>
-                                <PropertyName>Organization</PropertyName>
+                                <Label>Organization</Label>
+                                <ScriptBlock>$_.Subject.Organization</ScriptBlock>
                             </ListItem>
                             <ListItem>
-                                <PropertyName>OrganizationalUnitName</PropertyName>
+                                <Label>OrganizationalUnitName</Label>
+                                <ScriptBlock>$_.Subject.OrganizationalUnitName</ScriptBlock>
                             </ListItem>
                             <ListItem>
-                                <PropertyName>CommonName</PropertyName>
+                                <Label>CommonName</Label>
+                                <ScriptBlock>$_.Subject.CommonName</ScriptBlock>
                             </ListItem>
                         </ListItems>
                     </ListEntry>