diff --git a/src/spid_sp_test/__init__.py b/src/spid_sp_test/__init__.py
index 41a898f..303a490 100644
--- a/src/spid_sp_test/__init__.py
+++ b/src/spid_sp_test/__init__.py
@@ -6,7 +6,7 @@
 
 
 BASE_DIR = Path(__file__).resolve().parent
-__version__ = "1.2.14"
+__version__ = "1.2.15"
 __name__ = "spid_sp_test"
 logger = logging.getLogger(__name__)
 
diff --git a/tests/metadata/pri-ag-full.xml b/tests/metadata/pri-ag-full.xml
index 7d6f126..7cb41bb 100644
--- a/tests/metadata/pri-ag-full.xml
+++ b/tests/metadata/pri-ag-full.xml
@@ -1,195 +1,184 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="bff93e4d-d684-47d8-9bba-228e50bf4fa1" entityID="https://sp.example.it/pri-ag-full/TEST"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:spid="https://spid.gov.it/saml-extensions">
-
-<ds:Signature Id="Signature1">
-<ds:SignedInfo>
-<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-<ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-<ds:Reference URI="#bff93e4d-d684-47d8-9bba-228e50bf4fa1">
-<ds:Transforms>
-<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
-<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
-</ds:Transforms>
-<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-<ds:DigestValue />
-</ds:Reference>
-</ds:SignedInfo>
-<ds:SignatureValue />
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>MIIGMDCCBJigAwIBAgIUE7duhQxbNaufGDpvI9KFoQy5ytswDQYJKoZIhvcNAQEL
-BQAwgY0xGjAYBgNVBAoMEURldmVsb3BlcnMgSXRhbGlhMRUwEwYDVQQDDAxTUElE
-LlNQLlRFU1QxIDAeBgNVBFMMF2h0dHBzOi8vc3BpZC5leGFtcGxlLml0MRowGAYD
-VQRhDBFWQVRJVC0xMjM0NTY3ODkwMTELMAkGA1UEBhMCSVQxDTALBgNVBAcMBFJv
-bWEwHhcNMjIxMTIxMTAwNzM4WhcNMzIxMTE4MTAwNzM4WjCBjTEaMBgGA1UECgwR
-RGV2ZWxvcGVycyBJdGFsaWExFTATBgNVBAMMDFNQSUQuU1AuVEVTVDEgMB4GA1UE
-UwwXaHR0cHM6Ly9zcGlkLmV4YW1wbGUuaXQxGjAYBgNVBGEMEVZBVElULTEyMzQ1
-Njc4OTAxMQswCQYDVQQGEwJJVDENMAsGA1UEBwwEUm9tYTCCAaIwDQYJKoZIhvcN
-AQEBBQADggGPADCCAYoCggGBALz9TrdobG45iL9XpEpFKy3hknxdX2O5tozKX+D5
-SU/pqU4Lcmc+6A6zRDCoaFjl6G/8/RNkBiIGOsf2N6q6Q+8OmfDLFUprWVZ3evzz
-avB6erANa6Qz4TMtnOTl4haXCftsWpXn9hXNAu7DhccqdVbySfpQTWHsu6pW4FKE
-2fqb8qiadOR3VyG8NBunhTueFYGH7GycqX6m0YQed5g/CIec+2omFjc7cR//kT10
-RENrRpA2yoV9ytzF4SioKt3mZWeaDg5KbwrYGweX7ANa32/QsFgvcgLjEhownVSi
-y5a4tqmKVfdaWGjN28pUm86HyK7ll40r7oCIUhKK1RxZWLKyZPi6vgkWYQaY91Nq
-vGTuhqgpEBtaaicmcNbgaTPvU/3tPdteyDb3qcsMhCJXADN3mzSSyhycNj1ipb0K
-oTyuxWitpZ5rPlQhnt00LymypXwfchGURxHeBdWLDNP+kB3ej/5vrnREPcAHh2BP
-F5mvu+sd0wtqYWszGiecNEm3WQIDAQABo4IBhDCCAYAwCQYDVR0TBAIwADAOBgNV
-HQ8BAf8EBAMCBsAwdAYDVR0gBG0wazAfBgMrTBAwGDAWBggrBgEFBQcCAjAKDAhB
-Z0lEcm9vdDAgBgQrTBAGMBgwFgYIKwYBBQUHAgIwCgwIYWdJRGNlcnQwJgYGK0wQ
-BAMBMBwwGgYIKwYBBQUHAgIwDgwMY2VydF9TUF9Qcml2MB0GA1UdDgQWBBQklS4u
-qm6Qk7aswNrsSfwS9yPD5TCBzQYDVR0jBIHFMIHCgBQklS4uqm6Qk7aswNrsSfwS
-9yPD5aGBk6SBkDCBjTEaMBgGA1UECgwRRGV2ZWxvcGVycyBJdGFsaWExFTATBgNV
-BAMMDFNQSUQuU1AuVEVTVDEgMB4GA1UEUwwXaHR0cHM6Ly9zcGlkLmV4YW1wbGUu
-aXQxGjAYBgNVBGEMEVZBVElULTEyMzQ1Njc4OTAxMQswCQYDVQQGEwJJVDENMAsG
-A1UEBwwEUm9tYYIUE7duhQxbNaufGDpvI9KFoQy5ytswDQYJKoZIhvcNAQELBQAD
-ggGBAI1PRKJQSk3D35R+jJPyVy4k7iSUJSOG6Yl7VEfLoblA1ebJaJRhrYbIdD3k
-2Zkg/BHTrWQbXsa1ovz48alNxyC8DOvRSNFQRvKznf00f2hVJcRzVCmkzak4hRn0
-+nrEtNxOA+is3k/lQeB/SN/7pzXvgxllHbijuJ0hOJbmcnqqsYKyyyssAfCcmsap
-RehyIng1ZXmpASU3fvwGnCAcgBjW26uHtHp12Vf4PtV5ki1QWZhhUmYItFKPhpAI
-1u1m92qM5IsqVlgkJkyl9HkdWiaq/m9TKFBu0q+sKUMkqx+9O7nSpnw7seWK+RNT
-7fh+JYT/8sF5J+C9H6AbQTzWGbePLvfKZ/HnYtz58X9aqrXF+CAuejgVfxjLj0ci
-F4ek0Zi/FSJ3fpw29GCMt165MR4XFYXGhJVa/CyOzHJaookV6jqF7eBgJ/UykYOV
-kCmVfdtaHF+VZz+lziX0LEQ4u6Qs6lqaBmbpBbi8pWvjaF6pLkNnnUcEiwSlZ+JO
-ks2Byw==</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</ds:Signature>
-
-    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        <md:KeyDescriptor use="signing">
-            <ds:KeyInfo>
-                <ds:X509Data>
-                    <ds:X509Certificate>MIIGMDCCBJigAwIBAgIUE7duhQxbNaufGDpvI9KFoQy5ytswDQYJKoZIhvcNAQEL
-BQAwgY0xGjAYBgNVBAoMEURldmVsb3BlcnMgSXRhbGlhMRUwEwYDVQQDDAxTUElE
-LlNQLlRFU1QxIDAeBgNVBFMMF2h0dHBzOi8vc3BpZC5leGFtcGxlLml0MRowGAYD
-VQRhDBFWQVRJVC0xMjM0NTY3ODkwMTELMAkGA1UEBhMCSVQxDTALBgNVBAcMBFJv
-bWEwHhcNMjIxMTIxMTAwNzM4WhcNMzIxMTE4MTAwNzM4WjCBjTEaMBgGA1UECgwR
-RGV2ZWxvcGVycyBJdGFsaWExFTATBgNVBAMMDFNQSUQuU1AuVEVTVDEgMB4GA1UE
-UwwXaHR0cHM6Ly9zcGlkLmV4YW1wbGUuaXQxGjAYBgNVBGEMEVZBVElULTEyMzQ1
-Njc4OTAxMQswCQYDVQQGEwJJVDENMAsGA1UEBwwEUm9tYTCCAaIwDQYJKoZIhvcN
-AQEBBQADggGPADCCAYoCggGBALz9TrdobG45iL9XpEpFKy3hknxdX2O5tozKX+D5
-SU/pqU4Lcmc+6A6zRDCoaFjl6G/8/RNkBiIGOsf2N6q6Q+8OmfDLFUprWVZ3evzz
-avB6erANa6Qz4TMtnOTl4haXCftsWpXn9hXNAu7DhccqdVbySfpQTWHsu6pW4FKE
-2fqb8qiadOR3VyG8NBunhTueFYGH7GycqX6m0YQed5g/CIec+2omFjc7cR//kT10
-RENrRpA2yoV9ytzF4SioKt3mZWeaDg5KbwrYGweX7ANa32/QsFgvcgLjEhownVSi
-y5a4tqmKVfdaWGjN28pUm86HyK7ll40r7oCIUhKK1RxZWLKyZPi6vgkWYQaY91Nq
-vGTuhqgpEBtaaicmcNbgaTPvU/3tPdteyDb3qcsMhCJXADN3mzSSyhycNj1ipb0K
-oTyuxWitpZ5rPlQhnt00LymypXwfchGURxHeBdWLDNP+kB3ej/5vrnREPcAHh2BP
-F5mvu+sd0wtqYWszGiecNEm3WQIDAQABo4IBhDCCAYAwCQYDVR0TBAIwADAOBgNV
-HQ8BAf8EBAMCBsAwdAYDVR0gBG0wazAfBgMrTBAwGDAWBggrBgEFBQcCAjAKDAhB
-Z0lEcm9vdDAgBgQrTBAGMBgwFgYIKwYBBQUHAgIwCgwIYWdJRGNlcnQwJgYGK0wQ
-BAMBMBwwGgYIKwYBBQUHAgIwDgwMY2VydF9TUF9Qcml2MB0GA1UdDgQWBBQklS4u
-qm6Qk7aswNrsSfwS9yPD5TCBzQYDVR0jBIHFMIHCgBQklS4uqm6Qk7aswNrsSfwS
-9yPD5aGBk6SBkDCBjTEaMBgGA1UECgwRRGV2ZWxvcGVycyBJdGFsaWExFTATBgNV
-BAMMDFNQSUQuU1AuVEVTVDEgMB4GA1UEUwwXaHR0cHM6Ly9zcGlkLmV4YW1wbGUu
-aXQxGjAYBgNVBGEMEVZBVElULTEyMzQ1Njc4OTAxMQswCQYDVQQGEwJJVDENMAsG
-A1UEBwwEUm9tYYIUE7duhQxbNaufGDpvI9KFoQy5ytswDQYJKoZIhvcNAQELBQAD
-ggGBAI1PRKJQSk3D35R+jJPyVy4k7iSUJSOG6Yl7VEfLoblA1ebJaJRhrYbIdD3k
-2Zkg/BHTrWQbXsa1ovz48alNxyC8DOvRSNFQRvKznf00f2hVJcRzVCmkzak4hRn0
-+nrEtNxOA+is3k/lQeB/SN/7pzXvgxllHbijuJ0hOJbmcnqqsYKyyyssAfCcmsap
-RehyIng1ZXmpASU3fvwGnCAcgBjW26uHtHp12Vf4PtV5ki1QWZhhUmYItFKPhpAI
-1u1m92qM5IsqVlgkJkyl9HkdWiaq/m9TKFBu0q+sKUMkqx+9O7nSpnw7seWK+RNT
-7fh+JYT/8sF5J+C9H6AbQTzWGbePLvfKZ/HnYtz58X9aqrXF+CAuejgVfxjLj0ci
-F4ek0Zi/FSJ3fpw29GCMt165MR4XFYXGhJVa/CyOzHJaookV6jqF7eBgJ/UykYOV
-kCmVfdtaHF+VZz+lziX0LEQ4u6Qs6lqaBmbpBbi8pWvjaF6pLkNnnUcEiwSlZ+JO
-ks2Byw==</ds:X509Certificate>
-                </ds:X509Data>
-            </ds:KeyInfo>
-        </md:KeyDescriptor>
-        <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.aggregator.it/slo"/>
-        <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.aggregator.it/slo"/>
-        <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-        <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.aggregator.it/sso" index="0" isDefault="true"/>
-        <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.aggregator.it/sso" index="1" isDefault="false"/>
-        <md:AttributeConsumingService index="0">
-            <md:ServiceName
-                xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="it">Set 0
-            </md:ServiceName>
-            <md:ServiceDescription
-                xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="it">Login Attribute Set 0
-            </md:ServiceDescription>
-            <md:RequestedAttribute Name="spidCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="familyName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="fiscalNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="idCard" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="ivaCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="companyName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="registeredOffice" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-        </md:AttributeConsumingService>
-        <md:AttributeConsumingService index="1">
-            <md:ServiceName
-                xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="it">Set 1
-            </md:ServiceName>
-            <md:ServiceDescription
-                xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="it">Login Attribute Set 1
-            </md:ServiceDescription>
-            <md:RequestedAttribute Name="spidCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="familyName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="fiscalNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="idCard" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="ivaCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="companyName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="registeredOffice" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="email" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-            <md:RequestedAttribute Name="mobilePhone" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
-        </md:AttributeConsumingService>
-    </md:SPSSODescriptor>
-    <md:Organization>
-        <md:OrganizationName
-            xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="it">Organizzazione fittizia per il collaudo</md:OrganizationName>
-        <md:OrganizationDisplayName
-            xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="it">Organizzazione fittizia per il collaudo</md:OrganizationDisplayName>
-        <md:OrganizationURL
-            xmlns:xml="http://www.w3.org/XML/1998/namespace" xml:lang="it">https://www.aggregator.it
-        </md:OrganizationURL>
-    </md:Organization>
-    <md:ContactPerson contactType="other" spid:entityType="spid:aggregator">
-        <md:Extensions>
-            <spid:VATNumber>IT000000000000</spid:VATNumber>
-            <spid:PrivateServicesFullAggregator/>
-        </md:Extensions>
-        <md:Company>Aggregator</md:Company>
-        <md:EmailAddress>email@aggregator.it</md:EmailAddress>
-        <md:TelephoneNumber>+3912345678</md:TelephoneNumber>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="other" spid:entityType="spid:aggregated">
-        <md:Extensions>
-            <spid:FiscalCode>IT000000000000</spid:FiscalCode>
-            <spid:Private/>
-        </md:Extensions>
-        <md:Company>Organizzazione fittizia per il collaudo</md:Company>
-    </md:ContactPerson>
-    <md:ContactPerson contactType="billing">
-    <md:Extensions>
-      <fpa:CessionarioCommittente
-        xmlns:fpa="https://spid.gov.it/invoicing-extensions">
-        <fpa:DatiAnagrafici>
-          <fpa:IdFiscaleIVA>
-            <fpa:IdPaese>IT</fpa:IdPaese>
-            <fpa:IdCodice>00000000000</fpa:IdCodice>
-          </fpa:IdFiscaleIVA>
-          <fpa:Anagrafica>
-            <fpa:Denominazione>AG_Private</fpa:Denominazione>
-          </fpa:Anagrafica>
-        </fpa:DatiAnagrafici>
-        <fpa:Sede>
-          <fpa:Indirizzo>Via di prova</fpa:Indirizzo>
-          <fpa:NumeroCivico>00</fpa:NumeroCivico>
-          <fpa:CAP>00144</fpa:CAP>
-          <fpa:Comune>Roma</fpa:Comune>
-          <fpa:Provincia>RM</fpa:Provincia>
-          <fpa:Nazione>IT</fpa:Nazione>
-        </fpa:Sede>
-      </fpa:CessionarioCommittente>
-    </md:Extensions>
-    <md:Company>AG_Private</md:Company>
-    <md:EmailAddress>email@private-sp.it</md:EmailAddress>
-    <md:TelephoneNumber>12345678</md:TelephoneNumber>
-  </md:ContactPerson>
-
-</md:EntityDescriptor>
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:spid="https://spid.gov.it/saml-extensions" ID="bff93e4d-d684-47d8-9bba-228e50bf4fa1" entityID="https://sp.example.it/pri-ag-full/TEST">
+
+<ds:Signature Id="Signature1">
+<ds:SignedInfo>
+<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+<ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+<ds:Reference URI="#bff93e4d-d684-47d8-9bba-228e50bf4fa1">
+<ds:Transforms>
+<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+</ds:Transforms>
+<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+<ds:DigestValue />
+</ds:Reference>
+</ds:SignedInfo>
+<ds:SignatureValue />
+<ds:KeyInfo>
+<ds:X509Data>
+<ds:X509Certificate>MIIGMDCCBJigAwIBAgIUE7duhQxbNaufGDpvI9KFoQy5ytswDQYJKoZIhvcNAQEL
+BQAwgY0xGjAYBgNVBAoMEURldmVsb3BlcnMgSXRhbGlhMRUwEwYDVQQDDAxTUElE
+LlNQLlRFU1QxIDAeBgNVBFMMF2h0dHBzOi8vc3BpZC5leGFtcGxlLml0MRowGAYD
+VQRhDBFWQVRJVC0xMjM0NTY3ODkwMTELMAkGA1UEBhMCSVQxDTALBgNVBAcMBFJv
+bWEwHhcNMjIxMTIxMTAwNzM4WhcNMzIxMTE4MTAwNzM4WjCBjTEaMBgGA1UECgwR
+RGV2ZWxvcGVycyBJdGFsaWExFTATBgNVBAMMDFNQSUQuU1AuVEVTVDEgMB4GA1UE
+UwwXaHR0cHM6Ly9zcGlkLmV4YW1wbGUuaXQxGjAYBgNVBGEMEVZBVElULTEyMzQ1
+Njc4OTAxMQswCQYDVQQGEwJJVDENMAsGA1UEBwwEUm9tYTCCAaIwDQYJKoZIhvcN
+AQEBBQADggGPADCCAYoCggGBALz9TrdobG45iL9XpEpFKy3hknxdX2O5tozKX+D5
+SU/pqU4Lcmc+6A6zRDCoaFjl6G/8/RNkBiIGOsf2N6q6Q+8OmfDLFUprWVZ3evzz
+avB6erANa6Qz4TMtnOTl4haXCftsWpXn9hXNAu7DhccqdVbySfpQTWHsu6pW4FKE
+2fqb8qiadOR3VyG8NBunhTueFYGH7GycqX6m0YQed5g/CIec+2omFjc7cR//kT10
+RENrRpA2yoV9ytzF4SioKt3mZWeaDg5KbwrYGweX7ANa32/QsFgvcgLjEhownVSi
+y5a4tqmKVfdaWGjN28pUm86HyK7ll40r7oCIUhKK1RxZWLKyZPi6vgkWYQaY91Nq
+vGTuhqgpEBtaaicmcNbgaTPvU/3tPdteyDb3qcsMhCJXADN3mzSSyhycNj1ipb0K
+oTyuxWitpZ5rPlQhnt00LymypXwfchGURxHeBdWLDNP+kB3ej/5vrnREPcAHh2BP
+F5mvu+sd0wtqYWszGiecNEm3WQIDAQABo4IBhDCCAYAwCQYDVR0TBAIwADAOBgNV
+HQ8BAf8EBAMCBsAwdAYDVR0gBG0wazAfBgMrTBAwGDAWBggrBgEFBQcCAjAKDAhB
+Z0lEcm9vdDAgBgQrTBAGMBgwFgYIKwYBBQUHAgIwCgwIYWdJRGNlcnQwJgYGK0wQ
+BAMBMBwwGgYIKwYBBQUHAgIwDgwMY2VydF9TUF9Qcml2MB0GA1UdDgQWBBQklS4u
+qm6Qk7aswNrsSfwS9yPD5TCBzQYDVR0jBIHFMIHCgBQklS4uqm6Qk7aswNrsSfwS
+9yPD5aGBk6SBkDCBjTEaMBgGA1UECgwRRGV2ZWxvcGVycyBJdGFsaWExFTATBgNV
+BAMMDFNQSUQuU1AuVEVTVDEgMB4GA1UEUwwXaHR0cHM6Ly9zcGlkLmV4YW1wbGUu
+aXQxGjAYBgNVBGEMEVZBVElULTEyMzQ1Njc4OTAxMQswCQYDVQQGEwJJVDENMAsG
+A1UEBwwEUm9tYYIUE7duhQxbNaufGDpvI9KFoQy5ytswDQYJKoZIhvcNAQELBQAD
+ggGBAI1PRKJQSk3D35R+jJPyVy4k7iSUJSOG6Yl7VEfLoblA1ebJaJRhrYbIdD3k
+2Zkg/BHTrWQbXsa1ovz48alNxyC8DOvRSNFQRvKznf00f2hVJcRzVCmkzak4hRn0
++nrEtNxOA+is3k/lQeB/SN/7pzXvgxllHbijuJ0hOJbmcnqqsYKyyyssAfCcmsap
+RehyIng1ZXmpASU3fvwGnCAcgBjW26uHtHp12Vf4PtV5ki1QWZhhUmYItFKPhpAI
+1u1m92qM5IsqVlgkJkyl9HkdWiaq/m9TKFBu0q+sKUMkqx+9O7nSpnw7seWK+RNT
+7fh+JYT/8sF5J+C9H6AbQTzWGbePLvfKZ/HnYtz58X9aqrXF+CAuejgVfxjLj0ci
+F4ek0Zi/FSJ3fpw29GCMt165MR4XFYXGhJVa/CyOzHJaookV6jqF7eBgJ/UykYOV
+kCmVfdtaHF+VZz+lziX0LEQ4u6Qs6lqaBmbpBbi8pWvjaF6pLkNnnUcEiwSlZ+JO
+ks2Byw==</ds:X509Certificate>
+</ds:X509Data>
+</ds:KeyInfo>
+</ds:Signature>
+
+    <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+        <md:KeyDescriptor use="signing">
+            <ds:KeyInfo>
+                <ds:X509Data>
+                    <ds:X509Certificate>MIIGMDCCBJigAwIBAgIUE7duhQxbNaufGDpvI9KFoQy5ytswDQYJKoZIhvcNAQEL
+BQAwgY0xGjAYBgNVBAoMEURldmVsb3BlcnMgSXRhbGlhMRUwEwYDVQQDDAxTUElE
+LlNQLlRFU1QxIDAeBgNVBFMMF2h0dHBzOi8vc3BpZC5leGFtcGxlLml0MRowGAYD
+VQRhDBFWQVRJVC0xMjM0NTY3ODkwMTELMAkGA1UEBhMCSVQxDTALBgNVBAcMBFJv
+bWEwHhcNMjIxMTIxMTAwNzM4WhcNMzIxMTE4MTAwNzM4WjCBjTEaMBgGA1UECgwR
+RGV2ZWxvcGVycyBJdGFsaWExFTATBgNVBAMMDFNQSUQuU1AuVEVTVDEgMB4GA1UE
+UwwXaHR0cHM6Ly9zcGlkLmV4YW1wbGUuaXQxGjAYBgNVBGEMEVZBVElULTEyMzQ1
+Njc4OTAxMQswCQYDVQQGEwJJVDENMAsGA1UEBwwEUm9tYTCCAaIwDQYJKoZIhvcN
+AQEBBQADggGPADCCAYoCggGBALz9TrdobG45iL9XpEpFKy3hknxdX2O5tozKX+D5
+SU/pqU4Lcmc+6A6zRDCoaFjl6G/8/RNkBiIGOsf2N6q6Q+8OmfDLFUprWVZ3evzz
+avB6erANa6Qz4TMtnOTl4haXCftsWpXn9hXNAu7DhccqdVbySfpQTWHsu6pW4FKE
+2fqb8qiadOR3VyG8NBunhTueFYGH7GycqX6m0YQed5g/CIec+2omFjc7cR//kT10
+RENrRpA2yoV9ytzF4SioKt3mZWeaDg5KbwrYGweX7ANa32/QsFgvcgLjEhownVSi
+y5a4tqmKVfdaWGjN28pUm86HyK7ll40r7oCIUhKK1RxZWLKyZPi6vgkWYQaY91Nq
+vGTuhqgpEBtaaicmcNbgaTPvU/3tPdteyDb3qcsMhCJXADN3mzSSyhycNj1ipb0K
+oTyuxWitpZ5rPlQhnt00LymypXwfchGURxHeBdWLDNP+kB3ej/5vrnREPcAHh2BP
+F5mvu+sd0wtqYWszGiecNEm3WQIDAQABo4IBhDCCAYAwCQYDVR0TBAIwADAOBgNV
+HQ8BAf8EBAMCBsAwdAYDVR0gBG0wazAfBgMrTBAwGDAWBggrBgEFBQcCAjAKDAhB
+Z0lEcm9vdDAgBgQrTBAGMBgwFgYIKwYBBQUHAgIwCgwIYWdJRGNlcnQwJgYGK0wQ
+BAMBMBwwGgYIKwYBBQUHAgIwDgwMY2VydF9TUF9Qcml2MB0GA1UdDgQWBBQklS4u
+qm6Qk7aswNrsSfwS9yPD5TCBzQYDVR0jBIHFMIHCgBQklS4uqm6Qk7aswNrsSfwS
+9yPD5aGBk6SBkDCBjTEaMBgGA1UECgwRRGV2ZWxvcGVycyBJdGFsaWExFTATBgNV
+BAMMDFNQSUQuU1AuVEVTVDEgMB4GA1UEUwwXaHR0cHM6Ly9zcGlkLmV4YW1wbGUu
+aXQxGjAYBgNVBGEMEVZBVElULTEyMzQ1Njc4OTAxMQswCQYDVQQGEwJJVDENMAsG
+A1UEBwwEUm9tYYIUE7duhQxbNaufGDpvI9KFoQy5ytswDQYJKoZIhvcNAQELBQAD
+ggGBAI1PRKJQSk3D35R+jJPyVy4k7iSUJSOG6Yl7VEfLoblA1ebJaJRhrYbIdD3k
+2Zkg/BHTrWQbXsa1ovz48alNxyC8DOvRSNFQRvKznf00f2hVJcRzVCmkzak4hRn0
++nrEtNxOA+is3k/lQeB/SN/7pzXvgxllHbijuJ0hOJbmcnqqsYKyyyssAfCcmsap
+RehyIng1ZXmpASU3fvwGnCAcgBjW26uHtHp12Vf4PtV5ki1QWZhhUmYItFKPhpAI
+1u1m92qM5IsqVlgkJkyl9HkdWiaq/m9TKFBu0q+sKUMkqx+9O7nSpnw7seWK+RNT
+7fh+JYT/8sF5J+C9H6AbQTzWGbePLvfKZ/HnYtz58X9aqrXF+CAuejgVfxjLj0ci
+F4ek0Zi/FSJ3fpw29GCMt165MR4XFYXGhJVa/CyOzHJaookV6jqF7eBgJ/UykYOV
+kCmVfdtaHF+VZz+lziX0LEQ4u6Qs6lqaBmbpBbi8pWvjaF6pLkNnnUcEiwSlZ+JO
+ks2Byw==</ds:X509Certificate>
+                </ds:X509Data>
+            </ds:KeyInfo>
+        </md:KeyDescriptor>
+        <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.aggregator.it/slo"/>
+        <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.aggregator.it/slo"/>
+        <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+        <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.aggregator.it/sso" index="0" isDefault="true"/>
+        <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.aggregator.it/sso" index="1" isDefault="false"/>
+        <md:AttributeConsumingService index="0">
+            <md:ServiceName xml:lang="it">Set 0
+            </md:ServiceName>
+            <md:ServiceDescription xml:lang="it">Login Attribute Set 0
+            </md:ServiceDescription>
+            <md:RequestedAttribute Name="spidCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="familyName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="fiscalNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="idCard" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="ivaCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="companyName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="registeredOffice" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+        </md:AttributeConsumingService>
+        <md:AttributeConsumingService index="1">
+            <md:ServiceName xml:lang="it">Set 1
+            </md:ServiceName>
+            <md:ServiceDescription xml:lang="it">Login Attribute Set 1
+            </md:ServiceDescription>
+            <md:RequestedAttribute Name="spidCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="name" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="familyName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="fiscalNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="idCard" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="ivaCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="companyName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="registeredOffice" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="email" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+            <md:RequestedAttribute Name="mobilePhone" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:basic"/>
+        </md:AttributeConsumingService>
+    </md:SPSSODescriptor>
+    <md:Organization>
+        <md:OrganizationName xml:lang="it">Organizzazione fittizia per il collaudo</md:OrganizationName>
+        <md:OrganizationDisplayName xml:lang="it">Organizzazione fittizia per il collaudo</md:OrganizationDisplayName>
+        <md:OrganizationURL xml:lang="it">https://www.aggregator.it
+        </md:OrganizationURL>
+    </md:Organization>
+    <md:ContactPerson contactType="other" spid:entityType="spid:aggregator">
+        <md:Extensions>
+            <spid:VATNumber>IT000000000000</spid:VATNumber>
+            <spid:PrivateServicesFullAggregator/>
+        </md:Extensions>
+        <md:Company>Aggregator</md:Company>
+        <md:EmailAddress>email@aggregator.it</md:EmailAddress>
+        <md:TelephoneNumber>+3912345678</md:TelephoneNumber>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="other" spid:entityType="spid:aggregated">
+        <md:Extensions>
+            <spid:FiscalCode>__aggrsint</spid:FiscalCode>
+            <spid:Private/>
+        </md:Extensions>
+        <md:Company>Organizzazione fittizia per il collaudo</md:Company>
+    </md:ContactPerson>
+    <md:ContactPerson contactType="billing">
+    <md:Extensions>
+      <fpa:CessionarioCommittente xmlns:fpa="https://spid.gov.it/invoicing-extensions">
+        <fpa:DatiAnagrafici>
+          <fpa:IdFiscaleIVA>
+            <fpa:IdPaese>IT</fpa:IdPaese>
+            <fpa:IdCodice>00000000000</fpa:IdCodice>
+          </fpa:IdFiscaleIVA>
+          <fpa:Anagrafica>
+            <fpa:Denominazione>AG_Private</fpa:Denominazione>
+          </fpa:Anagrafica>
+        </fpa:DatiAnagrafici>
+        <fpa:Sede>
+          <fpa:Indirizzo>Via di prova</fpa:Indirizzo>
+          <fpa:NumeroCivico>00</fpa:NumeroCivico>
+          <fpa:CAP>00144</fpa:CAP>
+          <fpa:Comune>Roma</fpa:Comune>
+          <fpa:Provincia>RM</fpa:Provincia>
+          <fpa:Nazione>IT</fpa:Nazione>
+        </fpa:Sede>
+      </fpa:CessionarioCommittente>
+    </md:Extensions>
+    <md:Company>AG_Private</md:Company>
+    <md:EmailAddress>email@private-sp.it</md:EmailAddress>
+    <md:TelephoneNumber>12345678</md:TelephoneNumber>
+  </md:ContactPerson>
+
+</md:EntityDescriptor>
diff --git a/tests/metadata/pri-ag-full_signed.xml b/tests/metadata/pri-ag-full_signed.xml
index dd41efc..9e9c0a3 100644
--- a/tests/metadata/pri-ag-full_signed.xml
+++ b/tests/metadata/pri-ag-full_signed.xml
@@ -11,17 +11,17 @@
 <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
 </ds:Transforms>
 <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-<ds:DigestValue>BMK5PH2JNObY7FMjjJ+U3vA3wcLCH+B/ahkOAAqSVos=</ds:DigestValue>
+<ds:DigestValue>u2WCe8k2hLSb4rWv3QtjkLAxZwFaSAgrVDgGCd4uC58=</ds:DigestValue>
 </ds:Reference>
 </ds:SignedInfo>
-<ds:SignatureValue>RJom8PZBZOAGLb2e+7DUdvp5t3o7FhGxT5ccUgr85wpODssVX/P2UNDCp2Jia349
-b74lBdIDZUBfGtasA1ieApOonJl+IkfCd/YGhH8S0Lg2hryBm9NS3v81BtXZu8HP
-923L332E5zu1UkHSf5J1x8Y+ZcmAnn+GFxehtDFxIWe6mCDWApr9w0Nx5PW8d7Li
-GXpJcoz29LAD0YgwmhSNIkGas/i6DtQDW4hwKmem0vU4fO4BkvwBIQQsGk23lYVQ
-5ULfNB4RNWoCdg2j0lLJJ/7IRz+AxEJwnb0/y7iUTpKddKWMKbAxFdwqnZ4pid2D
-hqwYXuwuLmAn/yn+P3x3mrrzmU+BtFW3OuNQgx2lXtpUzZYx8iaxA7OaUGfCqsd7
-pmfO2ydii3oUJlWv4KlZZlXXQljmNRGkgX3gbALbwrBQ7N9ywFSBI+R8BLFs3c6t
-jGkT/0lOpvgXec4ofylqgDgp3IA8NGherXDUyvzhm/NhtS/lWNjymmLgKGSAL/0u</ds:SignatureValue>
+<ds:SignatureValue>csaiQk8Rq0GM/XeocBJZlT8uCVQ/z1sOP5aTUBXlNf5FAJU740UUIjf6gRdXE3Q8
+tUnSEoJ9U5n4/qhAONr+RNvzr3ZvCCpcoXp3Ml+1gpy64OJZ/qc7RKb5hdNFmNQW
+ZXQutuxYjV22NQnE0ba9M4JCcBz1u9rSyLBxAslZl8bqom0T33oYDN/jiDfByVgw
+cUPEpGOza2bWvHxA8tgIyDyh8IoLuxzdIWTYJF5rap89RTf/xfR9bRv0JO+swxvt
+rhw7GUzVO5/I2/RWQVrUU/Ex4kQLMu7zTMeLJNdvkGOBP8C64YW+WGYEuL0CaMQ3
+5k90VhOa3qI05ACiWbBP0jiXsHlJpjccAg8JOTiGzWMshHZy4UM5BHN/qdCkBjtE
+Mhv9sqfBrcuoFpbIAk/TA7A8PcPBHriIkqXQrjh7IkctqrOT5iQb6U+KxWlP5ch6
+AT6KKZGsIE2obVBcMpobysGbTsHt2HBpMn9L4qIOvaH+TBtHQg1yyPw1nvpSI5D5</ds:SignatureValue>
 <ds:KeyInfo>
 <ds:X509Data>
 <ds:X509Certificate>MIIGMDCCBJigAwIBAgIUE7duhQxbNaufGDpvI9KFoQy5ytswDQYJKoZIhvcNAQEL