SWAMID Testing is no moremd-2024-09-18-v05

All hail SWAMID QA!

61 files changed, 3 insertions, 8113 deletions

diff --git a/docs/Publish.md b/docs/Publish.md
index 6d302d4a..b362f918 100644
--- a/docs/Publish.md
+++ b/docs/Publish.md
@@ -33,9 +33,6 @@ The basic workflow is to:
     swamid-registered.mxml validates
     swamid-sp-2.0.mxml validates
     swamid-sp-transitive.mxml validates
-    swamid-testing-1.0.mxml validates
-    swamid-testing-idp-1.0.mxml validates
-    swamid-testing-sp-1.0.mxml validates
     <snip>
     Differences between tag md-2023-08-17-v02 and what you are about to sign:
     diff --git a/metadata/swamid-edugain/login.sunet.se-oidc-authenticate-broker.xml b/metadata/swamid-edugain/login.sunet.se-oidc-authenticate-broker.xml
diff --git a/metadata/Makefile b/metadata/Makefile
index 981abc7d..7fbebc7d 100644
--- a/metadata/Makefile
+++ b/metadata/Makefile
@@ -1,5 +1,5 @@
 SHELL=/bin/bash
-SRCDIRS=swamid-2.0 swamid-edugain swamid-testing
+SRCDIRS=swamid-2.0 swamid-edugain
 
 NOW=$(shell perl scripts/now_date.pl)
 
@@ -8,7 +8,6 @@ tag:
 
 EDUGAINXML=$(patsubst swamid-edugain/%.xml,.time/%.time,$(wildcard swamid-edugain/*.xml))
 SWAMID20XML=$(patsubst swamid-2.0/%.xml,.time/%.time,$(wildcard swamid-2.0/*.xml))
-TESTINGXML=$(patsubst swamid-testing/%.xml,.time/%.time,$(wildcard swamid-testing/*.xml))
 
 testRefedsRnS:
 	@echo "Checking for refeds R&S compatibillity for entities exported to eduGAIN"
@@ -87,7 +86,7 @@ checkUKalgorithms:
 	@xsltproc --xinclude xslt/check_uk_algorithms.xsl swamid-edugain/* | sed 's/.*/&/' | grep . && exit 1 || exit 0
 	@xsltproc --xinclude xslt/check_algsupport.xsl swamid-edugain/* | sed 's/.*/&/' | grep . && exit 1 || exit 0
 
-test: $(EDUGAINXML) $(SWAMID20XML) $(TESTINGXML) testMDUI testALlevel testEduGAINchecks testRefedsRnS testBadStrings testRegistrationAuthority checkInvalidChars checkUKalgorithms
+test: $(EDUGAINXML) $(SWAMID20XML) testMDUI testALlevel testEduGAINchecks testRefedsRnS testBadStrings testRegistrationAuthority checkInvalidChars checkUKalgorithms
 
 .time/%.time: swamid-edugain/%.xml
 	@xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $<
@@ -107,18 +106,9 @@ test: $(EDUGAINXML) $(SWAMID20XML) $(TESTINGXML) testMDUI testALlevel testEduGAI
 	@echo $< done
 	@touch -r $< $@
 
-.time/%.time: swamid-testing/%.xml
-	@xsltproc --stringparam regDate $(NOW) xslt/add-rpi.xsl $< > $<.c && mv $<.c $<
-	@xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $<
-
-	@xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1
-
-	@echo $< done
-	@touch -r $< $@
-
 commit: test
 	@git diff --color || true
 	@echo ; echo -n "Run 'git commit -av'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -av ;; s|skip) ;; *) exit 1 ;; esac
 	@git status -u
-	@echo "Checking for not committed files in swamid-*/" ; if git status --porcelain --ignored | awk '{print $$2}' | egrep "^swamid-edugain|^swamid-2.0/|^swamid-testing/" | sed 's/^/  /' | grep . ; then echo "Not committed files in swamid-*/, aborting" ; exit 1 ; fi
+	@echo "Checking for not committed files in swamid-*/" ; if git status --porcelain --ignored | awk '{print $$2}' | egrep "^swamid-edugain|^swamid-2.0/" | sed 's/^/  /' | grep . ; then echo "Not committed files in swamid-*/, aborting" ; exit 1 ; fi
 
diff --git a/metadata/MaxALofIDP.txt b/metadata/MaxALofIDP.txt
index d0613e52..87e68720 100644
--- a/metadata/MaxALofIDP.txt
+++ b/metadata/MaxALofIDP.txt
@@ -5,11 +5,6 @@
 3 swamid-edugain/connect.eduid.se-sunet.xml
 3 swamid-edugain/idp.oru.se-idp-shibboleth.xml
 3 swamid-edugain/weblogin.kau.se-idp-shibboleth.xml
-3 swamid-testing/idp.dev.eduid.se-idp.xml.xml
-3 swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
-3 swamid-testing/weblogin-test.kau.se-idp-shibboleth.xml
-3 swamid-testing/fs.test.ad.liu.se-adfs-services-trust.xml
-3 swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
 2 swamid-2.0/shibboleth.uhr.se-idp-shibboleth.xml
 2 swamid-2.0/idp.qa.lnu.se-idp-shibboleth.xml
 2 swamid-2.0/fs.uka.se-adfs-services-trust.xml
@@ -54,32 +49,6 @@
 2 swamid-edugain/idp.nordu.net-idp-shibboleth.xml
 2 swamid-edugain/login.ki.se-idp-shibboleth.xml
 2 swamid-edugain/miunidp.miun.se-idp-shibboleth.xml
-2 swamid-testing/kitstlogin03.user.ki.se-idp-shibboleth.xml
-2 swamid-testing/idp3.mdu.se-idp-shibboleth.xml
-2 swamid-testing/hbidp-test.test.hb.se-idp-shibboleth.xml
-2 swamid-testing/miunidptest.miun.se-idp-shibboleth.xml
-2 swamid-testing/connect.dev.eduid.se-sunet.xml
-2 swamid-testing/idp02.gih.se-idp-shibboleth.xml
-2 swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml
-2 swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
-2 swamid-testing/login-dev.du.se-idp-shibboleth.xml
-2 swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml
-2 swamid-testing/idp-test.it.su.se-idp-shibboleth.xml
-2 swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
-2 swamid-testing/fs.test.bth.se-adfs-services-trust.xml
-2 swamid-testing/idp-test.suni.se-adfs-services-trust.xml
-2 swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml
-2 swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml
-2 swamid-testing/idp-shibtest.slu.se-idp.xml
-2 swamid-testing/idp.uhr.se-idp-shibboleth.xml
-2 swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml
-2 swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
-2 swamid-testing/idp.demo.antagning.se-aws-idp.xml
-2 swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
-2 swamid-testing/idpproxy.dev.eduid.se-idp.xml
-2 swamid-testing/login.tst.ki.se-idp-shibboleth.xml
-2 swamid-testing/stslab.mah.se-adfs-services-trust.xml
-2 swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
 1 swamid-2.0/fs.nrm.se-adfs-services-trust.xml
 1 swamid-2.0/bankid-idp.sunet.se-bankid-idp.xml
 1 swamid-edugain/idp.vr.se-adfs-services-trust.xml
@@ -87,9 +56,6 @@
 1 swamid-edugain/fds.idp.hhs.se-adfs-services-trust.xml
 1 swamid-edugain/adfs.sp.se-adfs-services-trust.xml
 1 swamid-edugain/login.idp.hhs.se-idp-shibboleth.xml
-1 swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
-1 swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
-1 swamid-testing/idp.test.sunet.se-idp.xml
 3 swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
 2 swamid-edugain/idp-fs.slu.se-adfs-services-trust.xml
 3 swamid-edugain/connect.eduid.se-konstfack.xml
diff --git a/metadata/swamid-prod.fd b/metadata/swamid-prod.fd
index 915aca38..4f7c9e2b 100644
--- a/metadata/swamid-prod.fd
+++ b/metadata/swamid-prod.fd
@@ -8,7 +8,6 @@
         - /opt/metadata/swamid-interfederations-2.0 as swamid-interfederations-dir cleanup clean
         - /opt/metadata/swamid-edugain as swamid-edugain-dir cleanup clean
         - /opt/metadata/swamid-2.0 as swamid-2.0-dir cleanup clean
-        - /opt/metadata/swamid-testing as swamid-testing-dir cleanup clean
 
     # Read dirs
     - fork:
@@ -44,18 +43,6 @@
         - select as swamid-sp-transitive:
             - swamid-2.0!//md:EntityDescriptor[md:SPSSODescriptor]
 
-    # Testing
-    - fork:
-        # swamid-testing-1.0.xml
-        - select as swamid-testing-1.0:
-            - swamid-edugain-dir
-            - swamid-2.0-dir
-            - swamid-testing-dir
-    - fork:
-        # swamid-testing-idp-1.0.xml
-        - select as swamid-testing-idp-1.0:
-            - swamid-testing-1.0!//md:EntityDescriptor[md:IDPSSODescriptor]
-    - break
 - when request:
     - select
     - pipe:
diff --git a/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
deleted file mode 100644
index 8f23c669..00000000
--- a/metadata/swamid-testing/adfs.tad.hv.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.tad.hv.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-09-08T09:39:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.tad.hv.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hv.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">New Identity Provider for University West</mdui:Description>
-        <mdui:Description xml:lang="sv">Ny Identity Provider för Högskolan Väst</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Test Identity Provider for University West</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Test Identity Provider för Högskolan Väst</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.hv.se/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.hv.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">hv högskolan+väst university+west</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">hv högskolan+väst university+west</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="103" width="200">https://logo.hv.se/logo-en.jpg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="103" width="200">https://logo.hv.se/logo-sv.jpg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mdata.hv.se/privacy/Identity_Provider_Privacy_Policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mdata.hv.se/privacy/English_Identity_Provider_Privacy_Policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>hv.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:58.2822,12.2934</mdui:GeolocationHint>
-        <mdui:IPHint>193.10.188.0/22</mdui:IPHint>
-        <mdui:IPHint>193.10.192.0/20</mdui:IPHint>
-        <mdui:IPHint>193.10.234.0/23</mdui:IPHint>
-        <mdui:IPHint>193.10.236.0/23</mdui:IPHint>
-        <mdui:IPHint>212.25.132.0/23</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcagAwIBAgIQI5ieG4pm36lCFBeWIWLFoTANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBhZGZzLnRhZC5odi5zZTAeFw0yMDExMTIyMDQ4NDVaFw0yNTExMTMyMDQ4NDVaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGFkZnMudGFkLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkj2CHAHrvWfPhkh/ppCbjBdgu1jzXLRIHJij4Vo1IbWUx9PGCOIokLbJGo7U8YKONDis8DJzW+KqpHPgmNrXhWDMOCR8f76nmrJTwybk3ifBbZ1XecewM7hYEMR405lAd85YTz00pW5I8GtLIRhZvD7PB5hHyMKS/AWewv2u1S+oeUwpyVxR6fKRJSKuWS2/30HRMIgqeHfoL+PgDCJ8g1eEaoYDwz3rgx2lUI07Tj352FocMJzDPxtoG4bWEzZDS2tOktPCVGGIhQLcZvEHeeCjQN6VKN/QpYHegCCWWpXHxv97tGefyzYZbXR0YmlRyk/zCjmNT6vKxKUD9bK7kQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBi8kOMHPBRBgN9Mfnd88LyIx9TDQu4YV8+xnQk38S1mlpSfHTrbhVLycwfG/bXCnNS6rZHyOINH0LTUy8acvOjxjQeJw1pzvcHvq+lZG91+rA5bdHHnBmkH7cHr/Gw+TMkS8e0AamyN5SxyxYiLZGZjXnDKyM9UeeCmZYRLNjBE9PiR9XkfkMH19MeZxsHQqUHqy4QiFRFBlX5xhJL6x7EI8jSLXyAYPBJdAx97IaRL/rNI3lb4GxyaInxpmrvM5eKSJLYWVp21yWNDQHxUHyys9GKbz0kWOaQpqE8mk+EyZp3t1AugxnQ3a4sDfQyGEGp2jmDwRqrzVZwrzMKX3t1</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC2DCCAcCgAwIBAgIQE45whhqdRLNNlZ6eDkOvdTANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBhZGZzLnRhZC5odi5zZTAeFw0yMDExMTIyMDQ4NDZaFw0yNTExMTMyMDQ4NDZaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGFkZnMudGFkLmh2LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm6FKP2dRQ7oKy/3RtjmG++57bfKjjC64XwGPzQnoZf5FPsWN2tL/BYJxNRUbDoc252aMr+LTjEf5JwMT7KM5E8dMGCCiiQ8WLHGXHXcFM9xB+MpQxE1FCVcfAPMwZNULZ6knN0gkSjAPF2eE6eg/xqlT370/9koEzTD4BQszMbtuHkZYH54MqSl59jWxUwRX3QUJYQIou75RB8EQOAYSi4wPALKTGI9twOf67hC7tuEOlo2u8EWPv/Qy3ZgBuMNc3RLiSX8C0NxBiyTSqUeeQg09aX2VMzvhMZpO2BGdBdkrW4wd2xA5Xx7reHVfXFPbXCGFACvAosrLhidjGOpsNQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBtgvEuTxhP2aSszYglHg76v1LXuPhfBAAlNvaKv5nQOap5obZY6eY0PVmwcWZhZRwJuj1izxJFKIb84LWNwVyEla4WqmCuKZ5pZMpbkawtmW3HnlU13fbI+fL53CrnjLp5MNQQjb//PKhhxFF2VfDa5XEW6bMR6YfDefNAxfwuqjuybwqJ18En8K7st03+fAWA32RbRKopp/DtJYtVY01QjmactDhjuzA6INwVhZJecVGsLEQP+9Uvr15PdSnlHU3N3EvskMl7+1PNXbBl5JsnbZAq3WQytGfpyhxyoUSeHLaZ6hyS7EuoTYdkz0k3u1AtVMRMA46+n+Gybf3vR9Sf</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.tad.hv.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.tad.hv.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.tad.hv.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.tad.hv.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.tad.hv.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University West</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan Väst</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Högskolan Väst</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University West</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.hv.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.hv.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>University West</md:Company>
-    <md:SurName>Servicedesk Högkoslan Väst</md:SurName>
-    <md:EmailAddress>mailto:servicecenter@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University West</md:Company>
-    <md:GivenName>Magnus</md:GivenName>
-    <md:SurName>Andersson</md:SurName>
-    <md:EmailAddress>mailto:Magnus.Andersson@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223193</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University West</md:Company>
-    <md:GivenName>Christian</md:GivenName>
-    <md:SurName>Jiresjö</md:SurName>
-    <md:EmailAddress>mailto:Christian.Jiresjo@hv.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 520 223189</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>University West</md:Company>
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:SurName>IRT</md:SurName>
-    <md:EmailAddress>mailto:irt@hv.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
deleted file mode 100644
index d0aea279..00000000
--- a/metadata/swamid-testing/adfs.test.rkh.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.test.rkh.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-11-28T15:33:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Test ADFS Server for Swedish Red Cross University</mdui:Description>
-        <mdui:Description xml:lang="sv">Test ADFS Server för Röda Korsets Högskola</mdui:Description>
-        <mdui:DisplayName xml:lang="en">TEST ADFS Swedish Red Cross University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">TEST ADFS Röda Korsets Högskola</mdui:DisplayName>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://www.rkh.se/information-in-english/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.rkh.se/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE4jCCAsqgAwIBAgIQRrp3mWsX7K5LKG3N8Be8dzANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIEVuY3J5cHRpb24gLSBhZGZzLnRlc3QucmtoLnNlMB4XDTIyMDkwNzA5NDUyNVoXDTIzMDkwNzA5NDUyNVowLTErMCkGA1UEAxMiQURGUyBFbmNyeXB0aW9uIC0gYWRmcy50ZXN0LnJraC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPuB0ZSnW68A3J/L9Ez1vxA63WLLUt8j+r2/PteDZrpd+9HiOXNh4wCsMxDVPhxtoRpoBBhnYXCP2mXhHmqvZt1G9mZ5uCRyOf3pibkvm3v7sXERerRnefcjG7F30/7VDxRoW8JkOyDmyzJVuqKQr4Peahdcqn7+9iO6vAjfmt71GMh07iIOT5oPPjbIEa/dhMmuYh8Rb/K+nW0qZkYn97pZHswJs+YUBXN7XjJfxhO2cGrFT/CWM/3OYlk5BCEHdK5VQVJIuQU2XAJ6cK0cL89IcCJqfzvuEktrXWIVawjANX3EQTqnoyLIghOvyJLL580zR7/QuTme0QIKVzDP2HuwckdkfgNG4nMRQ0B+MgCslCBF6o5UfV9TzHs/+J6TKWY61XRs5X+Cxqh1ZVryA1DX0hQnbveCR67n8SQH2VDd4FAlY65LJ5sVFXBbC7mYEfPC1u4SRR4WgOvaAH7X/voXAKhSQ62gSGeoOfzbFZ5vja72/AO+jf1ZZMliJJGAMX7Y1J0WmfDVSX89XqBDi/uSxGGyuDjCBH6U1TIMw9H3fGmCcmHyrVtxSOIr/YdtXMuMQG4i2jallMbjOjhVo8cXa7HvaQSRNj8ZrOA/JXbDV/dhzJpd2o57/+quteinl7s2gP5B0Rje/+JgHd52vRRC44gQ56VeYBe5wZLafl6VAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAMIGYIRdODJHGQZQ85uLhBnAfVBhVrAs5QKkHve1WylISFHY9MDE3R28vKqZumjj9D5/romA5OvM8nP+UU7ba5Ba/i33u1cmD+zbu9i2MI9RMCKwnHG+qh3d8F3FkHSxBD4yhIGWSHolQ/vNHp4/zNh+uHEkBqSFQpu1082riaOJVHcSEKEvVFlUEmXw1U+2sGNs3Uiv1zGYrjLIa/0tVmNRoKuqqKvlmwr8R64wLT4yp64aw7C9o2HprNwAwxHnvbc+qkZkVv0IjUVCpIuDHForwN4HogmEL0xzZrRLRNIFvh8XtZCu/yEgL4Rt13EpdLsFqQfHKMAMCTkcRf/7aUXNFJPXdUfHKeiUpmitH4DfRCPkaiBalc3VKvon/Jmo1pXqp2PWPwj9m+HYLljs9Z1YN6DqM/eIcQXbFnNcUdi/gwfPvF5/gs1AhqTa09fBnxuOytTBfTbHnhsTCgHYSdAAr4IttchjTFjFfACc1iL+UX4o6BAKd35M5tWvvr436xeug5kniMCPedWEqGhD6BH6P89gmjq39cROiYV4bZG9M8vZgOOAQVIFWiB/EzJ0m0nPbUqgIE/QI0oICrQeCEKqvOmno2U3LVLY4rersx7ErVf8MaFVes9Z47Xu9DNP7/Q6w55/BGD2XScJSxwdMn0Hdi2fOYJYiOhGp5pnPyMb</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE3DCCAsSgAwIBAgIQPC199n1DjJVGdUBCWKFPRDANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBhZGZzLnRlc3QucmtoLnNlMB4XDTIyMDkwNzA5NDUyNFoXDTIzMDkwNzA5NDUyNFowKjEoMCYGA1UEAxMfQURGUyBTaWduaW5nIC0gYWRmcy50ZXN0LnJraC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKJ4bFw9AJXuSuRRHU+U7XQULoRapZs0C6QIZZng9KxKtDgOxfy4CopjRPisz1hJ7/njiGckc0vl6HQWhTWNL3ngmey3hueHVG3V3GEksR2iNlP64aBDRkvgosVUtNN701BrQECgPTJ4tzQOkP9bowoS7OXk9YiYrAzrpcc9Wsie9qJsSQHd9G470a7VYRNAHqA5l063ZNfEj8lYbrioi0HZSJf279VOFeoqSLC9Lf+mVVrTK7qL4IX3u3mL8YGkXHXaCds03SrcoJWFWnId2zJTxlVqNmN2o398V7OWRVJSPV6uhQDiEURL6MuDCkrSNysD1mGd66WkL/G98EmxsPeBpYcu46xRb/DdtPuRCPhoqRz99zG45Mk3Gg15wlrAK51aPgi6wobvrgh38fHFlOwCcSHQlB2YRjcLNMWSpsbNsNLQPqGBlElP1pCEik2UfFuyzT8BbvvwFvn0kvw+KGfSe5hIcD7zJPNr7TA9fAh2bjIuuH3j9fhv3BvOOxLluCFmr0fuDkYeP/d+LVOiA6FHJRj/4dH4092YbCCeEeIdthf6QX7cZYndK1KU/s4WPQi21wa37Wud9ZfSNI2sb/6N/S/1lMXVsglu5vmMUiZl35cC/jenl4Kc2iKB+Y0edxsyJvEvSQwxzuMu4cLhqNb4x6d5FQqs1McGUQ0HehJxAgMBAAEwDQYJKoZIhvcNAQELBQADggIBACO3PGHEPzL1tfMN1ymbLY/CUDnCFh+warNXjTl223TeUyoPQ5ddrjn4D8lEgyAOSUMedpt+86ZK3gFKgn7JQQWdavHh0FbWM2IPPGzq2XrIgy4z3o2SbbmJAQNdc1ekZxbGe9kd6F8pREzfXs3yZvHAbspa0+GKFBIF0LY9Vc/F7WtU6PZkhU1H3rsCCQ88srn4yjeZLcOz5jX/36MHcYNZKqpW0oMPJwcECkKcKsapL1cZoW6fwaXxxX8rv2eAOFVTHh0NQ3N8D4K/DK9+lisJU5iQ9GZSjdEOioge2X0q5KeWsVwiZzbpJEL16jVKGaj7vET5zTo1KX9Xdv0VwjqpHKet/Zic5aFNazPj7eGwOhQA2oF2p7rrjbabspgDBrczi9oVJv1rfLECf6mNCBRnEcU/k1sr6f93rkyum/Pdvk/YiFpdP7GFZsdTOpwz8S2B71M1scECz7Z3MRtBQruxOiXE8dccpawSEuXLwKwSi/95kVWqRNb5rXYRjPInpw8ALglnSZP0Tu9RjQ/n0tYjesNYYbcefs9xuPd3DSVcKlsk/EkfMR86gJ9a5/Y24JRkzAT3OK5ZjC6VNZbYn6wGZ1mTiO8Lw5U2rpIy23ucf8pSvLOIwLvJdroRg/eKdaDrUXSiUjJWHismggOobBtJsAvGAmS24Hz9CKzhlwDz</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.rkh.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.rkh.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <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://adfs.test.rkh.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.rkh.se/adfs/ls/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">TEST ADFS Swedish Red Cross University</md:ServiceName>
-      <md:ServiceName xml:lang="sv">TEST ADFS Röda Korsets Högskola</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://adfs.rkh.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">rkh.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">TEST ADFS Swedish Red Cross University</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test ADFS Server for Swedish Red Cross University</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.rkh.se/om-webbplatsen/behandling-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://www.rkh.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.rkh.se/information-in-english/</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="sv">TEST ADFS Röda Korsets Högskola</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test ADFS Server för Röda Korsets Högskola</mdui:Description>
-        <mdui:Logo xml:lang="en" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="126" width="200">https://dw.rkh.se/Logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE4jCCAsqgAwIBAgIQRrp3mWsX7K5LKG3N8Be8dzANBgkqhkiG9w0BAQsFADAtMSswKQYDVQQDEyJBREZTIEVuY3J5cHRpb24gLSBhZGZzLnRlc3QucmtoLnNlMB4XDTIyMDkwNzA5NDUyNVoXDTIzMDkwNzA5NDUyNVowLTErMCkGA1UEAxMiQURGUyBFbmNyeXB0aW9uIC0gYWRmcy50ZXN0LnJraC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPuB0ZSnW68A3J/L9Ez1vxA63WLLUt8j+r2/PteDZrpd+9HiOXNh4wCsMxDVPhxtoRpoBBhnYXCP2mXhHmqvZt1G9mZ5uCRyOf3pibkvm3v7sXERerRnefcjG7F30/7VDxRoW8JkOyDmyzJVuqKQr4Peahdcqn7+9iO6vAjfmt71GMh07iIOT5oPPjbIEa/dhMmuYh8Rb/K+nW0qZkYn97pZHswJs+YUBXN7XjJfxhO2cGrFT/CWM/3OYlk5BCEHdK5VQVJIuQU2XAJ6cK0cL89IcCJqfzvuEktrXWIVawjANX3EQTqnoyLIghOvyJLL580zR7/QuTme0QIKVzDP2HuwckdkfgNG4nMRQ0B+MgCslCBF6o5UfV9TzHs/+J6TKWY61XRs5X+Cxqh1ZVryA1DX0hQnbveCR67n8SQH2VDd4FAlY65LJ5sVFXBbC7mYEfPC1u4SRR4WgOvaAH7X/voXAKhSQ62gSGeoOfzbFZ5vja72/AO+jf1ZZMliJJGAMX7Y1J0WmfDVSX89XqBDi/uSxGGyuDjCBH6U1TIMw9H3fGmCcmHyrVtxSOIr/YdtXMuMQG4i2jallMbjOjhVo8cXa7HvaQSRNj8ZrOA/JXbDV/dhzJpd2o57/+quteinl7s2gP5B0Rje/+JgHd52vRRC44gQ56VeYBe5wZLafl6VAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAMIGYIRdODJHGQZQ85uLhBnAfVBhVrAs5QKkHve1WylISFHY9MDE3R28vKqZumjj9D5/romA5OvM8nP+UU7ba5Ba/i33u1cmD+zbu9i2MI9RMCKwnHG+qh3d8F3FkHSxBD4yhIGWSHolQ/vNHp4/zNh+uHEkBqSFQpu1082riaOJVHcSEKEvVFlUEmXw1U+2sGNs3Uiv1zGYrjLIa/0tVmNRoKuqqKvlmwr8R64wLT4yp64aw7C9o2HprNwAwxHnvbc+qkZkVv0IjUVCpIuDHForwN4HogmEL0xzZrRLRNIFvh8XtZCu/yEgL4Rt13EpdLsFqQfHKMAMCTkcRf/7aUXNFJPXdUfHKeiUpmitH4DfRCPkaiBalc3VKvon/Jmo1pXqp2PWPwj9m+HYLljs9Z1YN6DqM/eIcQXbFnNcUdi/gwfPvF5/gs1AhqTa09fBnxuOytTBfTbHnhsTCgHYSdAAr4IttchjTFjFfACc1iL+UX4o6BAKd35M5tWvvr436xeug5kniMCPedWEqGhD6BH6P89gmjq39cROiYV4bZG9M8vZgOOAQVIFWiB/EzJ0m0nPbUqgIE/QI0oICrQeCEKqvOmno2U3LVLY4rersx7ErVf8MaFVes9Z47Xu9DNP7/Q6w55/BGD2XScJSxwdMn0Hdi2fOYJYiOhGp5pnPyMb</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE3DCCAsSgAwIBAgIQPC199n1DjJVGdUBCWKFPRDANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIFNpZ25pbmcgLSBhZGZzLnRlc3QucmtoLnNlMB4XDTIyMDkwNzA5NDUyNFoXDTIzMDkwNzA5NDUyNFowKjEoMCYGA1UEAxMfQURGUyBTaWduaW5nIC0gYWRmcy50ZXN0LnJraC5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKJ4bFw9AJXuSuRRHU+U7XQULoRapZs0C6QIZZng9KxKtDgOxfy4CopjRPisz1hJ7/njiGckc0vl6HQWhTWNL3ngmey3hueHVG3V3GEksR2iNlP64aBDRkvgosVUtNN701BrQECgPTJ4tzQOkP9bowoS7OXk9YiYrAzrpcc9Wsie9qJsSQHd9G470a7VYRNAHqA5l063ZNfEj8lYbrioi0HZSJf279VOFeoqSLC9Lf+mVVrTK7qL4IX3u3mL8YGkXHXaCds03SrcoJWFWnId2zJTxlVqNmN2o398V7OWRVJSPV6uhQDiEURL6MuDCkrSNysD1mGd66WkL/G98EmxsPeBpYcu46xRb/DdtPuRCPhoqRz99zG45Mk3Gg15wlrAK51aPgi6wobvrgh38fHFlOwCcSHQlB2YRjcLNMWSpsbNsNLQPqGBlElP1pCEik2UfFuyzT8BbvvwFvn0kvw+KGfSe5hIcD7zJPNr7TA9fAh2bjIuuH3j9fhv3BvOOxLluCFmr0fuDkYeP/d+LVOiA6FHJRj/4dH4092YbCCeEeIdthf6QX7cZYndK1KU/s4WPQi21wa37Wud9ZfSNI2sb/6N/S/1lMXVsglu5vmMUiZl35cC/jenl4Kc2iKB+Y0edxsyJvEvSQwxzuMu4cLhqNb4x6d5FQqs1McGUQ0HehJxAgMBAAEwDQYJKoZIhvcNAQELBQADggIBACO3PGHEPzL1tfMN1ymbLY/CUDnCFh+warNXjTl223TeUyoPQ5ddrjn4D8lEgyAOSUMedpt+86ZK3gFKgn7JQQWdavHh0FbWM2IPPGzq2XrIgy4z3o2SbbmJAQNdc1ekZxbGe9kd6F8pREzfXs3yZvHAbspa0+GKFBIF0LY9Vc/F7WtU6PZkhU1H3rsCCQ88srn4yjeZLcOz5jX/36MHcYNZKqpW0oMPJwcECkKcKsapL1cZoW6fwaXxxX8rv2eAOFVTHh0NQ3N8D4K/DK9+lisJU5iQ9GZSjdEOioge2X0q5KeWsVwiZzbpJEL16jVKGaj7vET5zTo1KX9Xdv0VwjqpHKet/Zic5aFNazPj7eGwOhQA2oF2p7rrjbabspgDBrczi9oVJv1rfLECf6mNCBRnEcU/k1sr6f93rkyum/Pdvk/YiFpdP7GFZsdTOpwz8S2B71M1scECz7Z3MRtBQruxOiXE8dccpawSEuXLwKwSi/95kVWqRNb5rXYRjPInpw8ALglnSZP0Tu9RjQ/n0tYjesNYYbcefs9xuPd3DSVcKlsk/EkfMR86gJ9a5/Y24JRkzAT3OK5ZjC6VNZbYn6wGZ1mTiO8Lw5U2rpIy23ucf8pSvLOIwLvJdroRg/eKdaDrUXSiUjJWHismggOobBtJsAvGAmS24Hz9CKzhlwDz</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.rkh.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.rkh.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.rkh.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.rkh.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Swedish Red Cross University College</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Röda Korsets Högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish Red Cross University College</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Röda Korsets Högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.rkh.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.rkh.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Röda Korsets Högskola</md:Company>
-    <md:GivenName>Anders</md:GivenName>
-    <md:SurName>Mårtensson</md:SurName>
-    <md:EmailAddress>mailto:Anders.Martensson@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Röda Korsets Högskola</md:Company>
-    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Röda Korsets Högskola</md:Company>
-    <md:EmailAddress>mailto:servicedesk@rkh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>RKH Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@rkh.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml b/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
deleted file mode 100644
index c8254a81..00000000
--- a/metadata/swamid-testing/adfs.test.umu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://adfs.test.umu.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-06-28T13:32:59Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Umeå universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Umeå University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Umeå universitet</mdui:Description>
-        <mdui:Description xml:lang="en">Umeå University</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.umu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.umu.se/english</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy/?system=http://adfs.umu.se/adfs/services/trust&amp;lang=sv</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/privacy/?system=http://adfs.umu.se/adfs/services/trust&amp;lang=en</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <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://adfs.test.umu.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://adfs.test.umu.se/adfs/ls/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Umeå University</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Umeå universitet</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrcid" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduOrgAcronym" Name="urn:oid:1.3.6.1.4.1.2428.90.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonUniqueId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://administrationsverktyg.umu.se/ErrorUrl/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">umu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Umeå universitet (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Umeå University (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitsutgivare för anställda och studenter vid Umeå universitet (TEST).</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for employees and students at Umeå University (TEST).</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.umu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.umu.se/english</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-se-te.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="60" width="274">https://www.umu.se/globalassets/organisation/forvaltningen/universitetsservice/umu-logo-left-en-te.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">umu umeå+universitet umea+universitet umea+university umeå+university umeå umea</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="en">https://administrationsverktyg.umu.se/privacy?system=http://adfs.umu.se/adfs/services/trust&amp;lang=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://administrationsverktyg.umu.se/privacy?system=http://adfs.umu.se/adfs/services/trust&amp;lang=sv</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>umu.se</mdui:DomainHint>
-        <mdui:IPHint>130.239.0.0/16</mdui:IPHint>
-        <mdui:GeolocationHint>geo:63.820554,20.305799</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDTjCCAjagAwIBAgIQXEbNUVqxB4RHW5g2fVAK1zANBgkqhkiG9w0BAQsFADAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0NDExWhcNMzAwMjIwMDc1NDExWjAmMSQwIgYDVQQDDBtkZWNyeXB0aW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4H9vo9VTgPfxe82lBy06mFCA5MIt7Vd+eG0kq5rqY98mXhpnz/8VFVvePd2r6VWzMyoWm7XedyNDIlokRgP9y8ibMUKEf5NQDjG2JNhBY8eb3TLmR0dpEbPhrIw8AqJRF7AByhT5RcZVjQPRpbB0KkInPpkupNBQ20KPymA56UjDZJ4ZoixauxoWmpFMWP+0UjlDmKiAPy++n37TR0DBjy06xRy+GkAl4cFlaZFg9sjJBUNwSCjTu9mK4E3KvkqROQ1WAPhBczOYhUbtAGJCC/0zy8lM2ii7PvV7oeuUfJnqAeOw5a27LZ9YMS5xPRC+mLfZcIiF7P9Mca2pS+UfFAgMBAAGjeDB2MA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwJgYDVR0RBB8wHYIbZGVjcnlwdGluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQLcXS/9Z3y9wSkCzfIyUHkKCy9uTANBgkqhkiG9w0BAQsFAAOCAQEAX9Jntq8Vhq+MdSdv16rlgUzPKz+SlhDm4+8k4ucd9xdy3EoA0xsLudLEMFPqeQhq3wd7E8au/KJoJm0jbDEcS9ZUxvvTwatURtLbJ/WsCw58/Fas3/l4ogMXeXLrv8BZx55re6bNaU1KiXx3LM9r++0BZC21qb+68s3f+Zq/qbKzLauOqMS7bqi+X1kpKyFMywsSlXFLQXRWskVmJe3ghHpcR0vpXurVLjlVr1dD97jIpUq6+e0iDyCRCyOhx59FNjEw7E6YjoXq2o4Llfe2EzstghNJ594+TctcBREdQikZNZluVk/O/YcX06wia0o7sCWwuDvkEvZVMo4r/jVEwg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQclnHE0ziOIVM5+RU5ZTZXTANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwHhcNMjAwMjIwMDc0OTM3WhcNMzAwMjIwMDc1OTM3WjAjMSEwHwYDVQQDDBhzaWduaW5nLmFkZnMudGVzdC51bXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAcS2YkS1iNoJKOY+8rLSqupIts6QYYHb5XW07BSAxkZAC6vdaIhrV2zEdJxa5Tf7AxdzrHdyeP1oOBiJLKyrb0l+RuM+RjXPUM328LeWTC1o++/X6AXBzsJED/iici3BjtgTC6Em9IjGeB41mWpPCy6UbP9OtKNRI6Ac0XcDZkAzDA2a0tpDQPQiPsJ09aoCYc1ZMkp+vlFqhvXPMFkS+zO5Vog6pfe9hUs8yDwsEP8YHb5eHfyWqPcI8XWkeWMJvIcgIedHU0ubJ7H7O5cVlfYaM5qS4UkwFRAMSEvyl99P4p2GBAdTZNSBO7hS3zAR6KWbTG9SNqr4wk6oFPuu5AgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYc2lnbmluZy5hZGZzLnRlc3QudW11LnNlMB0GA1UdDgQWBBQbdu26yXQnU130Nv//MnJpqpi8cDANBgkqhkiG9w0BAQsFAAOCAQEABT4RjcrLCZc68tsM3AZJoYsplr7MQGlixSJ/v9c6N+dYL5kULFmTy/mDKHy1SnHwEVK9fkTcb4afg+kI9IrJOf8vX9MsJmprmU/RWmv47JIZ2k6/B8sQcy9CZj6vmEUtCu5crJrGhSNhepg8gpEP+hqCHjIRG4BV6eDJf+iKEj4EXIUN2Fd6rAuAeZ8SX8iNiW+aA/RNqgrxXJgJPSGTxRMnFEJrI0mFuwkiD3bv3KyrzcztyKCYjWP0huv2SRDsowGgfmJRCxcQFn7/PETxcaMgbbsypc9JlAViysdwQu1u4QdPbawu3AOqyWgqO0I6k+CM9bQT/suDjr2ElsXK6Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://adfs.test.umu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://adfs.test.umu.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://adfs.test.umu.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Umea University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Umeå universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Umea University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Umeå universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.umu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.umu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Umeå University</md:Company>
-    <md:SurName>ITS datordrift</md:SurName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Umea University</md:Company>
-    <md:GivenName>ITS datordrift</md:GivenName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Umea University</md:Company>
-    <md:GivenName>UmU Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Umea University</md:Company>
-    <md:GivenName>ITS datordrift</md:GivenName>
-    <md:EmailAddress>mailto:datordrift@its.umu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 90 786 6300</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml b/metadata/swamid-testing/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
deleted file mode 100644
index edfac18c..00000000
--- a/metadata/swamid-testing/box-idp.nordu.net-simplesaml-saml2-idp-metadata.php.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://box-idp.nordu.net/simplesaml/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-06-27T14:11:46Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://box-idp.nordu.net/simplesaml/saml2/idp/metadata.php">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIJAIAVEWBFxna/MA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWJveC1pZHAubm9yZHUubmV0MB4XDTEzMDYxOTA4MTYxMFoXDTIzMDQyODA4MTYxMFowHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5gi5hp6Uh1EAckiVKNUWqUqSPVuKmCEzE6iM85a+y3KZE+GUiaeaykltH0m83B3UsSxPeyZdP/mJTmCRFG/2F05uY1S6kcmK+X1Q+Trfswybt5xOdjlEq17GZD5qBzWMBdcQc60Ai9R2a7OvsRP05jljcv8x2njHbbmP/yqcUbKDL0niSm0bF06Rx5KVw+uWpDM3A34eWyf4aGulfnjy8xWq9plsiqzw2kfrfsmM+4S8oYRP9QqV3RVMlIYuPwyEzO7ko/lRp/moBFkOzbGU2ynuhpn51r9WSX4kK+1gyyi8l/QCZ9jfM+QLY7uB/mm/xUXBfH82K6tvJZLR64OL/AgMBAAGjfTB7MB0GA1UdDgQWBBSeFLZkxHZxW0JeFidp1pR3hhVMmzBMBgNVHSMERTBDgBSeFLZkxHZxW0JeFidp1pR3hhVMm6EgpB4wHDEaMBgGA1UEAxMRYm94LWlkcC5ub3JkdS5uZXSCCQCAFRFgRcZ2vzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQZ0ZVUQvEOucts7DYA885XEbKJZ50tkNHgbna/ZQCdrSMXb4J2l3B706T7yATXBSaH5KgFIgrCVnoCa3CAPlxZf5IUsvU/en+OBFYYlJB6D/ndfvlwYS6uYOBeY3pY/Ct1Epu3AG2qNkZ+LgRNDxMvYLms76BOc4L5YuPOk76tZtbpqw9ChtwcJh3JXvICwZ75I3SyZ1PFOlVsusjq+pZ8Iqk1fGECEJs34szes0j11E46YSMmwLSH1uxyb4LAQQ2K+Ird2Jl9+yPhovsJ/DMxdtg6mA2TeybOSN46hTdPZ44iOuPKrfSrgBMtulYaUN7MG3Rx4b/SffCdTLgBKg2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://box-idp.nordu.net/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>NORDUNet</md:GivenName>
-    <md:SurName>NOC</md:SurName>
-    <md:EmailAddress>mailto:noc@nordu.net</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/castest.weblogin.uu.se-cas.xml b/metadata/swamid-testing/castest.weblogin.uu.se-cas.xml
deleted file mode 100644
index 0a894c83..00000000
--- a/metadata/swamid-testing/castest.weblogin.uu.se-cas.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://castest.weblogin.uu.se/cas">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-16T18:53:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://castest.weblogin.uu.se/cas/login"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Interna tjänster vid Uppsala universitet (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Internal Services at Uppsala University (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets centrala autentiseringsservice (CAS) (TEST)</mdui:Description>
-        <mdui:Description xml:lang="en">The Central Authentication Service (CAS) at Uppsala University (TEST)</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://akka.uadm.uu.se/Teknisk_info/Gemensam_webbinloggning/CAS/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://akka.uadm.uu.se/Teknisk_info/Gemensam_webbinloggning/CAS/?languageId=1</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIC9DCCAdygAwIBAgIJAOwNygOxULuiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
-            BAMTD2dlbmVpLml0cy51dS5zZTAeFw0xNDAzMTkxMzIxMDJaFw0yNDAzMTYxMzIx
-            MDJaMBoxGDAWBgNVBAMTD2dlbmVpLml0cy51dS5zZTCCASIwDQYJKoZIhvcNAQEB
-            BQADggEPADCCAQoCggEBALmlOXHZH3qX/WRqlHTj2gLZq1CJSBzJvRztgMwSy99j
-            wECvZl3tK3u2MRJAfDuzFN71cSc/043aw1iRFcUmDTNcem3k++gamCkH+ZOU9otp
-            1REyUx48h2P0n954u/pYH800i/gZRHvmBULwXeoXl6Mspsj+/qC1fCKKdQ600QDA
-            nK+0e2n+T5maAHT7nIR8YkCuExoq/Z8/m4gx+W3VTtLO0BSrzmWhNxUAL2JXJeyj
-            0rlA5z9Dds0WvFFX6Q9JuSnmRdpQSFQvIlysQWAFea6a26Bita+pnr6rsi6p3JUS
-            O0U3/hbooWkbk0vMYkWlBMkEmcHeeYkwuHhODr89vd0CAwEAAaM9MDswGgYDVR0R
-            BBMwEYIPZ2VuZWkuaXRzLnV1LnNlMB0GA1UdDgQWBBTQ4oxwpsOll6tzXhCYC2qk
-            708bqDANBgkqhkiG9w0BAQUFAAOCAQEAtYqS4aYzDp/+UATGsN1WQ3PEQ2nM2GpS
-            M+GMJVTdPJql3FdPmerpRljr+kQyPUXHAr+8qWqk/DkERhSb+C47fRsixDsQYiOU
-            lyUCJ2HHbE6ZYI7w6e5o07c5IuTZxQy4VyBmFsH+o2aNhZbMFKNk4TPMAIWQPtbi
-            nW893Xs69KMMmPZT+s6mlp3eoNZCIKh7vIJrZtZYWH88IN1CqV6X0e8ElRHf4vUe
-            uSchaFhZ24so9OWUQwA6z5EG4j9l+dzjKKgI78BHUiIeexASk3BXNqSOQ1Q52KFI
-            Ezr4DJi4GietsCNfksQ5n5h7vzRM3Ob2mVRNfbJZ3AVHm4pc55GTBw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://castest.weblogin.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Interna tjänster vid Uppsala universitet (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Internal Services at Uppsala University (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/devrb.lbic.lu.se-.xml b/metadata/swamid-testing/devrb.lbic.lu.se-.xml
deleted file mode 100644
index 88b8b21c..00000000
--- a/metadata/swamid-testing/devrb.lbic.lu.se-.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://devrb.lbic.lu.se/">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-06-13T20:52:33Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">RB ansökan</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">RB application</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Research Board ansökningsformulär utveckling</mdui:Description>
-        <mdui:Description xml:lang="en">Research Board Application Development</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://ext-devrb.lbic.lu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://ext-devrb.lbic.lu.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://ext-devrb.lbic.lu.se/privacypolicy.php</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://ext-devrb.lbic.lu.se/privacypolicy.php</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFgzCCA2ugAwIBAgIJAPhFDUn5ZLm1MA0GCSqGSIb3DQEBCwUAMFgxCzAJBgNV
-BAYTAlNFMQ0wCwYDVQQHDARMdW5kMRgwFgYDVQQKDA9MdW5kIFVuaXZlcnNpdHkx
-IDAeBgkqhkiG9w0BCQEWEWxiaWMtaXRAbWVkLmx1LnNlMB4XDTIzMDEwOTEyMDcy
-N1oXDTMzMDEwODEyMDcyN1owWDELMAkGA1UEBhMCU0UxDTALBgNVBAcMBEx1bmQx
-GDAWBgNVBAoMD0x1bmQgVW5pdmVyc2l0eTEgMB4GCSqGSIb3DQEJARYRbGJpYy1p
-dEBtZWQubHUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyyQKO
-0NFDgzI0UzdpiXQDei9OEae6fhFV6dLRbiMYA1QJreep5HzF8nj4hsrHD0wyO+DB
-tN0R/r3V3M+reKPR7PhQ3PQ5BNIUnaG9gBu/M17Uv5JMkOj6tQ5HyD3+ffO3lQV9
-1awPeZesRfkxwcyOPd0QvXLmZDcZ3G0qZfHRtB4CUadsW9xjjBMlHLHRoHWNfKkY
-mNYynLcmNAG539bUZrDZxBqThEhlST7Dbcyc0vW8xr0R5p0WsRyCTBGkcF56dYHn
-UuHrhpsz/eq+dN+H0dALX/O1+NDVgkEIEehLw8kXks1zZQM+HWOFu5N75T8VHe6h
-4JD6/zlcqdH3D3vL1Wp2UqbB7j38mqD5xVq+/jyQQLl5btq6sXyur5kmDUWWjSGv
-nYxJkL3MECTBQQzFLIQoDPpTl4Mm/3rWbrm7pK67UzQ/yz40BCsMUqzq45x6X5rN
-XircsEKW/kxFdY7Mn4f82Q02n/4bI9zLPkKGUZo1hCsZ5v2GPPvm98tRzGFlCbqE
-CsiwCOwYcCV7Pfew9PKTNN+t/ox1UJaBRzsaRnjfDX/+WDGNNvd4NlTrQAoAwNTE
-nQobsZ2y2K102wT3iFmCZIGWdOoETOSnrMlk2akro6I8YuPgcFzbVLgXKMlczqut
-eJDuQnyGZEuqrh62rnzeYsKq4zuTzLU05TGwfwIDAQABo1AwTjAdBgNVHQ4EFgQU
-DYt6Cv5OtxVdnKLkwC6D0ed3yHIwHwYDVR0jBBgwFoAUDYt6Cv5OtxVdnKLkwC6D
-0ed3yHIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAk1yauH1Il/Ep
-5gxEM5q8MTn7QA63CHeRRNdf4O0bpI5F1ei3uA0qsHuTVPpRoUUzu7wuiuS5CGdi
-fnzvb4j0G+2AizQKEMZbEFQvQFuuIARty4Zay7SunXVyiI/sB0RFOYspyt/auXUg
-zEyJ1twZVlXGMwtrHmeKFJJhoTYVzs/TP4veOR8S866UXDDYFC4IChO1U4jbin5b
-JTY+9YnNDADIGdXW2hH6W8dUaJvFZA6SmDCeZ/iiJbpLv15qCOFnVIlLnC23PLkT
-mHaQvzK/8gWlDSSOdP2Y5paTqWvjztZ3D55zRtR/vhPy/mAJabarA4otMJ9A0XWC
-KviFw5yBGsBUvUs5dCAz0Ac9tMP9RiFjqw7VllI1eCRvT75a5XZKcuGdOW0ovshr
-Ec+yCaQgOM/I3vU5g43ysGdpPlAnWb55cD234eD9P4jGxi6lfq6mNeaSqRF9bl4a
-S6AowuZxFRaIt5kpsLWMWIGnrbPb6v/bIbWeebA5nzfZD2ZAU4upPoLOmuOpxy5E
-NEVoftIf9VkyOQTFUIsWvLLU3qoc7FXJ10qovM9BaEFzjvdUDjQauKvm551a3xkf
-U7lnIRWu432Qa1uekR2/rVsvBSx63qTpSXpnn1owNFUwVYt/PD+RdpzijfdBXI1m
-qydeSHsJ7nth74Mp8QxQIFFWt4ojszc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml2-logout.php/devrb"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml2-acs.php/devrb" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml1-acs.php/devrb" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml2-acs.php/devrb" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ext-devrb.lbic.lu.se/simplesaml/module.php/saml/sp/saml1-acs.php/devrb/artifact" index="3"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LBIC IT support</md:GivenName>
-    <md:EmailAddress>mailto:lbic-it@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>LBIC IT support</md:GivenName>
-    <md:EmailAddress>mailto:lbic-it@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LBIC IT support</md:GivenName>
-    <md:EmailAddress>mailto:lbic-it@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Abuse group at LU</md:GivenName>
-    <md:EmailAddress>mailto:abuse@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml b/metadata/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml
deleted file mode 100644
index 8c2e05c7..00000000
--- a/metadata/swamid-testing/flax.nettst.chalmers.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://flax.nettst.chalmers.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-01-17T12:29:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://flax.nettst.chalmers.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">nettst.chalmers.se</shibmd:Scope>
-      <shibmd:Scope regexp="false">chalmers.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Chalmers test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Chalmers test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider for Chalmers (test)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Chalmers (test)</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.chalmers.se/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.chalmers.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ita.chalmers.se/PrivacyPolicyIdP.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="81" width="625">https://www.chalmers.se/SiteCollectionImages/Logotyper/Chalmers%20logotyp/Chalmers_black.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="81" width="625">https://www.chalmers.se/SiteCollectionImages/Logotyper/Chalmers%20logotyp/Chalmers_black.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDxTCCAq2gAwIBAgIUd6HjHPm3c+w9WK7GshdZwbGl394wDQYJKoZIhvcNAQELBQAwcjELMAkGA1UEBhMCU1YxCjAIBgNVBAgMASAxFDASBgNVBAcMC0fDg8K2dGVib3JnMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMSAwHgYDVQQDDBdmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0yMDAyMDUxNDQyMDlaFw0zMDAyMDQxNDQyMDlaMHIxCzAJBgNVBAYTAlNWMQowCAYDVQQIDAEgMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzERMA8GA1UECgwIQ2hhbG1lcnMxDDAKBgNVBAsMA0lUQTEgMB4GA1UEAwwXZmxheC5uZXR0c3QuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxUIvhpYaSc7UfeV0XDRifE9U/oSh2UZKI5PHhoIq8hwFFkjmpI5dSKCHZDypl4gIkuPr8hXdaIxdvLGNL021+ilpdBCUn9mZl8BdKraCOGxjuqBuq2yNdg+Ao3SgJvp4HiAJAaqtzfU1HY9Qb+Ab80mCzeS/6RpepDcrOMw4TGBopoDc4QoxPz7/AY6Q/F9qgRuNVxXBKDrwiE8lR4GyQgak1mHp+w5GtSG4dMWncqHupgtazS5lAzOO11cRi+/x8ooiEnJvAzdbtjEKOfd/ENRkVLtYrb19cEduC3YBzAgNXx931X/U8g8scIb1mwwiou3v/FfW7kkPBAXGz2i7pAgMBAAGjUzBRMB0GA1UdDgQWBBTjAEdvtF865Ag04s8z/Xjq6AEuJzAfBgNVHSMEGDAWgBTjAEdvtF865Ag04s8z/Xjq6AEuJzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDrtyrlt4VtpVZfPBB6MU+3AkINCAaQUsa2UK7enkLAf7PLxikspijRqDEGT45uygajxXAviZeLorLHEE/4sz2XJCvpyDy2h9YXQMNZhCEnrETgvmIc4TRpBzSwb63eUVHbasgYHTKB/WH+VtBGj22SeeMJlykDp25lwfmbudRPMXHUd9O7HNRCbKmG2kK+EOmkotikdxkFDcJWpES8GH7Jcjt3gE920Oin+2K4ZMJkaI+7YjqokJgrVPbprMX25ldS7fAKmNFBwiW7tFnITwOLqsmcMiEKe/6gkK6/n1i6isAeiyFpojU1kMikvFretXEGxJsiS01NZEvqD+3Ze1F5</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDxTCCAq2gAwIBAgIUd6HjHPm3c+w9WK7GshdZwbGl394wDQYJKoZIhvcNAQELBQAwcjELMAkGA1UEBhMCU1YxCjAIBgNVBAgMASAxFDASBgNVBAcMC0fDg8K2dGVib3JnMREwDwYDVQQKDAhDaGFsbWVyczEMMAoGA1UECwwDSVRBMSAwHgYDVQQDDBdmbGF4Lm5ldHRzdC5jaGFsbWVycy5zZTAeFw0yMDAyMDUxNDQyMDlaFw0zMDAyMDQxNDQyMDlaMHIxCzAJBgNVBAYTAlNWMQowCAYDVQQIDAEgMRQwEgYDVQQHDAtHw4PCtnRlYm9yZzERMA8GA1UECgwIQ2hhbG1lcnMxDDAKBgNVBAsMA0lUQTEgMB4GA1UEAwwXZmxheC5uZXR0c3QuY2hhbG1lcnMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDxUIvhpYaSc7UfeV0XDRifE9U/oSh2UZKI5PHhoIq8hwFFkjmpI5dSKCHZDypl4gIkuPr8hXdaIxdvLGNL021+ilpdBCUn9mZl8BdKraCOGxjuqBuq2yNdg+Ao3SgJvp4HiAJAaqtzfU1HY9Qb+Ab80mCzeS/6RpepDcrOMw4TGBopoDc4QoxPz7/AY6Q/F9qgRuNVxXBKDrwiE8lR4GyQgak1mHp+w5GtSG4dMWncqHupgtazS5lAzOO11cRi+/x8ooiEnJvAzdbtjEKOfd/ENRkVLtYrb19cEduC3YBzAgNXx931X/U8g8scIb1mwwiou3v/FfW7kkPBAXGz2i7pAgMBAAGjUzBRMB0GA1UdDgQWBBTjAEdvtF865Ag04s8z/Xjq6AEuJzAfBgNVHSMEGDAWgBTjAEdvtF865Ag04s8z/Xjq6AEuJzAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQDrtyrlt4VtpVZfPBB6MU+3AkINCAaQUsa2UK7enkLAf7PLxikspijRqDEGT45uygajxXAviZeLorLHEE/4sz2XJCvpyDy2h9YXQMNZhCEnrETgvmIc4TRpBzSwb63eUVHbasgYHTKB/WH+VtBGj22SeeMJlykDp25lwfmbudRPMXHUd9O7HNRCbKmG2kK+EOmkotikdxkFDcJWpES8GH7Jcjt3gE920Oin+2K4ZMJkaI+7YjqokJgrVPbprMX25ldS7fAKmNFBwiW7tFnITwOLqsmcMiEKe/6gkK6/n1i6isAeiyFpojU1kMikvFretXEGxJsiS01NZEvqD+3Ze1F5</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://flax.nettst.chalmers.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://flax.nettst.chalmers.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Chalmers University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Chalmers Tekniska Högskola AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Chalmers</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.chalmers.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.chalmers.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Chalmers</md:Company>
-    <md:GivenName>Björn</md:GivenName>
-    <md:SurName>Sandell</md:SurName>
-    <md:EmailAddress>mailto:biorn@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Chalmers</md:Company>
-    <md:GivenName>Niklas</md:GivenName>
-    <md:SurName>Rosenqvist</md:SurName>
-    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Chalmers</md:Company>
-    <md:GivenName>Servicedesk</md:GivenName>
-    <md:EmailAddress>mailto:support@chalmers.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Chalmers</md:Company>
-    <md:GivenName>Chalmers Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@chalmers.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 31 772 8450</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/fs.test.ad.liu.se-adfs-services-trust.xml b/metadata/swamid-testing/fs.test.ad.liu.se-adfs-services-trust.xml
deleted file mode 100644
index ecdda021..00000000
--- a/metadata/swamid-testing/fs.test.ad.liu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.test.ad.liu.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-05-30T09:38:51Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Linköping University</mdui:Description>
-        <mdui:Description xml:lang="sv">Linköpings universitet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Linköping University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet</mdui:DisplayName>
-        <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="121" width="350">https://liu.se/mall11/images/logo-350-sv.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.liu.se/?l=sv</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://minit.liu.se/static/privacy_policy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQQCEHVKlQ/J5NcNnCootmozANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NDMyWhcNMjcxMjEyMTMwNDMyWjAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3h91j+L3z6SoseYD3RNjkHU/6NqJ6esnczHdUXEuXMYCufiqG562uv59YqoN8UxnNynWTZmFAU3wxdFMYsXKFkmzbb6gI/dFwsTCXA9AXKy1Htcs7ny0t9mU/V5OV8kdsprJ6MGirMqvOY5vdkl5nddJuDlyaEhSWe+ygdkGfTPKUW8jQlKHe5W//kfgf84yl3UG+yWH+eZs/rZ6ij5bTeTYT0CAbKauI+62HbbcwO3zNnsztZLdLMl7im90KmJuGE9P79XJZNvZBL2fbcizfQfdIoEdF++KWyRsn1att58kSs8VYwaPXcbrN3/wDAPW93yDhTWZYe6LwP1SpnW4bAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNkZWNyeXB0LnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSQ3Z/B+aCdqaxXMa8lGtR5yY6GCzANBgkqhkiG9w0BAQsFAAOCAQEAonKrwHHRCea1ATrvzJKTbiyKHpk4LFnAGt48i3tc7b7t6YVcsMBQ2LpriiUpIPpgEpTYSrkg43xsim7ACynmXd0Hb3ENTedzCiMPKAir8N3bqXNImrpb64Sb5EhaQLXxUS/HAxSx7+5tMJki6CRwoWoRK9gouj8rYImScVlZ1lUORvBgxEQEWi9zhm5+UBklvj9BuX2pWL52k8TjovpWXRdZCDLdE5a0II2pmXUAvbJurDEYPN6r+IZgOb27JbazISgmcNKSvbOZb33nafxRhEUKy4tTrEKUGDdW8pMlxAgJJ7wm2OtLASuFjkuabarjk+i0xV8vg/YMI9kwrTttyw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQeq/xL/dgt4VCKKovegQWtzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NjQ2WhcNMjcxMjEyMTMwNjQ2WjAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTPF7hdUl+i8tmPGO4RRtjmSwCGsPFADy+wb67uimM/xM8cf58Cj73MhbSuPK1o5d5VGnzVk+wp51H+BxLOFr0pSuVPTVvybeA8d9ZipN9A6Fi7JzGixsixCnbWfPmvDZVzy1V+658nlVTouoQjD4SiHpTVBBoroim8UNWJxBWC392WLXxeslmzXji/L6eD3S4VK/whuFiQm46z65whtGz9Iyy1b/4Uk8+tcmtbMSqK3fgWtbAFE3CpnklD5zplSJVmOENa+FPunELmVxiC3l/pjfbyAeDXEn6lhJ7ca/JNZxVtfO7DKmLooHz+pEfX3Aa3foub+qrQ4Z5WoUORLLnAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNzaWduaW5nLnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSKnmy1oaliBcoA6U200WScQU/KLDANBgkqhkiG9w0BAQsFAAOCAQEAMK3j0b5sqfedV8NshBu/AcA/6OdSCy7iH1COS5NdT24G/H58mkuCTzWdiJQNIP9haF+4w84+vFfJtDn/dBcpv5k7vq0CG+3DtfE6sIizd035SnApWU86RsRYNo4QnEzz4VqU2ExvNe1K8FWRa2n81CCzvEEJ+bEEeEAzenAB6Txpt6EPJFKUwDqwmcytGPbZfNAr9+eju4VGmjsdeX6fj+QYt9yc6ioNz0I8JOjDpYGhY/mIr/S/OnD+BaNuPsHThXlfl5aw4JA6tCmSCty9NQHiMjzmz4muzAxgNwpjne18g/7YyubRB60RKX+/WA77RATGlF6xwEB137kOnBw1+w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <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://fs.test.ad.liu.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs.test.ad.liu.se/adfs/ls/" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Linköping University</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Linköpings universitet</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://liu-errorurl-test-wa.azurewebsites.net/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">liu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Linköpings universitet Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Linköping University Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Linköping University</mdui:Description>
-        <mdui:Description xml:lang="sv">Linköpings universitet</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.liu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.liu.se/?l=en</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="126" width="350">https://liu.se/mall11/images/logo-350-en.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://liu.se/en/article/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">LIU Linköping University</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">LIU Linköping University</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>liu.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:58.397282,15.578624</mdui:GeolocationHint>
-        <mdui:IPHint>130.236.0.0/16</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:17::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQQCEHVKlQ/J5NcNnCootmozANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NDMyWhcNMjcxMjEyMTMwNDMyWjAjMSEwHwYDVQQDDBhmc2RlY3J5cHQudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3h91j+L3z6SoseYD3RNjkHU/6NqJ6esnczHdUXEuXMYCufiqG562uv59YqoN8UxnNynWTZmFAU3wxdFMYsXKFkmzbb6gI/dFwsTCXA9AXKy1Htcs7ny0t9mU/V5OV8kdsprJ6MGirMqvOY5vdkl5nddJuDlyaEhSWe+ygdkGfTPKUW8jQlKHe5W//kfgf84yl3UG+yWH+eZs/rZ6ij5bTeTYT0CAbKauI+62HbbcwO3zNnsztZLdLMl7im90KmJuGE9P79XJZNvZBL2fbcizfQfdIoEdF++KWyRsn1att58kSs8VYwaPXcbrN3/wDAPW93yDhTWZYe6LwP1SpnW4bAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNkZWNyeXB0LnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSQ3Z/B+aCdqaxXMa8lGtR5yY6GCzANBgkqhkiG9w0BAQsFAAOCAQEAonKrwHHRCea1ATrvzJKTbiyKHpk4LFnAGt48i3tc7b7t6YVcsMBQ2LpriiUpIPpgEpTYSrkg43xsim7ACynmXd0Hb3ENTedzCiMPKAir8N3bqXNImrpb64Sb5EhaQLXxUS/HAxSx7+5tMJki6CRwoWoRK9gouj8rYImScVlZ1lUORvBgxEQEWi9zhm5+UBklvj9BuX2pWL52k8TjovpWXRdZCDLdE5a0II2pmXUAvbJurDEYPN6r+IZgOb27JbazISgmcNKSvbOZb33nafxRhEUKy4tTrEKUGDdW8pMlxAgJJ7wm2OtLASuFjkuabarjk+i0xV8vg/YMI9kwrTttyw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDRTCCAi2gAwIBAgIQeq/xL/dgt4VCKKovegQWtzANBgkqhkiG9w0BAQsFADAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwHhcNMTcxMjEyMTI1NjQ2WhcNMjcxMjEyMTMwNjQ2WjAjMSEwHwYDVQQDDBhmc3NpZ25pbmcudGVzdC5hZC5saXUuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCTPF7hdUl+i8tmPGO4RRtjmSwCGsPFADy+wb67uimM/xM8cf58Cj73MhbSuPK1o5d5VGnzVk+wp51H+BxLOFr0pSuVPTVvybeA8d9ZipN9A6Fi7JzGixsixCnbWfPmvDZVzy1V+658nlVTouoQjD4SiHpTVBBoroim8UNWJxBWC392WLXxeslmzXji/L6eD3S4VK/whuFiQm46z65whtGz9Iyy1b/4Uk8+tcmtbMSqK3fgWtbAFE3CpnklD5zplSJVmOENa+FPunELmVxiC3l/pjfbyAeDXEn6lhJ7ca/JNZxVtfO7DKmLooHz+pEfX3Aa3foub+qrQ4Z5WoUORLLnAgMBAAGjdTBzMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwIwYDVR0RBBwwGoIYZnNzaWduaW5nLnRlc3QuYWQubGl1LnNlMB0GA1UdDgQWBBSKnmy1oaliBcoA6U200WScQU/KLDANBgkqhkiG9w0BAQsFAAOCAQEAMK3j0b5sqfedV8NshBu/AcA/6OdSCy7iH1COS5NdT24G/H58mkuCTzWdiJQNIP9haF+4w84+vFfJtDn/dBcpv5k7vq0CG+3DtfE6sIizd035SnApWU86RsRYNo4QnEzz4VqU2ExvNe1K8FWRa2n81CCzvEEJ+bEEeEAzenAB6Txpt6EPJFKUwDqwmcytGPbZfNAr9+eju4VGmjsdeX6fj+QYt9yc6ioNz0I8JOjDpYGhY/mIr/S/OnD+BaNuPsHThXlfl5aw4JA6tCmSCty9NQHiMjzmz4muzAxgNwpjne18g/7YyubRB60RKX+/WA77RATGlF6xwEB137kOnBw1+w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://fs.test.ad.liu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.ad.liu.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Linköpings universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Linköping University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Linköping University Test</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Linköpings universitet Test</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://liu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://liu.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Linköping University</md:Company>
-    <md:GivenName>Saml</md:GivenName>
-    <md:SurName>Admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 13 282828</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Linköping University</md:Company>
-    <md:SurName>LiU-IT SAML admins</md:SurName>
-    <md:EmailAddress>mailto:saml-admins@it.liu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>LiU Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@liu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 13 281744</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/fs.test.bth.se-adfs-services-trust.xml b/metadata/swamid-testing/fs.test.bth.se-adfs-services-trust.xml
deleted file mode 100644
index ff43f884..00000000
--- a/metadata/swamid-testing/fs.test.bth.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://fs.test.bth.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-18T16:17:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://fs.bth.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">bth.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">TEST - Identity Provider for Blekinge Institute of Technology</mdui:Description>
-        <mdui:Description xml:lang="sv">TEST - Identity Provider för Blekinge Tekniska Högskola</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Blekinge Tekniska Högskola - TEST</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">http://www.bth.se/eng</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.bth.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">BTH Blekinge+Tekniska+Högskola Blekinge+Institute+of+Technology</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="200" width="200">https://www.bth.se/wp-content/uploads/2022/01/logo_bth.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="200" width="200">https://www.bth.se/wp-content/uploads/2022/01/logo_bth.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.bth.se/eng/about-bth/personal-data/swamid-service-definition/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.bth.se/om-oss/personuppgifter/swamid-tjanstedefinition/</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="en">Blekinge Institute of Technology - TEST</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>bth.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:56.181775,15.590592</mdui:GeolocationHint>
-        <mdui:IPHint>193.11.184.0/21</mdui:IPHint>
-        <mdui:IPHint>194.47.128.0/19</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:2a::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3jCCAcagAwIBAgIQalxoJEiFpIdNREHOs3S8BTANBgkqhkiG9w0BAQsFADArMSkwJwYDVQQDEyBBREZTIEVuY3J5cHRpb24gLSBmcy50ZXN0LmJ0aC5zZTAeFw0yMjA0MjExNDAyMDVaFw0yNTA0MjAxNDAyMDVaMCsxKTAnBgNVBAMTIEFERlMgRW5jcnlwdGlvbiAtIGZzLnRlc3QuYnRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1wOMycoPklDSSlaAgHFxPiEr2xArck4t9VYHfr84APzT4uD+mTHiU1NSB7It8K77BEnPjJfcHudMhSv/1aNrZPZHil4EfrR+w2To+N/+80OUJ8Jdmw7orMD5foCYfrdAxIOnzYVShrfyA47SXq5f7p3h5hNKi+pH+F3Zoblkg6X5+MmwUZa4OaAVjbMshDdS5RbYin4FnbI03vq4D/j4SsC7XF/noj4jT18vFJZYWtRR9MvQ9Cx8Q6MsOXSS0qi4jBXS6rgE2/5DuEe5L1+CXz5WOQ++1SHjRMux++ogCw4sFd8GGDqtcSQ7+ozqlm8Fs8QM57ZivQsy2OqAwLWa/QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQAMsv5aZ2Ui2LlMSNv+olLdx9QvbstJJ330wi8UjM9iWpZdY0626OyLnVn7HBxqz2huts+SY+4wR0prg/6CTL3s9B3gS1hBl3+3fPpHGHRYlOjsrJ5ytdYUHW7IZMKHdKGFyMv/g2qrpcmj/Qm+qPTow6c2xeKQUQUnW+SUFAAd224t0iK+SFUskQejulMKDCZZePabSOTnWMFnIpwMTayiyktp+xiDZ77BZdjiphYW6bSDSPovqT1pCJk9AEImAhinVq1Vu6WOrv8wVR43LKrE1IJaZdJ9JtZXAWv7Wx0rrt3pnvKe4krSbbOltQclD888HukhEg48fcLG8HKXWOKJ</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC2DCCAcCgAwIBAgIQQTOp2BcAHLpH+3erh3BjzDANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDEx1BREZTIFNpZ25pbmcgLSBmcy50ZXN0LmJ0aC5zZTAeFw0yMjA0MjExNDAyMDZaFw0yNTA0MjAxNDAyMDZaMCgxJjAkBgNVBAMTHUFERlMgU2lnbmluZyAtIGZzLnRlc3QuYnRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA49Vq8ZG5Ig1l8cb2pBXVSFcmlbj37MFWraQftQ79APGlwstwM0U/5a6hYHaODDagrVdda5nJhM6uoDfRPE9Jl2q6KaLvMZOuqKsCYKiqq8dG05/VQk0Z652DJ0N/1D0A9fSVmPB0B89U5PexSdGQj++n4RWVNzMzdCS+2MPrTahf+4+6lQD09HfvDquONVwPpYz+fzbJP/E0BVvdzy1EWerF9aKmSFtuGPMohXvp9UnPLxjkk3U7MMCDBgG4KysOQLM3AX5uRjWIpYubqiMyXEXx9qa9MchhHhgikzaYzEW2Qgv6siok2mRy9F6vRgWCbPG0DQTP9NHqQWys+jNjzQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQDL6Skh79Db+hUO+IEqSsQZT7cDVXRgX9dbpHKME9sS1lEPHLPlAVhvvJ9nsYKg/eFlH04/9j83zBWlBLlend/85kq+bFnY498w7M6iUXVReI4virO1WIoqVw6W71hSnkUxhotBqLnA6GCnjripgr2BASpjVAH03XQjV8XDJ3pyX1S+pZrgUiHL9NT222IM9MG0GFuMaTzCDhye4fWhpSDC1UiaVG7R0Fxg3psSj2LeXo7qsi9TFA97L5qHyGXlvSBpUL2l2THPo/NCMlNqT51OcZ0GS7e/ps3CQudOs+LR0z+WYvQTwdiiPjVnKiPsr6sQ0662LykvX5jGov/8z5zA</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.bth.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.bth.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs.test.bth.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs.test.bth.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Blekinge Institute of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Blekinge Institute of Technology</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Blekinge Tekniska Högskola</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.bth.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.bth.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 381500</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Blekinge Institute of Technology</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:ithelpdesk@bth.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 455 38 51 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@bth.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/id.test.easyvote.se-Saml2.xml b/metadata/swamid-testing/id.test.easyvote.se-Saml2.xml
deleted file mode 100644
index b14ca751..00000000
--- a/metadata/swamid-testing/id.test.easyvote.se-Saml2.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://id.test.easyvote.se/Saml2">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-10-24T09:29:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Testenvironment for electronic elections</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Testsystem för elektroniska val</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Lund University test environment for electronic elections</mdui:Description>
-        <mdui:Description xml:lang="sv">Lunds universitets testsystem för elektroniska val</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIQbZ8VRUM4Tr9OtQ5lSgpTTzANBgkqhkiG9w0BAQsFADAkMSIwIAYDVQQDDBlpZC50ZXN0LnNhbWwyLmVhc3l2b3RlLnNlMB4XDTE5MTAyMjEzMzMwM1oXDTIwMTAyMjEzNTMwM1owJDEiMCAGA1UEAwwZaWQudGVzdC5zYW1sMi5lYXN5dm90ZS5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKQQDX1eG5SuMAukTuSP+M+j4qdzzD5shhC8NL582Y7MK4b13pultm9ELqCyvxeBBi+uUjt2iOlk7eP0DqA5oM2UB2rfoOG4EdJXj2HZ+FAzRIZbaGRPe/4K8NK1fRYb/2GPR/Ow7jSgivHx3nCLZ3w28nkLhiN4K2LSV4wdS/C8X2TrI3QoftVuQZw1S97B3RgvLAAz7zNrud40VMnS0X/fAiG7El0eiEteMZm1LJrNOmSD/XgOUZlLKJV83+7jDBdP/Qwa1qgNy+5qPknehrzmropwyneOOARqGDGeuUOMr25tXZ2TJ5+toXR+9lh8SpP4VcgnbF2JVEf4NADwunUCAwEAAaN2MHQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAkBgNVHREEHTAbghlpZC50ZXN0LnNhbWwyLmVhc3l2b3RlLnNlMB0GA1UdDgQWBBQQVAbrP50xPK+eruZsJylRqZz1LDANBgkqhkiG9w0BAQsFAAOCAQEAmOVnrNd38uUuk69QBtdDaP0u6afOFQfx3Jdi0g1MtE0aY/qW6i8/ycYi0e9wGCB+C+RnC3MCbFFvYlT8g2wsd4ludjQPYeFiGqta81ff19h/KfQ7hCRez/CcyIXo8tN6W15R3TCHcSljedDr0wI7xsbTpZLyFoVmNSuOtw2zF5+Uh0vjhj3akmWZgTTGeb/OTQHBydmevvoyGWDLnrv19tCJJ+T7qXuY/+beb+uEt/clsXnheNQjKTRTFVk8zNYJEPUr39bPUyeSqeywTCvSaZq2K8m1XG8kyBCfvtLyZFQr8+QILp3UvGy+xNCQPg1aTmNpfXV/xU7Sqe29FxIfiQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://id.test.easyvote.se/Saml2/Logout"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.test.easyvote.se/Saml2/Logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://id.test.easyvote.se/Saml2/Acs" isDefault="true" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://id.test.easyvote.se/Saml2/Acs" isDefault="false" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Lunds universitet</md:Company>
-    <md:GivenName>Anna</md:GivenName>
-    <md:SurName>Åkesson</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Lunds universitet</md:Company>
-    <md:GivenName>Eskil</md:GivenName>
-    <md:SurName>Swahn</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Lunds universitet</md:Company>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp-shibtest.slu.se-idp.xml b/metadata/swamid-testing/idp-shibtest.slu.se-idp.xml
deleted file mode 100644
index b7f2c541..00000000
--- a/metadata/swamid-testing/idp-shibtest.slu.se-idp.xml
+++ /dev/null
@@ -1,339 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-shibtest.slu.se/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-15T11:11:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-shibtest.slu.se/idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SLU Shibboleth Idp Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SLU Shibboleth Idp Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test Shibboleth Identity Provider för SLU.</mdui:Description>
-        <mdui:Description xml:lang="en">Test Shibboleth Identity Provider for SLU.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://idp-shibtest.slu.se/info/om.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idp-shibtest.slu.se/info/about.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idp-shibtest.slu.se/info/integritet.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-shibtest.slu.se/info/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUMhPoEf2KNEEQzETZhaUha/CQmD8wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU3WhcNNDAwOTA3MDg1NzU3WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALv1eV6CikXVLXZb
-KHh4Q10LMg0l5AVA72lgdWVVqRH1j0VKzuqWIqLDqh5CRYG801uMhv5s2H7ewo36
-fRFIk9Omh53We4d0yB7BuntBRjF+O469vsGcLVlS2bsOK1kZZNGr5hYZQELc9qhJ
-fa7StElIYAnQxkXxIY1aWdnVToEs7gjDkJWdQ4MJDywW/+Kg+e/7kZktteeqoap5
-hFmsq9inZpm11fGtUWOI4fl9TXlZy6X13x5lbDxFNnvF6HRtjafQjRmYx4uLN5+g
-IsaFIuguPa/9YnQN8cj0pFRmIROsKAJ5dO45Pi4iY4AqrnT1v7/wnncud+xll26Q
-fpq8QDguWf+4KNkt51TWkb++rEJroeTJH9d1iMqAO7qoKthNF6xNVqxN50MApiuO
-Y3wEmrBiW9s3d2sTuWSFB0atj+y3KIZsAWmYJ0Gdl8y3YAERHLfZE1hWKrCgobWF
-c9QdjQkteld7DLXcb9o1fS+Z8rYmTG7Lw4C22g2Tkb75Qh/QSQIDAQABo28wbTAd
-BgNVHQ4EFgQUbWNBoMNHfn1aHUjcXRxZpefoPLYwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAEUQKnyHXUy3FiRsHi+QcJFJ
-+4j+wV7FjcAoqYnCZ2BGMJvqyaFOHcoAvWZaYANMW57wDpBCHeY8pC8nc0RkbJkx
-1mREdupEtsztvNxwAzdpkEf2Cs4w9m3N0ik2A3jGGcKYTqkmEfwz74ZKfOo3ctU8
-CdYsBNVA9CGxNQmvO7sgdC+rOjj4r05as/XczXHwKAwjnuQnOgTGoimNYAqvIM5q
-+uXtqeOzTB2KGW0ZnMuCtKXyVlXcBFFoSK9g7d6perZMZDueS1+/n5VxQyI9wh2n
-qX2ghl3ZLngKmPK+CZSBiLRYPqmzaBglFHEP+zTDWAkauajY3YFsVBUKmRdXOuEq
-6bBj5Cvi6v3GqEosbFsdoUqOZphdbyUuo78Irg+TijAXat+VM5YA/YWjoi9buexe
-rbmBK2bCILRtcGsMPk3uMUsq0Jn6LYrHLzCl1ZRgG6HHwGXrbBqdanHGHoJGACtC
-lPXa9r98Vs7bLrP/b11343DbP3bvznNhmpqeaXtU8g==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUHBOJiF5eItVmpwaAbONnSJwedN0wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU0WhcNNDAwOTA3MDg1NzU0WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALKMy258/b8UEUfM
-HxDnWqQnH6hsnVOS2G53+fjiyasQicAYdc4ov0UzhoNPSpIb/pWLFZ07p+NjoILf
-Ksq+6/lzcYgLrBbpuqAdLl90slWZb3avSJZ1tkCo0JiC6zaNJw87idR8nTzgWOcQ
-RIlCeaXMvV+je1i8k3+LLUn0P63QLDT1wW5N6ZErtnSQEsenjnrH/a3lBtX0DSmU
-j/UO533iIvBxniPbNDIgVDWC8waQrDjk1hV9Omj6/xJwkKUNIVLR9XT+33232Fgn
-BGm8TbOFbEEv15GvaNLZdfXSTiOErGFYSKU58h9Nzdmr8oZURY4Cu6CENhOhZEYV
-O77RwkiuXB5vb+pgO6FFn8SFsF5JPtztGxVKMfI4y3DcaOhcmk3/UHakzzU2pmBW
-ac73M2q/JWwkMtvmoi8B65+Px7lMvBbkBVELyozBhBlu+QD6ArgIoH9AAbpaweR6
-LhDD5P1Q3FvUdtM+5QoYEgMRrpSfKa+8bp4EM5vtM4Yr5zOWhwIDAQABo28wbTAd
-BgNVHQ4EFgQUr4Sd2lM7XCQTyxNh9CFlfucGngYwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAEgDZ/DH8eavLtPIJLTsOiZK
-VXpJenizgbSHagPKeP/dQRv1MDpcVAB3hN8YmOO2tbzGyc5wcBPfC7qvMIUozlBR
-iiHTro+l/KZlE5S0nDxTsunVo3y3L1+C+KRhcFmMHNRwI5KArVVl+SiT2YEPE+oO
-lNVbqs1y3baFvZdCihDdgC9toS1idF8WxopxNhoFwzrly0d19NMlaOhsPUvjo2Qr
-O5AvgTSPdY8UzssqmE5add93yeMlkbDbLgDuLmOf/MT0Q0DQGOpVy18Fs9nD9iwz
-BtgLIW+NSUEKwSIbAquFIxcNJLwDlvdLkmreRxrcr1Q3TnUsT0dqyk0Be9wMukQm
-zwC6BS/r7dT3EKRlywxxmVr0V6TzeXbX2Ibspjndp7zQz3hb0not/IWUEMvZojgO
-50NDCxzWH5CWdUuN1hvAVcruGwJ2UKbgQMAf+3K6kgUeWwbSo+ENo52Mr4jsOdcj
-fMB48s6r6Avb5RBLRXFVossgJmxgi5Kp35LVkrkFGA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUVCdXGKcOA0mTcBW9/9WpMX8CNWQwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU2WhcNNDAwOTA3MDg1NzU2WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIoI0cm30Fp2N4Bv
-sieqDs69dulkqXkl5L7PlIyCAfZtCiO7Ozc24UgfqEbzEnc2C0Ld7lVdKiFOhbh3
-ot2vjyR6Di0qhlV16WNWol/nqCksNkwVjPmGym8oRAKo/CwrCXVF6t6JBRk5IzN7
-FdydSSBmgiw8YIpYQsPIqpghirVXfn8cCvxAnFX4Sax3hZdB667KLPN6gD5srBQI
-uapz/Y7Nr9P7hAdDWPRsGyY9TBGjtMmlWjzwEZQ1sBaUatOzgyEl5Y4C9Q3P8N36
-yTdTkHNy59EHma46dLSCRTe+qZsiIZ2uyRaPU9GdNHGUlKv8etiyUZD1AKOq3/Oh
-kLTELnv38910VtSp715nvcFFlwhcvo8fMh2cnp24HSn/YfBgE7edTpSfVQLdGd9g
-PMTB9JG9WgOnU98BVdisTJiZsDPbHkjiNEEkzhO2AgrhG+ZVrhKlcqrozjhI1sKE
-fBtJVrkceQ9KuDAc4iR5lZ5m6gQBqLvPLtbAIH+adCGaO8JBqQIDAQABo28wbTAd
-BgNVHQ4EFgQU0lRyUnJd8CMyaNpRiCgm+NY8p8AwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAG+9FCHtrtXrMLJCNVr3O1TH
-JbxNoEIt72PbN1pgnRgVm+ZWklKLM/1npnh3S4ZYuEUz/EjPlmved2GCPMNXq8o7
-Bc6Durlcvb1R0Zek8iQ6tZxKpHAOnEtbP+QC18m94wpgvD3HkPzRpvRYENLj5pK5
-ibTvQbf4ImFpV07qQ6Ur8DwPifYgy7gpoNNEfw92SmI0d4aDSJvWz7nwvb138nRm
-QRRt/b1drYL93EeD+pvGx3nUI/oyS4n9PLiIKtUx6Bm4hlc0ByW7y/hZp6dmPsk+
-hmdVa6a6eRuKkGnzGpr3FzbH723+BPfLqEz6Wy51X8ER7ngvjIvbJykRJHWS/E1A
-6ipNj79/PyC9nSwTuf49Djs1bY1Gky5Dj5n+aG/gPcPGbxmrf5CKUPxLnwTbx+tg
-jc1JNTh2kaMuVtUXytuU6+dTEHSi6u4BqT6Utn103E+nWQlAXsJSA6kWegWT16z8
-osqdhUK7LIXVz1hA0bgvU3Y+WlOlsIFD++67OzYPRg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://idp-shibtest.slu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-shibtest.slu.se/idp/profile/Shibboleth/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SLU Shibboleth Idp Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SLU Shibboleth Idp Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test Shibboleth Service Provider för SLU.</mdui:Description>
-        <mdui:Description xml:lang="en">Test Shibboleth Service Provider for SLU.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://idp-shibtest.slu.se/info/om.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idp-shibtest.slu.se/info/about.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idp-shibtest.slu.se/info/integritet.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-shibtest.slu.se/info/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="102" width="102">https://idp-shibtest.slu.se/images/logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUHBOJiF5eItVmpwaAbONnSJwedN0wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU0WhcNNDAwOTA3MDg1NzU0WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALKMy258/b8UEUfM
-HxDnWqQnH6hsnVOS2G53+fjiyasQicAYdc4ov0UzhoNPSpIb/pWLFZ07p+NjoILf
-Ksq+6/lzcYgLrBbpuqAdLl90slWZb3avSJZ1tkCo0JiC6zaNJw87idR8nTzgWOcQ
-RIlCeaXMvV+je1i8k3+LLUn0P63QLDT1wW5N6ZErtnSQEsenjnrH/a3lBtX0DSmU
-j/UO533iIvBxniPbNDIgVDWC8waQrDjk1hV9Omj6/xJwkKUNIVLR9XT+33232Fgn
-BGm8TbOFbEEv15GvaNLZdfXSTiOErGFYSKU58h9Nzdmr8oZURY4Cu6CENhOhZEYV
-O77RwkiuXB5vb+pgO6FFn8SFsF5JPtztGxVKMfI4y3DcaOhcmk3/UHakzzU2pmBW
-ac73M2q/JWwkMtvmoi8B65+Px7lMvBbkBVELyozBhBlu+QD6ArgIoH9AAbpaweR6
-LhDD5P1Q3FvUdtM+5QoYEgMRrpSfKa+8bp4EM5vtM4Yr5zOWhwIDAQABo28wbTAd
-BgNVHQ4EFgQUr4Sd2lM7XCQTyxNh9CFlfucGngYwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAEgDZ/DH8eavLtPIJLTsOiZK
-VXpJenizgbSHagPKeP/dQRv1MDpcVAB3hN8YmOO2tbzGyc5wcBPfC7qvMIUozlBR
-iiHTro+l/KZlE5S0nDxTsunVo3y3L1+C+KRhcFmMHNRwI5KArVVl+SiT2YEPE+oO
-lNVbqs1y3baFvZdCihDdgC9toS1idF8WxopxNhoFwzrly0d19NMlaOhsPUvjo2Qr
-O5AvgTSPdY8UzssqmE5add93yeMlkbDbLgDuLmOf/MT0Q0DQGOpVy18Fs9nD9iwz
-BtgLIW+NSUEKwSIbAquFIxcNJLwDlvdLkmreRxrcr1Q3TnUsT0dqyk0Be9wMukQm
-zwC6BS/r7dT3EKRlywxxmVr0V6TzeXbX2Ibspjndp7zQz3hb0not/IWUEMvZojgO
-50NDCxzWH5CWdUuN1hvAVcruGwJ2UKbgQMAf+3K6kgUeWwbSo+ENo52Mr4jsOdcj
-fMB48s6r6Avb5RBLRXFVossgJmxgi5Kp35LVkrkFGA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUVCdXGKcOA0mTcBW9/9WpMX8CNWQwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU2WhcNNDAwOTA3MDg1NzU2WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIoI0cm30Fp2N4Bv
-sieqDs69dulkqXkl5L7PlIyCAfZtCiO7Ozc24UgfqEbzEnc2C0Ld7lVdKiFOhbh3
-ot2vjyR6Di0qhlV16WNWol/nqCksNkwVjPmGym8oRAKo/CwrCXVF6t6JBRk5IzN7
-FdydSSBmgiw8YIpYQsPIqpghirVXfn8cCvxAnFX4Sax3hZdB667KLPN6gD5srBQI
-uapz/Y7Nr9P7hAdDWPRsGyY9TBGjtMmlWjzwEZQ1sBaUatOzgyEl5Y4C9Q3P8N36
-yTdTkHNy59EHma46dLSCRTe+qZsiIZ2uyRaPU9GdNHGUlKv8etiyUZD1AKOq3/Oh
-kLTELnv38910VtSp715nvcFFlwhcvo8fMh2cnp24HSn/YfBgE7edTpSfVQLdGd9g
-PMTB9JG9WgOnU98BVdisTJiZsDPbHkjiNEEkzhO2AgrhG+ZVrhKlcqrozjhI1sKE
-fBtJVrkceQ9KuDAc4iR5lZ5m6gQBqLvPLtbAIH+adCGaO8JBqQIDAQABo28wbTAd
-BgNVHQ4EFgQU0lRyUnJd8CMyaNpRiCgm+NY8p8AwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAG+9FCHtrtXrMLJCNVr3O1TH
-JbxNoEIt72PbN1pgnRgVm+ZWklKLM/1npnh3S4ZYuEUz/EjPlmved2GCPMNXq8o7
-Bc6Durlcvb1R0Zek8iQ6tZxKpHAOnEtbP+QC18m94wpgvD3HkPzRpvRYENLj5pK5
-ibTvQbf4ImFpV07qQ6Ur8DwPifYgy7gpoNNEfw92SmI0d4aDSJvWz7nwvb138nRm
-QRRt/b1drYL93EeD+pvGx3nUI/oyS4n9PLiIKtUx6Bm4hlc0ByW7y/hZp6dmPsk+
-hmdVa6a6eRuKkGnzGpr3FzbH723+BPfLqEz6Wy51X8ER7ngvjIvbJykRJHWS/E1A
-6ipNj79/PyC9nSwTuf49Djs1bY1Gky5Dj5n+aG/gPcPGbxmrf5CKUPxLnwTbx+tg
-jc1JNTh2kaMuVtUXytuU6+dTEHSi6u4BqT6Utn103E+nWQlAXsJSA6kWegWT16z8
-osqdhUK7LIXVz1hA0bgvU3Y+WlOlsIFD++67OzYPRg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-shibtest.slu.se:8443/idp/profile/Authn/SAML2/POST/SSO" index="0"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">SLU Shibboleth Idp Test</md:ServiceName>
-      <md:ServiceName xml:lang="sv">SLU Shibboleth Idp Test</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">slu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUMhPoEf2KNEEQzETZhaUha/CQmD8wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU3WhcNNDAwOTA3MDg1NzU3WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALv1eV6CikXVLXZb
-KHh4Q10LMg0l5AVA72lgdWVVqRH1j0VKzuqWIqLDqh5CRYG801uMhv5s2H7ewo36
-fRFIk9Omh53We4d0yB7BuntBRjF+O469vsGcLVlS2bsOK1kZZNGr5hYZQELc9qhJ
-fa7StElIYAnQxkXxIY1aWdnVToEs7gjDkJWdQ4MJDywW/+Kg+e/7kZktteeqoap5
-hFmsq9inZpm11fGtUWOI4fl9TXlZy6X13x5lbDxFNnvF6HRtjafQjRmYx4uLN5+g
-IsaFIuguPa/9YnQN8cj0pFRmIROsKAJ5dO45Pi4iY4AqrnT1v7/wnncud+xll26Q
-fpq8QDguWf+4KNkt51TWkb++rEJroeTJH9d1iMqAO7qoKthNF6xNVqxN50MApiuO
-Y3wEmrBiW9s3d2sTuWSFB0atj+y3KIZsAWmYJ0Gdl8y3YAERHLfZE1hWKrCgobWF
-c9QdjQkteld7DLXcb9o1fS+Z8rYmTG7Lw4C22g2Tkb75Qh/QSQIDAQABo28wbTAd
-BgNVHQ4EFgQUbWNBoMNHfn1aHUjcXRxZpefoPLYwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAEUQKnyHXUy3FiRsHi+QcJFJ
-+4j+wV7FjcAoqYnCZ2BGMJvqyaFOHcoAvWZaYANMW57wDpBCHeY8pC8nc0RkbJkx
-1mREdupEtsztvNxwAzdpkEf2Cs4w9m3N0ik2A3jGGcKYTqkmEfwz74ZKfOo3ctU8
-CdYsBNVA9CGxNQmvO7sgdC+rOjj4r05as/XczXHwKAwjnuQnOgTGoimNYAqvIM5q
-+uXtqeOzTB2KGW0ZnMuCtKXyVlXcBFFoSK9g7d6perZMZDueS1+/n5VxQyI9wh2n
-qX2ghl3ZLngKmPK+CZSBiLRYPqmzaBglFHEP+zTDWAkauajY3YFsVBUKmRdXOuEq
-6bBj5Cvi6v3GqEosbFsdoUqOZphdbyUuo78Irg+TijAXat+VM5YA/YWjoi9buexe
-rbmBK2bCILRtcGsMPk3uMUsq0Jn6LYrHLzCl1ZRgG6HHwGXrbBqdanHGHoJGACtC
-lPXa9r98Vs7bLrP/b11343DbP3bvznNhmpqeaXtU8g==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUHBOJiF5eItVmpwaAbONnSJwedN0wDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU0WhcNNDAwOTA3MDg1NzU0WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALKMy258/b8UEUfM
-HxDnWqQnH6hsnVOS2G53+fjiyasQicAYdc4ov0UzhoNPSpIb/pWLFZ07p+NjoILf
-Ksq+6/lzcYgLrBbpuqAdLl90slWZb3avSJZ1tkCo0JiC6zaNJw87idR8nTzgWOcQ
-RIlCeaXMvV+je1i8k3+LLUn0P63QLDT1wW5N6ZErtnSQEsenjnrH/a3lBtX0DSmU
-j/UO533iIvBxniPbNDIgVDWC8waQrDjk1hV9Omj6/xJwkKUNIVLR9XT+33232Fgn
-BGm8TbOFbEEv15GvaNLZdfXSTiOErGFYSKU58h9Nzdmr8oZURY4Cu6CENhOhZEYV
-O77RwkiuXB5vb+pgO6FFn8SFsF5JPtztGxVKMfI4y3DcaOhcmk3/UHakzzU2pmBW
-ac73M2q/JWwkMtvmoi8B65+Px7lMvBbkBVELyozBhBlu+QD6ArgIoH9AAbpaweR6
-LhDD5P1Q3FvUdtM+5QoYEgMRrpSfKa+8bp4EM5vtM4Yr5zOWhwIDAQABo28wbTAd
-BgNVHQ4EFgQUr4Sd2lM7XCQTyxNh9CFlfucGngYwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAEgDZ/DH8eavLtPIJLTsOiZK
-VXpJenizgbSHagPKeP/dQRv1MDpcVAB3hN8YmOO2tbzGyc5wcBPfC7qvMIUozlBR
-iiHTro+l/KZlE5S0nDxTsunVo3y3L1+C+KRhcFmMHNRwI5KArVVl+SiT2YEPE+oO
-lNVbqs1y3baFvZdCihDdgC9toS1idF8WxopxNhoFwzrly0d19NMlaOhsPUvjo2Qr
-O5AvgTSPdY8UzssqmE5add93yeMlkbDbLgDuLmOf/MT0Q0DQGOpVy18Fs9nD9iwz
-BtgLIW+NSUEKwSIbAquFIxcNJLwDlvdLkmreRxrcr1Q3TnUsT0dqyk0Be9wMukQm
-zwC6BS/r7dT3EKRlywxxmVr0V6TzeXbX2Ibspjndp7zQz3hb0not/IWUEMvZojgO
-50NDCxzWH5CWdUuN1hvAVcruGwJ2UKbgQMAf+3K6kgUeWwbSo+ENo52Mr4jsOdcj
-fMB48s6r6Avb5RBLRXFVossgJmxgi5Kp35LVkrkFGA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEOzCCAqOgAwIBAgIUVCdXGKcOA0mTcBW9/9WpMX8CNWQwDQYJKoZIhvcNAQEL
-BQAwHzEdMBsGA1UEAwwUaWRwLXNoaWJidGVzdC5zbHUuc2UwHhcNMjAwOTA3MDg1
-NzU2WhcNNDAwOTA3MDg1NzU2WjAfMR0wGwYDVQQDDBRpZHAtc2hpYmJ0ZXN0LnNs
-dS5zZTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIoI0cm30Fp2N4Bv
-sieqDs69dulkqXkl5L7PlIyCAfZtCiO7Ozc24UgfqEbzEnc2C0Ld7lVdKiFOhbh3
-ot2vjyR6Di0qhlV16WNWol/nqCksNkwVjPmGym8oRAKo/CwrCXVF6t6JBRk5IzN7
-FdydSSBmgiw8YIpYQsPIqpghirVXfn8cCvxAnFX4Sax3hZdB667KLPN6gD5srBQI
-uapz/Y7Nr9P7hAdDWPRsGyY9TBGjtMmlWjzwEZQ1sBaUatOzgyEl5Y4C9Q3P8N36
-yTdTkHNy59EHma46dLSCRTe+qZsiIZ2uyRaPU9GdNHGUlKv8etiyUZD1AKOq3/Oh
-kLTELnv38910VtSp715nvcFFlwhcvo8fMh2cnp24HSn/YfBgE7edTpSfVQLdGd9g
-PMTB9JG9WgOnU98BVdisTJiZsDPbHkjiNEEkzhO2AgrhG+ZVrhKlcqrozjhI1sKE
-fBtJVrkceQ9KuDAc4iR5lZ5m6gQBqLvPLtbAIH+adCGaO8JBqQIDAQABo28wbTAd
-BgNVHQ4EFgQU0lRyUnJd8CMyaNpRiCgm+NY8p8AwTAYDVR0RBEUwQ4IUaWRwLXNo
-aWJidGVzdC5zbHUuc2WGK2h0dHBzOi8vaWRwLXNoaWJidGVzdC5zbHUuc2UvaWRw
-L3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggGBAG+9FCHtrtXrMLJCNVr3O1TH
-JbxNoEIt72PbN1pgnRgVm+ZWklKLM/1npnh3S4ZYuEUz/EjPlmved2GCPMNXq8o7
-Bc6Durlcvb1R0Zek8iQ6tZxKpHAOnEtbP+QC18m94wpgvD3HkPzRpvRYENLj5pK5
-ibTvQbf4ImFpV07qQ6Ur8DwPifYgy7gpoNNEfw92SmI0d4aDSJvWz7nwvb138nRm
-QRRt/b1drYL93EeD+pvGx3nUI/oyS4n9PLiIKtUx6Bm4hlc0ByW7y/hZp6dmPsk+
-hmdVa6a6eRuKkGnzGpr3FzbH723+BPfLqEz6Wy51X8ER7ngvjIvbJykRJHWS/E1A
-6ipNj79/PyC9nSwTuf49Djs1bY1Gky5Dj5n+aG/gPcPGbxmrf5CKUPxLnwTbx+tg
-jc1JNTh2kaMuVtUXytuU6+dTEHSi6u4BqT6Utn103E+nWQlAXsJSA6kWegWT16z8
-osqdhUK7LIXVz1hA0bgvU3Y+WlOlsIFD++67OzYPRg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-shibtest.slu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sveriges Lantbruksuniversitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.slu.se/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT Help Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 18 67 66 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SLU säkerhet</md:GivenName>
-    <md:EmailAddress>mailto:sakerhet@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml b/metadata/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml
deleted file mode 100644
index 166c87cd..00000000
--- a/metadata/swamid-testing/idp-test.it.su.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp-test.it.su.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-05T07:55:07Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp-test.it.su.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">su.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Stockholms universitet (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Stockholm University (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för medarbetare och studenter vid Stockholms universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Stockholm university Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">http://www.su.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.su.se/english/</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="110" width="127">https://idp-test.it.su.se/idp/img/su-logo-sv_OLD.gif</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="110" width="127">https://idp-test.it.su.se/idp/img/su-logo-en_OLD.gif</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.su.se/medarbetare/it/it-tj%C3%A4nster/universitetskonto/policy-f%C3%B6r-hantering-av-personuppgifter-inom-ramen-f%C3%B6r-identitetsutgivaren-identity-provider-idp-1.383506</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.su.se/english/staff/it/it-services/policy-for-the-management-of-personal-information-within-the-scope-of-the-identity-provider-idp-1.384218</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>su.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3625,18.0586</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEBjCCAm6gAwIBAgIVAIoOB0+EQ2esNrfOR/DNO/LiLdhdMA0GCSqGSIb3DQEB
-CwUAMBwxGjAYBgNVBAMMEWlkcC10ZXN0Lml0LnN1LnNlMB4XDTIwMTAxMjA3NTAz
-NVoXDTQwMTAxMjA3NTAzNVowHDEaMBgGA1UEAwwRaWRwLXRlc3QuaXQuc3Uuc2Uw
-ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCh/m0otLh1VEJhtCW/DMCb
-dOR1iqylNBJGN+hYFIb2hNFrv+NBkAs4jr/99pzAQUgkHLiEpp4WLYAVekS8Adsb
-siqNUPsxgQtygm0o4NbIwHN7ZLEMNjC4r2mlscR4RIcfP6OoRUo/RwSvKcQteWMw
-wlARk2dsCXJFWKfGpXvdonn762uWcmjSsiwIUZcCOhZ7Xc538FOPMgZ33lBApXwE
-rf7cKPsfBWa8asv1U0COcsFliirVC0EqDWuXzMkTXJKnCWBpcNLscOd9zz1bOAQ1
-pf6ZgO2HEGGqczIgqi0q7aafIaFjvOtMkvalQWYThN/4SinMYFeyrbP0IzweLIVO
-c3BInDrut81eier88Czwq8oq9/XcqxyJXyS3A75fmoER08JJlNOt1TFokmJLhf1C
-e2fETnPTDTmg51ddjQjFYC+VAaiu06Q8A82jIrcMIAgGMAk6Eyi9p3PaEyetwVOj
-VibRlOCElJwXqMjpe+JbdoCdj9Hhjz/QBCSL8kccoVsCAwEAAaM/MD0wHQYDVR0O
-BBYEFGpKewsKlwmpeXIhOaqQsjdj/kEKMBwGA1UdEQQVMBOCEWlkcC10ZXN0Lml0
-LnN1LnNlMA0GCSqGSIb3DQEBCwUAA4IBgQCDRrQDy7/TTeANIS+uRx1IXaJ9h0Pv
-eo/XBNmKEC/M61fYAmGGmZPlpGzDRCKpRS6MlYwhcXT3BgijM3Hy6SBztdpZ462s
-rmOaUuoBMR32pTGpoEGnYiM3TJY4kQt+7fJYPMORBBD/Xng3Z+xDHF/wroPikyhH
-i7A1XBp1U1fQnP/H9A1eXAFRucoLXaQtxHYm0skHf6EuWfC7wCKa4U87WVueu6YI
-9jp0lr3klE34ax+QJ8YOD8bIsd9dTMNvYG8zmXpCEOzitYhFOe4gH3JLPAXp+1gE
-7wOi6zFZP3+SC9hTaZOxPMTWbg5Ag7wmQxl39IYBEpRNGe4Jhlqx5QKa82AGU6C5
-aCNzPBXHlvYR4OVzQ7SP5IPVdTCq4bNDhgPtauRy9fwuiAxylkxD/cwI6h+Tpwt8
-U/Fhukwdfy1fB5uVRZniTRINfsdzsFH878eoJZ+RMCbl7P9EO7fYiSS+AZDz/1Ij
-i5Njb3NXTdej0Y7FgTe1F/IfGOS4KxKJEG0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.it.su.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.it.su.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stockholm University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Stockholms universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Stockholms universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.su.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.su.se/english</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Stockholm University</md:Company>
-    <md:SurName>Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@su.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 16 1999</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:irt@su.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml b/metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
deleted file mode 100644
index e6cb994f..00000000
--- a/metadata/swamid-testing/idp-test.suni.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp-test.suni.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-04-21T13:14:48Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://idp-test.suni.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">suni.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Södertörns högskola - test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Södertörn University - test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test-IDP för Södertörns högskola.(Endast för testverksamhet)</mdui:Description>
-        <mdui:Description xml:lang="en">Test-IDP for Södertörn University.(For Testing purposes only)</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.sh.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.sh.se/english/sodertorn-university</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="118" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="108" width="604">https://www.sh.se/webdav/files/System/resources/graphics/logo-SH.svg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.sh.se/om-oss/strategier-och-ekonomi/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.sh.se/english/sodertorn-university/meet-sodertorn-university/strategies/personal-data-processing</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLTCCAxWgAwIBAgIQMd+/oVIasoFIXXKFlVUOKjANBgkqhkiG9w0BAQsFADAb
-MRkwFwYDVQQDDBBpZHAtdGVzdC5zdW5pLnNlMB4XDTIyMDkyMTEyMjQyOFoXDTI3
-MDkyMTEyMzQyN1owGzEZMBcGA1UEAwwQaWRwLXRlc3Quc3VuaS5zZTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAM40M7yKD+2dJTgpfwxHawn4vUxr/4CO
-uEh+GJcqEdpOsjYgYt1Aatscm/A7EJCaKpkVrJ4+NYf9xvYnXx4nTcMSJFaLsOp4
-Fs6ZDmlymM2TF4yRLG+vcDWcb65GXzEerbiMmit3srb5YmXLGV1+3gRU6E8LBfFT
-QXJbRSWG9e/Lxbd3Mkc8lMyc7kRRaUE+B2Su6/9VgiyFNbAHozqDTffIgw4gLehm
-YJE4PRbRdoFX8URHvNmL0BajFgKPZRasMSUNxdo05htq3g/K47KuabZueA+e5agu
-xZ9iPqH7rmjzVM1O3NWgYEQQffJseuubYufhDKZnaNDQmypotpv9mlViHXYU+Ni7
-Kn5WzaklBBrgdMhaCh+m2BKIX8kXo5vZrvVjCk0emjPbPMxYN6ZmDucNnUA04ljx
-/nI7zzjvOf4g1LPFP6/1IPgfq4DSbLUbIh1evWu/Jw6qjNJl6JsDGA2NExwCK46/
-buof+ZyHk2HObslz6jVzAuMy2IL80eKbP1Y8cLj28Mh5NUytCA2GE9OwsdAuEW2c
-7iGyToTDjj7BL8z4/Po1l/ujRDCEtkrwMWEfFogkC3ZjzgsCTR5jUolHo9Mv863v
-0cGoyHiXATe62vtFS69fQMMWYBHu8njg25FkmagT/1nRDPRuxPAZZtUSnWa938vq
-kgwN+BT2ZXt1AgMBAAGjbTBrMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwGwYDVR0RBBQwEoIQaWRwLXRlc3Quc3VuaS5zZTAd
-BgNVHQ4EFgQUyYjKdU9a4at+bWVcjL9fClBJ+dwwDQYJKoZIhvcNAQELBQADggIB
-AMpaw0oh9x6EX5MQ3zd2BQ61LGYjfKAAQYcu3DW7DyuJkl7C8+lZofsvYqu0osmv
-h0ul0AxWXRML9MRBEGHhCb/ecCjPeDzPGZvKVhkPOkthCc0FvfYDCHUj8dmEl5cY
-KRGPmaPyH4wxSC/aZBLaipamR7WpXuHS+RDCnZfRcwlfmnsoKMKtiEdddbNvzY39
-NT4Q79FBFSJu2kR4Zb9dKfKQYHfw+inEExzs6epIaKUqoOSrQHSEM+JcI1VdGKnY
-4KeaWe2gT3+Fjhqpkw9roU604bzsutRqkAk8shkzJ7lY+oJ3mTqCZqR0KCZ7TqNW
-JDw2G7pBIU8efocE1tPWj/IxgmjFiekLjUkE19kSMIyfQhqyXWlcYwMdvXjImanu
-NMm4USD+gquWk0OtlQzFwSemhYb6nHzGbWpBla4Zh73r3ov5XangVD9pn0FlZrtJ
-hsTg3r9CHiII8FkNq3+qZCnAOSuNjr8ScQ6nTAb9bh8Ke1+Qn8QyLTvFq7QABvab
-lgv5ve2lkH5TUfKHetfo31NIysJLf0ZItFdACrQbpu9g5cgacBxfpOUX10lrMATA
-seQZuFiSS51oQ7fty7CcY6DQ5/6LSBV26589+wk8VBKV63giwjyyAlknrMR0moQk
-VrFRnL6s6WXvC4dWzAggSoEp53xrRU2NaFzuHsRXD8Gj</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLTCCAxWgAwIBAgIQMd+/oVIasoFIXXKFlVUOKjANBgkqhkiG9w0BAQsFADAb
-MRkwFwYDVQQDDBBpZHAtdGVzdC5zdW5pLnNlMB4XDTIyMDkyMTEyMjQyOFoXDTI3
-MDkyMTEyMzQyN1owGzEZMBcGA1UEAwwQaWRwLXRlc3Quc3VuaS5zZTCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAM40M7yKD+2dJTgpfwxHawn4vUxr/4CO
-uEh+GJcqEdpOsjYgYt1Aatscm/A7EJCaKpkVrJ4+NYf9xvYnXx4nTcMSJFaLsOp4
-Fs6ZDmlymM2TF4yRLG+vcDWcb65GXzEerbiMmit3srb5YmXLGV1+3gRU6E8LBfFT
-QXJbRSWG9e/Lxbd3Mkc8lMyc7kRRaUE+B2Su6/9VgiyFNbAHozqDTffIgw4gLehm
-YJE4PRbRdoFX8URHvNmL0BajFgKPZRasMSUNxdo05htq3g/K47KuabZueA+e5agu
-xZ9iPqH7rmjzVM1O3NWgYEQQffJseuubYufhDKZnaNDQmypotpv9mlViHXYU+Ni7
-Kn5WzaklBBrgdMhaCh+m2BKIX8kXo5vZrvVjCk0emjPbPMxYN6ZmDucNnUA04ljx
-/nI7zzjvOf4g1LPFP6/1IPgfq4DSbLUbIh1evWu/Jw6qjNJl6JsDGA2NExwCK46/
-buof+ZyHk2HObslz6jVzAuMy2IL80eKbP1Y8cLj28Mh5NUytCA2GE9OwsdAuEW2c
-7iGyToTDjj7BL8z4/Po1l/ujRDCEtkrwMWEfFogkC3ZjzgsCTR5jUolHo9Mv863v
-0cGoyHiXATe62vtFS69fQMMWYBHu8njg25FkmagT/1nRDPRuxPAZZtUSnWa938vq
-kgwN+BT2ZXt1AgMBAAGjbTBrMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggr
-BgEFBQcDAgYIKwYBBQUHAwEwGwYDVR0RBBQwEoIQaWRwLXRlc3Quc3VuaS5zZTAd
-BgNVHQ4EFgQUyYjKdU9a4at+bWVcjL9fClBJ+dwwDQYJKoZIhvcNAQELBQADggIB
-AMpaw0oh9x6EX5MQ3zd2BQ61LGYjfKAAQYcu3DW7DyuJkl7C8+lZofsvYqu0osmv
-h0ul0AxWXRML9MRBEGHhCb/ecCjPeDzPGZvKVhkPOkthCc0FvfYDCHUj8dmEl5cY
-KRGPmaPyH4wxSC/aZBLaipamR7WpXuHS+RDCnZfRcwlfmnsoKMKtiEdddbNvzY39
-NT4Q79FBFSJu2kR4Zb9dKfKQYHfw+inEExzs6epIaKUqoOSrQHSEM+JcI1VdGKnY
-4KeaWe2gT3+Fjhqpkw9roU604bzsutRqkAk8shkzJ7lY+oJ3mTqCZqR0KCZ7TqNW
-JDw2G7pBIU8efocE1tPWj/IxgmjFiekLjUkE19kSMIyfQhqyXWlcYwMdvXjImanu
-NMm4USD+gquWk0OtlQzFwSemhYb6nHzGbWpBla4Zh73r3ov5XangVD9pn0FlZrtJ
-hsTg3r9CHiII8FkNq3+qZCnAOSuNjr8ScQ6nTAb9bh8Ke1+Qn8QyLTvFq7QABvab
-lgv5ve2lkH5TUfKHetfo31NIysJLf0ZItFdACrQbpu9g5cgacBxfpOUX10lrMATA
-seQZuFiSS51oQ7fty7CcY6DQ5/6LSBV26589+wk8VBKV63giwjyyAlknrMR0moQk
-VrFRnL6s6WXvC4dWzAggSoEp53xrRU2NaFzuHsRXD8Gj</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-test.suni.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.suni.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.suni.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Södertörns högskola</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Södertörn University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Södertörns högskola</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Södertörn University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.sh.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.sh.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Legat</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Södertörns högskola</md:Company>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Tomas</md:GivenName>
-    <md:SurName>Legat</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Södertörns högskola</md:Company>
-    <md:GivenName>Alvaro</md:GivenName>
-    <md:SurName>Acevedo</md:SurName>
-    <md:EmailAddress>mailto:server@sh.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml b/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
deleted file mode 100644
index 7e51d35c..00000000
--- a/metadata/swamid-testing/idp.auth.gu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idp.auth.gu.se/adfs/services/trust">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-09-19T08:14:53Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp3.it.gu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">ADFS University of Gothenburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">ADFS Göteborgs Universitet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">ADFS Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">ADFS The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www4.gu.se/idpsd/serviceDefionitionIDP_en.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://www4.gu.se/idpsd/serviceDefionitionIDP.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIGHzCCBAegAwIBAgIUORkrFWJ6cIPjH9blJKwtMwZzT0gwDQYJKoZIhvcNAQELBQAwgZ4xCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFWw6RzdHJhIEfDtnJhbGFuZDESMBAGA1UEBwwJR8O2dGVib3JnMR8wHQYDVQQKDBZHw7Z0ZWJvcmdzIHVuaXZlcnNpdGV0MRMwEQYDVQQLDApJVC1FbmhldGVuMSkwJwYDVQQDDCBBREZTIEVuY3J5cHRpb24gLSBpZHAuYXV0aC5ndS5zZTAeFw0yMzAzMDIwOTUxMTJaFw00MzAzMDEwOTUxMTJaMIGeMQswCQYDVQQGEwJTRTEaMBgGA1UECAwRVsOkc3RyYSBHw7ZyYWxhbmQxEjAQBgNVBAcMCUfDtnRlYm9yZzEfMB0GA1UECgwWR8O2dGVib3JncyB1bml2ZXJzaXRldDETMBEGA1UECwwKSVQtRW5oZXRlbjEpMCcGA1UEAwwgQURGUyBFbmNyeXB0aW9uIC0gaWRwLmF1dGguZ3Uuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/D2KNykVol5yR0PHpxmp4FtSEbDy21zlCceOwj7U1zQ5Xjjx89WaV2cbLrGHqv+76U3LK90tGecdnFr4/BEyXDvo8w78AGOzQKibKZit0m6oNZOHSh60HwuxPBc+0MP0xktlYx/D5eE8avpk9s/6+Qt38NglqH4aUAnwm5S0E+ay19dc5TEspzbFWeVmc0kQV6BJmFxFpBiVs500Ua47G2soLrXBmyR3rGWujwLlo0UPgHnoxPizdElVYXw5Bwtoox1XBDCjrm4xah8oXI12cUkNSrJaQ2/GOX9gDiVgedB51kaE8wpSY9fbvA+yOybd7H99BUc5FJaq75IHsPZurjS7Vbcbgm3s3esnrewBQG95H8+2cVZbisFlNtEt+iZPXYq0XzGatjBs8ogBwOBBjTay3Gt6LT8tC40l2xrRg3rLQRyOVnN38g9Gnf8lIklVzt9SVFsg7ALIEEddwjTV7mb6QJhxhMmdcMM5Sa17qeJKhI13c1tJqHTh83zPr0BMf4ZcffI2DNvg5DZfWGzPX2FqH+R48BMI8aFSpnNkBPz6VGa8mpoD9SGgQyCkbAuyPCTfI4hkewU4KnnEqIeVdXYEjyT0wE7NwqPzV8U2FdWCKLXL3ifAKka6f5xgl/QwIJNBdV81JL3hWIptzwdi90AGw/9o344TM7jIagQn0CQIDAQABo1MwUTAdBgNVHQ4EFgQUAooOroPru4KOlTgxljcs+HM/Mi0wHwYDVR0jBBgwFoAUAooOroPru4KOlTgxljcs+HM/Mi0wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEALiXCx7eBbaCB+v7pFlsNVADMkSh36lL6D17sYg0rNMQLxxzo+vCKZyDhaqjtfGsYvuqyu6IYA4Vg4EDOejJefLfOpOMKWIaEHhoZiQT45ESFAtD/eLx3/9Okc+Qm4b5/bXtmjQNr0y4U2hsKk3oJCli3noEZjGZ2h5sDRi1ZwAofX07nXD+PEDKiP+83c3SSSYXavnMkRl3B7mzB2ZbCQuW8spVDmkuvuV//GxuGpLdYganf+KxAWjYJBQnIh2OipGU/kyd2aYxUzruIxN/Xuhc0O22BVQ8pfP+ZQCPgV55+noW0cjbLPDJTj+qB1Fq6PbChiztBs+xT4rdGJXlLEbBcsn7tzMOC587EUoTtYFnOS7v5KaoKAVKCPi0sZuEg7NR7/V+7XBI2giQUPr7fj9zuEA6I0mFFVN0yD/rpmDXJKrdi5p4sIrnYQqXIkqveWzJ0kOL0Ndb7djVezQ/AMohyenzHWXmPbiXYektApHlp/xQp1RrqxXp/xcJMovy9ShFOy6g3NN6do0vlgL++ME55rNYEOS+E0TN5lTDAZmR6vB23REIY+0gtWznnbWCdhWdTmDrXbYVdohwJ/HnN7EMjTk+KIcoZVCtJVFvNsMgSubiFXLOAMeASxj2jZghtSjqEq50azX70NEv7Kh6OkG3c8dEPM8fsD+6TCbppxps=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIGGTCCBAGgAwIBAgIUeXgzKogKF1GxehzyxdcVg8FumjIwDQYJKoZIhvcNAQELBQAwgZsxCzAJBgNVBAYTAlNFMRowGAYDVQQIDBFWw6RzdHJhIEfDtnRhbGFuZDESMBAGA1UEBwwJR8O2dGVib3JnMR8wHQYDVQQKDBZHw7Z0ZWJvcmdzIHVuaXZlcnNpdGV0MRMwEQYDVQQLDApJVC1FbmhldGVuMSYwJAYDVQQDDB1BREZTIFNpZ25pbmcgLSBpZHAuYXV0aC5ndS5zZTAeFw0yMzAzMDIwOTUyMzhaFw00MzAzMDEwOTUyMzhaMIGbMQswCQYDVQQGEwJTRTEaMBgGA1UECAwRVsOkc3RyYSBHw7Z0YWxhbmQxEjAQBgNVBAcMCUfDtnRlYm9yZzEfMB0GA1UECgwWR8O2dGVib3JncyB1bml2ZXJzaXRldDETMBEGA1UECwwKSVQtRW5oZXRlbjEmMCQGA1UEAwwdQURGUyBTaWduaW5nIC0gaWRwLmF1dGguZ3Uuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCdrQqTMw0vYnX532IO+DIuQEYY/PVN6c83oVVP8Y3sN/lRkGZZPvuRR2rCVycJRpF5+MvvW+Bt7WOuXcVramRfVlCcOFJn6Kt+vgMhR5el9NPOBC/RTZTgsWnVyawpNk5iRzop3GGzoOm2HVh+E10JcnCoJqe1J7556SYL8ON00BkqGU4rLyXMShBqIvN1wtvII4GTBc9l9pIOQQCM547+glIZRyxK6aZq9ZJgZYmk5bquUTxtAQ30ZZp9GDFQbl/9gbrTfeBpiZfasR2cA0PUv06WpoyvNgwy9lP/idF4JXXQGrbot80hoNnH6+uSxYFNUuF6zUlnbwjJB7JUD6SW8u0KSvH5JMeASWxIWBCNOTGJc9yvs61hMZgAXKFEEDdEPhSeEsWUce4S+RW1pgnlnukrNTEm6gLJqmER8VdcF/9Rzj9Z78xZZ2Wi3Pp5gZiTePGh2jfAyEbLc8FaxjUncUSd/2YCO2UJde9IuwBbhhsYi3geZW4+IoBcuc3AyZUvWopqpLG9qFnNDPlVQEC6t7vxV2zPrsjxKquR98fa80FbicEroNp0Zz54BOwnqEb3O/M45xowphu1SfJhBTGscCwom7D9sbiq/Y8Wrn1mmftJ8gxdD19ej44A53YOgTTbZ1Qvo4IR6QMt+qkLMU8+82pOjgHBgsLvrKwbSipGiQIDAQABo1MwUTAdBgNVHQ4EFgQUVzLCfLxLd4fpFVeBuBzubbGX15IwHwYDVR0jBBgwFoAUVzLCfLxLd4fpFVeBuBzubbGX15IwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXEhCPskdQsMHAwmH1b4Fe+SriNHzE+c8p6S+MTzqq9x4hERpG9T5/jGMi83INheiFVbB2TZxvcG+GmzJ1mBqa7bvkruxjtDd6ekfl08DVIG26Od4UwoEuH/pc5NoGDfpLLUtkj/1x1dPoPefJy5pDs1L9RaXOdxs/HCaw8RvaXkOzWDNOByotb/eINvQaP7+ujgXn91rp5d4EqRcRVlA4pwbV4lv37mOqz121A8ChHBkrdMiO8k3T7ePQFuJXj1FdgGL1jQZcRXtdt7tooRp2gpbrsp2r2Vf5WGXEWOAtHA3vVKRsQt2ECM4rOSrqdcWMjW6gumGcQ9Y5og7dkGKfq68n4Kr4MFUi0ZnrdniNe794uUIu8vsNlKcexwcyXJ+eq5/lAgjqzuz/vTfHNOrBsYFRA40Sto+oKL8HCvaMOz0Ma8uypKSSC/6P38pGDy6N8om74KUBFfMMRXeGC9A8qzqx8YGdFgdL59hM1Ggn94BwxDczk7YBxpoe5i4+br5KO92E/S2nWOsr+w4Id1iz/FBjNKBq8Yh+idwbjZchaG6Kxw0aZOjf/FPrEcJserdWM/3SEGHw+sWM+JRvul/bxAHRDf6014B2aSW5dLeqiq360poPRLsHrHVKB9hsw5elRVPw+P09yMeEPspQc3y+6DdxQybhhtERdkiCGtMB2M=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.auth.gu.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.auth.gu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.auth.gu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.auth.gu.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.auth.gu.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>GU-Support</md:SurName>
-    <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46317862020</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Lena Ström</md:SurName>
-    <md:EmailAddress>mailto:lena.strom@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Tobias Galéus</md:SurName>
-    <md:EmailAddress>mailto:tobias.galeus@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IRT GU</md:GivenName>
-    <md:EmailAddress>mailto:irt@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp.demo.antagning.se-aws-idp.xml b/metadata/swamid-testing/idp.demo.antagning.se-aws-idp.xml
deleted file mode 100644
index b31287a2..00000000
--- a/metadata/swamid-testing/idp.demo.antagning.se-aws-idp.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.demo.antagning.se/aws-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-10T09:25:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.demo.antagning.se/aws-idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Antagning.se - Demo</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universityadmissions.se - Demo</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för sökande med konto i NyA-systemet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Identity Provider for students with account in the NyA-system.</mdui:Description>
-        <mdui:Keywords xml:lang="sv">antagning.se universityadmissions.se</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">antagning.se universityadmissions.se</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://universityadmissions.se/en/about-this-website/swamid-service-definition/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/swamid-service-definition/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="52" width="205">https://www.demo.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="52" width="195">https://www.demo.antagning.se/images/logo/antagning_se.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://universityadmissions.se/en/about-this-website/swamid-service-provider-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/swamid-service-provider-privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFITCCAwmgAwIBAgIUPWIhYqg8hA9udpgkTPj8J0+uWKAwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UEAwwVaWRwLmRlbW8uYW50YWduaW5nLnNlMB4XDTIzMDIwNzA4MjA1N1oXDTMzMDIwNDA4MjA1N1owIDEeMBwGA1UEAwwVaWRwLmRlbW8uYW50YWduaW5nLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3+z+VWwgLhrf/uBFYeRI1Ca5mwn1h5iBl/a8eVe4uWucdF0xhB1qndj5/jDkuaHViXFtbogoWqMobdKRkS0RoN0QJu6leiSR06yMNW1a7SmQzaTjxxwoH3CRQ7QsUI/YZgAqNDZkKcNsp/qgxfBR9jRNUNuVjQqjS2kpIDiwUhCwHiafWO5DIT4v8yquSCih9YEa4BQak8Rt+xJnL7YDEydvW16Z5vNvjOBczP+O2W+eMHekyOZzxgTu4qrXQFQRvrHhLWrvwGAs38n/QHxTFsClLCKVWpbHKhhl0kJz3GUPrgMUFBzdQJaEg+fbEBEcmejpbDCVEltC+ukKqqDLfYWhdw8/IuE9Zf2n+xtx0LlF96CV4mKqiuVrB4COskogr9DK0fsk4XgUtszwm8XmwyH5tECVo3Lq5bXIhkVSVKwDxoRktkmrIswoBopi1FS804U0Pf/JU11rP45GvKDW/33RSTfxxynweyqL9e8igvkc9/ZgKRKRP0dI2mQckaMyh4M1HKx16kkXFlMzn0OLkgzSQHPo3T2tf+9V2I4XBkgYB9acBnNAyTMtxR3jyFmAHmo2UmgCPMuafM5bOpQqCouSr5uKYGbO9CqCr4YotU7XpaBbafreboWwriPFHC9e7jT2fOevAspV1X/eVfRNgR5rjRNWJoS+nPWJmGXzbQMCAwEAAaNTMFEwHQYDVR0OBBYEFCzcoCXCdAZEVe7VHYXmgT+MNIMuMB8GA1UdIwQYMBaAFCzcoCXCdAZEVe7VHYXmgT+MNIMuMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGf+YEsQaq2h9dOCNQMxbTReOXWlBvvgnrXjFGCMP5PdGy3vHCroAoU4Ig/vNXtZZ2Sw0GBdhKHXKO6xGi5jQ+pJMSOu5WLnHHJ/e++W+MnCIVDiixym4/mNf2iJaBXU8MmikCVumQnigy517bgzU6XJ3/yMsnFGRwB9+eYBpf/BU3qxGPpypBZq7HACWZmRPsPh7KnNR8fWKzae2c8X+r2eaRtOqi3MLlaVspPkXpuQoEWlgDNpsx7t6YzbbK1U8eODgVdyh4RR3j0ov5tEqwazi+lkuzimoG44mQmYB6xo6Jtb7Wf74J9zmcmeY/WduVOK4k4L7njXokaqk2ICzqIPxhqv4wDIAY+U3p/J0H5lZWBF31Qeu6iJR6AWl0E8Hfw9y0AQAgS8W2NtuBr1YmSJXwL2VWaWEhSJR/ZwzwcU/MCV9lFebRabVHi7xbeAVnkhexwqn8TIQynRWwE/NQyrBKj8Z5E6WJHQqIMPa1jjXiBF1JBc4mLmx7Xeo1Tb56FMiXHHjlnZN9nEicVG/4FBVJ3nd5mnG2QHbo2bRRCZwBuldjzZ1ArcOg1kF+2uE9eaz3z7eKAz/uD/0y7Ue2p6/wduodfODS8/FctVgNSmAsOTm56QUR7D6wdk8O52MbaX3f1TjW3PVkY0xBf4sT7YJOxo5z8+PaGTHJxsr5+h</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.demo.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.demo.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.demo.antagning.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.demo.antagning.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.demo.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.demo.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:GivenName>UHR Systemdrift</md:GivenName>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml b/metadata/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml
deleted file mode 100644
index 65270521..00000000
--- a/metadata/swamid-testing/idp.hubbletest.antagning.se-aws-idp.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.hubbletest.antagning.se/aws-idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-10T09:25:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.hubbletest.antagning.se/aws-idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Antagning.se - Hubbletest</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universityadmissions.se - Hubbletest</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för sökande med konto i NyA-systemet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Identity Provider for students with account in the NyA-system.</mdui:Description>
-        <mdui:Keywords xml:lang="sv">antagning.se universityadmissions.se</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">antagning.se universityadmissions.se</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://universityadmissions.se/en/about-this-website/swamid-service-definition/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/swamid-service-definition/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="52" width="205">https://www.hubbletest.universityadmissions.se/images/logo/university-admisssions.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="52" width="195">https://www.hubbletest.antagning.se/images/logo/antagning_se.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://universityadmissions.se/en/about-this-website/swamid-service-provider-policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/swamid-service-provider-privacy-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLTCCAxWgAwIBAgIUA7mrTYhfoQZiUv8oKsVIYZ3GMMwwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaWRwLmh1YmJsZXRlc3QuYW50YWduaW5nLnNlMB4XDTIzMDIwNzE1MTUwNFoXDTMzMDIwNDE1MTUwNFowJjEkMCIGA1UEAwwbaWRwLmh1YmJsZXRlc3QuYW50YWduaW5nLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApv1jZlop3GF4iAkCjDJGv3XtgiizRaBb/ENUkJKCNV3fEoyVoJJjgxAHpa0fHGvqe5iL01a6+wJXdB0oDknyMIRfHvMQkVzNkMzTRcEbPSQclr7AG1FraiQLoJ7HPdJs5a5wtktB/khnWut24tbFpnDWq+xAbGhPUbOTcHSCRy0LOOLeJqsC1IAeOv/IEKr9y2kzv0vNUs9Bj0DhCMoqC5cgeO5Xl+2FjBSZ+DkMrcne6fMGxmufCTFx2H1L0fN2tV4ZGCXSQcZ2eRaDztJCYPha+rM5t0QdjAg8sgmCIfJU/UgVmmJWKtebNOjYwHcuMV8kvNMKmr6O7QXEBpLJb6dGyXcHYmYU3O8/1Zj5M+X+dD6Lz2TVjp7y3Dr5b3+U6rE4+vmW6zmPhS/Uy+P36zz5jItDV64yxYmzxrMmGG3/WbSl4eQC7n4sd4R+rCNDf5AakyTf2tWZiPhoi1dcxI4N7VZgaQkbIv6pnOfLLD04V4j9ho4eNdJr5JZ6/+bTsvsHfDVtqWQU8HzmNi2+5/yIU8olbFp79oRQz+yYNoq6iYogdEUYJPj5vQUgcALKXLZB6q3GeCZ5CWKebmqTVkka6/P4IfpAgde17AEb+rzs+4d4fe6L7S/flwLg0tgn7yrR2zfpAB4WrmqOSIINaOBgCunHZR0EtnmTTz6TrlECAwEAAaNTMFEwHQYDVR0OBBYEFK1nm42VYEQ46am66JmBWsZcW15TMB8GA1UdIwQYMBaAFK1nm42VYEQ46am66JmBWsZcW15TMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAHlhracFQE737KFjr5Fr8c7I6AfRBMtTh5xyNS6zFs9yp9W54efb2jk7lTMP0TCVxNm0CdrJ7QLKPrgPgLAqgrGajpkIVOqHhOmdeURe+M7o5w/+lxDeK6VhcCCs9Cmiw9QF3HznHFPvHlm0LHuZzSblCd71ZgW5hFa36u9Eueas1Gh3/X0EU6hDrKZ60eBpxAHr1MBWtghJiMGcj8C8ntiqMgsiITCXHqy6Y5QqrRu85xZ9MzF5S494IcD2iJHfscP8EHdPv2yPEwH5GnfqmFC3rLD/GvAMXsmnqCdSM8uRqfdfmKGI16r7aP6MXPUEFb1BOlR4GvBCwSVDh20xh6WMgz/agTorT4pNYsYaCTE6lnp7pf/8xOkXxp+wSVkp9owTgL9rOSsFJ8jQUnsoI2XJ0UdenNZ9AyCt/UxDqiPdp4RjK0YzeFzxVN7NyMVKMJ+xFzliMxYeC6jyzRNhqDNhJtc7AM9EL5y0RjKskHZo8NJPxQ/ikdqFj5OfTQJX+85v6D0UteJ4Jv5aor3FKzcblyF21oJcVPaHNoRQo9u5UYwTEyviL3QLXm2efKrvk3W7/mqwfe9A1VIXP4GQTUWmfRsfYvooTbRUXoyprvQoYl9MX+9qvXGlWKzhqMbYZYASyesBiNc7CMWgmHnK32N82K34O50ihlw4wczryoFP</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hubbletest.antagning.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hubbletest.antagning.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.hubbletest.antagning.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.hubbletest.antagning.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.hubbletest.antagning.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.hubbletest.antagning.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">antagning.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFLTCCAxWgAwIBAgIUA7mrTYhfoQZiUv8oKsVIYZ3GMMwwDQYJKoZIhvcNAQELBQAwJjEkMCIGA1UEAwwbaWRwLmh1YmJsZXRlc3QuYW50YWduaW5nLnNlMB4XDTIzMDIwNzE1MTUwNFoXDTMzMDIwNDE1MTUwNFowJjEkMCIGA1UEAwwbaWRwLmh1YmJsZXRlc3QuYW50YWduaW5nLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEApv1jZlop3GF4iAkCjDJGv3XtgiizRaBb/ENUkJKCNV3fEoyVoJJjgxAHpa0fHGvqe5iL01a6+wJXdB0oDknyMIRfHvMQkVzNkMzTRcEbPSQclr7AG1FraiQLoJ7HPdJs5a5wtktB/khnWut24tbFpnDWq+xAbGhPUbOTcHSCRy0LOOLeJqsC1IAeOv/IEKr9y2kzv0vNUs9Bj0DhCMoqC5cgeO5Xl+2FjBSZ+DkMrcne6fMGxmufCTFx2H1L0fN2tV4ZGCXSQcZ2eRaDztJCYPha+rM5t0QdjAg8sgmCIfJU/UgVmmJWKtebNOjYwHcuMV8kvNMKmr6O7QXEBpLJb6dGyXcHYmYU3O8/1Zj5M+X+dD6Lz2TVjp7y3Dr5b3+U6rE4+vmW6zmPhS/Uy+P36zz5jItDV64yxYmzxrMmGG3/WbSl4eQC7n4sd4R+rCNDf5AakyTf2tWZiPhoi1dcxI4N7VZgaQkbIv6pnOfLLD04V4j9ho4eNdJr5JZ6/+bTsvsHfDVtqWQU8HzmNi2+5/yIU8olbFp79oRQz+yYNoq6iYogdEUYJPj5vQUgcALKXLZB6q3GeCZ5CWKebmqTVkka6/P4IfpAgde17AEb+rzs+4d4fe6L7S/flwLg0tgn7yrR2zfpAB4WrmqOSIINaOBgCunHZR0EtnmTTz6TrlECAwEAAaNTMFEwHQYDVR0OBBYEFK1nm42VYEQ46am66JmBWsZcW15TMB8GA1UdIwQYMBaAFK1nm42VYEQ46am66JmBWsZcW15TMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAHlhracFQE737KFjr5Fr8c7I6AfRBMtTh5xyNS6zFs9yp9W54efb2jk7lTMP0TCVxNm0CdrJ7QLKPrgPgLAqgrGajpkIVOqHhOmdeURe+M7o5w/+lxDeK6VhcCCs9Cmiw9QF3HznHFPvHlm0LHuZzSblCd71ZgW5hFa36u9Eueas1Gh3/X0EU6hDrKZ60eBpxAHr1MBWtghJiMGcj8C8ntiqMgsiITCXHqy6Y5QqrRu85xZ9MzF5S494IcD2iJHfscP8EHdPv2yPEwH5GnfqmFC3rLD/GvAMXsmnqCdSM8uRqfdfmKGI16r7aP6MXPUEFb1BOlR4GvBCwSVDh20xh6WMgz/agTorT4pNYsYaCTE6lnp7pf/8xOkXxp+wSVkp9owTgL9rOSsFJ8jQUnsoI2XJ0UdenNZ9AyCt/UxDqiPdp4RjK0YzeFzxVN7NyMVKMJ+xFzliMxYeC6jyzRNhqDNhJtc7AM9EL5y0RjKskHZo8NJPxQ/ikdqFj5OfTQJX+85v6D0UteJ4Jv5aor3FKzcblyF21oJcVPaHNoRQo9u5UYwTEyviL3QLXm2efKrvk3W7/mqwfe9A1VIXP4GQTUWmfRsfYvooTbRUXoyprvQoYl9MX+9qvXGlWKzhqMbYZYASyesBiNc7CMWgmHnK32N82K34O50ihlw4wczryoFP</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.hubbletest.antagning.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.hubbletest.antagning.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Universityadmissions.se</md:Company>
-    <md:GivenName>UHR Systemdrift</md:GivenName>
-    <md:SurName>UHR Systemdrift</md:SurName>
-    <md:EmailAddress>mailto:appldrift_saml@uhr.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp.test.sunet.se-idp.xml b/metadata/swamid-testing/idp.test.sunet.se-idp.xml
deleted file mode 100644
index fbbe1c7f..00000000
--- a/metadata/swamid-testing/idp.test.sunet.se-idp.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.test.sunet.se/idp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-05-12T13:53:47Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#md5"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#ripemd160"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-md5"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-  </md:Extensions>
-  <md:IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.test.sunet.se/idp">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">sunet.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">SUNET - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SUNET - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Inloggning för anställda på SUNET - Test</mdui:Description>
-        <mdui:Description xml:lang="en">Login for SUNET employees - Test</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="205" width="256">https://static.sunet.se/images/sunet256.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=sv_SE</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=en_GB</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=en_GB</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://wiki.sunet.se/display/info/Sunet+Identity+Provider+Service+Definition+and+Privacy+Policy?showLanguage=sv_SE</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>sunet.se</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIUYEql9KeORzO2MWunOhj+TpEjff8wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMB4XDTIwMDUwNTA5MDQwOVoX
-DTMwMDUwMzA5MDQwOVowGjEYMBYGA1UEAwwPc2F0b3NhX2Zyb250ZW5kMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuO4LF9D+pTsI21yr4j91KEHa8P/N
-5cDjpxziteWXYt/RZtj1wIg1TjvcJF64LJ0qvkeyxpEjHSH0EkN2iRhWplw+5otI
-rWWJfz7k7uoD6z9vGgfEx6c4chOYqTioHz9kO4Extet+8xfO4lK5jC8x3hqEtXc1
-k0FUhHLNvaSnF+n8/nAMXZFROrs11y836oOefXYcenzQmQINsD/N/yVQWExJTujG
-KbBAZuWlYixChxEcB5a8fiTJjqBG36IvD5vtUL00BbAxkrewbSQqTRYph5gNCiaL
-2u3a0NCvecyHLPlNj+St4MuRZPVcT2R6j1Mdi00Gu24kEDF8+0FwBhASOPMNeTme
-weaCcTfP/nLqfUzq/GoQZd0Z+mA0Q3avcOg6OEDp5XH+WdbNnYftUYJzVMJdEI3/
-KfQ+VoQY+mYhAAMmiz+05QvQhGE6WxvW1Yzzqkzro9+5+A21+VrWfvGURGas/p/o
-cuCojZSpsyBrD/7MbJYIbbNwP4TMzgGXjjfFnRdimsx4lS3q/GgmdRmLsMKotTu0
-ul3b9+/UzPrPAAjhRKbHcYiXh5TqfI/PEvCowiW4Uh0dqybIl56LUcFqi6ZY9hIE
-vdEaNB0M+tTKo+Oe0I8MhtTKJNZcVqU1tKjAuVgpCUGdfPiUbzbO8i5aM1Wv2daw
-xVHubi/2wFWaex0CAwEAAaNTMFEwHQYDVR0OBBYEFK4Thns8RC8LpZgpl8smURWo
-oRZUMB8GA1UdIwQYMBaAFK4Thns8RC8LpZgpl8smURWooRZUMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQELBQADggIBAGfxgX2yfoD7Z45G4OSqRVSKPRBqmNPc
-W0+KR+o4a5DlbvRIMbELu2YWbxbrOV3i2OBxTCUqQxIbw67gEIlhyBYhgre5f+qh
-Mc/A5lZs+xhgIWgWb9ZuzyP9MDCUIhL6yx6FI0jKI4+lzRMPSWk2azmeWSFKE23M
-jZL/0xqOnsXsBS2AP76mHsedZzXot9L2P5MIQgWuilBs8IVjKIsNndddtzqNanH/
-PSMHNvSmN5Df5rw90qkI7qnPAM996Oblyn/0k32AqWExApMWa8ZD5uUjCNw61enX
-nSgDSMfFiltEQk9P+wESQN2JWqe8d7O9LqUhtHL4ljndbM1El+AQ8w9I3f6R/aUz
-awAwRJStuCRJvXL/9Civ/x0nKNfxrQOmAjLtK3fA9kJmuxQemenpT5CC1g5klutK
-04J0B5PyfHCoQuYs2NcvQ3NI9ozfssYmXplVAe0w4PwH2vvHH++4PpWDmTmiy86Q
-dlp8PDkRRctKbUu4ojK9mvYr7XfXY3UMVhLHorFfUEv7TEzN7OnAQC9AxFmAoQj0
-z22R0TQfg2nJKac4/rZ3Ri6IJtD9maIHeL3XikGrVe/9el8wXCVVOXsb6e+aJltj
-LVuQ6hWxdLht5ODuYILdfwPWFpdhTalVF4JgxqgpwMmAv7f4UHu6ukFQcq1jX+eI
-w1/klZ0omp5S
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.test.sunet.se/Saml2SP/sso/post"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.test.sunet.se/Saml2SP/sso/redirect"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Research Council</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Vetenskapsrådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Sunet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://sunet.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://sunet.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Technical</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Support</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>SUNET NOC</md:GivenName>
-    <md:EmailAddress>mailto:noc@sunet.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp.uhr.se-idp-shibboleth.xml b/metadata/swamid-testing/idp.uhr.se-idp-shibboleth.xml
deleted file mode 100644
index 6e7b103f..00000000
--- a/metadata/swamid-testing/idp.uhr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.uhr.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:55:24Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp.uhr.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">UHR's IDP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identityprovider for UHR</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQA1fEvobeB0k7/9iU1scJLuj8bgwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDhaFw0zNjAz
-MTMwNjEzNDhaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC5UJfJ8igHrENbdVYXCnU7yDb0hilzUW/iuZ9+8sj+
-GhtbREGNan0lCf5hEn+ZI7oNL6G9zhwdQxVrSuatcBDd63DHrk+pr7EX0b6x3qba
-4N3URVdmDcHz3ot+tdd3uxqofDGep/beUpureqW2AscRspLImvgy4lfEkqA7pKuB
-3NQvNDhPjiRIYo2gcQVmEI4uDTiJW9/YlXW8SYZO4Q5vHnJ2gItkD+5iGPRxul27
-uGaHeEjFov3e5b17NiqX4naZ7dYWPOK0KvBeHbY83pZqVzh/Dav3piXVkrJC+/MM
-1W/j1S0nO1J+vTKFYXD41u5b5+VhNCUKkT8Tb95l+5d9AgMBAAGjWzBZMB0GA1Ud
-DgQWBBSKLIlyhvxhCYq4b/P2OGh2Ad1YcjA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAKCFa0xcFkZZE+YXVGiRQ78Npu0fISmo3mJIQNfvX1f47kM3veRPX6c6
-kz+yCxdBmsFrzS6GZMASUS8HRApumTzbao/2EPXZIX1a6Fli/TRXhBjSKX3BQYv/
-qLXYfwDCHTXzxAXmSInEWrAeGsfWkznub7dJBL6gyVwocrgWIdf5NHujkuYCl6X+
-UxtRYjrGjs1FzAJS8b+mlaLELIKBmRMLdknZ/IhTExjiuvhIXnQdgcHRbcyKURQx
-fEHqr/LXLAx+9GIvQxcC84F2Wq8+iPCERg0b23gjzPT00sKlHkvEPaft5//b1jcd
-jh6Yq3qCCn2Yb+cFUDJT72VDJ7NoDRg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUK85xuzAU41ZIbKm/LJP7YzIXD/gwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDdaFw0zNjAz
-MTMwNjEzNDdaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCvNbZH0kfcp0xJ8uVIiBjuRTK2gAmcizSa36WHmsuL
-7c6wOx3XNjpMRxr5mA3k5u27sW6/lyGaqMdeQNY2CK6j6oL0hWcLAeRkZh8mRgNS
-H8+/FDLKn9+r/IQv4qUxHxvfJquLGotAbD9qcSzQmiqBeHtQTNE5k+5ajFH8IA6W
-74TEA1cwCH+g1EATRC36PGaDtLkvmXmKShPcKJ9Qg0Mvd252Y3Cm44I/LG0YgKvl
-8ubfC1KOHpEglrCZ+qxtO/rmhdlVpeKRoXIpYSbevDL3FwVE3o47dyM+sn2zhwsh
-XMuYD8EUlr+1T/gBLmeaHO9QlYXevGdbdDoEbWjHGsODAgMBAAGjWzBZMB0GA1Ud
-DgQWBBRXLdPEN0n4SiGCE9vPuD7ixTBQADA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAAgp4d1TvLdprgUKZj+S/YBwDyQ70Mr54TLrv8FrVCeHRXOw/piEkGAj
-Y/GfKbxP5yeQp3UvoYpEFwXEuXbqhX+ejdZRk9fUwQqlsVbUmd1IUauXSvD4qk4S
-qpzLqHNEpcwcGvHpv0c/PLMoYfgAB405kna7V+t9LjBgFgdL+QZTDK5SpG2NLnmq
-5J49BaZxgxHMcSoDRjeTbli1DlyPCf1QJWzmgJgbi79+SSou0y/1ncirmk7S2dVo
-g55hppBxE4Ch23T/kEHh6GraswLGpCOK/kyDyUA1YVrR8wELO7WBmJrxobTtAFWi
-jcs6eH7JlXc3P5b44189qTfCgUMntVg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUCRfcQ0FZIWx4ZsT6g19Z/LZ448MwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDhaFw0zNjAz
-MTMwNjEzNDhaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCZnBiK6quMGf57WTvpfoRWHpb5GSP6Xwh1QsXqf8Ws
-6uRqFFx7AXe09Vn2BU/yPtZO+Rw0Yb3+eNByUYbz7A5ZIG2vn0nSnryPo4Q8NQsp
-p+VKWXzatXefK+xhYzOgla+f/kIM+CcpqkypLHBzFX3jXPYM31i1HJHcLzXn4EWX
-GWKWYNVMVWM3h7aXOozWran5iGlZa2bB5Q/1Mfx2JWgdKKqmxv8HrnupdjcDjqQ1
-yA1ARH0Mp6MWGBNE9zm/nmNcTxCzHnZiXze2uHH7mH+qc6jWZbYxQ6PEll5FfgMT
-DXO4slIx2WYD7cSXLUYrWOfmzNJROOZz7M5p6G21tjzJAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQC6Bz+Gh8FN6WyPNNxumKKWHJJ6zA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAAc/D2iocq5hL7n585M10ola3lyuja91giPXv4vDRAqPN9TznKfPhd2v
-2uaWzcyyDVZRXfQbEoqwdm+65ijxSUjEXK8vcD/x4m4OMuBqkY7PAbap1za5dAJQ
-uKrjCR95Os2KWDdfuglPz5sh73kQwOKXNG/6fOb7LpW7cd2kBfDFuHLJegmK2H9u
-IpYvhjyBB62widywr2u8PXudGhkymB1ZArxaGEKKCbt4804ngM9ImYfop6xt4OwD
-ejud16QXqp7rWP7ba6tATI9k3Zngi4hP1bjkRJsmGcBIMQHODb4Xi3dft1uGWBdT
-slCO9tT9JJLe1hpBFObZDTDY6/rOkuc=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uhr.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uhr.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUQA1fEvobeB0k7/9iU1scJLuj8bgwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDhaFw0zNjAz
-MTMwNjEzNDhaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQC5UJfJ8igHrENbdVYXCnU7yDb0hilzUW/iuZ9+8sj+
-GhtbREGNan0lCf5hEn+ZI7oNL6G9zhwdQxVrSuatcBDd63DHrk+pr7EX0b6x3qba
-4N3URVdmDcHz3ot+tdd3uxqofDGep/beUpureqW2AscRspLImvgy4lfEkqA7pKuB
-3NQvNDhPjiRIYo2gcQVmEI4uDTiJW9/YlXW8SYZO4Q5vHnJ2gItkD+5iGPRxul27
-uGaHeEjFov3e5b17NiqX4naZ7dYWPOK0KvBeHbY83pZqVzh/Dav3piXVkrJC+/MM
-1W/j1S0nO1J+vTKFYXD41u5b5+VhNCUKkT8Tb95l+5d9AgMBAAGjWzBZMB0GA1Ud
-DgQWBBSKLIlyhvxhCYq4b/P2OGh2Ad1YcjA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAKCFa0xcFkZZE+YXVGiRQ78Npu0fISmo3mJIQNfvX1f47kM3veRPX6c6
-kz+yCxdBmsFrzS6GZMASUS8HRApumTzbao/2EPXZIX1a6Fli/TRXhBjSKX3BQYv/
-qLXYfwDCHTXzxAXmSInEWrAeGsfWkznub7dJBL6gyVwocrgWIdf5NHujkuYCl6X+
-UxtRYjrGjs1FzAJS8b+mlaLELIKBmRMLdknZ/IhTExjiuvhIXnQdgcHRbcyKURQx
-fEHqr/LXLAx+9GIvQxcC84F2Wq8+iPCERg0b23gjzPT00sKlHkvEPaft5//b1jcd
-jh6Yq3qCCn2Yb+cFUDJT72VDJ7NoDRg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUK85xuzAU41ZIbKm/LJP7YzIXD/gwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDdaFw0zNjAz
-MTMwNjEzNDdaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCvNbZH0kfcp0xJ8uVIiBjuRTK2gAmcizSa36WHmsuL
-7c6wOx3XNjpMRxr5mA3k5u27sW6/lyGaqMdeQNY2CK6j6oL0hWcLAeRkZh8mRgNS
-H8+/FDLKn9+r/IQv4qUxHxvfJquLGotAbD9qcSzQmiqBeHtQTNE5k+5ajFH8IA6W
-74TEA1cwCH+g1EATRC36PGaDtLkvmXmKShPcKJ9Qg0Mvd252Y3Cm44I/LG0YgKvl
-8ubfC1KOHpEglrCZ+qxtO/rmhdlVpeKRoXIpYSbevDL3FwVE3o47dyM+sn2zhwsh
-XMuYD8EUlr+1T/gBLmeaHO9QlYXevGdbdDoEbWjHGsODAgMBAAGjWzBZMB0GA1Ud
-DgQWBBRXLdPEN0n4SiGCE9vPuD7ixTBQADA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAAgp4d1TvLdprgUKZj+S/YBwDyQ70Mr54TLrv8FrVCeHRXOw/piEkGAj
-Y/GfKbxP5yeQp3UvoYpEFwXEuXbqhX+ejdZRk9fUwQqlsVbUmd1IUauXSvD4qk4S
-qpzLqHNEpcwcGvHpv0c/PLMoYfgAB405kna7V+t9LjBgFgdL+QZTDK5SpG2NLnmq
-5J49BaZxgxHMcSoDRjeTbli1DlyPCf1QJWzmgJgbi79+SSou0y/1ncirmk7S2dVo
-g55hppBxE4Ch23T/kEHh6GraswLGpCOK/kyDyUA1YVrR8wELO7WBmJrxobTtAFWi
-jcs6eH7JlXc3P5b44189qTfCgUMntVg=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDEzCCAfugAwIBAgIUCRfcQ0FZIWx4ZsT6g19Z/LZ448MwDQYJKoZIhvcNAQEL
-BQAwFTETMBEGA1UEAwwKaWRwLnVoci5zZTAeFw0xNjAzMTMwNjEzNDhaFw0zNjAz
-MTMwNjEzNDhaMBUxEzARBgNVBAMMCmlkcC51aHIuc2UwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCZnBiK6quMGf57WTvpfoRWHpb5GSP6Xwh1QsXqf8Ws
-6uRqFFx7AXe09Vn2BU/yPtZO+Rw0Yb3+eNByUYbz7A5ZIG2vn0nSnryPo4Q8NQsp
-p+VKWXzatXefK+xhYzOgla+f/kIM+CcpqkypLHBzFX3jXPYM31i1HJHcLzXn4EWX
-GWKWYNVMVWM3h7aXOozWran5iGlZa2bB5Q/1Mfx2JWgdKKqmxv8HrnupdjcDjqQ1
-yA1ARH0Mp6MWGBNE9zm/nmNcTxCzHnZiXze2uHH7mH+qc6jWZbYxQ6PEll5FfgMT
-DXO4slIx2WYD7cSXLUYrWOfmzNJROOZz7M5p6G21tjzJAgMBAAGjWzBZMB0GA1Ud
-DgQWBBQC6Bz+Gh8FN6WyPNNxumKKWHJJ6zA4BgNVHREEMTAvggppZHAudWhyLnNl
-hiFodHRwczovL2lkcC51aHIuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQEL
-BQADggEBAAc/D2iocq5hL7n585M10ola3lyuja91giPXv4vDRAqPN9TznKfPhd2v
-2uaWzcyyDVZRXfQbEoqwdm+65ijxSUjEXK8vcD/x4m4OMuBqkY7PAbap1za5dAJQ
-uKrjCR95Os2KWDdfuglPz5sh73kQwOKXNG/6fOb7LpW7cd2kBfDFuHLJegmK2H9u
-IpYvhjyBB62widywr2u8PXudGhkymB1ZArxaGEKKCbt4804ngM9ImYfop6xt4OwD
-ejud16QXqp7rWP7ba6tATI9k3Zngi4hP1bjkRJsmGcBIMQHODb4Xi3dft1uGWBdT
-slCO9tT9JJLe1hpBFObZDTDY6/rOkuc=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp02.gih.se-idp-shibboleth.xml b/metadata/swamid-testing/idp02.gih.se-idp-shibboleth.xml
deleted file mode 100644
index 6bfaa4c6..00000000
--- a/metadata/swamid-testing/idp02.gih.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp02.gih.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp02.gih.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Gymnastik- och idrottshögskolan - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish School of Sport and Health Sciences - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identitetsutgivare för Gymnastik- och Idrottshögskolan - Test</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for The Swedish School of Sport and Health Sciences - Test</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="80" width="80">https://idp02.gih.se/idp/images/gihlogo-mdui.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="80" width="80">https://idp02.gih.se/idp/images/gihlogo-mdui.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://idp02.gih.se/idp/info/information-sv-se.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://idp02.gih.se/idp/info/information-en-us.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idp02.gih.se/idp/info/privacy-sv-se.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp02.gih.se/idp/info/privacy-en-us.html</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">gih gymnastik-+och+idrottshögskolan the+swedish+school+of+sport+and+health+sciences</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>gih.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3467350,18.0811920</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAKtN6+g8qyINNSUdMUj+ETmlrH8pMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTAeFw0yMDExMTkxMTMyMTBaFw0z
-MDExMTkxMTMyMTBaMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIpGBr68QLi3BUV91eCG3U76xIuPwQdwJc3I
-0UkWaVUDT3018TmVOpHUftzi7ratKM2/YsSCXjKXAwd55Wrg9b13jZOBOajPumKA
-rTQ0j1XrJe3RrNXYV8fW3YGc2r5QkSK9exgZOQMYvrYszB4TRUxGFxtVbQ1bVqDu
-TPZw9+q3hZPwg7SXMyJxMqtviA73M8MhfwFhIS6oYiKa4vf3wVEWxRC8x/YOuzCh
-h1Yvq3BIzNWxJCimrcZeWe/VJlYnK2XsJ+37R94oPA/UZZWM4W7gZks3o0btJR8r
-jihmzfw63uTdiLQuquxti7vf3AfKjmy5CccigFDHN+7RUvtnBvUCAwEAAaNfMF0w
-HQYDVR0OBBYEFEsdX6ciDexkMd7P4b2DrjG9EtM+MDwGA1UdEQQ1MDOCDGlkcDAy
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMi5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAFvSriJHkdCy3EJ7W7Xn1guLHf7wMpACeOIv0TRK+TKi
-msQNzObMvxFRnAFgmIvuxq/7f6DZ0XGm0VqCcKxmuM7dW9GXtzVzzrtAIds5kFI1
-d3WUWkx8q//v9NGPG4i5KpXZHwR30IuDl5AyrUh0mm1haKWHy9ybm5/y/Yw/OoX1
-BGnFSMWW9V5fwiW1S6E5QqCC/LTPBJR3jIl0pQS/Ik2u2+6hVu/O12U9eaE5ZOCB
-pp7OqR+jjunl42YyKK6PYT209nJiW8SmFi+c9qSYmDgPKwlHnA/hYdvy9heTAWYm
-HrR00emNkHk9fs7zq95jHw4hSBCKWKhvoL62Xe4m/EE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAL7+mBPoPWMeB+fhGyTwStsYI5rrMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTAeFw0yMDExMTkxMTMxNDlaFw0z
-MDExMTkxMTMxNDlaMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK5ldipbAra5FH7zwDzdDHtZWqb64qBIIr7L
-Tjrg0tDxP2RGRzYEHuIwf14ce/fkDjTbBidgQTOj3DxnL7Pg/PfkSLsOiL9yPiiC
-y3ql3KJ+eB8JipnrtiGlU61D4o8g1kwGSCn+dSWECtPFh8L42++ht3n2YOUeWFn+
-+V/TKtGG3Ng0MfKb434K2eAJ89lkyd7Rwj7IWiCRXfLnuC+Hz5wz/HSR3L4xsIjh
-RDmEpsQpjBVsPdq6asuiLNTsuN6qQBQNg1oVjumCH1GD3mDas6oaGwICFnzl1wWW
-51A+9i6EHtW2nxtP3pTZZioxUwTzlVwmXVHtPwAixNMvksEqyz0CAwEAAaNfMF0w
-HQYDVR0OBBYEFFU9Z4F8VzfJPZnhDM1V0c8bLGWBMDwGA1UdEQQ1MDOCDGlkcDAy
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMi5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAIF/cLOHqzlGE6b3VTi0PDKME9IU/UXayuTPLwXcZC/W
-iU8aiaX9Ut2l5seEpQW49n9/llHpMz8U3YKOKqkpdinB4b8dCcYbP9m9rOsuvYBM
-ONL0hwFxwl2Ph6WB3U7jbpIt+dwShQzmWLDYMjqMbj5lW0dyq8cVii3w46L4Rgz0
-e7Hcjpzmj8XWf1qt/PotxX9RC6KpztrVAiuECnLo2M32uqYISykOPVW1ojpSG0Yb
-/4q9l+xBYxQ8zhXh+WHYK+m2iTYGc3yBaogxoylffp7dm735Y6+e/u7McDJgSuYU
-hfPauxBtehyqdj0u5Kh1alBnJrNgsNU1ldLSDXt8fxU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp02.gih.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp02.gih.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://idp02.gih.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" ns1:supportsRequestedAttributes="true" Location="https://idp02.gih.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://idp02.gih.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gih.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGzCCAgOgAwIBAgIUfL5eIxaCCsXXEHWoMbWDcuznRdkwDQYJKoZIhvcNAQEL
-BQAwFzEVMBMGA1UEAwwMaWRwMDIuZ2loLnNlMB4XDTIwMTExOTExMzA1OFoXDTMw
-MTExOTExMzA1OFowFzEVMBMGA1UEAwwMaWRwMDIuZ2loLnNlMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAj+HoBNvAQtsXd+fWDPJaB3oZhN4sLRxKxvr2
-6GnH67VmUtzb8LpByJ6P9aW+xbHP/KYZ2waDDM0OwmhFsgT6WMfIwu3JWa+JL0ey
-5ttKaP6Z7Dv20UD6ntntVLq9hGf/RDQSlbAtqoYAUMURAbiGQ8W0MK1K1cLCzJNn
-51xgvIJ0EFCThoBm29Qz9L85MwLFM/qQm3HLf3VuR7Sm9r1Uehr1XeZbylv1n5Ln
-PKThGVqNF3EUWPxY1rJb07MYKyis+IG8jf+8GyXi9hmdBX96znacB3MAZ+VSSxYX
-/glQYdukMZZr0UoL5AowT9GkEZ82lBOPngXm9SnDA4tGabe8jQIDAQABo18wXTAd
-BgNVHQ4EFgQUmf0NpPd2MGKF4HJmHxXsmDBhVyowPAYDVR0RBDUwM4IMaWRwMDIu
-Z2loLnNlhiNodHRwczovL2lkcDAyLmdpaC5zZS9pZHAvc2hpYmJvbGV0aDANBgkq
-hkiG9w0BAQsFAAOCAQEARcQYXeG/c5NT1dqlOQEbS5RmuuHo8YeVJqn42J4p7YWK
-ePa/fGNyiIa6r5L96S4zf1pBGXQ4waEofvdDr3WC/bUr2y4zpSoGL04z7Kz4JhIn
-2vv9sUFxjU+N61NxuSu/nSdoHNNi0+vTLqO0dCn2tsCzCYDOM+8fIzanWT7CCMd1
-+7kzroyXpbQfrsg1gHwkdz6FRhpyy8wYlkQBqNiYw8uI2Enz5DtCIgTdzeY5K6T2
-sq6tAAvkig6Q9YAKsZp2pxchkm8VE3Asn9pkKmmylelMXYrX1JZzfPyaQcY2UPD8
-U+hy+KSevibyVy5OBDk6lia+Yp9JAMYJ9eXkcaI1mg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAKtN6+g8qyINNSUdMUj+ETmlrH8pMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTAeFw0yMDExMTkxMTMyMTBaFw0z
-MDExMTkxMTMyMTBaMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAIpGBr68QLi3BUV91eCG3U76xIuPwQdwJc3I
-0UkWaVUDT3018TmVOpHUftzi7ratKM2/YsSCXjKXAwd55Wrg9b13jZOBOajPumKA
-rTQ0j1XrJe3RrNXYV8fW3YGc2r5QkSK9exgZOQMYvrYszB4TRUxGFxtVbQ1bVqDu
-TPZw9+q3hZPwg7SXMyJxMqtviA73M8MhfwFhIS6oYiKa4vf3wVEWxRC8x/YOuzCh
-h1Yvq3BIzNWxJCimrcZeWe/VJlYnK2XsJ+37R94oPA/UZZWM4W7gZks3o0btJR8r
-jihmzfw63uTdiLQuquxti7vf3AfKjmy5CccigFDHN+7RUvtnBvUCAwEAAaNfMF0w
-HQYDVR0OBBYEFEsdX6ciDexkMd7P4b2DrjG9EtM+MDwGA1UdEQQ1MDOCDGlkcDAy
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMi5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAFvSriJHkdCy3EJ7W7Xn1guLHf7wMpACeOIv0TRK+TKi
-msQNzObMvxFRnAFgmIvuxq/7f6DZ0XGm0VqCcKxmuM7dW9GXtzVzzrtAIds5kFI1
-d3WUWkx8q//v9NGPG4i5KpXZHwR30IuDl5AyrUh0mm1haKWHy9ybm5/y/Yw/OoX1
-BGnFSMWW9V5fwiW1S6E5QqCC/LTPBJR3jIl0pQS/Ik2u2+6hVu/O12U9eaE5ZOCB
-pp7OqR+jjunl42YyKK6PYT209nJiW8SmFi+c9qSYmDgPKwlHnA/hYdvy9heTAWYm
-HrR00emNkHk9fs7zq95jHw4hSBCKWKhvoL62Xe4m/EE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAL7+mBPoPWMeB+fhGyTwStsYI5rrMA0GCSqGSIb3DQEB
-CwUAMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTAeFw0yMDExMTkxMTMxNDlaFw0z
-MDExMTkxMTMxNDlaMBcxFTATBgNVBAMMDGlkcDAyLmdpaC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAK5ldipbAra5FH7zwDzdDHtZWqb64qBIIr7L
-Tjrg0tDxP2RGRzYEHuIwf14ce/fkDjTbBidgQTOj3DxnL7Pg/PfkSLsOiL9yPiiC
-y3ql3KJ+eB8JipnrtiGlU61D4o8g1kwGSCn+dSWECtPFh8L42++ht3n2YOUeWFn+
-+V/TKtGG3Ng0MfKb434K2eAJ89lkyd7Rwj7IWiCRXfLnuC+Hz5wz/HSR3L4xsIjh
-RDmEpsQpjBVsPdq6asuiLNTsuN6qQBQNg1oVjumCH1GD3mDas6oaGwICFnzl1wWW
-51A+9i6EHtW2nxtP3pTZZioxUwTzlVwmXVHtPwAixNMvksEqyz0CAwEAAaNfMF0w
-HQYDVR0OBBYEFFU9Z4F8VzfJPZnhDM1V0c8bLGWBMDwGA1UdEQQ1MDOCDGlkcDAy
-LmdpaC5zZYYjaHR0cHM6Ly9pZHAwMi5naWguc2UvaWRwL3NoaWJib2xldGgwDQYJ
-KoZIhvcNAQELBQADggEBAIF/cLOHqzlGE6b3VTi0PDKME9IU/UXayuTPLwXcZC/W
-iU8aiaX9Ut2l5seEpQW49n9/llHpMz8U3YKOKqkpdinB4b8dCcYbP9m9rOsuvYBM
-ONL0hwFxwl2Ph6WB3U7jbpIt+dwShQzmWLDYMjqMbj5lW0dyq8cVii3w46L4Rgz0
-e7Hcjpzmj8XWf1qt/PotxX9RC6KpztrVAiuECnLo2M32uqYISykOPVW1ojpSG0Yb
-/4q9l+xBYxQ8zhXh+WHYK+m2iTYGc3yBaogxoylffp7dm735Y6+e/u7McDJgSuYU
-hfPauxBtehyqdj0u5Kh1alBnJrNgsNU1ldLSDXt8fxU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp02.gih.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Gymnastik- och idrottshögskolan</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish School of sport and health sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.gih.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.gih.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Gymnastik- och idrottshögskolan, GIH</md:Company>
-    <md:SurName>CIO</md:SurName>
-    <md:EmailAddress>mailto:cio@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Gymnastik- och idrottshögskolan, GIH</md:Company>
-    <md:SurName>ITOps</md:SurName>
-    <md:EmailAddress>mailto:itops@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Gymnastik- och idrottshögskolan, GIH</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@gih.se</md:EmailAddress>
-    <md:TelephoneNumber>+46812053700</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@gih.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml b/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
deleted file mode 100644
index b529e509..00000000
--- a/metadata/swamid-testing/idp2.it.gu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp2.it.gu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T14:46:18Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://idp2.it.gu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Gothenburg idp2.it.gu.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IdP for University of Gothenburg idp2.it.gu.se</mdui:Description>
-        <mdui:Description xml:lang="sv">Test Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Göteborgs Universitet idp2.it.gu.se</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.gu.se/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.gu.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="129" width="127">https://idp2.it.gu.se/idp/images/1498144_ny_logo_en_normal.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="128" width="126">https://idp2.it.gu.se/idp/images/1510601_logo_sv_126.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>gu.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
-        <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>gu.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
-        <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAINrwBJif7MyDdcmC3aMRQx/C6NIMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwHhcNMTYwMzE0MTA0NzMwWhcN
-MzYwMzE0MTA0NzMwWjAYMRYwFAYDVQQDDA1pZHAyLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklmy11Wi1gbd2qqX51/6ye3KfqM3AAac
-dcrQIrLzdaqZL7vrrQpq2qgH/epM6Ed+WzixDZqnkUoKoumyAmyC46yWXfrz1+Hj
-1yjvXsnwbRefs7lT1JqRJczZiCli5hQ4WYZap+3QPHQrvJGEq51i13ULhNgK5xe+
-ito4GpVUlUwOjyoI08LXIZs7l59eTGK/sHsHh0WC/46u3AduQfnpZx1mlq6+3huk
-2DFgKrXNzFQRfhsyB/btD0v7DQ1wyn/b94fECeIiJtNWfzifKtsvXOMGuNUMhk04
-8EFeHfL5vMX7K3maJTfS5B9wcvi/mf7E0xhvCD9n5R/C5ikNzqzfqQIDAQABo2Ew
-XzAdBgNVHQ4EFgQUbhaTcpz0n3M1pcZ3wQqBG5L4ROYwPgYDVR0RBDcwNYINaWRw
-Mi5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAyLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAAtb8IM9rZSxCDqFqQqwiZH0Ij4pJPwTZbSUXW
-+T2O9LzLpCtJSVWtLlv15R0OILRieh9ckIFbnW40Y4JVbjETaX1CbVFUSIgq6WZG
-aKzoKR2m1IgP9Gs/2EUrZFFr7FXsAzDTbGZhPbaF6GhmK8+vIacbtmdAKO85BlOR
-n6JxeyT4l0tcm8loeajCPpER+1DyWeGtgFdXdIUsP5TfJdKwG1hZL0dUNc7YI/sR
-fm8r33IUquovFZwOmEmfgMBP7JZGwgf+UKA8YLCTuqzXrKhOOS+w0gS/I0xOeKvi
-slmWOOgRICBRYA2lHBZc0E9cAHv8ltiP/1ummZfZL3snn+eX
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAJXNXfPkY/tJdDVMCaw+c61mVwv0MA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwHhcNMTYwMzE0MTA0NzI5WhcN
-MzYwMzE0MTA0NzI5WjAYMRYwFAYDVQQDDA1pZHAyLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlpXT1DgnFLxxOsRy8LSuNHkmsHm0waBS
-BwtCXiqTEYDRcnB31Hye4DT7wjwpqsg8e81QFqszdDO3b/se1brgrsAX4gX+UoHv
-mNd9CkG9vfNF3vNpL3aUTV5CID7+r8iXXqvgxcCTH39W2b/1E/7xhV2cd1PAP9VI
-pRNuHVibWJEixl4MpHsrVJJk1TrmvQtjT+frCMKTM14i2wGLJMLjzudebsWZFX64
-A02XhkzloQIrE3+/bUkZBsTxpJzJBL9Gc+HLVraB4RVzrnmh+7U0BEPbkcgHEvAS
-OkidW/RtyBCTcr3uoxiXEHvW9f5/Wca0VMAKs8csNxQIUqUE+oc9ewIDAQABo2Ew
-XzAdBgNVHQ4EFgQUP7zSE8MllrSEOvovWKnieEDjsjYwPgYDVR0RBDcwNYINaWRw
-Mi5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAyLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAKn5K5CdnG2bZgzeQu+g4Ay8AcnjpRHRw6w89v
-edu6nBWvqQyAqZcLl9STC6UJBeWwfLMGj8eu9wOOCtCBETGE7hXcaTp+N2tGVHnG
-l8+lwZ6s5R8B95quke4OTzlxazWhwI3xicZL1Kwrj64GfjLvDCrQpEZJYd50hzyb
-rGGOOQN4j/oViF5Yl0xMLx2u+DLn6Zd/6/I7Eon6NoIdhNYVyd6UGlt0nYIpeBVI
-tkZr09dLUyeu1kGsnGhZZnRL7G+YLxJlO4SFHV/VjoeRZXwZ1MQJ1XIbqa7xgDpM
-fHA2iBVTGFOHR/EduBYUoKmhYK2LkJVMyHI3DzTNEle07mr6
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUKT1nsJWjTvn/gUt5ZMVyXM6ax78wDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwMi5pdC5ndS5zZTAeFw0xNjAzMTQxMDQ3MjlaFw0z
-NjAzMTQxMDQ3MjlaMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzq06/MQ7xCiwlHbHaliAkLuQnTkkD0sQ6
-1jKuwGzjNn/shY7Hf2EVKzy/vYOH9QLbMMzeHMwCAeq/W7QcZwnVjgSTeFaK7DeW
-xJkUELJvp8/T2RJMdj3XnSO76x01g1eLXKtgHfKC/WWeAP+WkrT07YBj0fRen+99
-jXHgj5BqL5IEtBGYFWA6GjNlWXdD3CDsUnDnj7S7fLo6BXs9Ob4vSFjRF9KWUaHf
-uspv1Sc4qIcm5qvhuYejuiP1oP1jLINE27ZRQgNGB9OFbe2dQrsdIiDVVNcdKq28
-Bltq+vu8+7c19RyY7oasDfxp01nIVpKAjLQxRHhkERkMNl/19y0VAgMBAAGjYTBf
-MB0GA1UdDgQWBBQsqSwdpJcQrBYLYtdKR9PAdv2mNjA+BgNVHREENzA1gg1pZHAy
-Lml0Lmd1LnNlhiRodHRwczovL2lkcDIuaXQuZ3Uuc2UvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAHF5lvS7YzKY4qPZI1sVSkQuiIK9U2jht5wYUQEC
-HnWFGAmS3idl3afHdGBVv+jD44jndnkojJ5pl63c9phYiKRiFqaRvoyC+hHkd0qD
-pkbY+yOc1ePrjXuIyNBKh9UJTiWWF2x/J7MJ2fiSsL+Q44Ot/wd3VzsOTWMgY+Gz
-USCXAEeFWLAs1crBEAaW2mmWQOYSyp95LNXV1JCsyd1R7I1KAQ6S21XqSyPEBtZf
-ocfXlxiISI9q8HuuNs3FvJhJZWITD4pgq6hDioWmYyDa5Xjr7d9e2oOJD9C25Te2
-1l6gYUDIMOfT4TSe+YHPj0W7ZChHQwggdChvqjV0WtykKL4=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.it.gu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.it.gu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.it.gu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.it.gu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.it.gu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAINrwBJif7MyDdcmC3aMRQx/C6NIMA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwHhcNMTYwMzE0MTA0NzMwWhcN
-MzYwMzE0MTA0NzMwWjAYMRYwFAYDVQQDDA1pZHAyLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAklmy11Wi1gbd2qqX51/6ye3KfqM3AAac
-dcrQIrLzdaqZL7vrrQpq2qgH/epM6Ed+WzixDZqnkUoKoumyAmyC46yWXfrz1+Hj
-1yjvXsnwbRefs7lT1JqRJczZiCli5hQ4WYZap+3QPHQrvJGEq51i13ULhNgK5xe+
-ito4GpVUlUwOjyoI08LXIZs7l59eTGK/sHsHh0WC/46u3AduQfnpZx1mlq6+3huk
-2DFgKrXNzFQRfhsyB/btD0v7DQ1wyn/b94fECeIiJtNWfzifKtsvXOMGuNUMhk04
-8EFeHfL5vMX7K3maJTfS5B9wcvi/mf7E0xhvCD9n5R/C5ikNzqzfqQIDAQABo2Ew
-XzAdBgNVHQ4EFgQUbhaTcpz0n3M1pcZ3wQqBG5L4ROYwPgYDVR0RBDcwNYINaWRw
-Mi5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAyLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAAtb8IM9rZSxCDqFqQqwiZH0Ij4pJPwTZbSUXW
-+T2O9LzLpCtJSVWtLlv15R0OILRieh9ckIFbnW40Y4JVbjETaX1CbVFUSIgq6WZG
-aKzoKR2m1IgP9Gs/2EUrZFFr7FXsAzDTbGZhPbaF6GhmK8+vIacbtmdAKO85BlOR
-n6JxeyT4l0tcm8loeajCPpER+1DyWeGtgFdXdIUsP5TfJdKwG1hZL0dUNc7YI/sR
-fm8r33IUquovFZwOmEmfgMBP7JZGwgf+UKA8YLCTuqzXrKhOOS+w0gS/I0xOeKvi
-slmWOOgRICBRYA2lHBZc0E9cAHv8ltiP/1ummZfZL3snn+eX
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDIDCCAgigAwIBAgIVAJXNXfPkY/tJdDVMCaw+c61mVwv0MA0GCSqGSIb3DQEB
-CwUAMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwHhcNMTYwMzE0MTA0NzI5WhcN
-MzYwMzE0MTA0NzI5WjAYMRYwFAYDVQQDDA1pZHAyLml0Lmd1LnNlMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlpXT1DgnFLxxOsRy8LSuNHkmsHm0waBS
-BwtCXiqTEYDRcnB31Hye4DT7wjwpqsg8e81QFqszdDO3b/se1brgrsAX4gX+UoHv
-mNd9CkG9vfNF3vNpL3aUTV5CID7+r8iXXqvgxcCTH39W2b/1E/7xhV2cd1PAP9VI
-pRNuHVibWJEixl4MpHsrVJJk1TrmvQtjT+frCMKTM14i2wGLJMLjzudebsWZFX64
-A02XhkzloQIrE3+/bUkZBsTxpJzJBL9Gc+HLVraB4RVzrnmh+7U0BEPbkcgHEvAS
-OkidW/RtyBCTcr3uoxiXEHvW9f5/Wca0VMAKs8csNxQIUqUE+oc9ewIDAQABo2Ew
-XzAdBgNVHQ4EFgQUP7zSE8MllrSEOvovWKnieEDjsjYwPgYDVR0RBDcwNYINaWRw
-Mi5pdC5ndS5zZYYkaHR0cHM6Ly9pZHAyLml0Lmd1LnNlL2lkcC9zaGliYm9sZXRo
-MA0GCSqGSIb3DQEBCwUAA4IBAQAKn5K5CdnG2bZgzeQu+g4Ay8AcnjpRHRw6w89v
-edu6nBWvqQyAqZcLl9STC6UJBeWwfLMGj8eu9wOOCtCBETGE7hXcaTp+N2tGVHnG
-l8+lwZ6s5R8B95quke4OTzlxazWhwI3xicZL1Kwrj64GfjLvDCrQpEZJYd50hzyb
-rGGOOQN4j/oViF5Yl0xMLx2u+DLn6Zd/6/I7Eon6NoIdhNYVyd6UGlt0nYIpeBVI
-tkZr09dLUyeu1kGsnGhZZnRL7G+YLxJlO4SFHV/VjoeRZXwZ1MQJ1XIbqa7xgDpM
-fHA2iBVTGFOHR/EduBYUoKmhYK2LkJVMyHI3DzTNEle07mr6
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDHzCCAgegAwIBAgIUKT1nsJWjTvn/gUt5ZMVyXM6ax78wDQYJKoZIhvcNAQEL
-BQAwGDEWMBQGA1UEAwwNaWRwMi5pdC5ndS5zZTAeFw0xNjAzMTQxMDQ3MjlaFw0z
-NjAzMTQxMDQ3MjlaMBgxFjAUBgNVBAMMDWlkcDIuaXQuZ3Uuc2UwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzq06/MQ7xCiwlHbHaliAkLuQnTkkD0sQ6
-1jKuwGzjNn/shY7Hf2EVKzy/vYOH9QLbMMzeHMwCAeq/W7QcZwnVjgSTeFaK7DeW
-xJkUELJvp8/T2RJMdj3XnSO76x01g1eLXKtgHfKC/WWeAP+WkrT07YBj0fRen+99
-jXHgj5BqL5IEtBGYFWA6GjNlWXdD3CDsUnDnj7S7fLo6BXs9Ob4vSFjRF9KWUaHf
-uspv1Sc4qIcm5qvhuYejuiP1oP1jLINE27ZRQgNGB9OFbe2dQrsdIiDVVNcdKq28
-Bltq+vu8+7c19RyY7oasDfxp01nIVpKAjLQxRHhkERkMNl/19y0VAgMBAAGjYTBf
-MB0GA1UdDgQWBBQsqSwdpJcQrBYLYtdKR9PAdv2mNjA+BgNVHREENzA1gg1pZHAy
-Lml0Lmd1LnNlhiRodHRwczovL2lkcDIuaXQuZ3Uuc2UvaWRwL3NoaWJib2xldGgw
-DQYJKoZIhvcNAQELBQADggEBAHF5lvS7YzKY4qPZI1sVSkQuiIK9U2jht5wYUQEC
-HnWFGAmS3idl3afHdGBVv+jD44jndnkojJ5pl63c9phYiKRiFqaRvoyC+hHkd0qD
-pkbY+yOc1ePrjXuIyNBKh9UJTiWWF2x/J7MJ2fiSsL+Q44Ot/wd3VzsOTWMgY+Gz
-USCXAEeFWLAs1crBEAaW2mmWQOYSyp95LNXV1JCsyd1R7I1KAQ6S21XqSyPEBtZf
-ocfXlxiISI9q8HuuNs3FvJhJZWITD4pgq6hDioWmYyDa5Xjr7d9e2oOJD9C25Te2
-1l6gYUDIMOfT4TSe+YHPj0W7ZChHQwggdChvqjV0WtykKL4=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Lena Ström</md:SurName>
-    <md:EmailAddress>mailto:lena.strom@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Tobias Galéus</md:SurName>
-    <md:EmailAddress>mailto:tobias.galeus@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>GU-Support</md:SurName>
-    <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46317862020</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IRT GU</md:GivenName>
-    <md:EmailAddress>mailto:irt@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idp3.mdu.se-idp-shibboleth.xml b/metadata/swamid-testing/idp3.mdu.se-idp-shibboleth.xml
deleted file mode 100644
index 076b9936..00000000
--- a/metadata/swamid-testing/idp3.mdu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,421 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp3.mdu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-05-24T07:18:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://idp3.mdu.se/error/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mdh.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens universitet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Mälardalen University-test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Mälardalens universitet-test</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://idp.mdh.se/idp.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://idp.mdh.se/idp.html</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="138" width="216">https://idp.mdh.se/idp/images/mdulogo-en.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="130" width="216">https://idp.mdh.se/idp/images/mdulogo-sv.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://portal.mdu.se/privacypolicy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://portal.mdu.se/privacypolicy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>mdh.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.6186,16.5407</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.3716,16.5085</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUJuVR+zDjW704KaA4mcKa5biaglowDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5tZHUuc2UwHhcNMjMwNTIzMjAyNDAxWhcNMzMw
-NTIzMjAyNDAxWjAWMRQwEgYDVQQDDAtpZHAzLm1kdS5zZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAKUfLAEt2wSWFTriUIarIUWCXoAKSXbHIzVD/5OA
-BfdgmWuhnB2EciPj3tFfoNotOZb5jVLdV/aUOWLtLbv/yPufdmrvm+wqc+LCWhes
-Do6WGBL04rGjG3t536cP4h1WIbiBvy3KbhUDMOGgUi8qhv+KitSwQJOjW8gF5QkV
-/fYJOigND+fMaVc5us3dmXRhWNCTjnQZs9IHZLuuHf+dpTQf7wC5f52GJU4hZFKR
-BCAWJf1OQj63XBCEtEKrocPpRVAMnYDP5WNqIqpwbdhhjW6jH6ZIJTNuNh8QrDHO
-vOgVnbYwZFw5sP1rjfwOBpOj5+OvUcexXjnB5B2g3yVPS86LG8B8OwOMcdo5qmvn
-KMWL1dDAHjkG4VMk3aPpmlneus1+UNaMJQLneYD3fr7RVLOsxW4fPoc9nSx+1t9o
-qoTlp7Lq5i9BmZHUkxuxSwk9FwIpqdLLAhSprujH/UP83bRqFOtSVy5MrnEK6ZgC
-4j9B7TI3DKLWDcq+1RQ2QNpFN18uGRRleJ6W7p0nHhdrORXlFN1dME8ZBSCwC39J
-zfNcd6BijBCZREpsi139psgub8qMe08sW8wME5VKaNFdNHC939ajtxpQf+cQ2zBc
-/6iv2UY3OLdWf2ZmM2NPBIvQrWJ8Kj1QsSHgbR3JYqmzYqcQOms7eMGXUvm4TaZF
-qqgdAgMBAAGjWTBXMB0GA1UdDgQWBBSqiBJpylo+6Pub4jWe4IRVLdy6PDA2BgNV
-HREELzAtggtpZHAzLm1kdS5zZYYeaHR0cHM6Ly9pZHAzLm1kdS5zZS9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4ICAQCEufUjmPMl1ji/rR2K4Z86SySkvKhGe4Sx
-bcDKtOXBGfg3HGtdII5LkKGh4PyTlssHXkhiTJtGuEV/+HyL+shf/T1LRmfhH4ca
-1OShtsH4FOFFKoyoEKnPuwe9iFoVcleapydQkimJ5cpPZw8J9pTOr+RWdrf51ckX
-c+w/zxjpRp65xXB6NPEpirI9KtMwIo4PEzmtZiNX85G6GWjE9M5yAeJZi/Qq6s4n
-DnxRTYWp6nY0aWuHeAf5LLtsXOZbS5WYMMQ3E7OI7/jG0qZd2gpQETUG+Nx22W1R
-GOOLw2Uk/smss2vSKCp10hNthihR4Lt7Z39JuK22CIAEqoMi65CMBCFHmvvPTtw1
-d6VodcTnO2gDtpBqt7MPo3iZB3WOpk890AwuUSffzoCFlwImcVBvF1akmPL4T1l4
-Ex5qVizdmnkp1nssuYBqRI+qOuXhnqAD6E0eWdsVcsI4KU9LTqvXt/6l8qAHavqQ
-40LpDMyYzAH7rWIAsrgzQsBU9QSucXY0VE9hShMZwSKSnt8YrbU+bDtQHrncwPsz
-kVJm61Pdv9g8OCfo+9hMp5NlgeVDKl0LnyJz/LHZx990P8fMHw1mrjUjW6lbkSMK
-ucJmtBBipkR8LLRzhHj76R6rQggAp762HfeqUtwf/Kxxxgy0cexxMZ7or6n13G7w
-jFBww+DKYw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE9DCCAtygAwIBAgIVALIRwdEJfzws7N9lQBSjie4THMavMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC2lkcDMubWR1LnNlMB4XDTIzMDUyMzE0NDMyMFoXDTMz
-MDUyMzE0NDMyMFowFjEUMBIGA1UEAwwLaWRwMy5tZHUuc2UwggIiMA0GCSqGSIb3
-DQEBAQUAA4ICDwAwggIKAoICAQCSM0KFijd/3XwEtt0anF80MGOknMc7TLBCNI4t
-/Hh/UYiEsgY7byXf5xc4bHHDsO5UNCdt4UC932tpHa+Ga5Xm3OSL7TiJ56CfLRXn
-Rzs2+6OwSas3nLNFo3FLt4rfPGM377P3kX/2hSuw0iNd6k33x1EcEg188o1+q4Zz
-CCByDtfta7L36kxjnaAlYFEtNJzMUDhpkNiRq/IDfnBlvChfLVQJfnnH6EbUmoUN
-LRh5U5/RsRVOdoojhbkzkZTEXgysGBG+neBrzrgB8Rt5dap8xSB/PDmiuBeyTA4g
-x6KYxYr8rYDIb49iOrbVZf52suUZXT8vnqco8Sun/Ak1YZdUYFUpuOxWgJtRq6fE
-oCwF5am21YMUTY/BYPrsOmZi2+bN850CMe9tkVyz/5umPjjOsVneSPzYG4oyBu9V
-eGuzXegbnyASPGw5idWnvO80rPa1PxKjG0ahQgIXw9TBvVCQ7CnutnxUF4NpysKC
-iXlbw7hJj3VfxUrEj9fWOeJdJRsHfT7PHd1K5dorRKoV3N6WtLO+aO7mEElBf9Iv
-VawBjqe70pIdi51cd92ZY4vlscLzVTM5rd4j542Jb8YnnSw2Nyde7bxSajWOLnBW
-cOYLGWXSdA4GpSwP/jDIP/uDr//CpNoGphcTUx8kE8hibF4hk/lzCqL5B7XSsw3o
-yy2/DwIDAQABozkwNzAdBgNVHQ4EFgQUQI1y3tpWzIzB14liEEL3b5Uv2GIwFgYD
-VR0RBA8wDYILaWRwMy5tZHUuc2UwDQYJKoZIhvcNAQELBQADggIBAJElNtgeWJko
-owerEEpoEukLb4bZgj84wu6fa1AdF8Epyue/uqqR3RVkfAC1fWGQ4TYQJIV2f4OA
-l2KYaOAMChl1lze3P3tQT3F5TVCzCQh1w3yukDdPndwmoSdPxEHfUbDWHzGe67u8
-9y3iVFpBQD1P+GRHd7/XgR+HWvvzZY+XsbbRzBDNZgE2zc2NXBCPjlEWlPcUOLN4
-eYt095CljTBVFytSu9gwDq+IXXrHOYsMf3Q72FUzchgJRhX6NouDjnzMq+n+Fw8x
-bU1L2vFI4GZrZVxaj/ldsxwB1Dkq9KkbZe0KrlO/Gm0D8XGfQWVv1uWzXa261Yzg
-JvMfWShVNEKigLzLm9Ag4+rS8ojNx8b5xaBBrVa64bBteIJ+E9gjwujppX8ecBOK
-BHYvdZIpLtiGXST9sGHDjxzCGYF+MXMGJrIVPiLQnJvsZ4STb5Z318b0E0A1qkQF
-EKutAOa7eteNigN8fMZB3X1HI+FjHv22E1z0usGgVVV+UX2vtLmoYt6Peh+jhigU
-VOSaobHsDGYDQSNo+Xn0O4kHYnjq5+Tms69BswQdxcBLx+9ivNvWgCGyZT8Ai6qN
-+9yxW8KvVMeWUZOOE9YLaydI0t4Fsdi0IqIrq89mplf+CdutvWn9nkK0v3Lz0FLi
-4odiRvoCvvwk4SfeSofbW4GH/B8F3YTp</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE8zCCAtugAwIBAgIUWsNpI67gRSzUDI/lkPg50ReK73swDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5tZHUuc2UwHhcNMjMwNTIzMTQ0MzA4WhcNMzMw
-NTIzMTQ0MzA4WjAWMRQwEgYDVQQDDAtpZHAzLm1kdS5zZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAJDMDFYZZ0QhVHBfm5f1nalYpBQDU7eIvSmdDuXZ
-oZeMIC/Vk4yk7jTzwGcOD799uExOVBg625TOL1xg+NvqwIcCGlU6WLMSzH+fsikO
-wTl/eNN8r7YSF+4fOMWifWyDqPi8Lxz05asDOg4xyOrciWmG9lIbUXg03Wx1mdnR
-w2xFq3Hb0S7QDqs8mMWazvI5/ZeGMtdSftT3z6G4brc1LxuAqBTuX2n4BVa2ZnKW
-ttqYrQNZ5IHepih/ZSZ9sHyptLOOBMedLruSm0r2fCG2NEv/TBOMiKmq53bGKM4U
-XX/bW8i96FxXrZxuHBEcOyCLBhXWk5WmIMocdRhpDl9UZ7+95lSTE7igtEAISvm9
-BykWkM7n1yRZFn8jDMQLVaVYCvKDW0/nXWmQD4BGNtQ3ujXJk/iViwuhkPrl37KT
-p8aReS1ClRFHApXj8TV8WEAnnJVPMVUDfIpQZBqWNycJo9d4dOYWpDj2+8WYflk9
-uKdpG1PIl1EfsQMExdXStZwp05XrX/IEYYe24i8slxRZ2G5oPjUAAyD8Zn0XoSV5
-rUTY7XG33awvhpvPdSf/Bst032dXfZf+Ix7YfnOlQi+cYMS0aMUuAAJU0byRIHNm
-9ytqF0VFEDQY0bonFAhd50x0RaICP1oRUynWFUWdwMJP67f0AKY9AmXZOMdQmPRv
-cR/hAgMBAAGjOTA3MB0GA1UdDgQWBBRK/1N3HhEUE2iVh09Hvq4yRIeVCzAWBgNV
-HREEDzANggtpZHAzLm1kdS5zZTANBgkqhkiG9w0BAQsFAAOCAgEAOufaIbqOzTBZ
-KiK2Pq8psS3FiJgds6YE5/ZY2OkXCZC5cVCgebySnbBSELv38/Hz1zfhmoKNOp+4
-UiRTX60XbayUSQL77apu/sh99z5CIYCBrvDw9U+CPFn+5lADS7GaYR5sS7yVLZd2
-h35RTdcT4cvce0S63wRXAWdlK5rL8viUHagvG2jSSigP9t6Vsdk8KXKfTtLGdY61
-1gp7n2zTrrA/IBGxhaRxHzPJ0ItEu6ex3f+FXiIVqkIGNpfvHisaqX0qR03tXune
-Uuqevxbs5z6eFGV8B2OErgWD1DdIg1aco5ZTQAUHhGVP6J6LMFOjI3/1yhdpaJWc
-WP91LwZC6iJ+BT7nPkCoxoCNtY5LUGkWjieaptqW3fEQXzXXtD3B1i5odWloCWER
-eoYAQnfWiDjAE95zvlHa7hRM+Zr4cwtbpNTAycp6sd6p/LiVJ4d1YZvAjXSJKgdh
-6GlprnjXhnFrZ7+CiEWU3/nAsjnbIAP29/Y6QpfKFusUT5NbHejxe+s7vvlbcd9G
-cvEFnUZMXma1uapiWGQXGv70BwO6Dc0KDV0fcH1E4bVfZmzW1+pD7IUrEc4dbnz7
-HmrEU7I6G/A599zoO4JUWwVLHUpKWyHCziNVW+5S/BRc1oBAuPtSFdKtS3atlTg3
-t0BH1/atFD99aRQh3GIAMSe0iL7yvIE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.mdu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp3.mdu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp3.mdu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.mdu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp3.mdu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">The Mälardalen University Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Mälardalens universitet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Mälardalen University-test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Mälardalens universitet-test</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://idp.mdh.se/idp.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://idp.mdh.se/idp.html</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">mdh vasteras eskilstuna malardalen malardalen+university malardalens+hogskola mälardalens+högskola</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="138" width="216">https://idp.mdh.se/idp/images/mdulogo-en.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="130" width="216">https://idp.mdh.se/idp/images/mdulogo-sv.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://portal.mdu.se/privacypolicy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://portal.mdu.se/privacypolicy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUJuVR+zDjW704KaA4mcKa5biaglowDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5tZHUuc2UwHhcNMjMwNTIzMjAyNDAxWhcNMzMw
-NTIzMjAyNDAxWjAWMRQwEgYDVQQDDAtpZHAzLm1kdS5zZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAKUfLAEt2wSWFTriUIarIUWCXoAKSXbHIzVD/5OA
-BfdgmWuhnB2EciPj3tFfoNotOZb5jVLdV/aUOWLtLbv/yPufdmrvm+wqc+LCWhes
-Do6WGBL04rGjG3t536cP4h1WIbiBvy3KbhUDMOGgUi8qhv+KitSwQJOjW8gF5QkV
-/fYJOigND+fMaVc5us3dmXRhWNCTjnQZs9IHZLuuHf+dpTQf7wC5f52GJU4hZFKR
-BCAWJf1OQj63XBCEtEKrocPpRVAMnYDP5WNqIqpwbdhhjW6jH6ZIJTNuNh8QrDHO
-vOgVnbYwZFw5sP1rjfwOBpOj5+OvUcexXjnB5B2g3yVPS86LG8B8OwOMcdo5qmvn
-KMWL1dDAHjkG4VMk3aPpmlneus1+UNaMJQLneYD3fr7RVLOsxW4fPoc9nSx+1t9o
-qoTlp7Lq5i9BmZHUkxuxSwk9FwIpqdLLAhSprujH/UP83bRqFOtSVy5MrnEK6ZgC
-4j9B7TI3DKLWDcq+1RQ2QNpFN18uGRRleJ6W7p0nHhdrORXlFN1dME8ZBSCwC39J
-zfNcd6BijBCZREpsi139psgub8qMe08sW8wME5VKaNFdNHC939ajtxpQf+cQ2zBc
-/6iv2UY3OLdWf2ZmM2NPBIvQrWJ8Kj1QsSHgbR3JYqmzYqcQOms7eMGXUvm4TaZF
-qqgdAgMBAAGjWTBXMB0GA1UdDgQWBBSqiBJpylo+6Pub4jWe4IRVLdy6PDA2BgNV
-HREELzAtggtpZHAzLm1kdS5zZYYeaHR0cHM6Ly9pZHAzLm1kdS5zZS9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4ICAQCEufUjmPMl1ji/rR2K4Z86SySkvKhGe4Sx
-bcDKtOXBGfg3HGtdII5LkKGh4PyTlssHXkhiTJtGuEV/+HyL+shf/T1LRmfhH4ca
-1OShtsH4FOFFKoyoEKnPuwe9iFoVcleapydQkimJ5cpPZw8J9pTOr+RWdrf51ckX
-c+w/zxjpRp65xXB6NPEpirI9KtMwIo4PEzmtZiNX85G6GWjE9M5yAeJZi/Qq6s4n
-DnxRTYWp6nY0aWuHeAf5LLtsXOZbS5WYMMQ3E7OI7/jG0qZd2gpQETUG+Nx22W1R
-GOOLw2Uk/smss2vSKCp10hNthihR4Lt7Z39JuK22CIAEqoMi65CMBCFHmvvPTtw1
-d6VodcTnO2gDtpBqt7MPo3iZB3WOpk890AwuUSffzoCFlwImcVBvF1akmPL4T1l4
-Ex5qVizdmnkp1nssuYBqRI+qOuXhnqAD6E0eWdsVcsI4KU9LTqvXt/6l8qAHavqQ
-40LpDMyYzAH7rWIAsrgzQsBU9QSucXY0VE9hShMZwSKSnt8YrbU+bDtQHrncwPsz
-kVJm61Pdv9g8OCfo+9hMp5NlgeVDKl0LnyJz/LHZx990P8fMHw1mrjUjW6lbkSMK
-ucJmtBBipkR8LLRzhHj76R6rQggAp762HfeqUtwf/Kxxxgy0cexxMZ7or6n13G7w
-jFBww+DKYw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE9DCCAtygAwIBAgIVALIRwdEJfzws7N9lQBSjie4THMavMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC2lkcDMubWR1LnNlMB4XDTIzMDUyMzE0NDMyMFoXDTMz
-MDUyMzE0NDMyMFowFjEUMBIGA1UEAwwLaWRwMy5tZHUuc2UwggIiMA0GCSqGSIb3
-DQEBAQUAA4ICDwAwggIKAoICAQCSM0KFijd/3XwEtt0anF80MGOknMc7TLBCNI4t
-/Hh/UYiEsgY7byXf5xc4bHHDsO5UNCdt4UC932tpHa+Ga5Xm3OSL7TiJ56CfLRXn
-Rzs2+6OwSas3nLNFo3FLt4rfPGM377P3kX/2hSuw0iNd6k33x1EcEg188o1+q4Zz
-CCByDtfta7L36kxjnaAlYFEtNJzMUDhpkNiRq/IDfnBlvChfLVQJfnnH6EbUmoUN
-LRh5U5/RsRVOdoojhbkzkZTEXgysGBG+neBrzrgB8Rt5dap8xSB/PDmiuBeyTA4g
-x6KYxYr8rYDIb49iOrbVZf52suUZXT8vnqco8Sun/Ak1YZdUYFUpuOxWgJtRq6fE
-oCwF5am21YMUTY/BYPrsOmZi2+bN850CMe9tkVyz/5umPjjOsVneSPzYG4oyBu9V
-eGuzXegbnyASPGw5idWnvO80rPa1PxKjG0ahQgIXw9TBvVCQ7CnutnxUF4NpysKC
-iXlbw7hJj3VfxUrEj9fWOeJdJRsHfT7PHd1K5dorRKoV3N6WtLO+aO7mEElBf9Iv
-VawBjqe70pIdi51cd92ZY4vlscLzVTM5rd4j542Jb8YnnSw2Nyde7bxSajWOLnBW
-cOYLGWXSdA4GpSwP/jDIP/uDr//CpNoGphcTUx8kE8hibF4hk/lzCqL5B7XSsw3o
-yy2/DwIDAQABozkwNzAdBgNVHQ4EFgQUQI1y3tpWzIzB14liEEL3b5Uv2GIwFgYD
-VR0RBA8wDYILaWRwMy5tZHUuc2UwDQYJKoZIhvcNAQELBQADggIBAJElNtgeWJko
-owerEEpoEukLb4bZgj84wu6fa1AdF8Epyue/uqqR3RVkfAC1fWGQ4TYQJIV2f4OA
-l2KYaOAMChl1lze3P3tQT3F5TVCzCQh1w3yukDdPndwmoSdPxEHfUbDWHzGe67u8
-9y3iVFpBQD1P+GRHd7/XgR+HWvvzZY+XsbbRzBDNZgE2zc2NXBCPjlEWlPcUOLN4
-eYt095CljTBVFytSu9gwDq+IXXrHOYsMf3Q72FUzchgJRhX6NouDjnzMq+n+Fw8x
-bU1L2vFI4GZrZVxaj/ldsxwB1Dkq9KkbZe0KrlO/Gm0D8XGfQWVv1uWzXa261Yzg
-JvMfWShVNEKigLzLm9Ag4+rS8ojNx8b5xaBBrVa64bBteIJ+E9gjwujppX8ecBOK
-BHYvdZIpLtiGXST9sGHDjxzCGYF+MXMGJrIVPiLQnJvsZ4STb5Z318b0E0A1qkQF
-EKutAOa7eteNigN8fMZB3X1HI+FjHv22E1z0usGgVVV+UX2vtLmoYt6Peh+jhigU
-VOSaobHsDGYDQSNo+Xn0O4kHYnjq5+Tms69BswQdxcBLx+9ivNvWgCGyZT8Ai6qN
-+9yxW8KvVMeWUZOOE9YLaydI0t4Fsdi0IqIrq89mplf+CdutvWn9nkK0v3Lz0FLi
-4odiRvoCvvwk4SfeSofbW4GH/B8F3YTp</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE8zCCAtugAwIBAgIUWsNpI67gRSzUDI/lkPg50ReK73swDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5tZHUuc2UwHhcNMjMwNTIzMTQ0MzA4WhcNMzMw
-NTIzMTQ0MzA4WjAWMRQwEgYDVQQDDAtpZHAzLm1kdS5zZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAJDMDFYZZ0QhVHBfm5f1nalYpBQDU7eIvSmdDuXZ
-oZeMIC/Vk4yk7jTzwGcOD799uExOVBg625TOL1xg+NvqwIcCGlU6WLMSzH+fsikO
-wTl/eNN8r7YSF+4fOMWifWyDqPi8Lxz05asDOg4xyOrciWmG9lIbUXg03Wx1mdnR
-w2xFq3Hb0S7QDqs8mMWazvI5/ZeGMtdSftT3z6G4brc1LxuAqBTuX2n4BVa2ZnKW
-ttqYrQNZ5IHepih/ZSZ9sHyptLOOBMedLruSm0r2fCG2NEv/TBOMiKmq53bGKM4U
-XX/bW8i96FxXrZxuHBEcOyCLBhXWk5WmIMocdRhpDl9UZ7+95lSTE7igtEAISvm9
-BykWkM7n1yRZFn8jDMQLVaVYCvKDW0/nXWmQD4BGNtQ3ujXJk/iViwuhkPrl37KT
-p8aReS1ClRFHApXj8TV8WEAnnJVPMVUDfIpQZBqWNycJo9d4dOYWpDj2+8WYflk9
-uKdpG1PIl1EfsQMExdXStZwp05XrX/IEYYe24i8slxRZ2G5oPjUAAyD8Zn0XoSV5
-rUTY7XG33awvhpvPdSf/Bst032dXfZf+Ix7YfnOlQi+cYMS0aMUuAAJU0byRIHNm
-9ytqF0VFEDQY0bonFAhd50x0RaICP1oRUynWFUWdwMJP67f0AKY9AmXZOMdQmPRv
-cR/hAgMBAAGjOTA3MB0GA1UdDgQWBBRK/1N3HhEUE2iVh09Hvq4yRIeVCzAWBgNV
-HREEDzANggtpZHAzLm1kdS5zZTANBgkqhkiG9w0BAQsFAAOCAgEAOufaIbqOzTBZ
-KiK2Pq8psS3FiJgds6YE5/ZY2OkXCZC5cVCgebySnbBSELv38/Hz1zfhmoKNOp+4
-UiRTX60XbayUSQL77apu/sh99z5CIYCBrvDw9U+CPFn+5lADS7GaYR5sS7yVLZd2
-h35RTdcT4cvce0S63wRXAWdlK5rL8viUHagvG2jSSigP9t6Vsdk8KXKfTtLGdY61
-1gp7n2zTrrA/IBGxhaRxHzPJ0ItEu6ex3f+FXiIVqkIGNpfvHisaqX0qR03tXune
-Uuqevxbs5z6eFGV8B2OErgWD1DdIg1aco5ZTQAUHhGVP6J6LMFOjI3/1yhdpaJWc
-WP91LwZC6iJ+BT7nPkCoxoCNtY5LUGkWjieaptqW3fEQXzXXtD3B1i5odWloCWER
-eoYAQnfWiDjAE95zvlHa7hRM+Zr4cwtbpNTAycp6sd6p/LiVJ4d1YZvAjXSJKgdh
-6GlprnjXhnFrZ7+CiEWU3/nAsjnbIAP29/Y6QpfKFusUT5NbHejxe+s7vvlbcd9G
-cvEFnUZMXma1uapiWGQXGv70BwO6Dc0KDV0fcH1E4bVfZmzW1+pD7IUrEc4dbnz7
-HmrEU7I6G/A599zoO4JUWwVLHUpKWyHCziNVW+5S/BRc1oBAuPtSFdKtS3atlTg3
-t0BH1/atFD99aRQh3GIAMSe0iL7yvIE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp3.mdu.se/idp/profile/Authn/SAML2/POST/SSO" index="0"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Mälardalen University-test</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Mälardalens universitet-test</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mdh.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFEzCCAvugAwIBAgIUJuVR+zDjW704KaA4mcKa5biaglowDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5tZHUuc2UwHhcNMjMwNTIzMjAyNDAxWhcNMzMw
-NTIzMjAyNDAxWjAWMRQwEgYDVQQDDAtpZHAzLm1kdS5zZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAKUfLAEt2wSWFTriUIarIUWCXoAKSXbHIzVD/5OA
-BfdgmWuhnB2EciPj3tFfoNotOZb5jVLdV/aUOWLtLbv/yPufdmrvm+wqc+LCWhes
-Do6WGBL04rGjG3t536cP4h1WIbiBvy3KbhUDMOGgUi8qhv+KitSwQJOjW8gF5QkV
-/fYJOigND+fMaVc5us3dmXRhWNCTjnQZs9IHZLuuHf+dpTQf7wC5f52GJU4hZFKR
-BCAWJf1OQj63XBCEtEKrocPpRVAMnYDP5WNqIqpwbdhhjW6jH6ZIJTNuNh8QrDHO
-vOgVnbYwZFw5sP1rjfwOBpOj5+OvUcexXjnB5B2g3yVPS86LG8B8OwOMcdo5qmvn
-KMWL1dDAHjkG4VMk3aPpmlneus1+UNaMJQLneYD3fr7RVLOsxW4fPoc9nSx+1t9o
-qoTlp7Lq5i9BmZHUkxuxSwk9FwIpqdLLAhSprujH/UP83bRqFOtSVy5MrnEK6ZgC
-4j9B7TI3DKLWDcq+1RQ2QNpFN18uGRRleJ6W7p0nHhdrORXlFN1dME8ZBSCwC39J
-zfNcd6BijBCZREpsi139psgub8qMe08sW8wME5VKaNFdNHC939ajtxpQf+cQ2zBc
-/6iv2UY3OLdWf2ZmM2NPBIvQrWJ8Kj1QsSHgbR3JYqmzYqcQOms7eMGXUvm4TaZF
-qqgdAgMBAAGjWTBXMB0GA1UdDgQWBBSqiBJpylo+6Pub4jWe4IRVLdy6PDA2BgNV
-HREELzAtggtpZHAzLm1kdS5zZYYeaHR0cHM6Ly9pZHAzLm1kdS5zZS9zaGliYm9s
-ZXRoMA0GCSqGSIb3DQEBCwUAA4ICAQCEufUjmPMl1ji/rR2K4Z86SySkvKhGe4Sx
-bcDKtOXBGfg3HGtdII5LkKGh4PyTlssHXkhiTJtGuEV/+HyL+shf/T1LRmfhH4ca
-1OShtsH4FOFFKoyoEKnPuwe9iFoVcleapydQkimJ5cpPZw8J9pTOr+RWdrf51ckX
-c+w/zxjpRp65xXB6NPEpirI9KtMwIo4PEzmtZiNX85G6GWjE9M5yAeJZi/Qq6s4n
-DnxRTYWp6nY0aWuHeAf5LLtsXOZbS5WYMMQ3E7OI7/jG0qZd2gpQETUG+Nx22W1R
-GOOLw2Uk/smss2vSKCp10hNthihR4Lt7Z39JuK22CIAEqoMi65CMBCFHmvvPTtw1
-d6VodcTnO2gDtpBqt7MPo3iZB3WOpk890AwuUSffzoCFlwImcVBvF1akmPL4T1l4
-Ex5qVizdmnkp1nssuYBqRI+qOuXhnqAD6E0eWdsVcsI4KU9LTqvXt/6l8qAHavqQ
-40LpDMyYzAH7rWIAsrgzQsBU9QSucXY0VE9hShMZwSKSnt8YrbU+bDtQHrncwPsz
-kVJm61Pdv9g8OCfo+9hMp5NlgeVDKl0LnyJz/LHZx990P8fMHw1mrjUjW6lbkSMK
-ucJmtBBipkR8LLRzhHj76R6rQggAp762HfeqUtwf/Kxxxgy0cexxMZ7or6n13G7w
-jFBww+DKYw==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE9DCCAtygAwIBAgIVALIRwdEJfzws7N9lQBSjie4THMavMA0GCSqGSIb3DQEB
-CwUAMBYxFDASBgNVBAMMC2lkcDMubWR1LnNlMB4XDTIzMDUyMzE0NDMyMFoXDTMz
-MDUyMzE0NDMyMFowFjEUMBIGA1UEAwwLaWRwMy5tZHUuc2UwggIiMA0GCSqGSIb3
-DQEBAQUAA4ICDwAwggIKAoICAQCSM0KFijd/3XwEtt0anF80MGOknMc7TLBCNI4t
-/Hh/UYiEsgY7byXf5xc4bHHDsO5UNCdt4UC932tpHa+Ga5Xm3OSL7TiJ56CfLRXn
-Rzs2+6OwSas3nLNFo3FLt4rfPGM377P3kX/2hSuw0iNd6k33x1EcEg188o1+q4Zz
-CCByDtfta7L36kxjnaAlYFEtNJzMUDhpkNiRq/IDfnBlvChfLVQJfnnH6EbUmoUN
-LRh5U5/RsRVOdoojhbkzkZTEXgysGBG+neBrzrgB8Rt5dap8xSB/PDmiuBeyTA4g
-x6KYxYr8rYDIb49iOrbVZf52suUZXT8vnqco8Sun/Ak1YZdUYFUpuOxWgJtRq6fE
-oCwF5am21YMUTY/BYPrsOmZi2+bN850CMe9tkVyz/5umPjjOsVneSPzYG4oyBu9V
-eGuzXegbnyASPGw5idWnvO80rPa1PxKjG0ahQgIXw9TBvVCQ7CnutnxUF4NpysKC
-iXlbw7hJj3VfxUrEj9fWOeJdJRsHfT7PHd1K5dorRKoV3N6WtLO+aO7mEElBf9Iv
-VawBjqe70pIdi51cd92ZY4vlscLzVTM5rd4j542Jb8YnnSw2Nyde7bxSajWOLnBW
-cOYLGWXSdA4GpSwP/jDIP/uDr//CpNoGphcTUx8kE8hibF4hk/lzCqL5B7XSsw3o
-yy2/DwIDAQABozkwNzAdBgNVHQ4EFgQUQI1y3tpWzIzB14liEEL3b5Uv2GIwFgYD
-VR0RBA8wDYILaWRwMy5tZHUuc2UwDQYJKoZIhvcNAQELBQADggIBAJElNtgeWJko
-owerEEpoEukLb4bZgj84wu6fa1AdF8Epyue/uqqR3RVkfAC1fWGQ4TYQJIV2f4OA
-l2KYaOAMChl1lze3P3tQT3F5TVCzCQh1w3yukDdPndwmoSdPxEHfUbDWHzGe67u8
-9y3iVFpBQD1P+GRHd7/XgR+HWvvzZY+XsbbRzBDNZgE2zc2NXBCPjlEWlPcUOLN4
-eYt095CljTBVFytSu9gwDq+IXXrHOYsMf3Q72FUzchgJRhX6NouDjnzMq+n+Fw8x
-bU1L2vFI4GZrZVxaj/ldsxwB1Dkq9KkbZe0KrlO/Gm0D8XGfQWVv1uWzXa261Yzg
-JvMfWShVNEKigLzLm9Ag4+rS8ojNx8b5xaBBrVa64bBteIJ+E9gjwujppX8ecBOK
-BHYvdZIpLtiGXST9sGHDjxzCGYF+MXMGJrIVPiLQnJvsZ4STb5Z318b0E0A1qkQF
-EKutAOa7eteNigN8fMZB3X1HI+FjHv22E1z0usGgVVV+UX2vtLmoYt6Peh+jhigU
-VOSaobHsDGYDQSNo+Xn0O4kHYnjq5+Tms69BswQdxcBLx+9ivNvWgCGyZT8Ai6qN
-+9yxW8KvVMeWUZOOE9YLaydI0t4Fsdi0IqIrq89mplf+CdutvWn9nkK0v3Lz0FLi
-4odiRvoCvvwk4SfeSofbW4GH/B8F3YTp</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE8zCCAtugAwIBAgIUWsNpI67gRSzUDI/lkPg50ReK73swDQYJKoZIhvcNAQEL
-BQAwFjEUMBIGA1UEAwwLaWRwMy5tZHUuc2UwHhcNMjMwNTIzMTQ0MzA4WhcNMzMw
-NTIzMTQ0MzA4WjAWMRQwEgYDVQQDDAtpZHAzLm1kdS5zZTCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBAJDMDFYZZ0QhVHBfm5f1nalYpBQDU7eIvSmdDuXZ
-oZeMIC/Vk4yk7jTzwGcOD799uExOVBg625TOL1xg+NvqwIcCGlU6WLMSzH+fsikO
-wTl/eNN8r7YSF+4fOMWifWyDqPi8Lxz05asDOg4xyOrciWmG9lIbUXg03Wx1mdnR
-w2xFq3Hb0S7QDqs8mMWazvI5/ZeGMtdSftT3z6G4brc1LxuAqBTuX2n4BVa2ZnKW
-ttqYrQNZ5IHepih/ZSZ9sHyptLOOBMedLruSm0r2fCG2NEv/TBOMiKmq53bGKM4U
-XX/bW8i96FxXrZxuHBEcOyCLBhXWk5WmIMocdRhpDl9UZ7+95lSTE7igtEAISvm9
-BykWkM7n1yRZFn8jDMQLVaVYCvKDW0/nXWmQD4BGNtQ3ujXJk/iViwuhkPrl37KT
-p8aReS1ClRFHApXj8TV8WEAnnJVPMVUDfIpQZBqWNycJo9d4dOYWpDj2+8WYflk9
-uKdpG1PIl1EfsQMExdXStZwp05XrX/IEYYe24i8slxRZ2G5oPjUAAyD8Zn0XoSV5
-rUTY7XG33awvhpvPdSf/Bst032dXfZf+Ix7YfnOlQi+cYMS0aMUuAAJU0byRIHNm
-9ytqF0VFEDQY0bonFAhd50x0RaICP1oRUynWFUWdwMJP67f0AKY9AmXZOMdQmPRv
-cR/hAgMBAAGjOTA3MB0GA1UdDgQWBBRK/1N3HhEUE2iVh09Hvq4yRIeVCzAWBgNV
-HREEDzANggtpZHAzLm1kdS5zZTANBgkqhkiG9w0BAQsFAAOCAgEAOufaIbqOzTBZ
-KiK2Pq8psS3FiJgds6YE5/ZY2OkXCZC5cVCgebySnbBSELv38/Hz1zfhmoKNOp+4
-UiRTX60XbayUSQL77apu/sh99z5CIYCBrvDw9U+CPFn+5lADS7GaYR5sS7yVLZd2
-h35RTdcT4cvce0S63wRXAWdlK5rL8viUHagvG2jSSigP9t6Vsdk8KXKfTtLGdY61
-1gp7n2zTrrA/IBGxhaRxHzPJ0ItEu6ex3f+FXiIVqkIGNpfvHisaqX0qR03tXune
-Uuqevxbs5z6eFGV8B2OErgWD1DdIg1aco5ZTQAUHhGVP6J6LMFOjI3/1yhdpaJWc
-WP91LwZC6iJ+BT7nPkCoxoCNtY5LUGkWjieaptqW3fEQXzXXtD3B1i5odWloCWER
-eoYAQnfWiDjAE95zvlHa7hRM+Zr4cwtbpNTAycp6sd6p/LiVJ4d1YZvAjXSJKgdh
-6GlprnjXhnFrZ7+CiEWU3/nAsjnbIAP29/Y6QpfKFusUT5NbHejxe+s7vvlbcd9G
-cvEFnUZMXma1uapiWGQXGv70BwO6Dc0KDV0fcH1E4bVfZmzW1+pD7IUrEc4dbnz7
-HmrEU7I6G/A599zoO4JUWwVLHUpKWyHCziNVW+5S/BRc1oBAuPtSFdKtS3atlTg3
-t0BH1/atFD99aRQh3GIAMSe0iL7yvIE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp3.mdu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Mälardalen University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Mälardalens universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mälardalen University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Mälardalens universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.mdu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.mdu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mälardalen University</md:Company>
-    <md:SurName>Peter Falck</md:SurName>
-    <md:EmailAddress>mailto:peter.falck@mdu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mälardalen University</md:Company>
-    <md:SurName>MDU Drift</md:SurName>
-    <md:EmailAddress>mailto:drift.ita@mdu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 21 101499</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mälardalen University</md:Company>
-    <md:SurName>Helpdesk MDU</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@mdu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 16 101550</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Mälardalen University</md:Company>
-    <md:GivenName>Peter</md:GivenName>
-    <md:SurName>Falck</md:SurName>
-    <md:EmailAddress>mailto:abuse@mdu.se</md:EmailAddress>
-    <md:TelephoneNumber>+4621101499</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idportal-dev.slu.se-sp.xml b/metadata/swamid-testing/idportal-dev.slu.se-sp.xml
deleted file mode 100644
index e1b94ab1..00000000
--- a/metadata/swamid-testing/idportal-dev.slu.se-sp.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idportal-dev.slu.se/sp">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-06-20T10:42:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Service allowing slu users to activate their account and confirm identity</mdui:Description>
-        <mdui:Description xml:lang="sv">Tjänst för att låta slus användare hämta ut konto och bekräfta sin identitet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">SLU Idportal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">SLU Idportal</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://idportal.slu.se/policy/infoen</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://idportal.slu.se/policy/infosv</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idportal.slu.se/policy/eduidpolicyEn</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://idportal.slu.se/policy/eduidpolicysv</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFxzCCA6+gAwIBAgIUV3nkQQJon6HzL4kdcqspOSTeZd8wDQYJKoZIhvcNAQELBQAwczELMAkGA1UEBhMCU0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExDDAKBgNVBAoMA1NMVTEWMBQGA1UECwwNSVQgRGVwYXJ0bWVudDEaMBgGA1UEAwwRaWRwb3J0YWwtZGV2LXNpZ24wHhcNMjMwNjIwMDg0NzQ3WhcNMzMwNjE3MDg0NzQ3WjBzMQswCQYDVQQGEwJTRTEQMA4GA1UECAwHVXBwc2FsYTEQMA4GA1UEBwwHVXBwc2FsYTEMMAoGA1UECgwDU0xVMRYwFAYDVQQLDA1JVCBEZXBhcnRtZW50MRowGAYDVQQDDBFpZHBvcnRhbC1kZXYtc2lnbjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK4VNk02S21yorNMJeST68LU0GPcwhx5j6lC4N2t87UkEHg/XuT+4UiOrAodDHiZLww+j2uMU+Oj61GjBwM3smSxe/+KZnO3eB0FPYyekFqox4/WeLw4ESWOl1JNXy6Hb4XPU+jwGoLkYbiZcK5F69izbrFazSFWOZyXjmenJItOyNpavG3i+tsBi0o0uQ9eGwHiCH6HRqwPwalnbhlMoBGvC2RlaES9hbru0UsYd2RUzXoAvSxYdV/oUP5qfeP5eoyKG1WhO+eYgNZX0I8/jRQZEUqLgwbZAZ6/Fgij8Cb8cfxjq3Tauvf4DhjrvGUhg+kVf8zYUwsIq5eMebzWMS9EXXF0JmuujBj4558TNWLNG2CHFmBa/V8wnwxTwsS9CrqKXcmKIORsLOAd2qyw9660igcxvP0uCovVKh7qa3RNXw4qoFHvaPtZzc8CDp32FqcXqC57lJjYGo3NWB/0rAllo6BydAQ9UOfftyHdUFFHqQRXJmraEzNDua8vC7+urZ4z+qR3yC8Txk/pSd/nhuQBuiSIvnPzXaFpPCre1Nd1XRCKYyRaEhSyuWb2ee347PA91gj/pdbnWx2qR1Orp7DbLs3F9Sc1UHnsevL+AFspFifYzTgQyz0nxYp7DlplACJZy2h2s2/49GBFgIrVZtX0sce95qsEsLQtWe8+mGktAgMBAAGjUzBRMB0GA1UdDgQWBBSY8z7j6ucKQKPOyeLzypsPjv4qsTAfBgNVHSMEGDAWgBSY8z7j6ucKQKPOyeLzypsPjv4qsTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAHXbVIvDIkh4WryP72zCQk/mNgfvhwdIq0u5KCDCCG7RE7HJx0btK1SORmteAp20ZrlphXteqygbR9VkyJHm8D3MyHZQMKUOJ6Q0xlo/jnYi3eQ516c5xW/ZgYpL2rfXa79XHQ9zz3b6Ljww2x1CuWaBcYi4mbniNCyFR2GvMEmq+WuixIrXW3SH15SVMN1d8gW7OS3kfPQfNoO+BPx6AGc2+hNBWmuBpL8r0go8ZkYJ74QDMC9ZTNflBzHlmWV9Zz6TLw3tbfGBtEA144/vjDMdWPeKNOaY08uwNJOlCf20oaq/0+zM63rBeg3+/vOxdvzvIorkNQRos/tPLnom2CayytIlVjB3xKlYjGG+sUjxPx82rxB2KI6zOK8I9c/ToTKFlflatCR+vXk8U1yO4LeFfd+SBGTPVJ5VBd4BuftbnI0I+gnYx52NCLt1n+5lZaA4D/zZd3Uuhv7CaywlrLgvEjhNifVmDMmpsmY4tOBHWnF7KN31gb7Hwp24mHwsatImB6k8hNFbOoI3KBAV7Q7gZ8BfXVEcOHOpGQHec48Pu/5zd8os8SqSKQfY5ikqu5JpfnGwOpv0omuPS7i2uMGhCj7NafoTOejM/AwUm/8oS0mc1U5tNZOJedX6YUJU6cqBi8B7zr+GBQjQJuggKl3GXWf3FHS/BRE84yPFSUew==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFxTCCA62gAwIBAgIUdXqG11CBJWv69M/KlKgM6pEvFaswDQYJKoZIhvcNAQELBQAwcjELMAkGA1UEBhMCU0UxEDAOBgNVBAgMB1VwcHNhbGExEDAOBgNVBAcMB1VwcHNhbGExDDAKBgNVBAoMA1NMVTEWMBQGA1UECwwNSVQgRGVwYXJ0bWVudDEZMBcGA1UEAwwQaWRwb3J0YWwtZGV2LWVuYzAeFw0yMzA2MjAwODQ4MDlaFw0zMzA2MTcwODQ4MDlaMHIxCzAJBgNVBAYTAlNFMRAwDgYDVQQIDAdVcHBzYWxhMRAwDgYDVQQHDAdVcHBzYWxhMQwwCgYDVQQKDANTTFUxFjAUBgNVBAsMDUlUIERlcGFydG1lbnQxGTAXBgNVBAMMEGlkcG9ydGFsLWRldi1lbmMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDmMuC/1oF6wkvmgRxPlg3fT7UEiJ/73ZA6L2pBhxAvL+Ia9ym8lfcQVTBM/sXkSq2IqzzrOvTsT7daRiOc7Rzt2hBQQtwSksO/+wB2ZwsA09U+UE/DuQx/D3bTK98Yn/rIY//+NLTeXbOxDfQ8Ryvi1IKJfd5761fWnJn+dWA6cYngZYPsggBViyqWlxFex8U+7pKFWohsmYeFiEy544uWOQGV2mpVnFmCXSNbEqtW2pV526MthSQk/Rshhf2DiTE8CoK7YQL2X9w40d0rtZ4yjZq18zVn5uB5CJVZsCIoNPLE7qMVpaQgSTtBajWcfMCSMSddg5Ka+ZMlGR0Ohqp0FZQUhivS+GyLeNNbFHtdaGQz7R0Z/GKBEo1hKyzR/3S35PO9VBClbuYFA8YKN/wSRzidfi/T3csiZZNcViN4Oqo5xe6yEcU7Uh8dv5vuSdEhm9kXlS4B87YvDT2agn+qMdvRDrbBdZbrdJfc54frJFYJ2hT+qcZkuU3NK7/6zrViEnRSQ49XaWAJLqVxX4yQ2vbKWwwunweakH8rnN7C9brAZDNMdMv6VxAflqVJUxU7wed2fmZ0KEOv50aldnzFPWM4nWw+qiLtFKXk+MXmY9qNxEb4X81QrNSQz0LFArMPyLBUoBZYglEFAr/Orq3PLKcD/0IbNQDGOvJGkAFI8wIDAQABo1MwUTAdBgNVHQ4EFgQUg4VkGsQrUJO3eziaUg36g56fDeMwHwYDVR0jBBgwFoAUg4VkGsQrUJO3eziaUg36g56fDeMwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAmtSfmkpd8/lduex9J/+RtRaJnrx27bAcFE9dydu1p9zVap4N/Mnbmb3xHghH1p0+61ogJxO8HqIsUco7JctwHz9Qe20qx4QcGSqjFdb9sicjqYAnRkhx9EUBXfZQKZFf6a7nLiqCmHdzMlx56oHDSMjnP9t7Vp3brZFe0odIgca1aLVOjoM4872OITH1XsNbJDMRZoCGfGfhpTFTd+KdZ+vgZB3MhIfZFOwEVqPkED3tm9wodWDNbJbkxeMhpXILGy2fFLMnAjFLihmKfa53vD7hHWiLE5N8V6ogec3+CV7IKtJH5/23gkL+mZdTpRBcQz7uAQ98miMMjjsBCdGLGumfVDfBoDgUtjN5XH8xpRDMnVbKvXTbg7Ac3vv5WYhQSCzfHbUJWQu1gc3OjXqOImx7uMkwCWPIrLpxjiDtywDVZS+8TXFn2MSbCXPMu8l/IweYdm7PhCZeRmppcBZnIWwX7a8lKwJhAOWnRsHMBlsi+o/DMLSPyjf5dZcF5gE6RW1ZbZ2V1FINE68+XzxioAXFAWxL011r3La/mOFni5nuP8I2S6y97ERbFbugvGICgd4YScuKBMmBs+xt93WgsnsmYAFlSPWC3G/+rKgbgUsDLG5uqzLpibNHNP6NEE/AfkaPWnqQfWajtkl/xQtbqDaizNVojpLrHr1pbG0/AI0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://localhost:7271/sp/Logout"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:7271/sp/Acs" isDefault="true" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://localhost:7271/sp/Acs" isDefault="false" index="1"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">idportal slu</md:ServiceName>
-      <md:ServiceName xml:lang="sv">idportal slu</md:ServiceName>
-      <md:RequestedAttribute isRequired="true" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="norEduPersonNIN"/>
-      <md:RequestedAttribute isRequired="true" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
-      <md:RequestedAttribute isRequired="true" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
-      <md:RequestedAttribute isRequired="true" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-      <md:RequestedAttribute isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAssurance"/>
-      <md:RequestedAttribute isRequired="true" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute isRequired="true" Name="urn:oid:2.16.840.1.113730.3.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mailLocalAddress"/>
-      <md:RequestedAttribute isRequired="true" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-    </md:AttributeConsumingService>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">idportal-test</md:ServiceName>
-      <md:ServiceName xml:lang="sv">idportal-test</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mailLocalAddress" Name="urn:oid:2.16.840.1.113730.3.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Sveriges lantbruksuniversitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Swedish University of Agricultural Sciences</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.slu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.slu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:support@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>SLU säkerhet</md:GivenName>
-    <md:EmailAddress>mailto:sakerhet@slu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml b/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
deleted file mode 100644
index 7877105e..00000000
--- a/metadata/swamid-testing/idptest.it.gu.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://idptest.it.gu.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-01-23T17:04:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://idptest.it.gu.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">The University of Gothenburg Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:Description xml:lang="sv">Identity Provider för anställda och studenter vid Göteborgs universitet.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">University of Gothenburg Test (ADFS idptest.it.gu.se)</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.gu.se/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.gu.se/</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="40" width="277">https://idp3.it.gu.se/idp/images/1374690_lo_gu_left.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="sv">Göteborgs universitet (ADFS idptest.it.gu.se)</mdui:DisplayName>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>gu.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:57.6981,11.9716</mdui:GeolocationHint>
-        <mdui:IPHint>130.241.0.0/18</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:d::/48</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFTjCCAzagAwIBAgIQIdfXkycblbFCU8nAIyh5bjANBgkqhkiG9w0BAQUFADAmMSQwIgYDVQQDDBtlbmNyeXB0aW9uLmlkcHRlc3QuaXQuZ3Uuc2UwHhcNMjIxMDI4MTMwMDI5WhcNMzIxMDI4MTMxMDI4WjAmMSQwIgYDVQQDDBtlbmNyeXB0aW9uLmlkcHRlc3QuaXQuZ3Uuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCmagmdoP5kL1tEMmtgKkmxHStaIBDPHcYea6vFIIJ/JWHRBzLfPqeT2e2nHaHXCmUdWYF04lqf5tbjY6lowcLexIX8IKgqUHNoyoT7MHFz18VgAzCBqKWwETnyiWac2voaMuJxZjNFEW0/2INIKv72nt/euCPv+fHJ1kunCwk5CFSvYYRSBFHpO+9ADlKFbKrE2h7ERzvjjPMMxfKahJBFMnuDQOnOHtIfXxuhWjMGbpFWBAkVtqUZTKBYSJtu0WZ2Bt3coxu30vm3KGNomk/twts0QOVXwNEfTLTDzr5bZoyKbJRbQy+JYBeEYVAo6sHII7aibNn/V6J941YhaVRAd0hXicBi0jKbhsYeGexV39tQbCIWmh24Cth0zv81Od/vF1UNscNPFyUYh8xsoJsZi+jmiPVY7N2dcVFRiuFMB8jgvbY1DEsliVcaM6Wt3VjE2CBSE4XzjQNucfQA5eSiPR1ZAq+sawdfpkavCXzH0TqEqxbR64pebS+ECB9O/SUOTTxnN/kIaUgEBxN29nIn22uvYriiLutGQsBHbR62eUKgLK4gsAV8FLdUfWjxar2QFJaW/7sC4BBNfu3WmibwgtQGGqbO1cq2POj3IoFIM6d5YztcIKVAtePQLSf+HwOJgYF61TCisX4euYiktv7cQwz8pREaUgcHXBeAGueD1QIDAQABo3gwdjAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMCYGA1UdEQQfMB2CG2VuY3J5cHRpb24uaWRwdGVzdC5pdC5ndS5zZTAdBgNVHQ4EFgQUgodGk+sIKLY8mFhSlG1xhShKdtkwDQYJKoZIhvcNAQEFBQADggIBAGrOokelMYqPDd8ADlzqZFlEHUAzqOBhdqC6flNdqhmOlU483yaodVnQEnTmPkSbZhpLVemoiO1Tr1KhV/YEemVqY6w9wG5+qRkU+v7yMcKXKixMMrDNNAj23ve6FnuhbhEgmuKowhrUSQ5Dhz0ammSUJhAtxJ42ZCc8DbyWxE6xrgPFWjSb+dG1cet/mK13ew79cqMQwJCCTGSI6/of4Bq53FSvOBc9Y1/Up57HwhEDNL1ipWKGbJAXsj20vzgOJmS0xSa25JK2rz98plc8HuVG8XdzB6Gq9VrEDWXYx97aijF3S8exunhe1x2FgdVXT/MSwuW6AQfgSRMO8idDC2+svLd/TznDcd0qyAMSaoaFZnctjVyKoVWme+gmq717NJx7Yft+YBW2PPXUNYXgunhuNK5Gbak1eRf7pJHUu2dBeNoOkt9K1ZinRJeKvcPO0HpKJYlddqEUdJE1pBwhhUCsXJKbDfqEVyV8Wv0dpT4MiQoVgCDvhYV2m6j0B+pQhBJOTqwi8hEBVXKj1ryn+NhZ7Y8JujwFVrsrUdR/xVr0sJeqNXbsjYFJo4XKGy0NcD8saVFGnLA7I0HkmlWDD+jw4f+14W/4D447jJcNI/BiNcqy4I46kz2FnNGFYLHmyC6a0xbPpfIWZ47n3UUwpawUvHlLF0RROYgK9dhSryIw</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFRTCCAy2gAwIBAgIQbLhJQtvaeJ9A4Z3lIobPkTANBgkqhkiG9w0BAQUFADAjMSEwHwYDVQQDDBhzaWduaW5nLmlkcHRlc3QuaXQuZ3Uuc2UwHhcNMjIxMDI4MTMwMDMwWhcNMzIxMDI4MTMxMDMwWjAjMSEwHwYDVQQDDBhzaWduaW5nLmlkcHRlc3QuaXQuZ3Uuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDGJlnvJ57vll9UjDtOj28ndzfZcR2i3bRLuTaep4GZYI7jqP8FOfS/b0JA6iYwgUsYPk6+LljkNpi38hXH0/8xypPmUmQzQkQw0kvzmb8b7Vj4NAA78+zxIFH0v/R+EwqCQRCkSr2fk26S+MaWHcH0HNiN0Sdbedmu/BXIS7dOZp3a0RaELkszl421mdULQYoKWFn5AElKELfEi1tnZxj4wIV7U7AIhtHVtPSU6N9/JAL7TZd76uP/yxpLN467q4YRe9GCXM/VE0SDHrrkro9m1sV1+/puTSSlABt+LsOdoqlUWm/EDdjyR3xBb0iGbiI++xo2VYLz+M4pXmkd+/F8+PRhQCJbD/Cl8tJDcxFQwxQzozhZL4phmmccffgOBcJyQhAF5LXYaa56caF5TqljgGfhHsWq4pKJqq3mr7Z/4I2VSUipyv57pLJqm2TeQwI2eeXxCb7MjEw+4fTG4Pq7p9NUZ9AWi8yR8W9lTuLTClSxD92PCJRyXg4Y/USX5oNPhmL3Sgr7LrqUrdivqG5otz27anqz7EjHYtiPAsMBR3D2nHtwPUbRwNV0ZkUhKoH8C66eoh5LTwt9bn1yMW9t9xqmZRHLm+NASCvWJ6Wgsa3tfutPQi9B+QIwVuS5Vf8W67eYaFHyzOTZoEhqbH5228eMQtqoz1Ba3YN72KXPQQIDAQABo3UwczAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMCMGA1UdEQQcMBqCGHNpZ25pbmcuaWRwdGVzdC5pdC5ndS5zZTAdBgNVHQ4EFgQUR/h5kDCVJcIEOaIODeCUUcloE84wDQYJKoZIhvcNAQEFBQADggIBADLtRN8rBgg+p0r9apX6i72yoJgb3ciFk1kc3MPTXfbubQmcLsoXmzcGsLqPft7qIVIS4BW7MPHBFRN7JLeiqpBSMCizId5WgkXTCsQCRjkmQoM79WI+KFDsW6S51clgRYBq+DwuJ/RKK9WKyBVth0/k13J08Hlv0WEwgq8k5ogKz77NdKGSp95d5AARsF2wtOGxNh8bDqzddwU/JSNUTE8GsoId/TFrUvS6nSjsuK/6Lr/Q5Em8qNOrlVmxUB5hSEpae22a8bOIyz6f4GJISbmLpszDep1BCm8dyRxMeyiMRvM+Qag3c/Ek0aLqcjp6/Sp+IOD04MzfzAtQFl67/JuqzKwZGqsGxaK1jRP8C6pi7FU2sywzND1Rg3og1CeEw4rE63Ze+h8yg1jrtYTq7aWnleZ62WGCThZM00nmkAdulFk0CfgzPzCdtD3jBhxUmkgDczdHV8/3fQby7wq92TI7GJtQKJZFMIWG9+3cT7Bw3LYLoGjlW2MI5bpfa6OFQ7qphEHpK71Rx1XYRlPlUgHV6cSttQzrs2qxwfLTvADZuSSMEGmHuq3eUQbPaxKw8QdFFhZ34lLtFdawfb10eKRSveKtikxmM05zYrcm1WTMPpSeuqJVcABoLekb4NoGsSOH2l4QShWOBfEXFS5y1XMi1VwcuGdkR/MEtNg4XmLg</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.it.gu.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.it.gu.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idptest.it.gu.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idptest.it.gu.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:GivenName>Rikard</md:GivenName>
-    <md:SurName>Nilsson</md:SurName>
-    <md:EmailAddress>mailto:rikard.nilsson@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Lena Ström</md:SurName>
-    <md:EmailAddress>mailto:lena.strom@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>University of Gothenburg</md:Company>
-    <md:SurName>Tobias Galéus</md:SurName>
-    <md:EmailAddress>mailto:tobias.galeus@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IRT GU</md:GivenName>
-    <md:EmailAddress>mailto:irt@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml b/metadata/swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
deleted file mode 100644
index fbb49c94..00000000
--- a/metadata/swamid-testing/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://imogen.surfnet.nl/proxy/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-07-02T09:50:20Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SURFconext test proxy</md:ServiceName>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bas</md:GivenName>
-    <md:SurName>Zoetekouw</md:SurName>
-    <md:EmailAddress>mailto:bas.zoetekouw@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/kitstlogin03.user.ki.se-idp-shibboleth.xml b/metadata/swamid-testing/kitstlogin03.user.ki.se-idp-shibboleth.xml
deleted file mode 100644
index 2ccfbd08..00000000
--- a/metadata/swamid-testing/kitstlogin03.user.ki.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://kitstlogin03.user.ki.se/idp/shibboleth">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-05-23T13:35:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login.tst.ki.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Karolinska Institutet test IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Karolinska Institutet test IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Karolinska Institutet test IdP</mdui:Description>
-        <mdui:Description xml:lang="sv">Karolinska Institutet test IdP</mdui:Description>
-        <mdui:Logo xml:lang="en" height="100" width="200">https://login.ki.se/images/KI_digital_logotyp_positiv_RGB.svg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="100" width="200">https://login.ki.se/images/KI_digital_logotyp_positiv_RGB.svg</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://staff.ki.se/service-definition-saml2-websso-identity-provider</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://staff.ki.se/rules-and-regulations-for-the-management-of-personal-information-within-the-identity-provider-idp</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://medarbetare.ki.se/tjanstebeskrivning-saml2-websso-identitetsutgivare</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://medarbetare.ki.se/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-identity-provider-idp</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVANn8y/AQRmrw3BXYraPBLAEE7gKtMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0yMTA0MDcxMjM1NDZa
-Fw00MTA0MDcxMjM1NDZaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIZqYOQkXjaxf2agzCYPZnfoFoeh
-D9Gc2VbpVlKmqRl1aod3hU61792VKyXF2wPa13zIgvp+1N7hdkaGl6Iu7eVoPuCl
-WEARaDVSn/WCoQ74TZvSqH6ulDNXmdO+I2JoZaceK9rFX6qSUc4Fl7z5tv2erqhH
-ymXlpBaQa6biuquB1ncqQkwOJbvPtAYgCrap2lWm7F49PdgKVAK2MF9yhTxlnYg5
-a0JH7JBClSi5oe/fkaq5G5gwzgZzRWoYDaQINjchrPSrb10VSwrwXMzEeavQI4OZ
-pASSjOvWeR1z4/AQssW3PNhFaMD5mB++BXa3qJViT+v6YNqFd0JS/w5vAjrtNpvo
-2PIYvGhsFfmw89BREuSu6ZnVhecR94rfLtlMSmN/G8VJVsAAChq2vGF99Mrbno4h
-FWX7JNVeDZMN/aITgjEMJOIe7fBgP+tM6iTvfr+/wpbwKmrpYoTeWMUdGTA18rus
-lcxhzetaYRFnib8hzEvusIybfI4GdQr2CdOPVwIDAQABo2UwYzAdBgNVHQ4EFgQU
-Wvpp8QoJuyPJXkLMoF2thvp40bEwQgYDVR0RBDswOYIPbG9naW4udHN0LmtpLnNl
-hiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAYEAI0jIM6tX4x+lz785emipwSGrDHhWCiJzc6cP/cRb0Sl/qcCD
-uO0d2NGQE8R4mM8BXY3/Qr6wQPYfgHRfQirXQf+jQ0/zRCfEbwzm2uiVMOYa9WZT
-OWwhTtTo2jhFpsm8c7llWD+ZvNb6s7euAh7+XhpU0jhUqBx2hcLj8M4gydse6Fsd
-+uFH5qmU4zVQA7lOLqYXinG/8mNewkymuVs18femzQZ1q429p8HCXJnx8upiBXwM
-jkGk9ygt7sD7b9rPoK3y6CxjmtdJ7KMy1dOBPJjNiE2MmSud58KPSsDs0KnvYJ1W
-Dtjd/fN+TWMNaDMgKAehbhclVJA8aRz3twzIzkMcTwDGRTGQzwG9tGNOKh9YWjKx
-mQF18J861OIE48aX8MMVwhIt8SKJLzXNvNEWcM0vTdXlD46jaBGn+jV0wKNXAm1k
-0UpWsWFWKUDDkYclMPOX1EtVKRUKJF/FyUiC/Wif/ZAlEoe4Z4ImjITXhsoVyr4+
-KhlryzUR6MkzKeg4</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUZavdR7VBjCyadcYTYGSw0IyoH58wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTIxMDQwNzEyMzUzNFoX
-DTQxMDQwNzEyMzUzNFowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBojAN
-BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAh30nX0vLYubmg2cEUOvzBZg9qxGn
-rR6w4JUt5UfsQQoKmPgUjDxuQgidYyBiuHAq3XwRkKa0qx96ON778vXyvgjcF4Vz
-0utBh/AUO4Uo38hTVnNwr6vE5YBlB/5T0yTa/eX3pa96BZFWIBJ5n0OaBEZEx6/k
-Qmsx2k6BbHzhxYiG24wxu04Iot4XtiD2iyLz8/6idGTAZu0dFv0w/j7im5SqlKy3
-pPrLPwXIuet71NxAwP4bGMZL0i4I1OyagH8bZUdcBiEGUu3TKecx20n7Siidqif1
-UjrwnvhX2HTpfedZ/4xa2RoQFMV3NrLAzZ2W5sxCDGH0InFzRW3uqCb7b4HUBIoY
-/OkdECqmzoQl1CGIgBCv7IkFhTjmRfGp1JrX1qnQfKZkOCMJ8Qz0DEMzJuM3E5r0
-mxsd4CbxjyzYU4XLlOR5uubVmqUmb8CEcW829urwnh5dAq548S207pXJqKre8dxM
-AfvYnkZHgR48nRhy9p3r0RRu0qp4KX44VVM/AgMBAAGjZTBjMB0GA1UdDgQWBBT7
-0/YE78UeD0KBvVb2/pyJMgEPaDBCBgNVHREEOzA5gg9sb2dpbi50c3Qua2kuc2WG
-Jmh0dHBzOi8vbG9naW4udHN0LmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBgQAKrPzc0tDSpNaqgP6Jgs94RZSoHXafFsrsdNa2yYTHv2vrYpQr
-qRsu5phFBigGSCSjEsmCacpPVhIzFhsOFlubvB8aJTjgN5bavMGsWE9j1tK3QOFt
-XmlJA1Ey8nX6MZa1kyAHBW+iIrH5Ort6KUe1cHscUfs8XjX5ojTl/R92xUjeGnum
-LJi8ZeaoIPejpa/jkEtuZK87nU/J2Iy0fX7SrJjcma3hHq7aqdrc1wSIHElo/JMb
-Y2myx7OUJEvVijLWTB6ZDVzd/AHEk7N+no0u1bsT4ux5n/TP3zmx2+xBlMmvFLHN
-5TNvF5HnkPH5/e5Y2bHuIT+A0oJCSZwx7LNYLFU7BBRwrMsDrfK6Ut55IQYlq2Qd
-MlS2rRXvQ7AWk7HnfcT8NdWSnpTKt8MDqaR9vHocZkNxyKmCNyRDlj/yBK3k9cY8
-+TEPOkimAgXUXbJBna5pH6PD3tpYmbYk3K45C/B/QYGDpCggi8G5OzTIBwDMASaI
-OE3J+Gw3YG29EFc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVALBgBInBAVhcW99wf5MMCoY/Ess9MA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0yMTA0MDcxMjM1MzVa
-Fw00MTA0MDcxMjM1MzVaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKPyVppvm2Fc80i3lq5kKjXfnR9c
-IyjRkH/Y4O5SDsfZRtXTDORy62fKoMzlfXdTwFkv/Aj99Zmf98O9meNdOTrF1MiH
-SAN+cEIysXHocN2GMPnohJttmSOlim5DY2b16H/vGFiBHRBSPUfyeUMTmItz8rby
-nEvJX0GG8rCFdadk8uvecOyistxc+AnB0w4kEYypazlR2/CVEAcr9altplqsSXJu
-y/EPeGKM3W40V+BC7pBGvqOrogMGStfGU8+aiIe8JaxIOne6RopR42Dq2l3W71ux
-3r6ws1DR9Ftmgxl4UIKc0mqYQ4CMEAAB8nfLAL8lBU8QYl5Dl+dqr3g6VOUNAo9E
-Z0tD8ZflHbmZ2UO8keHa1sKILdfm5VhVIcZ0m2KF/WH3mkwobCjd8izTtKmA7yBA
-i990Ir9jYcPg5WFTyX9FWwe+JDv7FftKXioirofGU9MK7RhGJdMEuvoal/3/nip7
-vKEImq/EckbWv+q0MYF73hWOyQmTL8cmpNYNvQIDAQABo2UwYzAdBgNVHQ4EFgQU
-vflM3/4hOTUnzSpL9ezMQQrFQhEwQgYDVR0RBDswOYIPbG9naW4udHN0LmtpLnNl
-hiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAYEARf6R9SB+yNDcydn2a5rL/WVKgIz3DkmDlnH3cdmBInVHEfcR
-qOukP9HgN28vmt3RWzxkc4KjwDCBJF3abwEAO56N2NjAts1xIDBOXpjOcODmsSa+
-oAElTY6B80qtbUC0g9BIC0ta1BVCsHff8hUYrd9+wBbfOIPbOB439fSPKoSTcCYy
-Z9hoWeKXl6U3wS7p/BtmY35vuEsYe3FSWDx/J8YIElqm9mdIgTWKnmMBgpJ14aEs
-KoKtZCUlnVRPg5y7EN8wKNdORO9Y56XXc+0V91cGJFsXnZXXbNZzmqSJYl0R26Um
-OT1TDHs3xGFFAMCmKzWnTM9VXZ8KitIGJaqZiBBC+xGX/9R5Z0OMAnjvAWWvU4EI
-pQz4t4mifPSO/0I2cZ7iyIe7VFPbKLyGpXitmDXiQactWndU3FiqjDxGHMSIXEz1
-PwuJvX7it1A9Hed/1ui+iuKIU5An0lBDnCHVuet+nXNF6cg+zCJsVKV2PRrBmRP3
-7hgZYsIT5SPmyDil</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://kitstlogin03.user.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://kitstlogin03.user.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" ns1:supportsRequestedAttributes="true" Location="https://kitstlogin03.user.ki.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://kitstlogin03.user.ki.se/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Karolinska Institutet test IdP SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Karolinska Institutet test IdP SP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Karolinska Institutet test IdP SP</mdui:Description>
-        <mdui:Description xml:lang="sv">Karolinska Institutet test IdP SP</mdui:Description>
-        <mdui:Logo xml:lang="en" height="100" width="200">https://login.ki.se/images/KI_digital_logotyp_positiv_RGB.svg</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="100" width="200">https://login.ki.se/images/KI_digital_logotyp_positiv_RGB.svg</mdui:Logo>
-        <mdui:InformationURL xml:lang="en">https://staff.ki.se/service-definition-saml2-websso-identity-provider</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://staff.ki.se/rules-and-regulations-for-the-management-of-personal-information-within-the-identity-provider-idp</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://medarbetare.ki.se/tjanstebeskrivning-saml2-websso-identitetsutgivare</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://medarbetare.ki.se/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-identity-provider-idp</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUZavdR7VBjCyadcYTYGSw0IyoH58wDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTIxMDQwNzEyMzUzNFoX
-DTQxMDQwNzEyMzUzNFowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBojAN
-BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAh30nX0vLYubmg2cEUOvzBZg9qxGn
-rR6w4JUt5UfsQQoKmPgUjDxuQgidYyBiuHAq3XwRkKa0qx96ON778vXyvgjcF4Vz
-0utBh/AUO4Uo38hTVnNwr6vE5YBlB/5T0yTa/eX3pa96BZFWIBJ5n0OaBEZEx6/k
-Qmsx2k6BbHzhxYiG24wxu04Iot4XtiD2iyLz8/6idGTAZu0dFv0w/j7im5SqlKy3
-pPrLPwXIuet71NxAwP4bGMZL0i4I1OyagH8bZUdcBiEGUu3TKecx20n7Siidqif1
-UjrwnvhX2HTpfedZ/4xa2RoQFMV3NrLAzZ2W5sxCDGH0InFzRW3uqCb7b4HUBIoY
-/OkdECqmzoQl1CGIgBCv7IkFhTjmRfGp1JrX1qnQfKZkOCMJ8Qz0DEMzJuM3E5r0
-mxsd4CbxjyzYU4XLlOR5uubVmqUmb8CEcW829urwnh5dAq548S207pXJqKre8dxM
-AfvYnkZHgR48nRhy9p3r0RRu0qp4KX44VVM/AgMBAAGjZTBjMB0GA1UdDgQWBBT7
-0/YE78UeD0KBvVb2/pyJMgEPaDBCBgNVHREEOzA5gg9sb2dpbi50c3Qua2kuc2WG
-Jmh0dHBzOi8vbG9naW4udHN0LmtpLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-DQEBCwUAA4IBgQAKrPzc0tDSpNaqgP6Jgs94RZSoHXafFsrsdNa2yYTHv2vrYpQr
-qRsu5phFBigGSCSjEsmCacpPVhIzFhsOFlubvB8aJTjgN5bavMGsWE9j1tK3QOFt
-XmlJA1Ey8nX6MZa1kyAHBW+iIrH5Ort6KUe1cHscUfs8XjX5ojTl/R92xUjeGnum
-LJi8ZeaoIPejpa/jkEtuZK87nU/J2Iy0fX7SrJjcma3hHq7aqdrc1wSIHElo/JMb
-Y2myx7OUJEvVijLWTB6ZDVzd/AHEk7N+no0u1bsT4ux5n/TP3zmx2+xBlMmvFLHN
-5TNvF5HnkPH5/e5Y2bHuIT+A0oJCSZwx7LNYLFU7BBRwrMsDrfK6Ut55IQYlq2Qd
-MlS2rRXvQ7AWk7HnfcT8NdWSnpTKt8MDqaR9vHocZkNxyKmCNyRDlj/yBK3k9cY8
-+TEPOkimAgXUXbJBna5pH6PD3tpYmbYk3K45C/B/QYGDpCggi8G5OzTIBwDMASaI
-OE3J+Gw3YG29EFc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVALBgBInBAVhcW99wf5MMCoY/Ess9MA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0yMTA0MDcxMjM1MzVa
-Fw00MTA0MDcxMjM1MzVaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCAaIw
-DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKPyVppvm2Fc80i3lq5kKjXfnR9c
-IyjRkH/Y4O5SDsfZRtXTDORy62fKoMzlfXdTwFkv/Aj99Zmf98O9meNdOTrF1MiH
-SAN+cEIysXHocN2GMPnohJttmSOlim5DY2b16H/vGFiBHRBSPUfyeUMTmItz8rby
-nEvJX0GG8rCFdadk8uvecOyistxc+AnB0w4kEYypazlR2/CVEAcr9altplqsSXJu
-y/EPeGKM3W40V+BC7pBGvqOrogMGStfGU8+aiIe8JaxIOne6RopR42Dq2l3W71ux
-3r6ws1DR9Ftmgxl4UIKc0mqYQ4CMEAAB8nfLAL8lBU8QYl5Dl+dqr3g6VOUNAo9E
-Z0tD8ZflHbmZ2UO8keHa1sKILdfm5VhVIcZ0m2KF/WH3mkwobCjd8izTtKmA7yBA
-i990Ir9jYcPg5WFTyX9FWwe+JDv7FftKXioirofGU9MK7RhGJdMEuvoal/3/nip7
-vKEImq/EckbWv+q0MYF73hWOyQmTL8cmpNYNvQIDAQABo2UwYzAdBgNVHQ4EFgQU
-vflM3/4hOTUnzSpL9ezMQQrFQhEwQgYDVR0RBDswOYIPbG9naW4udHN0LmtpLnNl
-hiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-9w0BAQsFAAOCAYEARf6R9SB+yNDcydn2a5rL/WVKgIz3DkmDlnH3cdmBInVHEfcR
-qOukP9HgN28vmt3RWzxkc4KjwDCBJF3abwEAO56N2NjAts1xIDBOXpjOcODmsSa+
-oAElTY6B80qtbUC0g9BIC0ta1BVCsHff8hUYrd9+wBbfOIPbOB439fSPKoSTcCYy
-Z9hoWeKXl6U3wS7p/BtmY35vuEsYe3FSWDx/J8YIElqm9mdIgTWKnmMBgpJ14aEs
-KoKtZCUlnVRPg5y7EN8wKNdORO9Y56XXc+0V91cGJFsXnZXXbNZzmqSJYl0R26Um
-OT1TDHs3xGFFAMCmKzWnTM9VXZ8KitIGJaqZiBBC+xGX/9R5Z0OMAnjvAWWvU4EI
-pQz4t4mifPSO/0I2cZ7iyIe7VFPbKLyGpXitmDXiQactWndU3FiqjDxGHMSIXEz1
-PwuJvX7it1A9Hed/1ui+iuKIU5An0lBDnCHVuet+nXNF6cg+zCJsVKV2PRrBmRP3
-7hgZYsIT5SPmyDil</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://kitstlogin03.user.ki.se/idp/profile/Authn/SAML2/POST/SSO" index="0"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Karolinska Institutet test IdP SP</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Karolinska Institutet test IdP SP</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/konto.test.uu.se-shibboleth.xml b/metadata/swamid-testing/konto.test.uu.se-shibboleth.xml
deleted file mode 100644
index 30650938..00000000
--- a/metadata/swamid-testing/konto.test.uu.se-shibboleth.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://konto.test.uu.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-05-18T09:55:39Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets kontoaktivering och lösenordsåterställning (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University user account activation and password reset (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Denna tjänst används för att du som ny vid universitetet ska kunna aktivera ditt användarkonto vid universitetet. Om du redan har ett aktivt konto kan du sätta ett nytt lösenord A om du glömt bort det.</mdui:Description>
-        <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account. You can also use this service to reset your password A for your user account after the account activation.</mdui:Description>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="sv">https://konto.test.uu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://konto.test.uu.se/index-en.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/c/perm/link?p=699273448&amp;l=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=699273448&amp;l=sv</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIC8TCCAdmgAwIBAgIJAMVWchzOigTwMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
-BAMTDmNoZW4uaXRzLnV1LnNlMB4XDTE0MDYyMzE1MjcwMVoXDTI0MDYyMDE1Mjcw
-MVowGTEXMBUGA1UEAxMOY2hlbi5pdHMudXUuc2UwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQCfDSR8ylUcIcDm/GKx7Ld6onV92/iKfbyrZj9uXiKM8iq7
-FDUtJpCvl8qlQ59vVMr6as+HeHsf3SHYHd/3i0D5FisBBZ8MBYccSELw/OpRuetc
-BO5ta8cZMTnhnMnRQi+XV1gic8sEg8LEo3vZmP8eoD5/Xky24cLVFaC/Rk/48oFZ
-qInZeSABpFM9FJOXKD801G0xfvma31guTMoTbDWzxg5SM9/oan8kh+lMsfC3Y+zG
-3GqttMtTt5CFRqYl+iBCUerKo14wt5Q429KAfHJPVX4W1RmNZ0gYgT1Fr9aZB8zz
-D9hQMBzTPKX3Myz6VHpqmg4xtTO0GAGsebMnyKOnAgMBAAGjPDA6MBkGA1UdEQQS
-MBCCDmNoZW4uaXRzLnV1LnNlMB0GA1UdDgQWBBTetpIV/6tzXm6My/TDY9d0txKR
-STANBgkqhkiG9w0BAQUFAAOCAQEAD9vrnvzkjS7kyM7YUZ8d3X6MwwOTfUxhPRzZ
-hoKAFmuXI68K81UYvsSPkoRICeznS5oEk4BRlIDBV4kBO3p4n0351WjIENMAcwFD
-mVrEQWUtZkQAZkARTlv9qNuqdgmmKBRb2lL9FXfovpQWCwDVBUzPlrUDdfmZzGuy
-Ql/gj+HX4uvvRUwouwG8eoqnBSxzzGPYlVHsjmOMD28tvKp9TrMWp2s852Siks3x
-6MnKP/eJW7PcB/XXcpJT8lwLZFnmazLbkUEX5GKijyNNLcRN9u5T7o47iE1tp6Rc
-Lf3VcAZi+NsypUL4nVwgn6iHbsaXGfTZPispp6rXJ48r/XnBFQ==
-        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.test.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.test.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.test.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.test.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://konto.test.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://konto.test.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.test.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.test.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://konto.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.test.uu.se/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Uppsala universitets kontoaktivering och lösenordsåterställning (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">Uppsala University user account activation and password reset (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/login-dev.du.se-idp-shibboleth.xml b/metadata/swamid-testing/login-dev.du.se-idp-shibboleth.xml
deleted file mode 100644
index d68861c6..00000000
--- a/metadata/swamid-testing/login-dev.du.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login-dev.du.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login-dev.du.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">du.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Dalarna University (ONLY FOR TESTING)</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Dalarna University (TEST)</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.du.se/saml2websso_en</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="146" width="350">https://login-dev.du.se/duse-logo-en.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.du.se/saml2websso_en#pp</mdui:PrivacyStatementURL>
-        <mdui:Description xml:lang="sv">Högskolan Dalarna (ENDAST TEST)</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Högskolan Dalarna (TEST)</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="sv">https://www.du.se/saml2websso</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
-        <mdui:Logo xml:lang="sv" height="146" width="350">https://login-dev.du.se/duse-logo-sv.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.du.se/saml2websso#pp</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://login-dev.du.se/duse-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://login-dev.du.se/duse-logo-16x16.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-dev.du.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-dev.du.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login-dev.du.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-dev.du.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login-dev.du.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login-dev.du.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">du.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login-dev.du.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login-dev.du.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Dalarna University (ONLY FOR TESTING)</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Dalarna University (TEST)</mdui:DisplayName>
-        <mdui:Keywords xml:lang="en">hda du</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://www.du.se/en</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="16" width="16">https://login-dev.du.se/duse-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="350">https://login-dev.du.se/duse-logo-en.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.du.se/personal-data-protection</mdui:PrivacyStatementURL>
-        <mdui:DisplayName xml:lang="sv">Högskolan Dalarna (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Högskolan Dalarna (ENDAST FÖR TEST)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">hda du</mdui:Keywords>
-        <mdui:InformationURL xml:lang="sv">https://www.du.se/en</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="16" width="16">https://login-dev.du.se/duse-logo-16x16.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="146" width="350">https://login-dev.du.se/duse-logo-sv.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.du.se/sv/hjalp/personuppgifter/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVANjkER+E+5lzcBMyqbx/pUrv4StpMA0GCSqGSIb3DQEB
-BQUAMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTAeFw0xMDExMTcxNTI4MTNa
-Fw0zMDExMTcxNTI4MTNaMBoxGDAWBgNVBAMTD2xvZ2luLWRldi5kdS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJTsLw/2NNOLUjRLB3/aizD3lP5J
-Hv9A8kb+luJYFvc8xHsrNX8vs68b34v0hSFkr4/C6qFIAnqG1phnZ+RvRfL9J4wG
-vxav6jtLU5WYnrZeFWG8e4PHvelHQ7GnR0ieDUoT5UMz/lQFFkigkuTMDDVVvLhC
-5QbsnodeTdALmnQQAKMqaIbxLmlM+wQ0VTqbDYzlyx6gemGHHGDtrd3YaoCteG5N
-v5M1eeGLtAwtTzazUh9OQMQXWnbFrFTZsXNOJLDFV4fHtilaHRG4i0GsmkWyzAOC
-TFVmsfG7NHcNbsDeArhE/Mdn3lxRTJO/05DJmY7XS7TNT4StPm64I8EdjbUCAwEA
-AaNlMGMwQgYDVR0RBDswOYIPbG9naW4tZGV2LmR1LnNlhiZodHRwczovL2xvZ2lu
-LWRldi5kdS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU40tq2fktCvaBJtND
-QafNhwXdSMcwDQYJKoZIhvcNAQEFBQADggEBAA4jM2gU64Cmws8pIcNnpm3XPRJN
-2kiCB1++cRt3DyAljWVf8GrVP3+xwtHcL54Y3paxEpqH8/QyMZCPOqrJIix3h3Qi
-zFPtwTPGP8CO3QKJqPyDSai5IK7GmdVuC0tVWykRCVDXpDBaz02G7+d9Z93b9WQS
-x+zPW68bKgavPcBYrN18gqMUEQlZmxs/mogmyx6GBnKiMoZYgUbqYA9Ytp/UI2UF
-C2AXPL0+DO5vY7Ah58tSWzVMRkSLZtQEyADQ7sBCa56IAAjIgQY1XXWF/PhjuQ8a
-xZo/5fNrNmxFOTkpA3No03UwcJ2LDbzPUPQQbQ9s4GSwwSQMVmlstBI/IIY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login-dev.du.se/idp/profile/Authn/SAML2/POST/SSO" index="0"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Dalarna University (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Högskolan Dalarna (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Dalarna University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Högskolan Dalarna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Högskolan Dalarna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Dalarna University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.du.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.du.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Dalarna University</md:Company>
-    <md:GivenName>Office of IT and Digital Infrastructure</md:GivenName>
-    <md:EmailAddress>mailto:shib-admin@du.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 23 778000</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml b/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
deleted file mode 100644
index 860ca617..00000000
--- a/metadata/swamid-testing/login.temp1235.hhs.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://login.temp1235.hhs.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-03-10T12:41:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC7DCCAdSgAwIBAgIQcXfC7I8AAZVDQZlpS80QEDANBgkqhkiG9w0BAQsFADAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE3WhcNMTgwMTIxMjA1MzE3WjAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSO706ECYl5LgivGf++RRzmJCdC6OypGGI1YHiVNeUhNBEE2pJ2IFr0ZXGpyrx7+bJRGdlZQG75fHsJE+5Fi3+gtNhMbsAnTfvR3PkX4JzAcl32bzxeKKIHQaou6TyPSCVM7hZQ9NnjrKamekIB52hxga7G4lo1tcnVZFYYBXl5CXvfHhnKkVfmUYKQvak8SQCkk7VkbbpFE9zmbpw7TewzWLcOVmHVjqMcMPh8xTwL/uWtiD5nUx43ZKKykXAt8MMutrXVeaXsWz6ii5sls46cfyA79luYnY52UyjLFfAfFJA9PcCg+JucYWkXMtjBzpVFmcUbF2u5NNryvfEC3aLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC0725ACqttJd6WGETAS2legpdN+dB9WIqOWqP8ub1uxyg0cx6aKtmLK2zXt3NGaJm9XmVb+v6uqToFurIAPYaguwABHy3JkTNNnO66BCtgN1CRtRm+fBz2RaEJ2zt4NIswOwsvEl7R6FWOihzQJ6fk4DEXAIhLQrCn/ti0yCFWhHqjd74Dvr2xHzppv9BLhDOn6RwdYj/EzSG1xe9oPvn1jyUUxGZzRro4e+25W/l2X2RDautBAYZq3bV+k5ak489U5EYQgcGrFWSs9DmAKk2qUwW6qvMDppD5kVTMfIEbeMUUftAo2VkG//Ym9Q3+A0/KkkpFmsG3taxLxgtm1VCg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC5jCCAc6gAwIBAgIQFLE+JRWbr6dO/DnzzRd18jANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE4WhcNMTgwMTIxMjA1MzE4WjAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb2zXOedFExa2buAnsMwWosysFcvUISb+hTP7Y7cDfLYLC4HYgeaVl+f0utv9EAKooMKbCOOoqypXfZvR4thEj4nASEd9l1SrK7bfTK21w7bpsgPW1YyLYyMeSWREIm2eB+vD19o8K0zF0bJ68ZjtQp/ZeuCB+UAOmwlcRv36tc4ky/MOgAudjG2nozN2Qol4/bjSpxy9X8Vk2AGLeEusv7U2kFnVUUO8LFSJrSukys7+KRrTJa+NoXQa9EXq1y9yPitLYiIfDu8OV0rJuNkidLkhVRluYlp8wsL5xtAPYMABkUCjejYW7OrGfejYTRSgzwRdUrDW2/003XR8eRvMDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHnffSwWY95Eu+s8rq4Paazq0tfXYVxkqfRcFFEOeI1Gyq7OGe2YSRTw8dW6/2wsQOZrbLsgRoLhn04B1+gt2wpP29JsKJwVjeKCEtXEqEIm6gmetPCW27pbkLMTUeMYan6jkI9jww7zR8nrwtulBlmzrAcivcNTDiSTq/W+3ec8wg2KPoY0ie5bk3XI5dhrYFzzb6XzVamGvUKYYx6DqOIP/nsTZy21y+4mOoo8bS0snippT2rUlbrFwn8fneuHv7NzEvp0bOSd78ke+hnEQDd44R9XhBU5RT5zvB24Tv6+dUXoSJN6TbauPgtUtGdEV/euSkTlkJoU1Ejbh5qupWY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <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://login.temp1235.hhs.se/adfs/ls/" index="0" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.temp1235.hhs.se/adfs/ls/" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/" index="2"/>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://login.temp1235.hhs.se/adfs/services/trust">
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC7DCCAdSgAwIBAgIQcXfC7I8AAZVDQZlpS80QEDANBgkqhkiG9w0BAQsFADAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE3WhcNMTgwMTIxMjA1MzE3WjAyMTAwLgYDVQQDEydBREZTIEVuY3J5cHRpb24gLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCSO706ECYl5LgivGf++RRzmJCdC6OypGGI1YHiVNeUhNBEE2pJ2IFr0ZXGpyrx7+bJRGdlZQG75fHsJE+5Fi3+gtNhMbsAnTfvR3PkX4JzAcl32bzxeKKIHQaou6TyPSCVM7hZQ9NnjrKamekIB52hxga7G4lo1tcnVZFYYBXl5CXvfHhnKkVfmUYKQvak8SQCkk7VkbbpFE9zmbpw7TewzWLcOVmHVjqMcMPh8xTwL/uWtiD5nUx43ZKKykXAt8MMutrXVeaXsWz6ii5sls46cfyA79luYnY52UyjLFfAfFJA9PcCg+JucYWkXMtjBzpVFmcUbF2u5NNryvfEC3aLAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAC0725ACqttJd6WGETAS2legpdN+dB9WIqOWqP8ub1uxyg0cx6aKtmLK2zXt3NGaJm9XmVb+v6uqToFurIAPYaguwABHy3JkTNNnO66BCtgN1CRtRm+fBz2RaEJ2zt4NIswOwsvEl7R6FWOihzQJ6fk4DEXAIhLQrCn/ti0yCFWhHqjd74Dvr2xHzppv9BLhDOn6RwdYj/EzSG1xe9oPvn1jyUUxGZzRro4e+25W/l2X2RDautBAYZq3bV+k5ak489U5EYQgcGrFWSs9DmAKk2qUwW6qvMDppD5kVTMfIEbeMUUftAo2VkG//Ym9Q3+A0/KkkpFmsG3taxLxgtm1VCg=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC5jCCAc6gAwIBAgIQFLE+JRWbr6dO/DnzzRd18jANBgkqhkiG9w0BAQsFADAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwMTIxMjA1MzE4WhcNMTgwMTIxMjA1MzE4WjAvMS0wKwYDVQQDEyRBREZTIFNpZ25pbmcgLSBsb2dpbi50ZW1wMTIzNS5oaHMuc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCb2zXOedFExa2buAnsMwWosysFcvUISb+hTP7Y7cDfLYLC4HYgeaVl+f0utv9EAKooMKbCOOoqypXfZvR4thEj4nASEd9l1SrK7bfTK21w7bpsgPW1YyLYyMeSWREIm2eB+vD19o8K0zF0bJ68ZjtQp/ZeuCB+UAOmwlcRv36tc4ky/MOgAudjG2nozN2Qol4/bjSpxy9X8Vk2AGLeEusv7U2kFnVUUO8LFSJrSukys7+KRrTJa+NoXQa9EXq1y9yPitLYiIfDu8OV0rJuNkidLkhVRluYlp8wsL5xtAPYMABkUCjejYW7OrGfejYTRSgzwRdUrDW2/003XR8eRvMDAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAHnffSwWY95Eu+s8rq4Paazq0tfXYVxkqfRcFFEOeI1Gyq7OGe2YSRTw8dW6/2wsQOZrbLsgRoLhn04B1+gt2wpP29JsKJwVjeKCEtXEqEIm6gmetPCW27pbkLMTUeMYan6jkI9jww7zR8nrwtulBlmzrAcivcNTDiSTq/W+3ec8wg2KPoY0ie5bk3XI5dhrYFzzb6XzVamGvUKYYx6DqOIP/nsTZy21y+4mOoo8bS0snippT2rUlbrFwn8fneuHv7NzEvp0bOSd78ke+hnEQDd44R9XhBU5RT5zvB24Tv6+dUXoSJN6TbauPgtUtGdEV/euSkTlkJoU1Ejbh5qupWY=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.temp1235.hhs.se/adfs/services/trust/artifactresolution" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.temp1235.hhs.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>IT</md:GivenName>
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 7369400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/login.tst.ki.se-idp-shibboleth.xml b/metadata/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
deleted file mode 100644
index 14be2b9f..00000000
--- a/metadata/swamid-testing/login.tst.ki.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login.tst.ki.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2015-11-11T16:03:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login.tst.ki.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Karolinska Institutet (test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Karolinska Institutet (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Test Identity Provider för Karolinska Institutet.</mdui:Description>
-        <mdui:Description xml:lang="en">Test Identity Provider for Karolinska Institutet.</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="146" width="292">https://login.tst.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="292">https://login.tst.ki.se/images/ki_logo_292x146.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">ki karolinska+institutet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">ki karolinska+institutet</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://staff.ki.se/service-definition-saml2-websso-identity-provider</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://staff.ki.se/rules-and-regulations-for-the-management-of-personal-information-within-the-identity-provider-idp</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="sv">https://medarbetare.ki.se/tjanstebeskrivning-saml2-websso-identitetsutgivare</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://medarbetare.ki.se/policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-identity-provider-idp</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>ki.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:59.3475753,18.0279382</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:59.219589,17.940939</mdui:GeolocationHint>
-        <mdui:IPHint>130.229.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.237.96.0/19</mdui:IPHint>
-        <mdui:IPHint>130.237.128.0/20</mdui:IPHint>
-        <mdui:IPHint>130.237.204.0/24</mdui:IPHint>
-        <mdui:IPHint>130.237.207.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.16.0/21</mdui:IPHint>
-        <mdui:IPHint>193.10.140.0/22</mdui:IPHint>
-        <mdui:IPHint>194.14.96.0/24</mdui:IPHint>
-        <mdui:IPHint>2001:06B0:0022::/48</mdui:IPHint>
-        <mdui:IPHint>136.155.0.0/16</mdui:IPHint>
-        <mdui:IPHint>159.38.0.0/16</mdui:IPHint>
-        <mdui:IPHint>193.10.63.0/24</mdui:IPHint>
-        <mdui:IPHint>193.10.76.0/24</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
-Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
-V8gzg8MFWL9vwAyTmg9prTkOzHxVSXpvrXz+Sr9OvAcpG7Qcia7+rS+raRMqaiG+
-+3tF932XgCZmq532oSYxFLk/ZssmyHQiUYY/tzC832yoiM8vIHYuQeyaD2i9HdhH
-vS4FLLcP5k4H166wW/uUkRDs/pG2e7uiT6RIhavV3sUIPlzRdkkuYhURcGjpTCsb
-5DRb+FmkRHH61OdLJMkqi7c8z3jmRXBZn+FsENElQPySzaiWJI+XKS8Mn36sFrTM
-gOXEYC3u9H6k3ZdXYVq+Brh0dwaQi7waPt3FJpfYPIDwxOYKtLHrgoS0MzECAwEA
-AaNlMGMwHQYDVR0OBBYEFMi5T4diS2VMxS0jWp5BszYiV96bMEIGA1UdEQQ7MDmC
-D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
-+JZ/VvmJJXF7t/YADLYQEhU4ybZOc0MRvGV6IKrmEwXHOpIcD7Uf+T1rvyIKQ24l
-a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
-s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
-WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
-n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
-DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
-tE4BnM29l3kUIPO17FPURUkhbrl86SeWHE6xPRATi9XHG44o9ACsLyR85FWkeGnj
-o26QqovXOxFn+YDEXIFu2Ier2YxJiL8MWte5n41Wf1poZQb0Sf4o+LOSrVZxd98n
-xzEuCJ93Luf4RxB9l+dfoVK4EDp6AAIJO/sxBmeEYfvNFukp+duyDFdQV1oSWaWg
-TMIqmaPevF4t39YwGCutFpZJyp++jfkixbNHzC75xiFyWfdumMcOs5FYA70rPUEl
-ZgQs1pUZv4qP7VeNNS6QXQyQl86kxMN7XfymgoqLQdHN2e1+JiEsk95kmwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUTvEk7OlxQx65QaRT+nO7cuOY71wwQgYDVR0RBDswOYIP
-bG9naW4udHN0LmtpLnNlhiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATSLgQWRc05CI6vkw8fCaC4pAYKmu
-uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
-EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
-N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
-fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
-MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
-Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
-DV2qXwakGUN8o2tdxn+zXKcrN0QN1CUsHkQlZ2m3PEEZlpgsp618SBGJVOHsLea8
-v3UxoEtw9BSGWip8xyWKMAhRh7KRmq4K4OqdNlo6M30KuPpPe0ZkI7gA2qR2lVv6
-ybR97uc9DrM8wKJjwYJKaYFeePdU99H4l2bzR6Au3mJ8Dd4Vq4wIPhC0ADvvDzU4
-UfZY/YkqAyroiwPZsaM2o8mspDqnbTOu6lPM4XeKFYKNdDamFVimnYLDKgM81/Ne
-IMv/7Klx5zt1Tf5NZaxgZ/xSXdQQAgQe/emteLIV5bdtIWlmT6O7WUI5QiUCAwEA
-AaNlMGMwHQYDVR0OBBYEFF7LNVAsmm6yfKeW7ViJuMrPTWfHMEIGA1UdEQQ7MDmC
-D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACYeLTIPNFIMCey2yr95YxXdZTzB
-wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
-l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
-xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
-U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
-jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login.tst.ki.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.tst.ki.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.tst.ki.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ki.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAMoel+MKpG2xaTjyazTBhaikYRLhMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDRa
-Fw0zNTExMDQxNDI4MDRaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIsH/cWaST4Ua0YvM2A1IpfWnWS4
-V8gzg8MFWL9vwAyTmg9prTkOzHxVSXpvrXz+Sr9OvAcpG7Qcia7+rS+raRMqaiG+
-+3tF932XgCZmq532oSYxFLk/ZssmyHQiUYY/tzC832yoiM8vIHYuQeyaD2i9HdhH
-vS4FLLcP5k4H166wW/uUkRDs/pG2e7uiT6RIhavV3sUIPlzRdkkuYhURcGjpTCsb
-5DRb+FmkRHH61OdLJMkqi7c8z3jmRXBZn+FsENElQPySzaiWJI+XKS8Mn36sFrTM
-gOXEYC3u9H6k3ZdXYVq+Brh0dwaQi7waPt3FJpfYPIDwxOYKtLHrgoS0MzECAwEA
-AaNlMGMwHQYDVR0OBBYEFMi5T4diS2VMxS0jWp5BszYiV96bMEIGA1UdEQQ7MDmC
-D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAErKe5nlDdbds4rre39uKZZXvPuF
-+JZ/VvmJJXF7t/YADLYQEhU4ybZOc0MRvGV6IKrmEwXHOpIcD7Uf+T1rvyIKQ24l
-a2qbjZ0/Si4K5V3VHWKw9n1hFxzpBVblRBQKpe3C2/AHtXo42I581Aj4RiMMvdtE
-s6I6mUGkWt+12okiFPkPYkZiKNS44MRH/MpFBRZyq2+16AvarO5TxU8czzuHIaiw
-WWUe6DVFlidT5MLwtVawka9hmB11ck88jfu1I9MuBA3kshE4P3nAZFUSxWBEJVhw
-n8eLCYnUBlf2Tz/qD15v7rjTQgMM5HFL8z5dSdm/ku7V0BGdseke4CKTTWE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUNQiQqRF0OWgY/8AQmnbujTqk5pUwDQYJKoZIhvcNAQEL
-BQAwGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMB4XDTE1MTEwNDE0MjgwMloX
-DTM1MTEwNDE0MjgwMlowGjEYMBYGA1UEAwwPbG9naW4udHN0LmtpLnNlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqigba9iKeQgpVTxXDJdR8XY3unuY
-tE4BnM29l3kUIPO17FPURUkhbrl86SeWHE6xPRATi9XHG44o9ACsLyR85FWkeGnj
-o26QqovXOxFn+YDEXIFu2Ier2YxJiL8MWte5n41Wf1poZQb0Sf4o+LOSrVZxd98n
-xzEuCJ93Luf4RxB9l+dfoVK4EDp6AAIJO/sxBmeEYfvNFukp+duyDFdQV1oSWaWg
-TMIqmaPevF4t39YwGCutFpZJyp++jfkixbNHzC75xiFyWfdumMcOs5FYA70rPUEl
-ZgQs1pUZv4qP7VeNNS6QXQyQl86kxMN7XfymgoqLQdHN2e1+JiEsk95kmwIDAQAB
-o2UwYzAdBgNVHQ4EFgQUTvEk7OlxQx65QaRT+nO7cuOY71wwQgYDVR0RBDswOYIP
-bG9naW4udHN0LmtpLnNlhiZodHRwczovL2xvZ2luLnRzdC5raS5zZS9pZHAvc2hp
-YmJvbGV0aDANBgkqhkiG9w0BAQsFAAOCAQEATSLgQWRc05CI6vkw8fCaC4pAYKmu
-uMqAIcKhkaVslYJGRRxnPlEKKvXZeh3QAkqj0RW7o/VFbltsfbOKpmg/h1hp110Q
-EdFRvAfpycCvKp7BnJa4mJ9RD0/PwuyeZ6IMg4hGt82gsgRbWJsCb6lYwj8i0ZIu
-N8jxHT9GPA1BezK2+iC7x/UZXuPzI+/AfRMchBzStgau9H+MsP1mXi1SIm+iqaRA
-fyNTnKTNyov83sU5fX101h10Qp9rW7Im/Ol1zZefMdOc4rsSYi8zSlaPWuIPz9nu
-MrwNBQ4u5RUrJQQCdmBSr/Iw8h4zKUYeAXW+LvaMoyY8uIN3mAq1wle+3A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDKDCCAhCgAwIBAgIVAN0l6j5eWkN11rN3K+x95i/rrVYgMA0GCSqGSIb3DQEB
-CwUAMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTAeFw0xNTExMDQxNDI4MDNa
-Fw0zNTExMDQxNDI4MDNaMBoxGDAWBgNVBAMMD2xvZ2luLnRzdC5raS5zZTCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKJ3zTxhdfaqyeZScdvMEST9OtZ8
-DV2qXwakGUN8o2tdxn+zXKcrN0QN1CUsHkQlZ2m3PEEZlpgsp618SBGJVOHsLea8
-v3UxoEtw9BSGWip8xyWKMAhRh7KRmq4K4OqdNlo6M30KuPpPe0ZkI7gA2qR2lVv6
-ybR97uc9DrM8wKJjwYJKaYFeePdU99H4l2bzR6Au3mJ8Dd4Vq4wIPhC0ADvvDzU4
-UfZY/YkqAyroiwPZsaM2o8mspDqnbTOu6lPM4XeKFYKNdDamFVimnYLDKgM81/Ne
-IMv/7Klx5zt1Tf5NZaxgZ/xSXdQQAgQe/emteLIV5bdtIWlmT6O7WUI5QiUCAwEA
-AaNlMGMwHQYDVR0OBBYEFF7LNVAsmm6yfKeW7ViJuMrPTWfHMEIGA1UdEQQ7MDmC
-D2xvZ2luLnRzdC5raS5zZYYmaHR0cHM6Ly9sb2dpbi50c3Qua2kuc2UvaWRwL3No
-aWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACYeLTIPNFIMCey2yr95YxXdZTzB
-wRAODcgpQGaCPdb+MtyT2a7m/Z3g2bzQvqGgC7er/fv8pXMhpsGuPrgwvQNWXWUA
-l+0EyhfpVZn/KvehtJV911wrqbLh8XVCTL1f+yegjZb927m3i1ctHIRRq5i2xMoC
-xDQRJ2cT1zKmKy/1EaZpJXNvWjt7Jpis7MAa5Upl6bjnYWLfCWwTxnSZ5hVqTU9G
-U5qAm8DQOPhc4+r9NNyiwB159QMR9AcUZNb6YHjqV3vcRQqTL6+UlryQimkERyZO
-jcblqs70JyQRXtd9os7yqr20I31AuUW8esXh7BQI2puRxXgTTfMJyxoPC5s=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login.tst.ki.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login.tst.ki.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Karolinska Institutet</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Karolinska Institutet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Karolinska Institutet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://ki.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://ki.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Karolinska Institutet</md:Company>
-    <md:EmailAddress>mailto:selfservice@ki.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 8 524 82222</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Security Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@ki.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml b/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
deleted file mode 100644
index 22b010e7..00000000
--- a/metadata/swamid-testing/login2.temp1235.hhs.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://login2.temp1235.hhs.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-04-05T09:41:44Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://login2.temp1235.hhs.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Stockholm School of Economics -- TEST ONLY</mdui:DisplayName>
-        <mdui:Description xml:lang="en">For testing only</mdui:Description>
-        <mdui:DisplayName xml:lang="sv">Handelshögskolan i Stockholm -- ENDAST TEST</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Endast TEST</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVANboDpiChpZce1QQ5dpyWf/W0JF9MA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUxWhcNMzcwNDAzMTMyNDUxWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjL3UUdDF
-MG+LpPoNtCylTQLQEF9V1lpKa36haGhDnbpDlfY5jMR+u/SYqZDm4XK+03CgSSFp
-d6bKDpQJdXRCE1e3+zLG70nHYVYr4xJRLYXnYqOTIzHyW5Scod469j7KQX3ZJqor
-VF/2I1b34S5IhvIPWcwpFCbPsy0Y0JA9u5bI60qN7WI2AvfHjSRNEyLYy26I21uO
-VxWBosQOOuWJWM5u9nxxsDgx/7mXjNgG9MNndU3/asSt3gxMDWBIR8HnGRVEIpRt
-Ix4osEhEv6cCvC3KW5ivWxLYjYfVf74X6110jnyFmimchjihncCg2dhFar3evBL0
-WDl+KqHw5Iq6ZQIDAQABo3MwcTAdBgNVHQ4EFgQU9dV+CoGic2FD/Qfb00dscI1d
-J00wUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQBPzRpf9a96dgiCaLUBbJ8VfuKUtmsXoO71hmLpwWobv8v9d5HK03iY
-Kqm52vYm/GVlTTpar6Xg4icGLuGOvdB0/Ux0fdK9XebD9Qi0OBvD/5fD+TAbGoML
-bnkT4zr2+87txGEjLtmcT47Fu2dM58UArtLSvu7cGhh50P+LD7a6Ip6KxM35X94v
-m/hq55Kozrie6cB5vxSP8Kx/n5RKrLQBRedUaKNkfAacYXYKcFeWvwecnZz5Ezbs
-kL8+nsk2L2EWP+5Gdvlj7Og4ZmMW3WCV5VrAcn0aknUTyguUU3iPSzDqHG+s1Woh
-B90rsNE83YT8g731/6Y6sLC841F5HGNO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAJJaCEFsKewXEyQNmm3HxyP8WG0oMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUwWhcNMzcwNDAzMTMyNDUwWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxcuBujdK
-EIL3/PLAo6iFzVsBBtHKjdcmW0BKuvLqq2xXPeXzcCWtwV06BHTRbu1lLS/VUWQb
-hv7Y16DBSPyxyJbYiugN8WqgqGUaSCLnAhlm0owX59f6uEnpCfgkS87Km5S1KeD6
-KDUA8OOdoRSjG+mFVBSlC4nvYJjB+9eideAtW5TxUgGqp9lG4aLLMAUuPzOX3imH
-Vf04mNKFk2OQ3Mq20Ri8KewOpYHSXjfIPNAuxJ8mVndQ4RFazaxFmwvgD35uBN8f
-jfwVFKmjPFYU/DmxMisui/6JMkur/PQyr7n1Z/WVSHphkwzunj1EkYTvxWLZSDc1
-Spn+IhjnfLVoSwIDAQABo3MwcTAdBgNVHQ4EFgQUnKKAxcCkmcDnyFi37n82nNDA
-o9swUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCd1hisMfUZEpqKyizswbtkxLNIU1Yp4NbkNtKt2HgK8FSZHyx7bgEB
-zhg7BVetgrnfeRm8bBm0MBdxXt1aQSmLv0AxhwvgPv+W4oYtQacuG8MLTXop4y4A
-0libaM0vUQjJ6wniI+hZMpitaH/Q0vlO2Tq87Bg4n/cqXxBvwotBpf/R1RJXJ76y
-P1J973eOl+PqoVp6sSaNKlnoGi3oSu3yC6qKN1bLtT73UJQQTrJMK71psOTTTb78
-Z/tJfXfrAU6clq8BzV9tPrGaNh8Vc8fCafyosAyIggbyGuKbnoTBSk7X1+dKFcCL
-dKJkzuygfKebul7JLITyh1taLtz86Wrq
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAJFFeRTPSw5r8Nr1ASE+SxUO9SXqMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUxWhcNMzcwNDAzMTMyNDUxWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhWNQvzJ
-HpTZuSkaVsPbE4S0W2MfnV2RzNzdqg8vjeWILJrrLs5oJZHfK7xxcnsiLsTRIAaW
-rbeGFW2cy9fCTOJqPtG6vWuQz40qUAn0gJHGKYk/bXFpt5OkiR2XLwwtBoRO1tFz
-FTCYh/S+sB38km/RLu0MWD6Gzxta3H9+eU2zVepYopAU5UCRskytEHCpGeml0w8z
-oaw8mCf/8upkXsaKeH7VbTXhyS22rvqT/aTyxQMhbmVtNg7LtnJzZh+s4dYKiNAY
-59Tp8hhKFonLKD705BJoDYVZpl6LJI5lsn1L3xImSamVt6QFkf1H6oUTg7V+T0uw
-PJrbxtfPOVD0vwIDAQABo3MwcTAdBgNVHQ4EFgQUYSvnk/lbI16l/EDD6F7+1dSy
-xSEwUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA+WDOAP8fltDJLtOxdVjQ9QwiPffz6CyjKIGYuXouTBKeIP0FdbFvh
-Z8Cq51VyHqSOx3b5vVi9COT5LjOsz/Bo+SPGzBRAT+NjfJDvqjpXC4C8VZp7LuNJ
-w0mxQqp7BHnWHsDfT/oNHnsJOM5kT0knq6h7YDL05Tm2rzy//OsrA66EYaKsycnR
-PFEyLgZ0Ls+MUQgQzZDow4UHpfFwPnx/4CHQImB+aOiPvKAzbCf6S29z8BPxJta6
-ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
-1tAPLutBQ/nXr5SzoF4sUipVZGCI/nJy
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://login2.temp1235.hhs.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login2.temp1235.hhs.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">hhs.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVANboDpiChpZce1QQ5dpyWf/W0JF9MA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUxWhcNMzcwNDAzMTMyNDUxWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjL3UUdDF
-MG+LpPoNtCylTQLQEF9V1lpKa36haGhDnbpDlfY5jMR+u/SYqZDm4XK+03CgSSFp
-d6bKDpQJdXRCE1e3+zLG70nHYVYr4xJRLYXnYqOTIzHyW5Scod469j7KQX3ZJqor
-VF/2I1b34S5IhvIPWcwpFCbPsy0Y0JA9u5bI60qN7WI2AvfHjSRNEyLYy26I21uO
-VxWBosQOOuWJWM5u9nxxsDgx/7mXjNgG9MNndU3/asSt3gxMDWBIR8HnGRVEIpRt
-Ix4osEhEv6cCvC3KW5ivWxLYjYfVf74X6110jnyFmimchjihncCg2dhFar3evBL0
-WDl+KqHw5Iq6ZQIDAQABo3MwcTAdBgNVHQ4EFgQU9dV+CoGic2FD/Qfb00dscI1d
-J00wUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQBPzRpf9a96dgiCaLUBbJ8VfuKUtmsXoO71hmLpwWobv8v9d5HK03iY
-Kqm52vYm/GVlTTpar6Xg4icGLuGOvdB0/Ux0fdK9XebD9Qi0OBvD/5fD+TAbGoML
-bnkT4zr2+87txGEjLtmcT47Fu2dM58UArtLSvu7cGhh50P+LD7a6Ip6KxM35X94v
-m/hq55Kozrie6cB5vxSP8Kx/n5RKrLQBRedUaKNkfAacYXYKcFeWvwecnZz5Ezbs
-kL8+nsk2L2EWP+5Gdvlj7Og4ZmMW3WCV5VrAcn0aknUTyguUU3iPSzDqHG+s1Woh
-B90rsNE83YT8g731/6Y6sLC841F5HGNO
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAJJaCEFsKewXEyQNmm3HxyP8WG0oMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUwWhcNMzcwNDAzMTMyNDUwWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxcuBujdK
-EIL3/PLAo6iFzVsBBtHKjdcmW0BKuvLqq2xXPeXzcCWtwV06BHTRbu1lLS/VUWQb
-hv7Y16DBSPyxyJbYiugN8WqgqGUaSCLnAhlm0owX59f6uEnpCfgkS87Km5S1KeD6
-KDUA8OOdoRSjG+mFVBSlC4nvYJjB+9eideAtW5TxUgGqp9lG4aLLMAUuPzOX3imH
-Vf04mNKFk2OQ3Mq20Ri8KewOpYHSXjfIPNAuxJ8mVndQ4RFazaxFmwvgD35uBN8f
-jfwVFKmjPFYU/DmxMisui/6JMkur/PQyr7n1Z/WVSHphkwzunj1EkYTvxWLZSDc1
-Spn+IhjnfLVoSwIDAQABo3MwcTAdBgNVHQ4EFgQUnKKAxcCkmcDnyFi37n82nNDA
-o9swUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQCd1hisMfUZEpqKyizswbtkxLNIU1Yp4NbkNtKt2HgK8FSZHyx7bgEB
-zhg7BVetgrnfeRm8bBm0MBdxXt1aQSmLv0AxhwvgPv+W4oYtQacuG8MLTXop4y4A
-0libaM0vUQjJ6wniI+hZMpitaH/Q0vlO2Tq87Bg4n/cqXxBvwotBpf/R1RJXJ76y
-P1J973eOl+PqoVp6sSaNKlnoGi3oSu3yC6qKN1bLtT73UJQQTrJMK71psOTTTb78
-Z/tJfXfrAU6clq8BzV9tPrGaNh8Vc8fCafyosAyIggbyGuKbnoTBSk7X1+dKFcCL
-dKJkzuygfKebul7JLITyh1taLtz86Wrq
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDRDCCAiygAwIBAgIVAJFFeRTPSw5r8Nr1ASE+SxUO9SXqMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFmxvZ2luMi50ZW1wMTIzNS5oaHMuc2UwHhcNMTcwNDAz
-MTMyNDUxWhcNMzcwNDAzMTMyNDUxWjAhMR8wHQYDVQQDDBZsb2dpbjIudGVtcDEy
-MzUuaGhzLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvhWNQvzJ
-HpTZuSkaVsPbE4S0W2MfnV2RzNzdqg8vjeWILJrrLs5oJZHfK7xxcnsiLsTRIAaW
-rbeGFW2cy9fCTOJqPtG6vWuQz40qUAn0gJHGKYk/bXFpt5OkiR2XLwwtBoRO1tFz
-FTCYh/S+sB38km/RLu0MWD6Gzxta3H9+eU2zVepYopAU5UCRskytEHCpGeml0w8z
-oaw8mCf/8upkXsaKeH7VbTXhyS22rvqT/aTyxQMhbmVtNg7LtnJzZh+s4dYKiNAY
-59Tp8hhKFonLKD705BJoDYVZpl6LJI5lsn1L3xImSamVt6QFkf1H6oUTg7V+T0uw
-PJrbxtfPOVD0vwIDAQABo3MwcTAdBgNVHQ4EFgQUYSvnk/lbI16l/EDD6F7+1dSy
-xSEwUAYDVR0RBEkwR4IWbG9naW4yLnRlbXAxMjM1Lmhocy5zZYYtaHR0cHM6Ly9s
-b2dpbjIudGVtcDEyMzUuaGhzLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEB
-CwUAA4IBAQA+WDOAP8fltDJLtOxdVjQ9QwiPffz6CyjKIGYuXouTBKeIP0FdbFvh
-Z8Cq51VyHqSOx3b5vVi9COT5LjOsz/Bo+SPGzBRAT+NjfJDvqjpXC4C8VZp7LuNJ
-w0mxQqp7BHnWHsDfT/oNHnsJOM5kT0knq6h7YDL05Tm2rzy//OsrA66EYaKsycnR
-PFEyLgZ0Ls+MUQgQzZDow4UHpfFwPnx/4CHQImB+aOiPvKAzbCf6S29z8BPxJta6
-ZVOgTNDyMvfjJy54qOW28X+xRFZ9JpVo1SCBY/VyM1qJsOvFesw18dJORMU444BX
-1tAPLutBQ/nXr5SzoF4sUipVZGCI/nJy
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://login2.temp1235.hhs.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Stockholm School of Economics</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Stockholm School of Economics</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Handelshögskolan i Stockholm</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.hhs.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.hhs.se/sv/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:gregor.borgstrand@hhs.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:itsupport@hhs.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/miunidptest.miun.se-idp-shibboleth.xml b/metadata/swamid-testing/miunidptest.miun.se-idp-shibboleth.xml
deleted file mode 100644
index eab91141..00000000
--- a/metadata/swamid-testing/miunidptest.miun.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,310 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://miunidptest.miun.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:27:55Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://miunidptest.miun.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Mittuniversitetet (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">IDP för test på Mittuniversitetet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Mid Sweden University (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IDP for testing at Mid Sweden University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://miun.se/personuppgifterIdP</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://miun.se/en/personuppgifterIdP</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="146" width="260">https://miunidptest.miun.se/idp/images/miun-logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="146" width="260">https://miunidptest.miun.se/idp/images/miun-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>miun.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:63.176762,14.651352</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:62.394626,17.284259</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:62.630989,17.946473</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUDopqrwr+8ysNjsx8WcAQU0xgFqYwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
-MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSfUra2csPm7zfml2+
-+FLWgZ3C3W7V77ogOuOd/5+79XywWdtHD1WrJntmL4eGvytW8vU6/DOo0c4UVKxt
-DKB2LSIy6uwd+OPbnWl6IQbk2ylb0UOIMV1pLMgBmrBoKt2dtpUH0T3Oqg2D7r9r
-CH8nk7rgrT5INIQDCS1NNVWEgRqltMH1Mmn90J2XzoGZrl6ZmEZ8uWURcypuPZcT
-QY9VvbVP8PKz1Bo9Qhh0LjXOumIGCdQoH0sQytePjcroLpL1HSAvX7DDsPNl4/Qh
-snILrHdK2z601oN1Ngu1rxrqWz0H2j9Z8U+zYjxdGOpvjXPg8iOIZJW0YM36SbcB
-SfKZAgMBAAGjbTBrMB0GA1UdDgQWBBQC5zJpccPPIWSbMiJAkQHQ39PBNTBKBgNV
-HREEQzBBghNtaXVuaWRwdGVzdC5taXVuLnNlhipodHRwczovL21pdW5pZHB0ZXN0
-Lm1pdW4uc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACdM6Gcf
-mHA0Hr1zC4T18vXqj2todlOm/wBoisGcJ8Yvz5YDozE0Ginn1RpjaUab/v10s8BK
-xBwVnyzTupIJMl0pW7XEHzVEWStpn69m+iNFtDuCe8gVvILI0dRt1NVUD/+b3d1U
-/QePhM43hJVGWi7/yyP12INV98P4HdZ91VMxafGzFVCh/cgLjYxwVaAYt0kCzZqE
-oAK9ajxQTMEz7h5ebJDfi+eydnDmzUFuFYzjB4CIPs0YLvyr5R1wXOxzZcpPE7c5
-qjqmAlpXZIozlPXNuM5NG2qX5fs+okW0ZvDzp7uGthyxxTchBR8PxTfSnE2ImX2a
-Q2DB2f7ifMpnsvw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIVAPRwsS0jawwgnaLnIOydT5jeXjVhMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4uc2UwHhcNMTYwMzE0MTA0
-ODMyWhcNMzYwMzE0MTA0ODMyWjAeMRwwGgYDVQQDDBNtaXVuaWRwdGVzdC5taXVu
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4EPO2E98M79WKFHy
-APjeQALlMgPuAkrVa9aiC84V7q3hgfdbD0wbNJTGA9uj7an2Fz5uNfUWS1Rg/7DT
-uEjrGpsWXn3mlBuH2wOZe9wHqFwVf5NUos/00gLxs6WIjaNv6gxnbnVss0pKURTL
-+bl4mn7XSPpbNosWlHkn4IbnXBi8zTwQ7Us2+klu15YfAPnlkMYgzOl1YkxqB3cM
-zxnejzBjzpG1VJWkLUOEFxlFYUwEsn5aOMpT4DXEq1PSSZfDmtz6tN+WQiV8W1rt
-QYyThOUwvF+L6Z9N960IFfiirCVk30doFfu5P/KmzciFWKcRHH2Jce3R/pC0SVNs
-56Z63QIDAQABo20wazAdBgNVHQ4EFgQUhtV3ZMcE4JWqlNJJVYkqB5inKUEwSgYD
-VR0RBEMwQYITbWl1bmlkcHRlc3QubWl1bi5zZYYqaHR0cHM6Ly9taXVuaWRwdGVz
-dC5taXVuLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCKf/Z8
-m1RMKsiP56XEBD/KlZToM23WF+i3xw7IPlo6a+bMT2emxKBCVv3CU6oMe55TMUeu
-RHzNHB3g0oa/xH+APxLbP64FMvDrJAPFDsltRX97C9UyO47rBL983Jcjo20fjCt1
-03xMipYa9aYc6miUSXKSP0zLu8XoyRo8Vlx0+4y1hI1B/vfgw2I850thSfM/TepO
-eHLpC5j1cjhz+omgj8KtOu4iwRShXmOTb3/MPKYQ0BezIuI99QfavE3jkdVg4+bb
-sEjpTEgCNeNotsnug8EzSf3jMac7QVsKk/ZUjpMUiH1QWeXQSzpkT+BfEjcXUm23
-p8Zy6HNa1RvGgW8P</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUPMQjIIrMt+goB+uHSwi2oO14KAgwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
-MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgqMKF+EDtjw74HWSy
-t2SU4fV4734PyV9gsPBJph8VQ32cAB7tqkqhIQbkHJKhJ4XeladH+ifk+BOdje9n
-EwIKIehxdujW832NAlMkEXfo3M2wt8UCBATCoWsxexkFUtNhZQnvtUm7dW0GuDYE
-NaZd0W6JMz0vBl83+JatCHu30kHu6CDgo/D6S9RL4pj3KiN08oR5Rjn5jHdNgMTf
-dNuYn2jsvKiR9EtcXC2KgvtYwqzGpjmcFxthBPBF3lzAza8ES16UVCPxVuH9DSJ5
-gB20wTMzP9xKSWQ/NKjh4AqEZ0hLH4dXGDzA3G3h/IkSgfaB+XalZDC6vzfuXXnv
-dE2HAgMBAAGjbTBrMB0GA1UdDgQWBBREfhKvA2DRE1mKkZfCgjAyiwegWzBKBgNV
-HREEQzBBghNtaXVuaWRwdGVzdC5taXVuLnNlhipodHRwczovL21pdW5pZHB0ZXN0
-Lm1pdW4uc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGl9GoKC
-gm7ywKn8I5eAF+MEUkDPPPt5KMSfIe7SZmI975vceeCDaPOZ8gvKuAHHC3yG6fgf
-FLqNffN26y4k6EYg4XVGq5u8SmEwDktTn4wRJyj4NN9cqg3EZbw7wa10jTVTGEWm
-13Hf0TEi2qAkU3Xb8K7hHDy//BnKHo1FZLcIPMUGrIpaCl32klb5fAwvE+E6QgCB
-aFup4A/f+gTnofyIo1gi8TmMs/7v+A5Ty39VdmU15eXvA2TBhGEDFmVAQWnZvSQ2
-YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
-7RI4YGkyabhUuiM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://miunidptest.miun.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://miunidptest.miun.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidptest.miun.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidptest.miun.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Mittuniversitetet (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">IDP för test på Mittuniversitetet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Mid Sweden University (test)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IDP for testing at Mid Sweden University</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.miun.se/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">http://www.miun.se</mdui:InformationURL>
-        <mdui:Keywords xml:lang="en">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:Keywords xml:lang="sv">miun miu mittuniversitetet mid+sweden+university miunpunktse</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://miun.se/personuppgifterIdP</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://miun.se/en/personuppgifterIdP</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" height="146" width="260">https://miunidptest.miun.se/idp/images/miun-logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="146" width="260">https://miunidptest.miun.se/idp/images/miun-logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIVAPRwsS0jawwgnaLnIOydT5jeXjVhMA0GCSqGSIb3DQEB
-    CwUAMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4uc2UwHhcNMTYwMzE0MTA0
-    ODMyWhcNMzYwMzE0MTA0ODMyWjAeMRwwGgYDVQQDDBNtaXVuaWRwdGVzdC5taXVu
-    LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4EPO2E98M79WKFHy
-    APjeQALlMgPuAkrVa9aiC84V7q3hgfdbD0wbNJTGA9uj7an2Fz5uNfUWS1Rg/7DT
-    uEjrGpsWXn3mlBuH2wOZe9wHqFwVf5NUos/00gLxs6WIjaNv6gxnbnVss0pKURTL
-    +bl4mn7XSPpbNosWlHkn4IbnXBi8zTwQ7Us2+klu15YfAPnlkMYgzOl1YkxqB3cM
-    zxnejzBjzpG1VJWkLUOEFxlFYUwEsn5aOMpT4DXEq1PSSZfDmtz6tN+WQiV8W1rt
-    QYyThOUwvF+L6Z9N960IFfiirCVk30doFfu5P/KmzciFWKcRHH2Jce3R/pC0SVNs
-    56Z63QIDAQABo20wazAdBgNVHQ4EFgQUhtV3ZMcE4JWqlNJJVYkqB5inKUEwSgYD
-    VR0RBEMwQYITbWl1bmlkcHRlc3QubWl1bi5zZYYqaHR0cHM6Ly9taXVuaWRwdGVz
-    dC5taXVuLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCKf/Z8
-    m1RMKsiP56XEBD/KlZToM23WF+i3xw7IPlo6a+bMT2emxKBCVv3CU6oMe55TMUeu
-    RHzNHB3g0oa/xH+APxLbP64FMvDrJAPFDsltRX97C9UyO47rBL983Jcjo20fjCt1
-    03xMipYa9aYc6miUSXKSP0zLu8XoyRo8Vlx0+4y1hI1B/vfgw2I850thSfM/TepO
-    eHLpC5j1cjhz+omgj8KtOu4iwRShXmOTb3/MPKYQ0BezIuI99QfavE3jkdVg4+bb
-    sEjpTEgCNeNotsnug8EzSf3jMac7QVsKk/ZUjpMUiH1QWeXQSzpkT+BfEjcXUm23
-    p8Zy6HNa1RvGgW8P</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUPMQjIIrMt+goB+uHSwi2oO14KAgwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
-MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgqMKF+EDtjw74HWSy
-t2SU4fV4734PyV9gsPBJph8VQ32cAB7tqkqhIQbkHJKhJ4XeladH+ifk+BOdje9n
-EwIKIehxdujW832NAlMkEXfo3M2wt8UCBATCoWsxexkFUtNhZQnvtUm7dW0GuDYE
-NaZd0W6JMz0vBl83+JatCHu30kHu6CDgo/D6S9RL4pj3KiN08oR5Rjn5jHdNgMTf
-dNuYn2jsvKiR9EtcXC2KgvtYwqzGpjmcFxthBPBF3lzAza8ES16UVCPxVuH9DSJ5
-gB20wTMzP9xKSWQ/NKjh4AqEZ0hLH4dXGDzA3G3h/IkSgfaB+XalZDC6vzfuXXnv
-dE2HAgMBAAGjbTBrMB0GA1UdDgQWBBREfhKvA2DRE1mKkZfCgjAyiwegWzBKBgNV
-HREEQzBBghNtaXVuaWRwdGVzdC5taXVuLnNlhipodHRwczovL21pdW5pZHB0ZXN0
-Lm1pdW4uc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGl9GoKC
-gm7ywKn8I5eAF+MEUkDPPPt5KMSfIe7SZmI975vceeCDaPOZ8gvKuAHHC3yG6fgf
-FLqNffN26y4k6EYg4XVGq5u8SmEwDktTn4wRJyj4NN9cqg3EZbw7wa10jTVTGEWm
-13Hf0TEi2qAkU3Xb8K7hHDy//BnKHo1FZLcIPMUGrIpaCl32klb5fAwvE+E6QgCB
-aFup4A/f+gTnofyIo1gi8TmMs/7v+A5Ty39VdmU15eXvA2TBhGEDFmVAQWnZvSQ2
-YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
-7RI4YGkyabhUuiM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidptest.miun.se/idp/profile/Authn/SAML2/POST/SSO" index="0"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Mid Sweden University (test)</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Mittuniversitetet (test)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">miun.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUDopqrwr+8ysNjsx8WcAQU0xgFqYwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
-MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDSfUra2csPm7zfml2+
-+FLWgZ3C3W7V77ogOuOd/5+79XywWdtHD1WrJntmL4eGvytW8vU6/DOo0c4UVKxt
-DKB2LSIy6uwd+OPbnWl6IQbk2ylb0UOIMV1pLMgBmrBoKt2dtpUH0T3Oqg2D7r9r
-CH8nk7rgrT5INIQDCS1NNVWEgRqltMH1Mmn90J2XzoGZrl6ZmEZ8uWURcypuPZcT
-QY9VvbVP8PKz1Bo9Qhh0LjXOumIGCdQoH0sQytePjcroLpL1HSAvX7DDsPNl4/Qh
-snILrHdK2z601oN1Ngu1rxrqWz0H2j9Z8U+zYjxdGOpvjXPg8iOIZJW0YM36SbcB
-SfKZAgMBAAGjbTBrMB0GA1UdDgQWBBQC5zJpccPPIWSbMiJAkQHQ39PBNTBKBgNV
-HREEQzBBghNtaXVuaWRwdGVzdC5taXVuLnNlhipodHRwczovL21pdW5pZHB0ZXN0
-Lm1pdW4uc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACdM6Gcf
-mHA0Hr1zC4T18vXqj2todlOm/wBoisGcJ8Yvz5YDozE0Ginn1RpjaUab/v10s8BK
-xBwVnyzTupIJMl0pW7XEHzVEWStpn69m+iNFtDuCe8gVvILI0dRt1NVUD/+b3d1U
-/QePhM43hJVGWi7/yyP12INV98P4HdZ91VMxafGzFVCh/cgLjYxwVaAYt0kCzZqE
-oAK9ajxQTMEz7h5ebJDfi+eydnDmzUFuFYzjB4CIPs0YLvyr5R1wXOxzZcpPE7c5
-qjqmAlpXZIozlPXNuM5NG2qX5fs+okW0ZvDzp7uGthyxxTchBR8PxTfSnE2ImX2a
-Q2DB2f7ifMpnsvw=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDODCCAiCgAwIBAgIVAPRwsS0jawwgnaLnIOydT5jeXjVhMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4uc2UwHhcNMTYwMzE0MTA0
-ODMyWhcNMzYwMzE0MTA0ODMyWjAeMRwwGgYDVQQDDBNtaXVuaWRwdGVzdC5taXVu
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4EPO2E98M79WKFHy
-APjeQALlMgPuAkrVa9aiC84V7q3hgfdbD0wbNJTGA9uj7an2Fz5uNfUWS1Rg/7DT
-uEjrGpsWXn3mlBuH2wOZe9wHqFwVf5NUos/00gLxs6WIjaNv6gxnbnVss0pKURTL
-+bl4mn7XSPpbNosWlHkn4IbnXBi8zTwQ7Us2+klu15YfAPnlkMYgzOl1YkxqB3cM
-zxnejzBjzpG1VJWkLUOEFxlFYUwEsn5aOMpT4DXEq1PSSZfDmtz6tN+WQiV8W1rt
-QYyThOUwvF+L6Z9N960IFfiirCVk30doFfu5P/KmzciFWKcRHH2Jce3R/pC0SVNs
-56Z63QIDAQABo20wazAdBgNVHQ4EFgQUhtV3ZMcE4JWqlNJJVYkqB5inKUEwSgYD
-VR0RBEMwQYITbWl1bmlkcHRlc3QubWl1bi5zZYYqaHR0cHM6Ly9taXVuaWRwdGVz
-dC5taXVuLnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQCKf/Z8
-m1RMKsiP56XEBD/KlZToM23WF+i3xw7IPlo6a+bMT2emxKBCVv3CU6oMe55TMUeu
-RHzNHB3g0oa/xH+APxLbP64FMvDrJAPFDsltRX97C9UyO47rBL983Jcjo20fjCt1
-03xMipYa9aYc6miUSXKSP0zLu8XoyRo8Vlx0+4y1hI1B/vfgw2I850thSfM/TepO
-eHLpC5j1cjhz+omgj8KtOu4iwRShXmOTb3/MPKYQ0BezIuI99QfavE3jkdVg4+bb
-sEjpTEgCNeNotsnug8EzSf3jMac7QVsKk/ZUjpMUiH1QWeXQSzpkT+BfEjcXUm23
-p8Zy6HNa1RvGgW8P</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNzCCAh+gAwIBAgIUPMQjIIrMt+goB+uHSwi2oO14KAgwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTbWl1bmlkcHRlc3QubWl1bi5zZTAeFw0xNjAzMTQxMDQ4
-MzRaFw0zNjAzMTQxMDQ4MzRaMB4xHDAaBgNVBAMME21pdW5pZHB0ZXN0Lm1pdW4u
-c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgqMKF+EDtjw74HWSy
-t2SU4fV4734PyV9gsPBJph8VQ32cAB7tqkqhIQbkHJKhJ4XeladH+ifk+BOdje9n
-EwIKIehxdujW832NAlMkEXfo3M2wt8UCBATCoWsxexkFUtNhZQnvtUm7dW0GuDYE
-NaZd0W6JMz0vBl83+JatCHu30kHu6CDgo/D6S9RL4pj3KiN08oR5Rjn5jHdNgMTf
-dNuYn2jsvKiR9EtcXC2KgvtYwqzGpjmcFxthBPBF3lzAza8ES16UVCPxVuH9DSJ5
-gB20wTMzP9xKSWQ/NKjh4AqEZ0hLH4dXGDzA3G3h/IkSgfaB+XalZDC6vzfuXXnv
-dE2HAgMBAAGjbTBrMB0GA1UdDgQWBBREfhKvA2DRE1mKkZfCgjAyiwegWzBKBgNV
-HREEQzBBghNtaXVuaWRwdGVzdC5taXVuLnNlhipodHRwczovL21pdW5pZHB0ZXN0
-Lm1pdW4uc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAGl9GoKC
-gm7ywKn8I5eAF+MEUkDPPPt5KMSfIe7SZmI975vceeCDaPOZ8gvKuAHHC3yG6fgf
-FLqNffN26y4k6EYg4XVGq5u8SmEwDktTn4wRJyj4NN9cqg3EZbw7wa10jTVTGEWm
-13Hf0TEi2qAkU3Xb8K7hHDy//BnKHo1FZLcIPMUGrIpaCl32klb5fAwvE+E6QgCB
-aFup4A/f+gTnofyIo1gi8TmMs/7v+A5Ty39VdmU15eXvA2TBhGEDFmVAQWnZvSQ2
-YAe2eCFJhzuNutfMyzzH4ZE1da+vfxQX0yLQpKiK4XRIH4Jr1THM/12L+YNmlRPF
-7RI4YGkyabhUuiM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://miunidptest.miun.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.miun.se/privacypolicy/about</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.miun.se/privacypolicy/about</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA Department</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:GivenName>Incident Manager</md:GivenName>
-    <md:SurName>SystemDrift, INFRA Department</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:GivenName>Incident Manager</md:GivenName>
-    <md:SurName>Mid Sweden University Incident Manager</md:SurName>
-    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/miunidtest.test.miun.se-saml-miun-metadata.xml b/metadata/swamid-testing/miunidtest.test.miun.se-saml-miun-metadata.xml
deleted file mode 100644
index 0ab36dde..00000000
--- a/metadata/swamid-testing/miunidtest.test.miun.se-saml-miun-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://miunidtest.test.miun.se/saml/miun/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-12T08:35:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Studentinformationsverktyg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Student Information Tools</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Tjänster för studenter.</mdui:Description>
-        <mdui:Description xml:lang="en">Services for student.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDZTCCAk2gAwIBAgIUPqt3KoPwgXU1NxKQGo6pC+HBdKEwDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxHjAcBgNVBAoMFU1pZCBTd2VkZW4gVW5pdmVyc2l0eTAeFw0yMDA0MTcxMzU5MDFaFw0zMDA0MTcxMzU5MDFaMEIxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMR4wHAYDVQQKDBVNaWQgU3dlZGVuIFVuaXZlcnNpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY6KIUQNALQPAeBCWbDwVbYY0iFU3Awy59rZx6DNjksqYVnOV6IAgZHc72NSrgk8Hytx1DufoSXVq90PeBAhnQep4bll61oe2Z74KoAbEd8ys+JtvloMZ61V3IeNVria7AgjXyI7AALydiu4GW/H/+eXISjC8gAkSzMpxBmGI4oZdDiKYn16D9vJncQFW7HtR2xKqu4oEeIV1mrUHQ8dhQIgJgeKA3MEdvywC0pQePwkuncWEy2E8syPSWr/+Axtw04CQQGtRGAGk4yGHyRrDWt6zdQ02ayiH8+FsdswjSZUuSii/wuo1GYBnFDbWPO/FM2f+E5Z8EPdPtGCgeBAohAgMBAAGjUzBRMB0GA1UdDgQWBBQPU0Sczduvg9nyck0RhUptiSv8DTAfBgNVHSMEGDAWgBQPU0Sczduvg9nyck0RhUptiSv8DTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCB5ggnFQMmCTgmYP8RXQyVIagTqzS5vHlqcwn86HN00v3ov69C+kNMYCV3e+xTY2HmABGIbh5SiqxHq36A7BPrX7H5c7CuNhDhG6ol+Xeeg/mzbyKD0DbsJ/KmUF6iLICCKiQoJC1hck1ApRJP8F30MW8yeJlJDu9vvefKqbXaTS83uYpzy0yQBk6z+nDLlaU20Hx2sSHqXOQS9i8dxb5TNcZlHS36IEW5I2SgRRJ+SYxFrytI+8TJQkQoueJ7n8SGd+VjyXUcMXx7HsZwgzMyYoJyolMY5Ts6mHr+REn+xk+PB5V5J40WXAMwCQg7OjL0P+yjgFThKvo03etq6xfG</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDZTCCAk2gAwIBAgIUPqt3KoPwgXU1NxKQGo6pC+HBdKEwDQYJKoZIhvcNAQELBQAwQjELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxHjAcBgNVBAoMFU1pZCBTd2VkZW4gVW5pdmVyc2l0eTAeFw0yMDA0MTcxMzU5MDFaFw0zMDA0MTcxMzU5MDFaMEIxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMR4wHAYDVQQKDBVNaWQgU3dlZGVuIFVuaXZlcnNpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDY6KIUQNALQPAeBCWbDwVbYY0iFU3Awy59rZx6DNjksqYVnOV6IAgZHc72NSrgk8Hytx1DufoSXVq90PeBAhnQep4bll61oe2Z74KoAbEd8ys+JtvloMZ61V3IeNVria7AgjXyI7AALydiu4GW/H/+eXISjC8gAkSzMpxBmGI4oZdDiKYn16D9vJncQFW7HtR2xKqu4oEeIV1mrUHQ8dhQIgJgeKA3MEdvywC0pQePwkuncWEy2E8syPSWr/+Axtw04CQQGtRGAGk4yGHyRrDWt6zdQ02ayiH8+FsdswjSZUuSii/wuo1GYBnFDbWPO/FM2f+E5Z8EPdPtGCgeBAohAgMBAAGjUzBRMB0GA1UdDgQWBBQPU0Sczduvg9nyck0RhUptiSv8DTAfBgNVHSMEGDAWgBQPU0Sczduvg9nyck0RhUptiSv8DTAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCB5ggnFQMmCTgmYP8RXQyVIagTqzS5vHlqcwn86HN00v3ov69C+kNMYCV3e+xTY2HmABGIbh5SiqxHq36A7BPrX7H5c7CuNhDhG6ol+Xeeg/mzbyKD0DbsJ/KmUF6iLICCKiQoJC1hck1ApRJP8F30MW8yeJlJDu9vvefKqbXaTS83uYpzy0yQBk6z+nDLlaU20Hx2sSHqXOQS9i8dxb5TNcZlHS36IEW5I2SgRRJ+SYxFrytI+8TJQkQoueJ7n8SGd+VjyXUcMXx7HsZwgzMyYoJyolMY5Ts6mHr+REn+xk+PB5V5J40WXAMwCQg7OjL0P+yjgFThKvo03etq6xfG</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidtest.test.miun.se/saml/miun/sls"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidtest.test.miun.se/saml/miun/acs" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Studentinformationsverktyg</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Studentinformationsverktyg</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Mittuniversitetet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Mid Sweden University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.miun.se/privacypolicy/about</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.miun.se/privacypolicy/about</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>46 10 142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>46 10 142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10 142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Manager</md:GivenName>
-    <md:SurName>Mid Sweden University Icident Manager</md:SurName>
-    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/miunidutv.test.miun.se-saml-miun-metadata.xml b/metadata/swamid-testing/miunidutv.test.miun.se-saml-miun-metadata.xml
deleted file mode 100644
index 3ca2568f..00000000
--- a/metadata/swamid-testing/miunidutv.test.miun.se-saml-miun-metadata.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://miunidutv.test.miun.se/saml/miun/metadata">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-11-12T08:35:56Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Studentinformationsverktyg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Student Information Tools</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Tjänster för studenter.</mdui:Description>
-        <mdui:Description xml:lang="en">Services for student.</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:PrivacyStatementURL>
-        <mdui:InformationURL xml:lang="en">https://www.miun.se/privacypolicy/studentinformationtools</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.miun.se/privacypolicy/studentinformationsverktyg</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEoTCCAwmgAwIBAgIJALr6KmPgG+ebMA0GCSqGSIb3DQEBCwUAMGcxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxIDAeBgNVBAMMF21pdW5pZHB1dHYudGVzdC5taXVuLnNlMB4XDTIwMDkyMjA4MjY0N1oXDTMwMDkyMjA4MjY0N1owZzELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEgMB4GA1UEAwwXbWl1bmlkcHV0di50ZXN0Lm1pdW4uc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDG6ZhVyA1nYDkcjSOWTBHSVUWwo0ku36oZ/+KWo4KHK9PaA66FpQc0iisOO7aXXFFbtR2WS3dkymUp4wGiOCuda/omF1SMTmYyYKAcPXAei+dsVxNsJ+5notWj5JRKnRQxJ4TnS7GJiS1pK2JBAifx4ssPZCIa5F941iQDiJk6r3/S9C4+AxCkQej7zrNr9AzFYksNSOzLcOxZatG6X+L6EV+ujAtIiwtiJ8rnh4jFyY33LrXuVWty3fGPBn4HG7NiCnjRt+MopEPc0TAM0XX+5xY6TTEYwQASK66ScypIfSBuhTiVixpRcKcMcAENHKQJTNueS+f0w23ESKpGgKGn98MwIy93PzEgX3T9f3wefKLVSxHuPizOs5tWPoGEtzT1RDqYR7gZxkKw0vz8fFmt/JQPOvX0xTZzxomaiFCgyyZsHk6gtlYnTtFZf4ULI/NiK8mC9oQA6VR3FqOAsYpV3i6atVl55g4gUs4lXuRKFW2HbNrarDhZ2IEvLHrzCasCAwEAAaNQME4wHQYDVR0OBBYEFChMG93llg10eQb2YkbVrxb9k5ZpMB8GA1UdIwQYMBaAFChMG93llg10eQb2YkbVrxb9k5ZpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggGBABz2u3FfSXJyLyMpuTdGV2H0G1t2hRQi6F+uMdCQEwZ5dXbX5sutEl5JzKR57amtNfXodeCQck1pgXDoT3dM8lgi8f4Oz1tKo0PZQfXL+zQiev0/9X6iC1cXWqjuMw28c4o0YYz+j+8WFdaNjW4zxYNBay9hBsPoofxWZeaTGV5Y93svy4xe+9G0Mbo42LOUDXEhOnHMip3TdBMGsNu2VEcUzLiKjKZBmzUtqISofD61fdI8d22je/bRim7MV69i9uGHw4pmbWEd3OAmMGFIIyOZOM/fPAIxLKV7kZs11xVBL14ViHFBKklQcYqZ1ws+N0fUhwaBzQzzUzaPz9wN4X0ixvr0wNM9M3Sv/dM4Cfq7fkvp5qJBuj+nIX7YgBPllMwUtf9XddGYxZJZrkpjNlt03WPTmPU3wZDiR125442ANoPZZ1TAC5W3z7Q+5SKCSMaZxNRagwwr5oeA3iLdfaJsHEln6f215KAMTisHCVuscmX0kA/YwWTkIMztb5JUcg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEoTCCAwmgAwIBAgIJALr6KmPgG+ebMA0GCSqGSIb3DQEBCwUAMGcxCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxIDAeBgNVBAMMF21pdW5pZHB1dHYudGVzdC5taXVuLnNlMB4XDTIwMDkyMjA4MjY0N1oXDTMwMDkyMjA4MjY0N1owZzELMAkGA1UEBhMCU0UxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEgMB4GA1UEAwwXbWl1bmlkcHV0di50ZXN0Lm1pdW4uc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDG6ZhVyA1nYDkcjSOWTBHSVUWwo0ku36oZ/+KWo4KHK9PaA66FpQc0iisOO7aXXFFbtR2WS3dkymUp4wGiOCuda/omF1SMTmYyYKAcPXAei+dsVxNsJ+5notWj5JRKnRQxJ4TnS7GJiS1pK2JBAifx4ssPZCIa5F941iQDiJk6r3/S9C4+AxCkQej7zrNr9AzFYksNSOzLcOxZatG6X+L6EV+ujAtIiwtiJ8rnh4jFyY33LrXuVWty3fGPBn4HG7NiCnjRt+MopEPc0TAM0XX+5xY6TTEYwQASK66ScypIfSBuhTiVixpRcKcMcAENHKQJTNueS+f0w23ESKpGgKGn98MwIy93PzEgX3T9f3wefKLVSxHuPizOs5tWPoGEtzT1RDqYR7gZxkKw0vz8fFmt/JQPOvX0xTZzxomaiFCgyyZsHk6gtlYnTtFZf4ULI/NiK8mC9oQA6VR3FqOAsYpV3i6atVl55g4gUs4lXuRKFW2HbNrarDhZ2IEvLHrzCasCAwEAAaNQME4wHQYDVR0OBBYEFChMG93llg10eQb2YkbVrxb9k5ZpMB8GA1UdIwQYMBaAFChMG93llg10eQb2YkbVrxb9k5ZpMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggGBABz2u3FfSXJyLyMpuTdGV2H0G1t2hRQi6F+uMdCQEwZ5dXbX5sutEl5JzKR57amtNfXodeCQck1pgXDoT3dM8lgi8f4Oz1tKo0PZQfXL+zQiev0/9X6iC1cXWqjuMw28c4o0YYz+j+8WFdaNjW4zxYNBay9hBsPoofxWZeaTGV5Y93svy4xe+9G0Mbo42LOUDXEhOnHMip3TdBMGsNu2VEcUzLiKjKZBmzUtqISofD61fdI8d22je/bRim7MV69i9uGHw4pmbWEd3OAmMGFIIyOZOM/fPAIxLKV7kZs11xVBL14ViHFBKklQcYqZ1ws+N0fUhwaBzQzzUzaPz9wN4X0ixvr0wNM9M3Sv/dM4Cfq7fkvp5qJBuj+nIX7YgBPllMwUtf9XddGYxZJZrkpjNlt03WPTmPU3wZDiR125442ANoPZZ1TAC5W3z7Q+5SKCSMaZxNRagwwr5oeA3iLdfaJsHEln6f215KAMTisHCVuscmX0kA/YwWTkIMztb5JUcg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://miunidutv.test.miun.se/saml/miun/sls"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://miunidutv.test.miun.se/saml/miun/acs" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Student Information Tools</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Studentinformationsverktyg</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">MIUN</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">MIUN</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Mittuniversitetet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Mid Sweden University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.miun.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.miun.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>SystemDrift, INFRA, Mittuniversitetet</md:SurName>
-    <md:EmailAddress>mailto:swamidcontact@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-142 80 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Mid Sweden University</md:Company>
-    <md:SurName>IT Helpdesk</md:SurName>
-    <md:EmailAddress>mailto:helpdesk@miun.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 771 976130</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Manager</md:GivenName>
-    <md:SurName>Mid Sweden University Icident Manager</md:SurName>
-    <md:EmailAddress>mailto:abuse@miun.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/openidp.feide.no.xml b/metadata/swamid-testing/openidp.feide.no.xml
deleted file mode 100644
index 1f146aff..00000000
--- a/metadata/swamid-testing/openidp.feide.no.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://openidp.feide.no">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://openidp.feide.no">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICizCCAfQCCQCY8tKaMc0BMjANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTEQMA4GA1UEChMHVU5JTkVUVDEOMAwGA1UECxMFRmVpZGUxGTAXBgNVBAMTEG9wZW5pZHAuZmVpZGUubm8xKTAnBgkqhkiG9w0BCQEWGmFuZHJlYXMuc29sYmVyZ0B1bmluZXR0Lm5vMB4XDTA4MDUwODA5MjI0OFoXDTM1MDkyMzA5MjI0OFowgYkxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxDjAMBgNVBAsTBUZlaWRlMRkwFwYDVQQDExBvcGVuaWRwLmZlaWRlLm5vMSkwJwYJKoZIhvcNAQkBFhphbmRyZWFzLnNvbGJlcmdAdW5pbmV0dC5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAt8jLoqI1VTlxAZ2axiDIThWcAOXdu8KkVUWaN/SooO9O0QQ7KRUjSGKN9JK65AFRDXQkWPAu4HlnO4noYlFSLnYyDxI66LCr71x4lgFJjqLeAvB/GqBqFfIZ3YK/NrhnUqFwZu63nLrZjcUZxNaPjOOSRSDaXpv1kb5k3jOiSGECAwEAATANBgkqhkiG9w0BAQUFAAOBgQBQYj4cAafWaYfjBU2zi1ElwStIaJ5nyp/s/8B8SAPK2T79McMyccP3wSW13LHkmM1jwKe3ACFXBvqGQN0IbcH49hu0FKhYFM/GPDJcIHFBsiyMBXChpye9vBaTNEBCtU3KjjyG0hRT2mAQ9h+bkPmOvlEo/aH0xR68Z9hw4PF13w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIICizCCAfQCCQCY8tKaMc0BMjANBgkqhkiG9w0BAQUFADCBiTELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTEQMA4GA1UEChMHVU5JTkVUVDEOMAwGA1UECxMFRmVpZGUxGTAXBgNVBAMTEG9wZW5pZHAuZmVpZGUubm8xKTAnBgkqhkiG9w0BCQEWGmFuZHJlYXMuc29sYmVyZ0B1bmluZXR0Lm5vMB4XDTA4MDUwODA5MjI0OFoXDTM1MDkyMzA5MjI0OFowgYkxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEDAOBgNVBAoTB1VOSU5FVFQxDjAMBgNVBAsTBUZlaWRlMRkwFwYDVQQDExBvcGVuaWRwLmZlaWRlLm5vMSkwJwYJKoZIhvcNAQkBFhphbmRyZWFzLnNvbGJlcmdAdW5pbmV0dC5ubzCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAt8jLoqI1VTlxAZ2axiDIThWcAOXdu8KkVUWaN/SooO9O0QQ7KRUjSGKN9JK65AFRDXQkWPAu4HlnO4noYlFSLnYyDxI66LCr71x4lgFJjqLeAvB/GqBqFfIZ3YK/NrhnUqFwZu63nLrZjcUZxNaPjOOSRSDaXpv1kb5k3jOiSGECAwEAATANBgkqhkiG9w0BAQUFAAOBgQBQYj4cAafWaYfjBU2zi1ElwStIaJ5nyp/s/8B8SAPK2T79McMyccP3wSW13LHkmM1jwKe3ACFXBvqGQN0IbcH49hu0FKhYFM/GPDJcIHFBsiyMBXChpye9vBaTNEBCtU3KjjyG0hRT2mAQ9h+bkPmOvlEo/aH0xR68Z9hw4PF13w==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openidp.feide.no/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openidp.feide.no/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Andreas</md:GivenName>
-    <md:SurName>Åkre Solberg</md:SurName>
-    <md:EmailAddress>mailto:andreas@uninett.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/permitwinstaging1.caleaccess.com.xml b/metadata/swamid-testing/permitwinstaging1.caleaccess.com.xml
deleted file mode 100644
index fd35829d..00000000
--- a/metadata/swamid-testing/permitwinstaging1.caleaccess.com.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://permitwinstaging1.caleaccess.com">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-07-04T11:36:21Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/Login/Lund_University"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Flowbird Parking Services</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Flowbird Parking Services</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Webbaserat system för parkeringstillstånd</mdui:Description>
-        <mdui:Description xml:lang="en">A web based parking solution</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="en">https://calepermit.com/customer/swamid/privacypolicy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>caleaccess.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=caleaccess.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/DCCAmSgAwIBAgIUZQq7U9ElqvROzxsBFSVGCFylSp4wDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAxMOY2FsZWFjY2Vzcy5jb20wHhcNMjAwNjI1MDgzNDQxWhcN
-MzAwNjIzMDgzNDQxWjAZMRcwFQYDVQQDEw5jYWxlYWNjZXNzLmNvbTCCAaIwDQYJ
-KoZIhvcNAQEBBQADggGPADCCAYoCggGBAKvksESS+EIF5od1vgwxRfR6m4qat1VB
-tnFJEO7hEiUrBlWwjiHcGQC6fg337aEGzh4g+dNBOeJRST+8ZmgbGc6R7O6gAQfT
-qtAaJAcfSzYl3Q6dXMU0ziQMtsZcJdIIbrMOF6eEsbK311wcZx+2g5nKIa280Bhg
-ZZI4fO0FBamBl4SEXzIxZ/7E+TtQjJDUTqJ5OuHF+BxG4awEVaIKfdseLHcbsIoM
-l6rNiSVd+/X6YD0dEhgWWd4aZxhgS4JOXOcPb6ztbF7EaM8z93ImRaHI9z2WO5Tw
-u3Wf/lNPaV71lmyZid9r29WEdiMdKe1aEokrhQJVF0Wz4YMlCwVIpAMKbOUTBDHR
-gli8QPyCYHw5SywxLwkZaVSb1ipba0nUbtNRDdtPezAXZvj3h1NyIoD+7ihTkIMd
-MuaTrXYrpW3RxqmdeNC3/yJJ+7PTkKa1VyYkJ5IoHJHS1aWMkgwsY/KmpUKuYtUN
-R0jNXMJTwOWCOMHTXSEmEPhhiemggU5k9wIDAQABozwwOjAZBgNVHREEEjAQgg5j
-YWxlYWNjZXNzLmNvbTAdBgNVHQ4EFgQUdAqevqVWsBzQHNJ63IKrJwRTaS8wDQYJ
-KoZIhvcNAQELBQADggGBAB2F7f11FaCRhVIgI5V6aWWsnK1nNw80V6O8STQdiHXX
-VnKGF+mkJmtoeNe0hJKptqQatheFzagBlzSrmvUI4FUkx5yI/0apl19402niRg/G
-+7BMlR4KtHSDFdT6NqMMnBixU0ozFE/caeLN1RP7bZHXfP9pmz/pp6s/n85UvKhu
-ZekcmCF4Gr8t0/DyalRojDmAz9g2JCJIHUzctzhUM2bpWk6pbo0VDihL2YLSQSXc
-BqOYWfgAl40ktDOZlviwhNKOAV6SNBe9xMFW/DqiKgggOQzCKMHsKvUYSuV4ALWe
-JR5RtUCyxnGYSKsCabD6V0PsL8rObVdC4PDwfv/TFRpS8Y5VDAO3j9/h1blS108d
-k1DhoZaPeEIHa97F5j6qXpFqadLLjV1O8Ph1q/EFkbAS0MYtMyRTOlxy4qypSIaO
-32l60CiSDNoQfgD0ey5ENM3vau/GSQd/ylBD1717hLEjNA4+kl2AFNPJ6r19ZNpQ
-tt8Ph0n7cMJdPPS6TcNfEA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://permitwinstaging1.caleaccess.com/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="en">Flowbird Parking Services</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="personalIdentityNumber" Name="urn:oid:1.2.752.29.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="schacDateOfBirth" Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="c" Name="urn:oid:2.5.4.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="co" Name="urn:oid:0.9.2342.19200300.100.1.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Flowbird Sverige AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Flowbird Sverige AB</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.caleaccess.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Zoran Ivic</md:SurName>
-    <md:EmailAddress>mailto:zoran.ivic@service.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Flowbird Sverige AB</md:Company>
-    <md:GivenName>Stefan</md:GivenName>
-    <md:SurName>Belkot</md:SurName>
-    <md:EmailAddress>mailto:stefan.belkot@flowbird.group</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Flowbird Sverige AB</md:Company>
-    <md:GivenName>Stefan</md:GivenName>
-    <md:SurName>Belkot</md:SurName>
-    <md:EmailAddress>mailto:stefan.belkot@flowbird.group</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/referens-idp.skolfederation.se-idp-shibboleth.xml b/metadata/swamid-testing/referens-idp.skolfederation.se-idp-shibboleth.xml
deleted file mode 100644
index 85d816f5..00000000
--- a/metadata/swamid-testing/referens-idp.skolfederation.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://referens-idp.skolfederation.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2018-10-10T15:43:06Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://referens-idp.skolfederation.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDZTCCAk2gAwIBAgIUKPuSVuIjr2FbDlWqGOFy0ApB/O0wDQYJKoZIhvcNAQEF
-BQAwKTEnMCUGA1UEAxMecmVmZXJlbnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTEyMDUwMjA5MDI1MVoXDTMyMDUwMjA5MDI1MVowKTEnMCUGA1UEAxMecmVmZXJl
-bnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAinya2PnreUkOXyDvS4Vaooc0cmBlsRHsJ8DWxhuNA0LiUI+MDBPs
-5OC71rmTXzg3ePZVrAsmQiy+vCA5hsWsYDMH5rVHlHWvtojxyS+AGbNgbaWkX+l9
-GWfDAGvs93nfeFhDU8sLScjCnDwwcaCfLj26OHeRv8bkuNFdE4Cm4/bQOn1DwhqK
-PM/za1N7yBDX98apeNidbqCknlL9G/O0MYvuMv0hTWJcEclIy78olLzecPPQ+Ymj
-1sWj0xT1nVbgUz5xcV1p9KMs9+uzOFuS4vDAh8RI/kj4oZkvYm5eUviSqbtAvCuc
-gIkrnAHpsVJeKwvfE1t6KMAGAg8nmPfG+QIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-HnJlZmVyZW5zLWlkcC5za29sZmVkZXJhdGlvbi5zZYY1aHR0cHM6Ly9yZWZlcmVu
-cy1pZHAuc2tvbGZlZGVyYXRpb24uc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-FDGYGEoW6StQ2y1uiHAO4kbWKEzXMA0GCSqGSIb3DQEBBQUAA4IBAQARTJuCZOLb
-zxV5XFjBaPtWdEeZbYqYrItX5BeAPQ/M0hnyYeU3bU3ytfWGyT5m7Ff8aQcRM8Xe
-EBW7oTSurHCVO1joCXzI46tsq/71Enq+IFhhWMjHt12MopjsKRC7y6GcbjrTjA8o
-NERsWm/h0CKeBv0vn2tmGHjcKF6nI+sZfiVsOufnFvfjO3r2laPz2XsTNwPs3HlQ
-l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
-73JJwci3n22fBYfUAIPYzjETa0mJ0zg18NGK90yXH7d786hUvxsn0h/b8GBUyiZb
-1d+aL8hqHTd2
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://referens-idp.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://referens-idp.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">referens-idp.skolfederation.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDZTCCAk2gAwIBAgIUKPuSVuIjr2FbDlWqGOFy0ApB/O0wDQYJKoZIhvcNAQEF
-BQAwKTEnMCUGA1UEAxMecmVmZXJlbnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTEyMDUwMjA5MDI1MVoXDTMyMDUwMjA5MDI1MVowKTEnMCUGA1UEAxMecmVmZXJl
-bnMtaWRwLnNrb2xmZWRlcmF0aW9uLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAinya2PnreUkOXyDvS4Vaooc0cmBlsRHsJ8DWxhuNA0LiUI+MDBPs
-5OC71rmTXzg3ePZVrAsmQiy+vCA5hsWsYDMH5rVHlHWvtojxyS+AGbNgbaWkX+l9
-GWfDAGvs93nfeFhDU8sLScjCnDwwcaCfLj26OHeRv8bkuNFdE4Cm4/bQOn1DwhqK
-PM/za1N7yBDX98apeNidbqCknlL9G/O0MYvuMv0hTWJcEclIy78olLzecPPQ+Ymj
-1sWj0xT1nVbgUz5xcV1p9KMs9+uzOFuS4vDAh8RI/kj4oZkvYm5eUviSqbtAvCuc
-gIkrnAHpsVJeKwvfE1t6KMAGAg8nmPfG+QIDAQABo4GEMIGBMGAGA1UdEQRZMFeC
-HnJlZmVyZW5zLWlkcC5za29sZmVkZXJhdGlvbi5zZYY1aHR0cHM6Ly9yZWZlcmVu
-cy1pZHAuc2tvbGZlZGVyYXRpb24uc2UvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYE
-FDGYGEoW6StQ2y1uiHAO4kbWKEzXMA0GCSqGSIb3DQEBBQUAA4IBAQARTJuCZOLb
-zxV5XFjBaPtWdEeZbYqYrItX5BeAPQ/M0hnyYeU3bU3ytfWGyT5m7Ff8aQcRM8Xe
-EBW7oTSurHCVO1joCXzI46tsq/71Enq+IFhhWMjHt12MopjsKRC7y6GcbjrTjA8o
-NERsWm/h0CKeBv0vn2tmGHjcKF6nI+sZfiVsOufnFvfjO3r2laPz2XsTNwPs3HlQ
-l27vPw5wc7vuymARYxUEaDSRqL1Tzk784JGsGeoAhGMMjJp+IiYC6rtRDOD43rsZ
-73JJwci3n22fBYfUAIPYzjETa0mJ0zg18NGK90yXH7d786hUvxsn0h/b8GBUyiZb
-1d+aL8hqHTd2
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://referens-idp.skolfederation.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">ReferensIdP</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Skolfederation.SE Referens-IDP</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://skolfederation.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:Company>SUNET</md:Company>
-    <md:EmailAddress>mailto:operations@skolfederation.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml b/metadata/swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml
deleted file mode 100644
index fe7687b1..00000000
--- a/metadata/swamid-testing/s2s.ifmsa.se-Saml2-proxy_saml2_backend.xml.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://s2s.ifmsa.se/Saml2/proxy_saml2_backend.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-11-05T14:34:05Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://s2s.ifmsa.se/Saml2/disco" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDZDCCAkwCCQC/CkAr6rf3djANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJT
-RTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xFTATBgNV
-BAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxGTAXBgNVBAMMEHMycy5jbG91
-ZGFwcC5uZXQwHhcNMTcwOTE2MjMwMTQ0WhcNMjcwOTE0MjMwMTQ0WjB0MQswCQYD
-VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
-FTATBgNVBAoMDElGTVNBLVN3ZWRlbjELMAkGA1UECwwCSVQxGTAXBgNVBAMMEHMy
-cy5jbG91ZGFwcC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC8
-Avq0plP8TbRCesOX3ZdBtUySWjiXGolOP+YFWvkF1DKyqLsttiYCUelKng+bNvWH
-xwRvFp/+LIfObeOOgDyzz+MJq8y5NaJNM9ZDErT2jLI533VIC3GYnmMu0D/FLG+N
-wzXf7B3w35APuy0UhamKxLIyZSaAAXctNeGyzM5QU1jC+ylgkW0swMG2u4F45Ufd
-MvpfMfHqpg1rVYDWSBOz8fLLh1FXgzjU3OvGjeYHTEusRdiY5ff+uzDNPmt8SWvY
-GK3LIEHNkP2VAG2AfQ21v32BMWtSTqG+vqcsgaivqwo2Gt+d8WuZgVCmV4XzFHdI
-C6U7lnojlRmPbxia4QlTAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAEAimvY/Xyn9
-GSrN3Fpu4eWffDocY/OAeLknsokv5fRrE3DfUYC1akwW5GMha6hQcc5DNt3F5O0z
-9FeUFLoEGjmavVL5kFDnkQcxBxDQMx2i3hfdd4Ji2c2yZf66xNot54/L5Ha25Gcl
-dwQ0t8n66d+IXLLvg2KtyWJjfycEgsbrV76b6L71t+iTbFh/ZsfvmEePYJlwOZ7q
-l88ZeHMBKnOdDANm1jTZTD2DjpwjO2Qy4Ng8gIXQola1O/gG/LaLfu7Fxk/8T9TE
-r5EPe+L5117kzDaDZtqV6H4q24B2mhguRNUCN2ZkonPPEvkhdgcokV7qffRDkwXu
-zJkE6G+EYWU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://s2s.ifmsa.se/Saml2/acs/post" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://s2s.ifmsa.se/Saml2/acs/redirect" index="2"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IFMSA-Sweden</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IFMSA-Sweden</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.ifmsa.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Admin</md:GivenName>
-    <md:EmailAddress>mailto:admin@ifmsa.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Admin</md:GivenName>
-    <md:EmailAddress>mailto:admin@ifmsa.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml b/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
deleted file mode 100644
index e8cbb85d..00000000
--- a/metadata/swamid-testing/samlvettingspdev.test.it.gu.se.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://samlvettingspdev.test.it.gu.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-12-09T08:44:49Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Account activation for the University of Gotehenburg</mdui:Description>
-        <mdui:Description xml:lang="sv">Kontoaktivering för Göteborgs universitet</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Account activation for the University of Gotehenburg</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Kontoaktivering för Göteborgs universitet</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://sptest.it.gu.se/info</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://sptest.it.gu.se/info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://sp.it.gu.se/privacy-policy/?lang=en</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://sp.it.gu.se/privacy-policy/?lang=sv</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIQE5HAhCRBOphLNLu1Ts3eKDANBgkqhkiG9w0BAQsFADAU
-MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjIxMDE1MTUxMDAxWhcNMjMxMDE1MTUz
-MDAxWjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDgkq/hli/LClq7piIB8eX+PR0ZQgcT9eunJMiYAVFlYddB2CSR
-hmcH0jpIMhgz0pfg/SgE38iVNejcL/uu1+86NEzbCFMTrSKBfp3EAFRGGLHZgHun
-usKT5/JtqKJOEIH97dAJot38QZAlkfktNrR731UkyazQO89rmGH0BMdV6p2ylNDn
-NYIRUrM9qNIBUhAw75xM4oFlK1r3KuotPZ5cWQgwsPHW2ML7l6XSokbmXNyi7uSH
-V2aOdmjOCOqf6I0uQ6nFWpz7lZP1uV9F4gUVPo/JAVkt4nKkERwWBDDyzh36YIw2
-PvTCbVXAPskT++hRUmWxfS230Egq7G2UMQHtAgMBAAGjZjBkMA4GA1UdDwEB/wQE
-AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwFAYDVR0RBA0wC4IJ
-bG9jYWxob3N0MB0GA1UdDgQWBBTSkbIURwvVclPsKkZI0THUJOyRnTANBgkqhkiG
-9w0BAQsFAAOCAQEAt+AbdGn9gch+U/J+0Z2OJPnXMgY3pLNzX/5PIvlaT0bcnxmD
-FQA2TyuE7RfBHvh9n8hxo4MX48xk9Mwa6zGCT9/VakHFiikj0BaCS+w76+WODhKx
-B0ZCjdgOUfOJWVEStfEnKbJHnPyfdanX03XS11fpCvqCNKtBS6MdNzHx+I+2KBFk
-kKwyaanH09rba/ZKgrg4SZqTUYylG6OpE8UI2FeYSIKSFrnPUnpNhUXd0E3VUKoh
-zdEYs1kQRylSueKLleTejTZa8MyR6abMgM7DnsebsweMqavvmFdXTiehh5IAPygH
-KdDCYYX3nxmihSFMU9MLBACFzLYjVf3/BNPNIQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIQE5HAhCRBOphLNLu1Ts3eKDANBgkqhkiG9w0BAQsFADAU
-MRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMjIxMDE1MTUxMDAxWhcNMjMxMDE1MTUz
-MDAxWjAUMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDgkq/hli/LClq7piIB8eX+PR0ZQgcT9eunJMiYAVFlYddB2CSR
-hmcH0jpIMhgz0pfg/SgE38iVNejcL/uu1+86NEzbCFMTrSKBfp3EAFRGGLHZgHun
-usKT5/JtqKJOEIH97dAJot38QZAlkfktNrR731UkyazQO89rmGH0BMdV6p2ylNDn
-NYIRUrM9qNIBUhAw75xM4oFlK1r3KuotPZ5cWQgwsPHW2ML7l6XSokbmXNyi7uSH
-V2aOdmjOCOqf6I0uQ6nFWpz7lZP1uV9F4gUVPo/JAVkt4nKkERwWBDDyzh36YIw2
-PvTCbVXAPskT++hRUmWxfS230Egq7G2UMQHtAgMBAAGjZjBkMA4GA1UdDwEB/wQE
-AwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwFAYDVR0RBA0wC4IJ
-bG9jYWxob3N0MB0GA1UdDgQWBBTSkbIURwvVclPsKkZI0THUJOyRnTANBgkqhkiG
-9w0BAQsFAAOCAQEAt+AbdGn9gch+U/J+0Z2OJPnXMgY3pLNzX/5PIvlaT0bcnxmD
-FQA2TyuE7RfBHvh9n8hxo4MX48xk9Mwa6zGCT9/VakHFiikj0BaCS+w76+WODhKx
-B0ZCjdgOUfOJWVEStfEnKbJHnPyfdanX03XS11fpCvqCNKtBS6MdNzHx+I+2KBFk
-kKwyaanH09rba/ZKgrg4SZqTUYylG6OpE8UI2FeYSIKSFrnPUnpNhUXd0E3VUKoh
-zdEYs1kQRylSueKLleTejTZa8MyR6abMgM7DnsebsweMqavvmFdXTiehh5IAPygH
-KdDCYYX3nxmihSFMU9MLBACFzLYjVf3/BNPNIQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Location="https://localhost:7232/Swamid/Logout" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:AssertionConsumerService Location="https://localhost:7232/Swamid/AssertionConsumerService" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Account activation for the University of Gotehenburg</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Kontoaktivering för Göteborgs universitet</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>mailto:xnilsr@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:gukonto@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:irt@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/shib-test01.skolfederation.se-idp-shibboleth.xml b/metadata/swamid-testing/shib-test01.skolfederation.se-idp-shibboleth.xml
deleted file mode 100644
index c1b7a96e..00000000
--- a/metadata/swamid-testing/shib-test01.skolfederation.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shib-test01.skolfederation.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T14:07:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shib-test01.skolfederation.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Test IdP 01 Skolfederation</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IdP 01 Skolfederation</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAPQ2/2lBxCasx98gbLhaMYWOfsu4MA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczM1oXDTM2MDMxNDEyMDczM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCyrgKI7YKZJTgfOMz6Tdl4JSh0/lI4a6t6kc6nWbK2wPrTO6dr/6rc
-6zfSnzZTxdMfdq4i3GQm6wqARhyopiBioqL7jfi9xFHAQ1EKBo0bYgILkUWaDB0c
-BE+g4GHbsDtU46M3Nv01iFSRrZfJIvir19sRK7pNPVneJogZMyHIGk0DeIE1e3sy
-q5hrkiPQh2wpvjQ5m0iqu/EdFfnX2SusvxZicYaFv5tuX7SWta8em9lQUXXOE1oq
-rrLucAvzlbvgPR+JWBWS92Rzyba49nP1RVpt5nFQEPDxndHJJX2jFleMXlQekjZY
-wkq43JH+lxeAniRkKNLXMNqVGb5OvgyNAgMBAAGjgYEwfzAdBgNVHQ4EFgQUqUSe
-k3iUhS7oddbgmRKPj92kelEwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHsPZpDTpzq3Ok4u
-MEV2sbqLvXlv2rIKLrSXn5wyyBisUtDKRgPpvhWeUHTjcHZMeuIY/V41d3ULDJfM
-njdytPo1d+5zXwtmqRMixzG8j/VNVPtHEwe+oFvYlWM2lvG/58dpJGVNZMgJoFpI
-ELWXWTRuDfmvB59XaJNjPA91lPCtNvpumW5ArRyT+OtvFyKWam01jEPf8ALS2Q9E
-t3CIJ1G5s7bXyPvXnrtbmQ6ZLEChbzByvLJkFtJS45IpKPy4hxtOLfOQxdlg4jna
-8W+hsupYXK3/3qb4qqaqhdtD+SWkwe/+ATup8hcmodfxhGTDnRKGXrFSzKZT4rZ0
-SMNmbOs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVANmghSf7VgN3DeTHXvgyLAxYK07WMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczMloXDTM2MDMxNDEyMDczMlowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDHQoTq1sDL1nvtkyWJIcS+2QKV+7UnSckcYhV9ETcOjz/X0eW+tI19
-2mdmJ7eYuQhtjAwUefCssbv4D4N0AB35yfbNFHJFSR32iMp8XSzcjkY1p7reL/91
-8v77ywWge5n66/2oTI1uxPbFESFXuSmNULNsZ084EVsZ5cVdSWaMhTV1yb3UT6P7
-ggioG7ZSezWftR4A9YTrDZ/L68Cl67d1QTcuLjBHuXnYaTylIzrUF/uSQ18wecOt
-P5c84m9z9Wp5mkSnKsM/5X2XAL2rnF30UJ1PbnnBiord7wsbzYlB37pURbJHkzSb
-85UjD65qzPJE1TxhWzeQoohGiA5VoTO7AgMBAAGjgYEwfzAdBgNVHQ4EFgQU7lJv
-sBxJjTpqyzRn2n6bJHwP8n0wXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAKrU1hh+0smkuJoj
-kk5LdoVpO+umabRIHxzhb9Qg29TMYgI8M9KvIpzxIa9dkJO5E2Il/soMgu9DPGc2
-sgxlqpIK9IQRrszhYh7/KIqXLeazZvt+VAkqcKEh2YlAzOng3JiDGQg2RuMVoEE3
-kS9Ib6/hyXLNabKnLncmU78qSN8AKvqt0I7E0q6EZSOje2LH7lxn1GOxGUQ6dh1y
-Ac8g0evEFl9VPCV/8ekZScbJV4V9AD/Zt9iNfgBY/9fylLKWrNjOnewHPDN6iof2
-e9uaMSKN+lfG7j1VT3ILeK287Xlec41ohosz9j/MlKNKGMjI1bybF+PLFmdfE30w
-oM6nOO8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAIeMvqpR5U5Y2XpY3eVqWkq+JRhzMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczM1oXDTM2MDMxNDEyMDczM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCS9DrfWA4WLombKbKcFAooA0rr8FQTPWXUZKdAf5jrkPhgLQRWExvE
-da2ZJ2obCvd68fuXooNlyErEzNOar7tVqisNdbzpOmxD6/DfHEjCoYyO+gzeYZI5
-wvQYZVvNeI/ZaZmAF69IQBIUrGjWNOOYh8WYWQpN7H6LV1gFJaMkaaANQGUy5LYy
-OdgdipMfg2H9Zl7nT3b3OkH8+q3Ti500EdRkY23Z0iG2ir/p6g3rQCkZ4tCftlDN
-cQgmrXTlY52/tXaFH5D+I0u3XoMJEuc0WSdmABZqZFSrNTZSaa77p3Nea0h4BtQX
-UcXauYw1s/6q2AqQvpqbknC/XC+YXSOtAgMBAAGjgYEwfzAdBgNVHQ4EFgQU1dE1
-8Ytop65CLyRnV6sbc4nsGbkwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIFLv6J5KwrWE9jC
-0j6/iYlmWBBHhgqJM5jxId+QJ/iWWFw7mv1H50pXh6zxHQby9jSMoR1vDHZJyEAH
-EuMKnZserxLunp+UwwWsDM7yhMI0IJpN4Vq+5akQqa1ScitMr4K9nDoGst9zkyZo
-aePquGWFdiAUdEq4tZOWAba4t0wC1/OSE08JiW5BLZF2ntIPxPGtkIAkg1pkA2+w
-KlBf+dVuoEzEDYbbyhTHVDtcYqVD2V69GeoUB3HjUToP/qn19t1oqGOtUkIeFzuO
-z75FH/RYPpm1Ol0OyS4l9cOkIg9LZdmYk3ze8kM1TwBdK/SX3UKW5tfNKnGW6Kbq
-ARYfhCs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test01.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test01.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAPQ2/2lBxCasx98gbLhaMYWOfsu4MA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczM1oXDTM2MDMxNDEyMDczM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCyrgKI7YKZJTgfOMz6Tdl4JSh0/lI4a6t6kc6nWbK2wPrTO6dr/6rc
-6zfSnzZTxdMfdq4i3GQm6wqARhyopiBioqL7jfi9xFHAQ1EKBo0bYgILkUWaDB0c
-BE+g4GHbsDtU46M3Nv01iFSRrZfJIvir19sRK7pNPVneJogZMyHIGk0DeIE1e3sy
-q5hrkiPQh2wpvjQ5m0iqu/EdFfnX2SusvxZicYaFv5tuX7SWta8em9lQUXXOE1oq
-rrLucAvzlbvgPR+JWBWS92Rzyba49nP1RVpt5nFQEPDxndHJJX2jFleMXlQekjZY
-wkq43JH+lxeAniRkKNLXMNqVGb5OvgyNAgMBAAGjgYEwfzAdBgNVHQ4EFgQUqUSe
-k3iUhS7oddbgmRKPj92kelEwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHsPZpDTpzq3Ok4u
-MEV2sbqLvXlv2rIKLrSXn5wyyBisUtDKRgPpvhWeUHTjcHZMeuIY/V41d3ULDJfM
-njdytPo1d+5zXwtmqRMixzG8j/VNVPtHEwe+oFvYlWM2lvG/58dpJGVNZMgJoFpI
-ELWXWTRuDfmvB59XaJNjPA91lPCtNvpumW5ArRyT+OtvFyKWam01jEPf8ALS2Q9E
-t3CIJ1G5s7bXyPvXnrtbmQ6ZLEChbzByvLJkFtJS45IpKPy4hxtOLfOQxdlg4jna
-8W+hsupYXK3/3qb4qqaqhdtD+SWkwe/+ATup8hcmodfxhGTDnRKGXrFSzKZT4rZ0
-SMNmbOs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVANmghSf7VgN3DeTHXvgyLAxYK07WMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczMloXDTM2MDMxNDEyMDczMlowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDHQoTq1sDL1nvtkyWJIcS+2QKV+7UnSckcYhV9ETcOjz/X0eW+tI19
-2mdmJ7eYuQhtjAwUefCssbv4D4N0AB35yfbNFHJFSR32iMp8XSzcjkY1p7reL/91
-8v77ywWge5n66/2oTI1uxPbFESFXuSmNULNsZ084EVsZ5cVdSWaMhTV1yb3UT6P7
-ggioG7ZSezWftR4A9YTrDZ/L68Cl67d1QTcuLjBHuXnYaTylIzrUF/uSQ18wecOt
-P5c84m9z9Wp5mkSnKsM/5X2XAL2rnF30UJ1PbnnBiord7wsbzYlB37pURbJHkzSb
-85UjD65qzPJE1TxhWzeQoohGiA5VoTO7AgMBAAGjgYEwfzAdBgNVHQ4EFgQU7lJv
-sBxJjTpqyzRn2n6bJHwP8n0wXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAKrU1hh+0smkuJoj
-kk5LdoVpO+umabRIHxzhb9Qg29TMYgI8M9KvIpzxIa9dkJO5E2Il/soMgu9DPGc2
-sgxlqpIK9IQRrszhYh7/KIqXLeazZvt+VAkqcKEh2YlAzOng3JiDGQg2RuMVoEE3
-kS9Ib6/hyXLNabKnLncmU78qSN8AKvqt0I7E0q6EZSOje2LH7lxn1GOxGUQ6dh1y
-Ac8g0evEFl9VPCV/8ekZScbJV4V9AD/Zt9iNfgBY/9fylLKWrNjOnewHPDN6iof2
-e9uaMSKN+lfG7j1VT3ILeK287Xlec41ohosz9j/MlKNKGMjI1bybF+PLFmdfE30w
-oM6nOO8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAIeMvqpR5U5Y2XpY3eVqWkq+JRhzMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAxLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDczM1oXDTM2MDMxNDEyMDczM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDEuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCS9DrfWA4WLombKbKcFAooA0rr8FQTPWXUZKdAf5jrkPhgLQRWExvE
-da2ZJ2obCvd68fuXooNlyErEzNOar7tVqisNdbzpOmxD6/DfHEjCoYyO+gzeYZI5
-wvQYZVvNeI/ZaZmAF69IQBIUrGjWNOOYh8WYWQpN7H6LV1gFJaMkaaANQGUy5LYy
-OdgdipMfg2H9Zl7nT3b3OkH8+q3Ti500EdRkY23Z0iG2ir/p6g3rQCkZ4tCftlDN
-cQgmrXTlY52/tXaFH5D+I0u3XoMJEuc0WSdmABZqZFSrNTZSaa77p3Nea0h4BtQX
-UcXauYw1s/6q2AqQvpqbknC/XC+YXSOtAgMBAAGjgYEwfzAdBgNVHQ4EFgQU1dE1
-8Ytop65CLyRnV6sbc4nsGbkwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDEuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDEuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAIFLv6J5KwrWE9jC
-0j6/iYlmWBBHhgqJM5jxId+QJ/iWWFw7mv1H50pXh6zxHQby9jSMoR1vDHZJyEAH
-EuMKnZserxLunp+UwwWsDM7yhMI0IJpN4Vq+5akQqa1ScitMr4K9nDoGst9zkyZo
-aePquGWFdiAUdEq4tZOWAba4t0wC1/OSE08JiW5BLZF2ntIPxPGtkIAkg1pkA2+w
-KlBf+dVuoEzEDYbbyhTHVDtcYqVD2V69GeoUB3HjUToP/qn19t1oqGOtUkIeFzuO
-z75FH/RYPpm1Ol0OyS4l9cOkIg9LZdmYk3ze8kM1TwBdK/SX3UKW5tfNKnGW6Kbq
-ARYfhCs=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test01.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/shib-test02.skolfederation.se-idp-shibboleth.xml b/metadata/swamid-testing/shib-test02.skolfederation.se-idp-shibboleth.xml
deleted file mode 100644
index 2f72bf89..00000000
--- a/metadata/swamid-testing/shib-test02.skolfederation.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shib-test02.skolfederation.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T14:07:26Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shib-test02.skolfederation.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Test IdP at shib-test02.skolfederation.se</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test IdP at shib-test02.skolfederation.se</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAKIpDXYRvdS2zrotYm2OUO6QtBHxMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxNFoXDTM2MDMxNDEyMDcxNFowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDuXdCQDsnzEIKfhIVj4JXc3iLImuBBjd8b0AsaYIODAgnFTYEp6JwR
-YnEKDnQYEoWs6WfWjm9ByOtinHo55J27H7St5svmILIaA0XL/mtMEvVrwL+V8sp0
-UQG85zECyBUUsfa9ak9OsL/mMQSauOLOAmvO0NWP73/9AMBEDAP+Z3sncvhNVeUH
-3qXG7TYMyS63yiPQuzS/4IMA4YTm/zefx2cOC7DuouGzli2JdiLKwWVw2gnAw7m8
-AvAJM362NgwqcKEK8GXnHUUPOoNzvP6tMOuXtOt9LykmgY5okLgIUlVdJMELDcns
-hdx+/dUabm0lXXfihXletkwg7xSoGjUJAgMBAAGjgYEwfzAdBgNVHQ4EFgQU4Drw
-32V/cXL1Hps1tAMm5Wlzt5YwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBANVNtea/BQug5Xpa
-CvoLtZtn33yTL+LLwd7xhXYKlVrwXUm8oNfuJ6xpuql019t4S6+xJRNhqfqDHYVl
-nZVE6p98IVjboOPvQRDb9vGTaiGFIHkujpSAplPT3Q0ObJQXnosZdqVz0f5Ek5Y1
-uCx+7x06it9hCtMiuOx2rvbcSnB7aZ6QEmM+waRm9/NBbIfVVXyBAfvV5Tkj1ggB
-tU7ldt/up6rWflSYUuGSsyOK93tdl4/mElsax6z0uh5WGYysXD3VNwO3TUgn5oik
-qgLKGvBSeU71+pacWFMPhGTlgN9xilY98Izcpkqx8R0HOPse1Glrv/g/d2WBeTdW
-gYB1MC0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAMTx9B2MrDDQObwplYL31jsuEurxMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxM1oXDTM2MDMxNDEyMDcxM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCt+kswx/S/yGOdwcE6PXoLmdyosI+HyD4zewHAIvt2GaI+q6xcEY/I
-OwSLzVmaepW7HXbjJTTh2WWZXD9LuvUdRcddUoWyZRzO64heeKXwc09Un/QapulI
-qpJ7GJlX7ltNvWy10RqTkacPwXQimXcUQw/VNe0z2oF0erJifLHqkLT8MqXbHSQt
-Sv+5h2vR6M64ZNxe0lx4Slz6k9PCnXXQ2JdWJ07kPk3XWBTIv5g9EQi2OiD4gloD
-xawjNV51RiIUu5/BCarZgR3zPbRhkdswEHGAV26qU4QuwfqPZ8u1KPCnoZiNWCvD
-yyBj5hS5la0CmlYE+Fpk4lsgDV+HwRcNAgMBAAGjgYEwfzAdBgNVHQ4EFgQU2umq
-nceDOCxq0IvogBhhDmGzl9gwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAG3pFikol/CkP/6R
-tmkXK73fWojvbI8BatUTqikaRUTlfVgjqZ+71Uo648AUzT2pZUft+c/sAsQuW7p5
-rTsd1UkK5bGPji5JVsmD5qFOwGeMvyA3gGa8dgO1SehTwxG4Je7ZdvX5baYiMj4l
-aBWvYni36opxrFb/Xm144wU6F2wuLNQls9wzdtDivQnRoRMmUGkX6PRKzOIXuILQ
-lV+dpSrUDVYXncmFabB4jg6UU9GcXqNJz8IvQIVQcejw5pV4Zl1at52pDahk0U4U
-wB3emD5nkdkKgcsXj0LAYKZFYC4xqQxpBTZW5BCRwOQRKSa842J73oqGoAkdBAKa
-XOGjlaA=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAOKFRmXnO1W0+z5Ro16pX8gqQCK3MA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxNFoXDTM2MDMxNDEyMDcxNFowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDnudV/0wu5A017jD3yt41NXG2RzHbxJwt1E5khPHhgETfs+8ypTAEf
-HpdsWNWgM55jIi1w9HVVjzdY4i/htksxSvBgrRBnv79ZXjGlTEeaG+O1+xbmFAmp
-Zc4GHDpqW85U5Lw4skSjm/KJkzMd6biCdbd7syNoBk039XMHA0A8IgKOd3Dhs72u
-i2v0LF7ODqkmMSX27kC7p+dpfrNfvK/FstrhKzfDZVmijqNogqmw4s4bb9HL/Lw3
-dlPPpWMvvpuPcp11m9A09uo0ucSTrKhb7GZMZKvFMwnII7cfchjVkFQ9xXsTDLKm
-PIGPk2N/q+KUD7FUsCiNvClBxqocAiYvAgMBAAGjgYEwfzAdBgNVHQ4EFgQUkJdZ
-a+VzDO7nwVBI7P2x2zfhiAgwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHewrKz8eBsP8NLG
-aHPOLkLvxPKO2gOBzwGUafCp5zXLpnOIrOjVziBxeCRaGbsXlnLsxsTTfUnw7bxo
-TSKm8wwxpgtLoygQKyrY1GdN0fusRibm1D3221matfb4qCQSxZfttXy5TGzild3K
-CK0Wz3vK8wia/ldpUp0CR77F90XUpnOBZUJraZGP3zNWOulQn/V04DKjEbfFYbsT
-Kns4efG8+N0tHM6lqEVgiZn2/II3mHKwX8mJfXOmcXHSg9dwIlxcI2GQmUc5Yfu6
-wJXtfbVcy4pR2oEn6oLV4AFtkqrhlRIwXyEVLk+wVGBcn5lkZdjhilRqpVYVpL86
-yD8jVf0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib-test02.skolfederation.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-test02.skolfederation.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">skolfederation.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAKIpDXYRvdS2zrotYm2OUO6QtBHxMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxNFoXDTM2MDMxNDEyMDcxNFowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDuXdCQDsnzEIKfhIVj4JXc3iLImuBBjd8b0AsaYIODAgnFTYEp6JwR
-YnEKDnQYEoWs6WfWjm9ByOtinHo55J27H7St5svmILIaA0XL/mtMEvVrwL+V8sp0
-UQG85zECyBUUsfa9ak9OsL/mMQSauOLOAmvO0NWP73/9AMBEDAP+Z3sncvhNVeUH
-3qXG7TYMyS63yiPQuzS/4IMA4YTm/zefx2cOC7DuouGzli2JdiLKwWVw2gnAw7m8
-AvAJM362NgwqcKEK8GXnHUUPOoNzvP6tMOuXtOt9LykmgY5okLgIUlVdJMELDcns
-hdx+/dUabm0lXXfihXletkwg7xSoGjUJAgMBAAGjgYEwfzAdBgNVHQ4EFgQU4Drw
-32V/cXL1Hps1tAMm5Wlzt5YwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBANVNtea/BQug5Xpa
-CvoLtZtn33yTL+LLwd7xhXYKlVrwXUm8oNfuJ6xpuql019t4S6+xJRNhqfqDHYVl
-nZVE6p98IVjboOPvQRDb9vGTaiGFIHkujpSAplPT3Q0ObJQXnosZdqVz0f5Ek5Y1
-uCx+7x06it9hCtMiuOx2rvbcSnB7aZ6QEmM+waRm9/NBbIfVVXyBAfvV5Tkj1ggB
-tU7ldt/up6rWflSYUuGSsyOK93tdl4/mElsax6z0uh5WGYysXD3VNwO3TUgn5oik
-qgLKGvBSeU71+pacWFMPhGTlgN9xilY98Izcpkqx8R0HOPse1Glrv/g/d2WBeTdW
-gYB1MC0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAMTx9B2MrDDQObwplYL31jsuEurxMA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxM1oXDTM2MDMxNDEyMDcxM1owKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQCt+kswx/S/yGOdwcE6PXoLmdyosI+HyD4zewHAIvt2GaI+q6xcEY/I
-OwSLzVmaepW7HXbjJTTh2WWZXD9LuvUdRcddUoWyZRzO64heeKXwc09Un/QapulI
-qpJ7GJlX7ltNvWy10RqTkacPwXQimXcUQw/VNe0z2oF0erJifLHqkLT8MqXbHSQt
-Sv+5h2vR6M64ZNxe0lx4Slz6k9PCnXXQ2JdWJ07kPk3XWBTIv5g9EQi2OiD4gloD
-xawjNV51RiIUu5/BCarZgR3zPbRhkdswEHGAV26qU4QuwfqPZ8u1KPCnoZiNWCvD
-yyBj5hS5la0CmlYE+Fpk4lsgDV+HwRcNAgMBAAGjgYEwfzAdBgNVHQ4EFgQU2umq
-nceDOCxq0IvogBhhDmGzl9gwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAG3pFikol/CkP/6R
-tmkXK73fWojvbI8BatUTqikaRUTlfVgjqZ+71Uo648AUzT2pZUft+c/sAsQuW7p5
-rTsd1UkK5bGPji5JVsmD5qFOwGeMvyA3gGa8dgO1SehTwxG4Je7ZdvX5baYiMj4l
-aBWvYni36opxrFb/Xm144wU6F2wuLNQls9wzdtDivQnRoRMmUGkX6PRKzOIXuILQ
-lV+dpSrUDVYXncmFabB4jg6UU9GcXqNJz8IvQIVQcejw5pV4Zl1at52pDahk0U4U
-wB3emD5nkdkKgcsXj0LAYKZFYC4xqQxpBTZW5BCRwOQRKSa842J73oqGoAkdBAKa
-XOGjlaA=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDYTCCAkmgAwIBAgIVAOKFRmXnO1W0+z5Ro16pX8gqQCK3MA0GCSqGSIb3DQEB
-CwUAMCgxJjAkBgNVBAMMHXNoaWItdGVzdDAyLnNrb2xmZWRlcmF0aW9uLnNlMB4X
-DTE2MDMxNDEyMDcxNFoXDTM2MDMxNDEyMDcxNFowKDEmMCQGA1UEAwwdc2hpYi10
-ZXN0MDIuc2tvbGZlZGVyYXRpb24uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDnudV/0wu5A017jD3yt41NXG2RzHbxJwt1E5khPHhgETfs+8ypTAEf
-HpdsWNWgM55jIi1w9HVVjzdY4i/htksxSvBgrRBnv79ZXjGlTEeaG+O1+xbmFAmp
-Zc4GHDpqW85U5Lw4skSjm/KJkzMd6biCdbd7syNoBk039XMHA0A8IgKOd3Dhs72u
-i2v0LF7ODqkmMSX27kC7p+dpfrNfvK/FstrhKzfDZVmijqNogqmw4s4bb9HL/Lw3
-dlPPpWMvvpuPcp11m9A09uo0ucSTrKhb7GZMZKvFMwnII7cfchjVkFQ9xXsTDLKm
-PIGPk2N/q+KUD7FUsCiNvClBxqocAiYvAgMBAAGjgYEwfzAdBgNVHQ4EFgQUkJdZ
-a+VzDO7nwVBI7P2x2zfhiAgwXgYDVR0RBFcwVYIdc2hpYi10ZXN0MDIuc2tvbGZl
-ZGVyYXRpb24uc2WGNGh0dHBzOi8vc2hpYi10ZXN0MDIuc2tvbGZlZGVyYXRpb24u
-c2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAHewrKz8eBsP8NLG
-aHPOLkLvxPKO2gOBzwGUafCp5zXLpnOIrOjVziBxeCRaGbsXlnLsxsTTfUnw7bxo
-TSKm8wwxpgtLoygQKyrY1GdN0fusRibm1D3221matfb4qCQSxZfttXy5TGzild3K
-CK0Wz3vK8wia/ldpUp0CR77F90XUpnOBZUJraZGP3zNWOulQn/V04DKjEbfFYbsT
-Kns4efG8+N0tHM6lqEVgiZn2/II3mHKwX8mJfXOmcXHSg9dwIlxcI2GQmUc5Yfu6
-wJXtfbVcy4pR2oEn6oLV4AFtkqrhlRIwXyEVLk+wVGBcn5lkZdjhilRqpVYVpL86
-yD8jVf0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib-test02.skolfederation.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml b/metadata/swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml
deleted file mode 100644
index 84abb4d4..00000000
--- a/metadata/swamid-testing/shibbo3test.ltu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,301 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibbo3test.ltu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-03-14T13:20:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Lulea University of Technology - TEST SP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet - TEST SP</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Service Provider för Luleå tekniska universitet - TEST SP</mdui:Description>
-        <mdui:Description xml:lang="en">Service Provider for Lulea University of Technology - TEST SP</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Generell-beskrivning-av-SAML2-WebSSO-1.218206</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Generell-beskrivning-av-SAML2-WebSSO-1.218206</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="130" width="250">https://www.ltu.se/image/LTU_logo-sve-smal.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="130" width="250">https://www.ltu.se/image/LTU_logo-eng-smal.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Din-anvandare/Policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-Identity-Provider-IdP-1.218207</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Din-anvandare/Policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-Identity-Provider-IdP-1.218207?l=en</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIVANzbaWTqiitWHi/FZY/Cf0XjTG2tMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzVaFw0zNjAzMTQwOTIzMzVaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIM1kTvLw1tGy0YpTe80
-KxGj8w4oZiMHbErUhWUVNG09C6hMOfGkVdLBTZhqZcNhqGHLKGeE6ET9l4/YGEY1
-xdPCy4aHPyBH0AZZ5hVhRgOthEFdKTH5smb4J+lMk8a51BoRMStRmsm93IeYMMzU
-7HlCbsZ0H6bGRksEMWvbAiH5w5psT6He5oI+05g3RV1WrDexFImX/x7fZTI8YOTD
-qi64CDoLtGmGfE6dp1HPONfdLyFBr3/ENC6n9b9OOE2w7PDK63bHKrc4WfGCPWMG
-rWGLFnRwSfUKijJtvUdLAaE2SRvfzqxyZ5gUv0jcZH7VMkW1SWhgEajeiez+Z3J5
-MesCAwEAAaNrMGkwHQYDVR0OBBYEFI/PN6vDb385cLrqCL3JU+gGX4lGMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFKVyzGKVJty
-QYqseA7FjSfrOXw9Kljuggvn7M1fCs3esr3Ic4Gm3cDhjyFNakysZQm7kXC364sC
-N1JBGj4pSRLOmjaZVCCQkat4gQztumH+W47M7aFFIw+IUveS6HzhL3xMQFjxFnfL
-JU/FmWASnTeBzLGtts7eUcOtSobz6N4grPlR75KuOSDPovWyFgcmaAS17OFOt6AH
-3KIHNZOHO0rqx5g9EHzOF/+CsiAwRhg+2ydhLtf51A3ju8g/A4WMFdfmGESvM7MO
-zqNlArfwLcg+x0Au2u+aTWbCjwIq0cvdEC8CmJorZA6nH0tz8WMQXImhvrEWbtAi
-DUfmSji9lFM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIVALc7cXmNp5/uQQWtVri12AzDbYe/MA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzZaFw0zNjAzMTQwOTIzMzZaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMry0LiGt0F7Kkk/xqpo
-+evp9nQtztlkRNdN7DDDUejwLAOBB4xwotTdwmAs2F611QLhZSWI+FLM3jr+YxD1
-fUzef54BLPlPFRPmQUFzy9Uf6NJ9RUnArPWjyWEgwSQwpyu9TeKz5rpCCe39woL9
-sLOfFVRw/Lh2y6j1hPBipbP0OP3nsRE1WLZ36Q7LKQPJ6+FF0eyrEqnVfNEgHmFa
-bOR9aNjEL14gsW6KbfOsRuM+XWOj+0cNboBddVYwMmaML1sC8N5mZI0pmchz80VW
-OoY77wTxp4s4cLiOHvEfX2JqERy9h89tJQC5HnzLhjaDT9W9gKBlxe5GTvY22JhB
-g0kCAwEAAaNrMGkwHQYDVR0OBBYEFG7iRdtb6OAhSOnHYnNCvvNuZ9IEMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBADiDD72lxvE6
-K0/DIp6S4DOkqzJkyV+rzDDEJ4/TBvlr22jBFoCTjI/G2n/GjvOXYfIw2nMV86iC
-Ug5HMXsV9vgsIR4ChH+Y8YkNebCDgKckZK7opC1Jbq/7e7KNc+Dr++aOPKnuHQjQ
-N7xSqaBpIRIavAWONsxbvyLKSGWQsckYtwVug9rDwkjYm6JPd0Uae+ALgCIcIOgQ
-NDdQFzh/nDsIV9lfCwSIgBVFDAvO5HODbMrlIyAyCw4cdDxRLP0Q/dI3uLcs6Hxb
-ls1YqceuIJ1xea3cFj/VxrqP2sizmG/OGusxJ1JfWY/OHbeyiBtVAYz1u3WAy0xh
-ynzkb00+6b8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo3test.ltu.se/idp/profile/Authn/SAML2/POST/SSO" index="0"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Lulea University of Technology - TEST SP</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Luleå tekniska universitet - TEST SP</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shibbo3test.ltu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Lulea University of Technology - TEST</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Luleå tekniska universitet - TEST</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Luleå tekniska universitet - TEST</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for Lulea University of Technology - TEST</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Generell-beskrivning-av-SAML2-WebSSO-1.218206</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Generell-beskrivning-av-SAML2-WebSSO-1.218206</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="130" width="250">https://www.ltu.se/image/LTU_logo-sve-smal.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="130" width="250">https://www.ltu.se/image/LTU_logo-eng-smal.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Din-anvandare/Policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-Identity-Provider-IdP-1.218207</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.ltu.se/ltu/it-support/IT-support-personal/Anvandarnamn-och-losenord/Din-anvandare/Policy-for-hantering-av-personuppgifter-inom-ramen-for-identitetsutgivaren-Identity-Provider-IdP-1.218207?l=en</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">LTU lulea+tekniska+universitet lulea+university+of+technology</mdui:Keywords>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIVAJ/C7GVb0LTEi+7pmKXgaDAcajc6MA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzdaFw0zNjAzMTQwOTIzMzdaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxY6dkU9SFJLbKBtWEH
-wUWSxz9S4EpELEEmrTlv5FVQhR+UPMGqtbojFMasuFZOhFExLPB+NWKC2hsmhEyO
-R2/EHTFe7VhL9ZNEcbVZedHHw7dq3Zc0GuU3s2tqTb4/8gace9Pkx8MV2JGQcpll
-h/AE23GXRXPMSkFo6l35zBlzp9fmI42aKx+KGAdrvZhO4ZDVJ+8n+6U5z0YXDkIN
-32HlssxPOWYIQlhzLpNAJ9fLPwDk54dptE7oH+FRwZeAqvNobb/nwCH5Mw6wEOWJ
-xRi6lWDtW7LpPPeL+LwsDimvmtv8ahcOHxFclu/WrJ6FF8vJy/gH5pbqaNsI6mqC
-+EcCAwEAAaNrMGkwHQYDVR0OBBYEFFqKbVvlVTHGptIYS+EG98Wt/rEJMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACF00Z7OZ4IK
-C2t/ywPTIDe5U+Wk2pQ03tBpZ+pTbnI7nFxvkSRB65TeP4KX7BS6cn52jtpi+j1T
-oEWMTmTjxRBCs9RIGox04kUQlD87W7fxDyI0ZN0FA8GYOm27ZmA7PHSb9IPiXBJ5
-Kq+xeyKcnkJ84xa5Q91C9uVsgLafjdm/Z69imp9JIiybEKgnK88KRDU5VSBgV93R
-ctUC49it+6D3/Wi8K3eOLA+wo5lPLPxIsLf8gHLHwWgUvaVHt1sg6MdTU+011DTj
-8eJ9j9wuRVWrsHH97ZmkITZB0mBzkx3OS3VLsCJB5f640tbPZY75OKrOz7D07LBJ
-seV/+5km6JE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIVANzbaWTqiitWHi/FZY/Cf0XjTG2tMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzVaFw0zNjAzMTQwOTIzMzVaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIM1kTvLw1tGy0YpTe80
-KxGj8w4oZiMHbErUhWUVNG09C6hMOfGkVdLBTZhqZcNhqGHLKGeE6ET9l4/YGEY1
-xdPCy4aHPyBH0AZZ5hVhRgOthEFdKTH5smb4J+lMk8a51BoRMStRmsm93IeYMMzU
-7HlCbsZ0H6bGRksEMWvbAiH5w5psT6He5oI+05g3RV1WrDexFImX/x7fZTI8YOTD
-qi64CDoLtGmGfE6dp1HPONfdLyFBr3/ENC6n9b9OOE2w7PDK63bHKrc4WfGCPWMG
-rWGLFnRwSfUKijJtvUdLAaE2SRvfzqxyZ5gUv0jcZH7VMkW1SWhgEajeiez+Z3J5
-MesCAwEAAaNrMGkwHQYDVR0OBBYEFI/PN6vDb385cLrqCL3JU+gGX4lGMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFKVyzGKVJty
-QYqseA7FjSfrOXw9Kljuggvn7M1fCs3esr3Ic4Gm3cDhjyFNakysZQm7kXC364sC
-N1JBGj4pSRLOmjaZVCCQkat4gQztumH+W47M7aFFIw+IUveS6HzhL3xMQFjxFnfL
-JU/FmWASnTeBzLGtts7eUcOtSobz6N4grPlR75KuOSDPovWyFgcmaAS17OFOt6AH
-3KIHNZOHO0rqx5g9EHzOF/+CsiAwRhg+2ydhLtf51A3ju8g/A4WMFdfmGESvM7MO
-zqNlArfwLcg+x0Au2u+aTWbCjwIq0cvdEC8CmJorZA6nH0tz8WMQXImhvrEWbtAi
-DUfmSji9lFM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIVALc7cXmNp5/uQQWtVri12AzDbYe/MA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzZaFw0zNjAzMTQwOTIzMzZaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMry0LiGt0F7Kkk/xqpo
-+evp9nQtztlkRNdN7DDDUejwLAOBB4xwotTdwmAs2F611QLhZSWI+FLM3jr+YxD1
-fUzef54BLPlPFRPmQUFzy9Uf6NJ9RUnArPWjyWEgwSQwpyu9TeKz5rpCCe39woL9
-sLOfFVRw/Lh2y6j1hPBipbP0OP3nsRE1WLZ36Q7LKQPJ6+FF0eyrEqnVfNEgHmFa
-bOR9aNjEL14gsW6KbfOsRuM+XWOj+0cNboBddVYwMmaML1sC8N5mZI0pmchz80VW
-OoY77wTxp4s4cLiOHvEfX2JqERy9h89tJQC5HnzLhjaDT9W9gKBlxe5GTvY22JhB
-g0kCAwEAAaNrMGkwHQYDVR0OBBYEFG7iRdtb6OAhSOnHYnNCvvNuZ9IEMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBADiDD72lxvE6
-K0/DIp6S4DOkqzJkyV+rzDDEJ4/TBvlr22jBFoCTjI/G2n/GjvOXYfIw2nMV86iC
-Ug5HMXsV9vgsIR4ChH+Y8YkNebCDgKckZK7opC1Jbq/7e7KNc+Dr++aOPKnuHQjQ
-N7xSqaBpIRIavAWONsxbvyLKSGWQsckYtwVug9rDwkjYm6JPd0Uae+ALgCIcIOgQ
-NDdQFzh/nDsIV9lfCwSIgBVFDAvO5HODbMrlIyAyCw4cdDxRLP0Q/dI3uLcs6Hxb
-ls1YqceuIJ1xea3cFj/VxrqP2sizmG/OGusxJ1JfWY/OHbeyiBtVAYz1u3WAy0xh
-ynzkb00+6b8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibbo3test.ltu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo3test.ltu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">ltu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIVAJ/C7GVb0LTEi+7pmKXgaDAcajc6MA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzdaFw0zNjAzMTQwOTIzMzdaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKxY6dkU9SFJLbKBtWEH
-wUWSxz9S4EpELEEmrTlv5FVQhR+UPMGqtbojFMasuFZOhFExLPB+NWKC2hsmhEyO
-R2/EHTFe7VhL9ZNEcbVZedHHw7dq3Zc0GuU3s2tqTb4/8gace9Pkx8MV2JGQcpll
-h/AE23GXRXPMSkFo6l35zBlzp9fmI42aKx+KGAdrvZhO4ZDVJ+8n+6U5z0YXDkIN
-32HlssxPOWYIQlhzLpNAJ9fLPwDk54dptE7oH+FRwZeAqvNobb/nwCH5Mw6wEOWJ
-xRi6lWDtW7LpPPeL+LwsDimvmtv8ahcOHxFclu/WrJ6FF8vJy/gH5pbqaNsI6mqC
-+EcCAwEAAaNrMGkwHQYDVR0OBBYEFFqKbVvlVTHGptIYS+EG98Wt/rEJMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBACF00Z7OZ4IK
-C2t/ywPTIDe5U+Wk2pQ03tBpZ+pTbnI7nFxvkSRB65TeP4KX7BS6cn52jtpi+j1T
-oEWMTmTjxRBCs9RIGox04kUQlD87W7fxDyI0ZN0FA8GYOm27ZmA7PHSb9IPiXBJ5
-Kq+xeyKcnkJ84xa5Q91C9uVsgLafjdm/Z69imp9JIiybEKgnK88KRDU5VSBgV93R
-ctUC49it+6D3/Wi8K3eOLA+wo5lPLPxIsLf8gHLHwWgUvaVHt1sg6MdTU+011DTj
-8eJ9j9wuRVWrsHH97ZmkITZB0mBzkx3OS3VLsCJB5f640tbPZY75OKrOz7D07LBJ
-seV/+5km6JE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIVANzbaWTqiitWHi/FZY/Cf0XjTG2tMA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzVaFw0zNjAzMTQwOTIzMzVaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIM1kTvLw1tGy0YpTe80
-KxGj8w4oZiMHbErUhWUVNG09C6hMOfGkVdLBTZhqZcNhqGHLKGeE6ET9l4/YGEY1
-xdPCy4aHPyBH0AZZ5hVhRgOthEFdKTH5smb4J+lMk8a51BoRMStRmsm93IeYMMzU
-7HlCbsZ0H6bGRksEMWvbAiH5w5psT6He5oI+05g3RV1WrDexFImX/x7fZTI8YOTD
-qi64CDoLtGmGfE6dp1HPONfdLyFBr3/ENC6n9b9OOE2w7PDK63bHKrc4WfGCPWMG
-rWGLFnRwSfUKijJtvUdLAaE2SRvfzqxyZ5gUv0jcZH7VMkW1SWhgEajeiez+Z3J5
-MesCAwEAAaNrMGkwHQYDVR0OBBYEFI/PN6vDb385cLrqCL3JU+gGX4lGMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAFKVyzGKVJty
-QYqseA7FjSfrOXw9Kljuggvn7M1fCs3esr3Ic4Gm3cDhjyFNakysZQm7kXC364sC
-N1JBGj4pSRLOmjaZVCCQkat4gQztumH+W47M7aFFIw+IUveS6HzhL3xMQFjxFnfL
-JU/FmWASnTeBzLGtts7eUcOtSobz6N4grPlR75KuOSDPovWyFgcmaAS17OFOt6AH
-3KIHNZOHO0rqx5g9EHzOF/+CsiAwRhg+2ydhLtf51A3ju8g/A4WMFdfmGESvM7MO
-zqNlArfwLcg+x0Au2u+aTWbCjwIq0cvdEC8CmJorZA6nH0tz8WMQXImhvrEWbtAi
-DUfmSji9lFM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIVALc7cXmNp5/uQQWtVri12AzDbYe/MA0GCSqGSIb3DQEB
-CwUAMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5zZTAeFw0xNjAzMTQwOTIz
-MzZaFw0zNjAzMTQwOTIzMzZaMB0xGzAZBgNVBAMMEnNoaWJibzN0ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMry0LiGt0F7Kkk/xqpo
-+evp9nQtztlkRNdN7DDDUejwLAOBB4xwotTdwmAs2F611QLhZSWI+FLM3jr+YxD1
-fUzef54BLPlPFRPmQUFzy9Uf6NJ9RUnArPWjyWEgwSQwpyu9TeKz5rpCCe39woL9
-sLOfFVRw/Lh2y6j1hPBipbP0OP3nsRE1WLZ36Q7LKQPJ6+FF0eyrEqnVfNEgHmFa
-bOR9aNjEL14gsW6KbfOsRuM+XWOj+0cNboBddVYwMmaML1sC8N5mZI0pmchz80VW
-OoY77wTxp4s4cLiOHvEfX2JqERy9h89tJQC5HnzLhjaDT9W9gKBlxe5GTvY22JhB
-g0kCAwEAAaNrMGkwHQYDVR0OBBYEFG7iRdtb6OAhSOnHYnNCvvNuZ9IEMEgGA1Ud
-EQRBMD+CEnNoaWJibzN0ZXN0Lmx0dS5zZYYpaHR0cHM6Ly9zaGliYm8zdGVzdC5s
-dHUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBADiDD72lxvE6
-K0/DIp6S4DOkqzJkyV+rzDDEJ4/TBvlr22jBFoCTjI/G2n/GjvOXYfIw2nMV86iC
-Ug5HMXsV9vgsIR4ChH+Y8YkNebCDgKckZK7opC1Jbq/7e7KNc+Dr++aOPKnuHQjQ
-N7xSqaBpIRIavAWONsxbvyLKSGWQsckYtwVug9rDwkjYm6JPd0Uae+ALgCIcIOgQ
-NDdQFzh/nDsIV9lfCwSIgBVFDAvO5HODbMrlIyAyCw4cdDxRLP0Q/dI3uLcs6Hxb
-ls1YqceuIJ1xea3cFj/VxrqP2sizmG/OGusxJ1JfWY/OHbeyiBtVAYz1u3WAy0xh
-ynzkb00+6b8=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo3test.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lulea University of Technology</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Luleå tekniska universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Luleå tekniska universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lulea University of Technology</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.ltu.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.ltu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Lulea University of Technology</md:Company>
-    <md:SurName>LTU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Lulea University of Technology</md:Company>
-    <md:SurName>LTU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Lulea University of Technology</md:Company>
-    <md:SurName>LTU Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:its-idp@list.ltu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 920 491664</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@ltu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml b/metadata/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml
deleted file mode 100644
index 854e330c..00000000
--- a/metadata/swamid-testing/shibboleth-test.uhr.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth-test.uhr.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-06-18T15:23:21Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://shibboleth-test.uhr.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Universitets- och högskolerådet - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Swedish Council for Higher Education - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Universitets- och högskolerådet (UHR)</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for the Swedish Council for Higher Education (UHR)</mdui:Description>
-        <mdui:Logo xml:lang="sv" height="71" width="265">https://shibboleth.uhr.se/idp/images/uhr_logo.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="71" width="265">https://shibboleth.uhr.se/idp/images/uhr_logo.png</mdui:Logo>
-        <mdui:Keywords xml:lang="sv">UHR Universitetes+och+Högskolerådet VHS IPK The+Swedish+Council+for+Higher+Education</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">UHR Universitetes+och+Högskolerådet VHS IPK The+Swedish+Council+for+Higher+Education</mdui:Keywords>
-        <mdui:InformationURL xml:lang="en">https://antagning.se/sv/om-antagning.se/swamid-service-definition/#swamid-service-definition-english</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/swamid-service-definition/#swamid-service-definition-svenska</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://antagning.se/sv/om-antagning.se/hantering-av-personuppgifter/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://antagning.se/sv/om-antagning.se/hantering-av-personuppgifter/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>uhr.se</mdui:DomainHint>
-        <mdui:IPHint>193.11.100.0/24</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.33760,18.05835</mdui:GeolocationHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIVAJCxn4gn3X28tRiZcgE0XA1NKrT+MA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVzdC51aHIuc2UwHhcNMjIxMjEz
-MDgzMjA4WhcNNDIxMjEzMDgzMjA4WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLXRl
-c3QudWhyLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtAZx0N6u
-mTurKR3bh8c8OCVgey4TWseq1KTzyjxk9GEW2MQPPUeSkukYEh+z2eutwg1FjVVS
-i7SVI3Q1tamQJUE/McyEW8OOWHjBgaUlt+fNKaLJpuc1+z8paA3W0AvIvq9GuUz/
-lxGgomXKgxE6wEY6D3AABikibqO3O9GjZuIQEw5imXyUAG3lMophTGZqXpbXKXTn
-+Wel+xhlDcCesvfcXeGHkzPzHCrRgFFu88I2ri6MRb++wpkrX9M+UWXTm5f8d+Ok
-pYgLyADjqenoK0A4PI3+U2nNOEtSOF0+fhYMkMIqOqLzC7RSE/k+hmSJ5zm2sxVY
-rfxoFBk9odmRsgClfWH00QrxA+3c0epuc/JBslVpcggmjpMEpD42371s+1Jek3Gm
-KqGC1zb+z0jO3SQ1s1PKm9vdJCyRya2qOn0VZM+6WW/dTBsvkKdqLMhITtJrMEPx
-4uvpUfBPG/H0J3d9rga/+r0WNGyWq7LSbZ0kESCV0VD5g3oCB2lTQzXY8HKDEJDP
-Ag5l+M9sV4AD/t1Fm0Zb7Jx7ZsGQOkwLi5oE/CjC9Pr1lfvablKrkklu7QVqAojx
-O8gvs7wZyLXTXDYiayqNY4iRUA3lneH3G2dQ+skc0mykffwXHsMHa/utuVmNudTg
-jx5MChsT+Fb6UdioahdNUMmeQZbv86mGEbsCAwEAAaNEMEIwHQYDVR0OBBYEFOay
-Ad4tUoYuPLN3C3kZdDTDMgMpMCEGA1UdEQQaMBiCFnNoaWJib2xldGgtdGVzdC51
-aHIuc2UwDQYJKoZIhvcNAQELBQADggIBACgTWySxLuEH1Ltjlpwsvok8wJtYzx+9
-84hgcY4FTWYQH9g+rMu4eROHmMCt2AGsNw+jTEC1t52so8KdcGvmJBoPC6kK09tD
-Qws7DVRU42sSpmxUFXcw1Cqkpc/movQXJf/z6laKwRfvKxPW9HnPOFDB108NswsO
-QzkAO02P/Wr3nffxuzlq0qYAUCneQAbRexHoL6/ii6oOeiCKEJ4+w7Ly+UDSi6TO
-53HEotQs/WEMZr9sx0bze81oHmh9XCvPCUWQrKPaBeSktWo/MHm7f5aad6xbMvzk
-og1e2V9U3AipCNdcAk62+5VkgAtOxmCVXzJAkSNblemBqo4LXyl61ctcI5xNB1hg
-gNsfNEOC68GnHgrkbL0cvLWVLKybpsbXWQck80NvVaKp/Wrg6X/N0rspe6C0ORVL
-tZNHkUvMvB6yb0DzK7cXUpGfa4WEHDPWJ9q0FV8anA3ICmr5GP+Lhaj9dbYOrT1k
-oYjMZpD5vA628yWAzHRV6l1/upH6lwsIY0WKxGqYBG0rTHsvDDdhN0LokwK9XvUu
-jtymDLu/KkKtdxEzj+gqz/W+HNFOLP9KAq+4V/KcbyZgKqoS++RCR2E/fVtzYdUr
-jbIdLzVzYDevI4Qg3IVYDZCMgaaJV8IHyUZUb/XfPHv/JdOGrwJmEJ9CMAPq4A95
-EiC3I6l2DAGD</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFFTCCAv2gAwIBAgIVAJvGNK7dTzqieC282vavqu0TBoM8MA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVzdC51aHIuc2UwHhcNMjIxMjEz
-MDgyODQ2WhcNNDIxMjEzMDgyODQ2WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLXRl
-c3QudWhyLnNlMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAylV5RaIO
-j0CQ9CQgpzNUaQcIa6OtRI0dnGxHkaUMPHcde6E+2q9sxFc9j7Q9j7+esSzFVDV7
-egHrppsBS/MRZ/UFMtjh0okI2giaFj+9pAyDsIkqNNVBe6fq0qXbXbtimQGwc0iN
-hxx4KG+IZJv9VlnR6jGq939D8Pp0PUuHlLCs3l0NA0XbGWleMwDcyI0jeqhkqb9i
-8cSMpxRvfP11hQKBPcthWk2YTEqQwYnqrY9BW65zbX7ez1OPsOmI5WImj7kbfVqr
-uDxUATunOqn3OFE7ZIOeNWtHZ7Jm+qCa4e0zlD405qmV482JWSzbWwEYy/E6O5k+
-p9cah/88c8J+cy/PaqSIUshNXjjwxCHVYxVWrfCRO6kC6T3ZImZxaSf8rtuyJMNj
-VKepkwVbfOk6fMezXVfBypYmXtFe3fmwpCAMGInRxyg/LMvU7tODEB5OWjaVqCbK
-W4I3vpREu6a+E7xH8SWezK9gQhfcG/NsP1mjZH3GMe6V2Wr/CRojLU7NMTqZipHB
-UJ++NtGQ6UkbdoO779y1DZwNdlnuiLBZ9WEa/m4RXH8uOwQzSUmE3SCBHJWTtQeP
-OcXngluN4ZVXfi9nNDHQQ7KTZdvBH92RQ2n47wIuEhAg68+pMBu9TLv29+lY6dNU
-daFytXYwaRc6jhkwKFoC5DDsIQgiWqXUMRMCAwEAAaNEMEIwHQYDVR0OBBYEFFN1
-gjg3lCiVzoo/pFMlhxVXZYFPMCEGA1UdEQQaMBiCFnNoaWJib2xldGgtdGVzdC51
-aHIuc2UwDQYJKoZIhvcNAQELBQADggIBAKiaNZB718PKvHmKIf9BEkUl4bQ2j1Pg
-4/qjwteJOuCh3fB4l87PzcKvP1m/lvk38AxqPi3SQYT6XbotASg3FSCzMyp4Q+Az
-dx1oWDMA96oKtdSedOu79nnTcUn73YassvOuCRWB+4QlPd5Lc+pFQvjM1sl27jty
-n1FeYxxkGpkQHbTubV29ym3ybFetwFUb84XGkES9tADc+ENnFm8dW5jyZoCrFDq6
-Ui6YarLvEfHD9eU9LQeKyzokE/T8ktcyKM6OkZiHdRfs7RtVlYNi4d0qq/XtzYdB
-qipx64/9pw6l1JYDuPaq5u/ThdzsRb55w76UXXjGInl/UpikW+rcTArVhjUHa0X8
-pe1igHiDVsY5HY6KNJQ0bWnYkQ4AwzAA28ypHTOrrC6NDroOJHM1f6Qaxh8GQtVB
-v4E1BDYjmiwDIvlx4vMnN6MfIsivC6F1HI7R/vf5lZzXWkeB8PN4U48w1vQcBL7P
-x/A1s4aGehdM5ag0Z4BpBSbW1A1EgpoXW0tDeqoSuOlq/OY3RCMEp6iZ3Jy+LSmC
-3LAkqey6MqSYHYy80Rn2nMXgPEVgBNIghehe5jYxNvFkzSTPiAaW/6RGQvCW8IO5
-+KyD/Kj67ApgX3gl7CWs4RBQW2t6H3zJSIS5+Td5JnPLNsVMH2WGxUb2Hi9/YNeq
-pp82vHkt9Dvh</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIVAJ5SfMszNkWe4hlPfBELQBBQAXpyMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVzdC51aHIuc2UwHhcNMjIxMDEy
-MTAzOTU1WhcNNDIxMDEyMTAzOTU1WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLXRl
-c3QudWhyLnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAhMyxebeM
-DdMSLUwoorjZAMS3oI3mUszdC7FZIdUPuNxCq7g31Rgij2TDLbK+aIaOKEL8sQcX
-MZ2qb5icXj9/FkQrKFXulYDO/gMssunU9Jf6YTbFwX5Rr9c9Of1qC8+ZYkwYULxo
-EWIf5GvorC8pyFooR0dRm7nnX8Nj+f7cTRyHAh7S7ul1C2zKA5QQiItXKIbhvPRG
-2Pu9s0ep12/AVZFlcZKgCpZ77IQrCzfFJgVNsVNAwzgxwYi2KZ4qMuKiPyqOKqHh
-eJC8hOJHx9JJ7+Ax/bcYoTkysZi4CK4ZBCzI+pc+IAq8Dklg5wRbgVFbYwrP8BIt
-4gbhjeQscaXyHx1psKOc4b1LSpzRPox/3WThCfrKN65mKPaPtIRckazPdoDgiwk1
-ffHNvaYdRJzyQ4QVuYHUKj+FIX0Zs/uku5UGbVf9AAJk7QbfQxpaSVmAP1pwpt/3
-kiAc4ReEaFDuDkv9MrOuZ7Ukexq4z9DDvo9jEgQMsgCokVj73LyQK39jAgMBAAGj
-WDBWMB0GA1UdDgQWBBQF0kzQRnjDDwD+m/RpDD2+2L8aqjA1BgNVHREELjAsghZz
-aGliYm9sZXRoLXRlc3QudWhyLnNlhhJodHRwczovL3Voci5zZS9pZHAwDQYJKoZI
-hvcNAQELBQADggGBAGxBn419IHuXPyYzjkOHeMGIf8XoJbqQGEW0mb5G7X5RYk5l
-baSttIdEMZ1Oi2QVE9rI+sDIX+QOlSIJhhqddUUz7WYWA9A9LrNtjYicp9gHC8v8
-jt1pk+FbN0zWWw/TVCHdbYIK0WvS2XK1O3LpcsYgkYsfRNzJ3LgaF6fSATQ0lLpS
-6aL5ez0eVSOkQaCqXAb+hYxAfJQcKj636UoDVe2ior+MGMV53FwjCQ9AVnz2Lg/Y
-/wCDaz0A+48IZOMRl/cj638KAOpQSygRw+Ay3FvgQerfpI026pbCYchuEIG4aBRD
-M4xfflDEQAS0+KSkU84me5gGEX88BxUIoW8ZcLWrPaiaFhZLRaiOdEoCaaTqKd+f
-CBuCdSJWqYYbFl7DOgcZPpx06EljnWcZdkinruEjrnj9yYc+RJWr/3846r98gekH
-OAxXvtgQcEtqeqeP+RwSdxDas1xV43IHVD2PNKjK2XV3GiQT0ftbMuYS3aTR9n8+
-TXTmDToCsU6Qmj1SCQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth-test.uhr.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth-test.uhr.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth-test.uhr.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth-test.uhr.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">uhr.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIUOATcGEj3wIktiyHQCEKHqZULEjowDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWc2hpYmJvbGV0aC10ZXN0LnVoci5zZTAeFw0yMjEwMTIx
-MDM5NTZaFw00MjEwMTIxMDM5NTZaMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVz
-dC51aHIuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCjb6KFKK1D
-twx0HQIDMGwmIlNqWlGEYQBuGyKWN9r/64AnAGIiIWr6G2Jq0sdA6WDHeFvjjhXF
-oAGYkvWFsvihDK0WXhf/F+tjFfDIssRjeyFOBsPMS1LXHlrH4UMbewABZ1YslEYF
-Nan2rFeW4llbMFDNxTi7X4HMsR/Io3Rl+TJ09uSEeHDDTY9Y2sa+HsXUKGX5gIrq
-ikajqnWQ9t8KBzeVD3rTWjM832cGjyoDKIzhgpp3iQwwrgJ7yKt6Fqe23N25x/Dl
-DsOxOH3TBhZrGkWyk25EZr4Gh9DJUC5TUpWYKAyIZpz2vC33ey2FK2ZNWwXbORLH
-acX+xyRlpZ3D0zuUc+xf7NOnMPjFvWO4qkVkgap66GIPMkljF6XWqFS7D2OEevWG
-IiEGUD7rg4OSlEwc4YCqu8AJ+kSEw3fF8WWkXqCbzeisB4sM1WPR4EAFURhhJXhS
-AifHz0GNhwkQnOZlo4Yt2F+oXqE+QxWtx5+PcVeg67PdCH+utL2/ZXUCAwEAAaNY
-MFYwHQYDVR0OBBYEFKXOQfMxT1iENkdMXOCt3mFhW1xzMDUGA1UdEQQuMCyCFnNo
-aWJib2xldGgtdGVzdC51aHIuc2WGEmh0dHBzOi8vdWhyLnNlL2lkcDANBgkqhkiG
-9w0BAQsFAAOCAYEAcuhrezNgzLLs5oLpHnJA+Zw7jl0ahHuHNUKgspLp9uABdyb+
-pYBgWOaqz4JALF3xymvbCF0phBhrKyER9ivWLG3mFqP3EoRPX8DtHyxLwV9UiTi9
-psAr2d62Nu/1i9Bjdkga5DZv1hImxtYyrsLveWmmOjiCCNsOc5+o45tzC13VIMTa
-wtVrXZWNXaMixqTJDN9U8Y+jLF0LbpkjfVAu3NkvPbtNaGmA1wlLwf9RXi0uDKMc
-LXau1CpOIETYnooEvMG4rAxBH5BSG78PBoZqwyYYyrgLkWhCl7UmQ8cqUmRjTJto
-veZ5b1kWXtsFzCWBMvpj7niPtwcVGRom4xwSLn9eVMhOCS+muHGXDBX1Fme3czJv
-zjcbWAZJ7Hy7Qd3sYMmSgAQ++dyKz1k5iabpqivnQkzApqCkvsamDU8mChtTKykb
-/oRC/xoZpo68UaZxZBL2Sg+RtosZbaq7TV5NFlKESJhxCwAYEVueKPMIvOYKt72I
-5mrKixnDwSCdD47v</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIUYgGACEiGgrTo47X+TqYPSGxD/UcwDQYJKoZIhvcNAQEL
-BQAwITEfMB0GA1UEAwwWc2hpYmJvbGV0aC10ZXN0LnVoci5zZTAeFw0yMjEwMTIx
-MDM5NTVaFw00MjEwMTIxMDM5NTVaMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVz
-dC51aHIuc2UwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCD5ekCMo+2
-Q7YFCtyt51PoIZW1OzWUH96SpZ2gn+7Lrz0vkZF7fzvSOAQExlGeExQ290WfJ/uR
-P7Tx3LPicZtb065C4ulzoLC5yk1TTu7uOVA0RXwucSzMN5ENZNJ9gO/V9/exxDEw
-zrNOUYmizsr68RKF7NuxWRYXSbnBbfHLZr9km1qDKPVII9SL3ZIU0L4rxdWoi6At
-pG3BKyEjUaaDXivkqcjmQ6FNi76CQkfMaWjCg1vcU0+iWe2Smu58H1Fx+hb0DZJk
-sEfXH4OdOPv6uJXZatQhfCr2EpcmnbC8+o4XzCkmjb73rD7X2v72/yDTb8h9m0x4
-lYxu9lpkHfZxp+XVn7Mh1gCfKpzs3Uffc4YEpyg2NvMV4GUhhdW8KBZX9w3UpLZl
-DpSiA6Uxt4j1kg4dBozimnrRqKQPCXWMRUOQ6OlIOssCVG8SeRZ6vNy8HXHgyiyk
-RZsJWJWFqIzIc6m+t9+ul5uv8iYMVV6KzRwFmbKvkkVIoSlEinKkFKcCAwEAAaNY
-MFYwHQYDVR0OBBYEFAGc+fTGKxxqg/LEEcjGtMxDpC4hMDUGA1UdEQQuMCyCFnNo
-aWJib2xldGgtdGVzdC51aHIuc2WGEmh0dHBzOi8vdWhyLnNlL2lkcDANBgkqhkiG
-9w0BAQsFAAOCAYEAY1N+N6Jy8cFLSFO1XQ4BUg2hxNAut4zKvWctbVWq93lNpthq
-NmDOYhiuesdByJ2l6dF3DSdHOuKT63n2MpmZlv4ij6UcaN0huqB8Bk6mFlGi5xu6
-SaE3XQku3tquW9fjtn9kBEQOY6XPTxVLtpGHeMaNF0VMsSQVeyOsRKz3I1nrTWGN
-h6QiQ0d//Y1XzhE6mEvHMOkQAT15jZGJNed9kX72mQg3wRIFn0n2Qu4QFgRr2Ng1
-b9uOl47VFA39YbRpG5+xMtWxoQFSmCS230rmVQc+fK4CSs+KiOHLpXqgI0HCwnq1
-lRJED3kgwq0stxtTYQgYPJpzN8eacGooEt4yr7u5KYek6oVF+YKlUlGyj7/wpTyC
-GvlnoqO1flHO9uqiOmcFNatRCkltp3tjazy193BvKkK0UXOVkiFjiEFUnRtBPJMZ
-INraI0zZLNvWehtoqPKIIf9+p6AjYGibnCc5RNZ69wV9C607sJ0OduQA/tD57RD+
-WKm80kgA7nAooBqu</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKTCCApGgAwIBAgIVAJ5SfMszNkWe4hlPfBELQBBQAXpyMA0GCSqGSIb3DQEB
-CwUAMCExHzAdBgNVBAMMFnNoaWJib2xldGgtdGVzdC51aHIuc2UwHhcNMjIxMDEy
-MTAzOTU1WhcNNDIxMDEyMTAzOTU1WjAhMR8wHQYDVQQDDBZzaGliYm9sZXRoLXRl
-c3QudWhyLnNlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAhMyxebeM
-DdMSLUwoorjZAMS3oI3mUszdC7FZIdUPuNxCq7g31Rgij2TDLbK+aIaOKEL8sQcX
-MZ2qb5icXj9/FkQrKFXulYDO/gMssunU9Jf6YTbFwX5Rr9c9Of1qC8+ZYkwYULxo
-EWIf5GvorC8pyFooR0dRm7nnX8Nj+f7cTRyHAh7S7ul1C2zKA5QQiItXKIbhvPRG
-2Pu9s0ep12/AVZFlcZKgCpZ77IQrCzfFJgVNsVNAwzgxwYi2KZ4qMuKiPyqOKqHh
-eJC8hOJHx9JJ7+Ax/bcYoTkysZi4CK4ZBCzI+pc+IAq8Dklg5wRbgVFbYwrP8BIt
-4gbhjeQscaXyHx1psKOc4b1LSpzRPox/3WThCfrKN65mKPaPtIRckazPdoDgiwk1
-ffHNvaYdRJzyQ4QVuYHUKj+FIX0Zs/uku5UGbVf9AAJk7QbfQxpaSVmAP1pwpt/3
-kiAc4ReEaFDuDkv9MrOuZ7Ukexq4z9DDvo9jEgQMsgCokVj73LyQK39jAgMBAAGj
-WDBWMB0GA1UdDgQWBBQF0kzQRnjDDwD+m/RpDD2+2L8aqjA1BgNVHREELjAsghZz
-aGliYm9sZXRoLXRlc3QudWhyLnNlhhJodHRwczovL3Voci5zZS9pZHAwDQYJKoZI
-hvcNAQELBQADggGBAGxBn419IHuXPyYzjkOHeMGIf8XoJbqQGEW0mb5G7X5RYk5l
-baSttIdEMZ1Oi2QVE9rI+sDIX+QOlSIJhhqddUUz7WYWA9A9LrNtjYicp9gHC8v8
-jt1pk+FbN0zWWw/TVCHdbYIK0WvS2XK1O3LpcsYgkYsfRNzJ3LgaF6fSATQ0lLpS
-6aL5ez0eVSOkQaCqXAb+hYxAfJQcKj636UoDVe2ior+MGMV53FwjCQ9AVnz2Lg/Y
-/wCDaz0A+48IZOMRl/cj638KAOpQSygRw+Ay3FvgQerfpI026pbCYchuEIG4aBRD
-M4xfflDEQAS0+KSkU84me5gGEX88BxUIoW8ZcLWrPaiaFhZLRaiOdEoCaaTqKd+f
-CBuCdSJWqYYbFl7DOgcZPpx06EljnWcZdkinruEjrnj9yYc+RJWr/3846r98gekH
-OAxXvtgQcEtqeqeP+RwSdxDas1xV43IHVD2PNKjK2XV3GiQT0ftbMuYS3aTR9n8+
-TXTmDToCsU6Qmj1SCQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth-test.uhr.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Universitets- och högskolerådet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">The Swedish Council for Higher Education</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.uhr.se/en/start/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.uhr.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>The Swedish Council for Higher Education</md:Company>
-    <md:SurName>Johan Andersson</md:SurName>
-    <md:EmailAddress>mailto:johan.andersson@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-470 06 66</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>The Swedish Council for Higher Education</md:Company>
-    <md:SurName>Technical Team</md:SurName>
-    <md:EmailAddress>mailto:alertoperators@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-470 03 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>The Swedish Council for Higher Education</md:Company>
-    <md:SurName>Support Team</md:SurName>
-    <md:EmailAddress>mailto:alertoperators@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-470 03 00</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Incident Team</md:GivenName>
-    <md:EmailAddress>mailto:abuse@uhr.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 10-470 03 00</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/sp-t1.oru.se-shibboleth.xml b/metadata/swamid-testing/sp-t1.oru.se-shibboleth.xml
deleted file mode 100644
index 9d7dde8a..00000000
--- a/metadata/swamid-testing/sp-t1.oru.se-shibboleth.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sp-t1.oru.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-12-08T08:16:15Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-t1.oru.se/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp-t1.oru.se/Shibboleth.sso/DS/Login" index="1"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-t1.oru.se/Shibboleth.sso/Login-AL2"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-t1.oru.se/Shibboleth.sso/WAYF/idp.antagning.se"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp-t1.oru.se/Shibboleth.sso/WAYF/idp.test.antagning.se"/>
-      <mdui:UIInfo>
-        <mdui:Description xml:lang="en">Test system for Central webservice for Örebro University. The system is handling student activation, re-enrolls  students and registers existing and new student accounts aswell as act as intermediary for password changes. EduID is used to validate AL2 accounts.</mdui:Description>
-        <mdui:Description xml:lang="sv">Testsystem för Central webbtjänst för Örebro universitet. Systemet aktiverar, återaktiverar och kursregistrerar nya och befintliga studentkonton samt är ombudssystem för lösenordsbyten. EduID används för att validera AL2-konton.</mdui:Description>
-        <mdui:DisplayName xml:lang="en">Central webservice for Örebro University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Central webbtjänst för Örebro universitet</mdui:DisplayName>
-        <mdui:InformationURL xml:lang="en">https://www.oru.se/utbildning/jag-ar-student/mina-studier/registrering/transfer-of-personal-data-to-the-central-webservice-for-orebro-university-in-connection-with-federated-login-privacy-policy</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://www.oru.se/utbildning/jag-ar-student/mina-studier/registrering/transfer-of-personal-data-to-the-central-webservice-for-orebro-university-in-connection-with-federated-login-privacy-policy</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.oru.se/utbildning/jag-ar-student/mina-studier/registrering/transfer-of-personal-data-to-the-central-webservice-for-orebro-university-in-connection-with-federated-login-privacy-policy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.oru.se/utbildning/jag-ar-student/mina-studier/registrering/transfer-of-personal-data-to-the-central-webservice-for-orebro-university-in-connection-with-federated-login-privacy-policy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>sp-t1.oru.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=itsupport@oru.se,CN=sp-t1.oru.se,O=Internet Widgits Pty Ltd,ST=Some-State,C=SE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFgTCCA2kCFAngqMeO4J95JnZRbmafUPwPXuGUMA0GCSqGSIb3DQEBCwUAMH0x
-CzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRl
-cm5ldCBXaWRnaXRzIFB0eSBMdGQxFTATBgNVBAMMDHNwLXQxLm9ydS5zZTEfMB0G
-CSqGSIb3DQEJARYQaXRzdXBwb3J0QG9ydS5zZTAeFw0yMjEyMDgxMjI1NTZaFw0z
-MjEyMDUxMjI1NTZaMH0xCzAJBgNVBAYTAlNFMRMwEQYDVQQIDApTb21lLVN0YXRl
-MSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxFTATBgNVBAMMDHNw
-LXQxLm9ydS5zZTEfMB0GCSqGSIb3DQEJARYQaXRzdXBwb3J0QG9ydS5zZTCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALblMVqXAHXgQlrzB10nF8lbQVV/
-xDXAOQI1+l9C7gXUyGNHNja4ffvYCHIy1xXH+JVn4OC5mth0Ge3NW3yCy9m9JJZS
-vuFhF6+QAmOYShEDWOipxPcQGyAAa97BQwl68W3Z8kev32Wfz+bDOhFRUIPy4BKI
-L9juLVT7dj9wBMQ0iVP3bBdtPXVCT1H8rEJob1Y4bv1eZyroh+zlGtsDm/tTCBYa
-gRTxOWNfRF4MD3FxFLywtt4Mw4R4qn6Gk528Uq7dbRLqZYHuIR3wEargQVkP1Lwe
-nmflyCgrmTzo5wZeUzczn3CSQWFDhMLSm2lazSurBbJ2Xz/VWxgcPciXod8gZNva
-Htt5iLJ8IGx6hlEtHS0ZreZKAAOVPvEIY/fGDdaoKbOPTrW+Q6BiEythx6m+vZNO
-5zFBWfzjs4Q8fP3NcrVeC9mhOkuCwQlylhX7m5nA2ZGh8y5lW7FqfFaFXV9WZf6t
-Cjm8Z4HhN/aLUGv9shJhmTD0h8wH23cROwcUZWxuUxdKHIp8QXfQMZ6YA1Yg1csn
-W+nAm2AcinpWSN4qrMQKLou9PO3sA09xOYH3nG7lsBiPpPgsIKyw3vWm1aL3mZRe
-v7LKVj4QTicMeWWDm0h/BS9UkFcdyv0egKeqXNqPwbij30xvx+CSHRF6iCDvrppH
-qEudPiAgcQf+m/t9AgMBAAEwDQYJKoZIhvcNAQELBQADggIBAGCj68DPtOSW264C
-W2pe2Pb53Kh5WUArfx0ATU2OGoqpRqQBc/iJo0R+OLD4MEMoTFd8/OxcRLfzbpp+
-6uqOus9to+OjVL+LtwugvJiGiR20XO21Qe8RiL1r26LB5Y24CJzZIJLS0iTfqTEU
-fei04P8/H9fTjCThmqdDqcFSIjVtIOwTC5DCPXrnZEhyd9CFb3qv50EpZ3Kr+ZdT
-L3WyM1FwIfxopCutU1LT+rOJnY6iJxg8yaBUdo7TkAIo4APHDGXdvssUVHRBfz/v
-FWBf3UWKFNC8lepzebqAIFu5Y7t+AH7YImtSprCQJhGzNvYEaAj1ocgEDKtC/Hyi
-Db3Y/e0cN8qLkXx9Vq5v4zDB3rxU8JvIAw3Elc2/q3ZpshLDqv09mls4hXaoIlxP
-Px+jBLmxtheCricR2/7Y/w2B5Oq8+cXxatPXP60AZT8fJzbi2E6zp9Aw8bWMF2o/
-MXpmN0ySI//P+P7SwtlEP0Bvo3/sihr686nc9jo9rah1/bzKU+cEeXse5DvVkpO5
-wFaTfWRFJKRnZ9s+5OJD6ZGrYtaqnPce4teig4W/j8tFNKBvcXuntCMAG+YQG1lb
-xwmNo3p8zfmooR7GfgwK9VbAkU5K/HFVyJk7+GT7LKbnvw65LzUOF751o4qZP57W
-kbqIaURF3orLGDpBJ2m+KaMri5Jv</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-t1.oru.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp-t1.oru.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp-t1.oru.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-t1.oru.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp-t1.oru.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp-t1.oru.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Central webservice for Örebro University</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Central webbtjänst för Örebro universitet</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="norEduPersonNIN" Name="urn:oid:1.3.6.1.4.1.2428.90.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Örebro University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Örebro universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Örebro University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Örebro universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.oru.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.oru.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>IT-support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 19 303166</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IT support</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@oru.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/sp.haikom.com-saml-kph-test.xml b/metadata/swamid-testing/sp.haikom.com-saml-kph-test.xml
deleted file mode 100644
index 6948c1f0..00000000
--- a/metadata/swamid-testing/sp.haikom.com-saml-kph-test.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sp.haikom.com/saml/kph-test">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2017-10-17T11:16:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="true" WantAssertionsSigned="true">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets visitkortsportal (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University business cards portal (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Uppsala universitets visitkortsportal används för beställning av visitkort.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University business cards portal is used for ordering business cards.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=860972</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=860972</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIIcS3igxdPcxEwDQYJKoZIhvcNAQENBQAwgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb20wHhcNMTcwOTE2MDAwMDAwWhcNMzcwOTE2MDAwMDAwWjBOMRYwFAYDVQQDDA1zcC5oYWlrb20uY29tMQ8wDQYDVQQKDAZIYWlLb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWmhC8VIJsSOSArrsO/jRgukGxCbX+0KyIzA2aNcsi9GDvYIMnf9m4P/uhVK7YFrsaC6BvWv38mdZP3oW4tOVX5J9XuiMwH+mOJajyNvMqaMebWLbwJJ2mDSC/4kX9y5tn+y/Fwu3+QMnRApVQCLWL+Pr5z7xeq4gpETsC8KnDqRq3jNSRClYmZzU3UNFb5wKIcLFJ7ShQpFi5tORhNeX1Y8ziUJgUChKlvrqI9Xxs+whEtMjqmqB6P/8NDR35y8bzmv8FlfNdJQXP8XG+icTXAOsuI78fIQQl860v+BiuCHIr3nzHcZIkeXP1E5skVE8G521TzALacNABvMKRUhCQIDAQABo4IBBDCCAQAwgdAGA1UdIwSByDCBxYAUUlkcUX7NJ5BrsANXn7DX2or8t2ihgaKkgZ8wgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb22CCHEt4oMXT3MRMB0GA1UdDgQWBBRSWRxRfs0nkGuwA1efsNfaivy3aDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAESl1nr0+3TNo3KEh2UPykyi/2XrYrfMU4Yu7FMQPYPcyNqjumUumzX/fjwHP/yWeNZ7F3L+2npQicZ/04o4sNwzhixuZ2fSv/s5PTvpbwQzBEbTitLkr/ki1PTLQp12yIN6EWkmpxdsnfMEvY3arV3e6Le8c2dVZSIUomuDYg38KhEoj22yPUYsBCxKv7mWBB4H/BJ6rOxAlJ00T4FOCKttj4qajKuEK3T9rbQ2CMnhxLB2WPcWUSE8oprLZSNwqDSWzhnn0YZEWRKj2jd3RuFsnSBTlroYwiUgfiLTWOj3bTcw5/B5uty2TVAqmWTA4fAQUgZn3JBJ7SeeGbaQdc</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIIcS3igxdPcxEwDQYJKoZIhvcNAQENBQAwgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb20wHhcNMTcwOTE2MDAwMDAwWhcNMzcwOTE2MDAwMDAwWjBOMRYwFAYDVQQDDA1zcC5oYWlrb20uY29tMQ8wDQYDVQQKDAZIYWlLb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiWmhC8VIJsSOSArrsO/jRgukGxCbX+0KyIzA2aNcsi9GDvYIMnf9m4P/uhVK7YFrsaC6BvWv38mdZP3oW4tOVX5J9XuiMwH+mOJajyNvMqaMebWLbwJJ2mDSC/4kX9y5tn+y/Fwu3+QMnRApVQCLWL+Pr5z7xeq4gpETsC8KnDqRq3jNSRClYmZzU3UNFb5wKIcLFJ7ShQpFi5tORhNeX1Y8ziUJgUChKlvrqI9Xxs+whEtMjqmqB6P/8NDR35y8bzmv8FlfNdJQXP8XG+icTXAOsuI78fIQQl860v+BiuCHIr3nzHcZIkeXP1E5skVE8G521TzALacNABvMKRUhCQIDAQABo4IBBDCCAQAwgdAGA1UdIwSByDCBxYAUUlkcUX7NJ5BrsANXn7DX2or8t2ihgaKkgZ8wgZwxKDAmBgNVBAMMH0hhaUtvbSBTZWxmLVNpZ25lZCBDZXJ0aWZpY2F0ZXMxDzANBgNVBAoMBkhhaUtvbTEXMBUGA1UECwwOd3d3LmhhaWtvbS5jb20xEjAQBgNVBAcMCVN0b2NraG9sbTEPMA0GA1UEBhMGU3dlZGVuMSEwHwYJKoZIhvcNAQkBFhJzdXBwb3J0QGhhaWtvbS5jb22CCHEt4oMXT3MRMB0GA1UdDgQWBBRSWRxRfs0nkGuwA1efsNfaivy3aDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBDQUAA4IBAQAESl1nr0+3TNo3KEh2UPykyi/2XrYrfMU4Yu7FMQPYPcyNqjumUumzX/fjwHP/yWeNZ7F3L+2npQicZ/04o4sNwzhixuZ2fSv/s5PTvpbwQzBEbTitLkr/ki1PTLQp12yIN6EWkmpxdsnfMEvY3arV3e6Le8c2dVZSIUomuDYg38KhEoj22yPUYsBCxKv7mWBB4H/BJ6rOxAlJ00T4FOCKttj4qajKuEK3T9rbQ2CMnhxLB2WPcWUSE8oprLZSNwqDSWzhnn0YZEWRKj2jd3RuFsnSBTlroYwiUgfiLTWOj3bTcw5/B5uty2TVAqmWTA4fAQUgZn3JBJ7SeeGbaQdc</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/slo/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/slo/Redirect"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tryckportal.kph.se:8443/Kph/api/saml/sp/v1/sso/Redirect" index="2" isDefault="false"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">HaiKom AB</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">HaiKom</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.haikom.com</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>HaiKom</md:Company>
-    <md:EmailAddress>mailto:support@haikom.com</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/sso.36602638.inspera.com-saml.xml b/metadata/swamid-testing/sso.36602638.inspera.com-saml.xml
deleted file mode 100644
index d6d0d5d6..00000000
--- a/metadata/swamid-testing/sso.36602638.inspera.com-saml.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://sso.36602638.inspera.com/saml">
-  <md:Extensions>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2023-02-10T09:43:19Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Inspera Assessment (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Inspera Assessment is a
-					leading European SaaS provider for high stakes
-					assessment.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.inspera.com</mdui:InformationURL>
-        <mdui:Logo xml:lang="en" height="18" width="126">https://www.inspera.com/hubfs/InsperaFall2015/insperaassessment.svg</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.inspera.com/legal/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFQjCCAyqgAwIBAgIGAYZzzfroMA0GCSqGSIb3DQEBCwUAMGIxCzAJBgNVBAYTAk5PMQ0wCwYD VQQHDARPc2xvMRMwEQYDVQQKDApJbnNwZXJhIEFTMRkwFwYDVQQLDBBTQU1MLWludGVncmF0aW9u MRQwEgYDVQQDDAtpbnNwZXJhLmNvbTAeFw0yMzAyMjAxMTQ4NDRaFw0zMzAyMTgxMTQ4NDRaMGIx CzAJBgNVBAYTAk5PMQ0wCwYDVQQHDARPc2xvMRMwEQYDVQQKDApJbnNwZXJhIEFTMRkwFwYDVQQL DBBTQU1MLWludGVncmF0aW9uMRQwEgYDVQQDDAtpbnNwZXJhLmNvbTCCAiIwDQYJKoZIhvcNAQEB BQADggIPADCCAgoCggIBAL4a2TGtN7znYz8HgEiz0T8u1iteBt9hU+SHZwM2VbgYqlrF+722R0Yv yQIKOCa6z65A2e7hYKlBQqQosOkowK/TqkqW9t1YgX5CUdrJfY6uSht47PM+7j8pdDZcCCukXxM3 pu2S0Hq1AfiCaA9iDHjbFnPati2+Hdh/Q7XJUJGkYnXHjxydgl1M8BNYQ/e5g2AsmyO53mOyWCNh aRjCqTGPTpkfOiuT82XKq2hB4aZfeS9Tu/B66PkuPbynj+5JiosjUxQXWYLZc5bq1VyJxVON6CDZ YWWypNs2vHz2p9O0NMBq1yyjjOLjumwej0VmmvOt0eLW9kJ1jONW7g3qR/iYE8snqL5ETVmbY5s2 yX14RXqPDrhs36BDKsBiMuc9KKyLCYjyRfP/O1xvc4iT+o9G6ulPwOj36rpJHFLT8+S0YIsnYzHS AOSCnVYUg4Lg4UtGqMM61x1RHYabIHfi3OVNnXogRcV+2kHqUJryuGbF4LJfP4oTfG0/hqVl5LFR Q+PIuNTZsmO3cQ88luPvoQn4WWtLP970rllilqL4aSzDI+81QCzvneA95cjLJc/yQ8NA+uO5PQ3+ yaP3+c8bwbmLxg9ks4qHSlVYbPYlxD2ipDUysm2qN0/cuqmNDMopiBuPiJrS0gcBuzbO4S5am7Xo oWd+EVA287t46t61IxvpAgMBAAEwDQYJKoZIhvcNAQELBQADggIBAB3MENI6mr7d+FN8V+hhBsdb v02phvZgI0GZ1cIbjz/lZX2b0PP7WvYaBj4GwgXth7YjoCV31Qld+pI3hTnbPobPtqM4xt9kVWbM g48KDfO8WyDvcTIpUfs/7hmMvJG5o6ZoAiFFdYH8mFWGmm6Q6rTIak1i4yYZcB3c/gL5EFIWwiwa 1vq9VUbiipIl1ZKKs54qee7OwIVUE04ZhWmvFk7lBINrfAGJl0Z08ZCsqDjOHQkoqiJ3O0xKxNV1 PacOKlH9e7HbLGYbri1yMms8LAjWCOFod+y510pNpguhPJzcRWfRUDimn+wRaEWbEC/1EM3Q3Uhi zUYLekKVQubzNjreZ0sdZvoPbvTyRWyNxuRoBocAxUTnGfMyGt7tYa5SyHApzEI40eMNP9zQY3rU iAV3jiL4OP7fi6DtV3dYQZ23YMiokZmz9o5KGSLUg3IgjHp/zFAlRdmOPZKDGkygIFMvmjc9FNiZ Y1oWdBUCDOPRYG8VGR+1F12xRfe19iUG8ihYijzt2AXOHR7xtv+NsEquVVxH99/C5NLlDNJhOfRv Fw0WJXllJ+OUHqgUjxVR1Puy2TpGpfw8wYRgXHNtQGqKansKnkZKrXpXIm99zL3X0muxre6DMpAH XGt8JkCnXvtRG8bBClJ4VbQlY/Z3R0ZPgWjE7eCjMuvcM/nBlbIS</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uutest.inspera.com/saml/endpoint/logout" ResponseLocation="https://uutest.inspera.com/saml/endpoint/logoutresponse"/>
-    <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://uutest.inspera.com/saml/endpoint/assertion" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Inspera Assessment Login
-				service</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Inspera Assessment Login service</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Inspera AS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Inspera</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.inspera.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Inspera Assessment Technical Support Team</md:GivenName>
-    <md:EmailAddress>mailto:support@inspera.no</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Inspera Assessment Administration</md:GivenName>
-    <md:EmailAddress>mailto:firmapost@inspera.no</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Inspera Assessment Service Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@inspera.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/stslab.mah.se-adfs-services-trust.xml b/metadata/swamid-testing/stslab.mah.se-adfs-services-trust.xml
deleted file mode 100644
index fb5438c3..00000000
--- a/metadata/swamid-testing/stslab.mah.se-adfs-services-trust.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="http://stslab.mah.se/adfs/services/trust">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2022-05-20T09:23:01Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=http://stslab.mah.se/adfs/services/trust">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mah.se (regexp="false")</shibmd:Scope>
-      <shibmd:Scope regexp="false">mah.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Test Identity Provider for Malmö university</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Malmö university</mdui:Description>
-        <mdui:Keywords xml:lang="en">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:Logo xml:lang="en" height="163" width="56">https://mau.se/siteassets/mau_en_logotype.svg</mdui:Logo>
-        <mdui:DisplayName xml:lang="sv">Test Identity Provider för Malmö universitet</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Identity Provider för Malmö universitet</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://service.mau.se/solutions/open-knowledge-items/item/KA%201552/sv_SE/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://service.mau.se/solutions/open-knowledge-items/item/KA%201552/en/</mdui:InformationURL>
-        <mdui:Keywords xml:lang="sv">mah mau malmo+universitet malmo+university</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://service.mau.se/solutions/open-knowledge-items/item/KA%201558/sv_SE/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://service.mau.se/solutions/open-knowledge-items/item/KA%201558/en/</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="170" width="56">https://mau.se/siteassets/mau_sv_logotyp.svg</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>mah.se</mdui:DomainHint>
-        <mdui:GeolocationHint>geo:55.6087954,12.9945611</mdui:GeolocationHint>
-        <mdui:IPHint>195.178.224.0/19</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIQW0dvhIGI9LlEjyE4QH+rTDANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDEx9BREZTIEVuY3J5cHRpb24gLSBzdHNsYWIubWFoLnNlMB4XDTIyMDUxMDEwNTYxM1oXDTI1MDUwOTEwNTYxM1owKjEoMCYGA1UEAxMfQURGUyBFbmNyeXB0aW9uIC0gc3RzbGFiLm1haC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMaS0WkRq0kUwWAUMtKMLYUw6kwNlpTyJfjn/Xs64oSMsUyN59V3UHF42Ane1x6ZVACF/ctxMeFhLMh8Uj/cCfecHIbvSOgmajuVwe5usgYCUErNhRaoX38xsYnoEaOBLT4bQRq4xm3mNakNzO4KPVzJ/ybyaUOfDKFkpx4ZO1a6wsGXcVxp5UAABg2Q3Ll9/dQAZUbywwElhtuB/J4kRbVxXejAIwqDWTP68wIwIPbjFaSUT8BmhjPwBnGMkQTf6xgv9Aq7N1h2m2k1GPN62WwjaYlQt2r/ROkplNj1bu+7z13sI0ReqmjHpozmKqi50O9igaP9PPEJFMrA/CFFIaUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAuxW4Kgg51WWiT1tZAK8CAzOvHTJSzig1hjbX8GPVZKKt3bNOeczhEqKRvLVWvio1huTuSHSnF7mEBt2ghbl80NHPJ6BSwHeTjSW4J81UzCb8BCtVFVGxvNypG/fRBMGZpQ7/PjP4DkobWR6tyLbKVMshq3d9gQPjkzLLM/70XPLuzX9JAW7uVbfutK6NUmxSBSPakDc7mzlJGC5xYEDsO1PtEhP3gQsY66O5Ftl1FwmH6M3YaGIHs8HNlOtr4zYv7UXuTo93MaDVp6QqJIdSUYCbXy+SeLnogS2nIuZNqDyUvViwpobyxS9DkuOrd5gkLAnE5eHLtJa8azmfNBGEZg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQNUOymZUnNZ5LgKcuEtj9uDANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBzdHNsYWIubWFoLnNlMB4XDTIyMDUxMDEwNTYwM1oXDTI1MDUwOTEwNTYwM1owJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gc3RzbGFiLm1haC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ8hiQ1ewxfM7Z8vnGQBBZZCOTeRx/p7fzpuXHCI2RtP1MaeIscAMSedIvsSYZGkndXtqszQpUtvveWoPi6Gs/xdVd1YpRmeqzzacq/+uux+7YODoVw0s7QQDAEdC/t4+586mmYPDfjmugQSg3j/Jbp+Wn3jHd+vj7WNI1z9AxSKh+rIft4olr3pLEv0UvJ/ylHJO6Ohn/rbPe/bXChOzvBv7zOLHCfG03uXWwennOG65qFqgSUh0gqQ9WZcBzeyA7FJ70087ElcHqIoFm+hCEtEDkZ4Dc6tj2xfxMeI+0RZITOh+WeynWfW+XuAqj7Z5wJYQK3tudqFg1YFrLfNK8cCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEASPOFDrv7+BP1aSZPwpq3+WuaIHjqSLif+TQ1Aoss2uktJhT/SPf7E+jVuBJ0CXkqkyb8EJdwFD06Kymbqmlr/p9pxdcY7ON6VK8J4pjLdsKssPfbiDe1etzLXMDm60ULW8TpQL0Zaa/eB5EiXgBzP7xOKI4tF4gNbpIWgMMRcnUnRg0BXLBYkd+VGHW1mD5y7jKxOPugIn8W9afhQXnhKRfdA5spyi655A1HlodS0McviwCd8kpTU/dbI/XedSGOjS5ZDvf1wOOB5DazxGb/j+98mXyZmvd41fBy0Ps5sEJGYyg4BnCOyLfsOt3Y2bBvYX23lgua/PMVUYRe3NpnPA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIC1jCCAb6gAwIBAgIQFoGG9+p3RpdG1Ufyjd3O9TANBgkqhkiG9w0BAQsFADAnMSUwIwYDVQQDExxBREZTIFNpZ25pbmcgLSBzdHNsYWIubWFoLnNlMB4XDTIyMDUxMDEwNTYwM1oXDTI1MDUwOTEwNTYwM1owJzElMCMGA1UEAxMcQURGUyBTaWduaW5nIC0gc3RzbGFiLm1haC5zZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0V6jeNEyEW2z2NEyHxehmkJDHg9L82OMzf0dcsaYzXJFZhLYsbygJmbs7B9f3lZQ5VWf9Bi1dUNQI1BJJhkd/vMAeB1Pcu4pUfS8lGJiV9e20qQ7fMmzaajzUtLTkHbJFUQRnpKCeWh0+ScIGDzyUMhQsLfYYbg3vgJUTnCrN/keqT5ZykquhZmXkskaeH3sc9fvEb1JtkYe+6sdT4oRYuJrERML/qPx+Dg74tqz9Q11bT04FxEi0QSpWMEXkownwRaIuyPYq4Sa0+imHwOa1+tMkdLulSA8BqXR6l8kcGamWjXozH+Hri4xiQyuLiscAozkDmBRbBpLKlCO8HmL8CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAKLF9+v57eznYgb9HSXKT5icnK+5YqT5oLEj12m0B3CNp7/Yzh3cWzRW4es453JYv1MixbmG68kLg7hW5B9/WoewSpqveRy+95ard040vnq3wHib9uzP8kn/+6gHCOhWmdvAQ6nVFCIlY2CnHZot4h1aDJ2KFWFFYr31w2SrtfkMsUJXkZ7rQIhTGb0si5ogko3L/SfVnHsAwC9IFVu5A/HHRaflMV1C7FctcDhoMBch3OFy/CWoMr4v3SNTGhVwIzQyrH3ko9jr1GoN5lXm3d55WSn6bJYkycWwrwjCxbED32XvqTElM9316E056fiaGa7uyQcG8KccfhuoBULMN0Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stslab.mah.se/adfs/ls/"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stslab.mah.se/adfs/ls/"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://stslab.mah.se/adfs/ls/"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://stslab.mah.se/adfs/ls/"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">MAH</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">MAH</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Malmö universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Malmö university</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">https://www.mau.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">https://www.mau.se/en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="support">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:support@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 40 6657555</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Malmö universitet</md:Company>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:Company>Malmö universitet</md:Company>
-    <md:GivenName>IT Drift</md:GivenName>
-    <md:SurName>IT Drift</md:SurName>
-    <md:EmailAddress>mailto:drift@mau.se</md:EmailAddress>
-    <md:TelephoneNumber>+46 709 655480</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/test.lu.ortrac.com-saml-sp.xml b/metadata/swamid-testing/test.lu.ortrac.com-saml-sp.xml
deleted file mode 100644
index d7713565..00000000
--- a/metadata/swamid-testing/test.lu.ortrac.com-saml-sp.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test.lu.ortrac.com/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-09-14T06:28:36Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.lu.ortrac.com/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.lu.ortrac.com/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">QPS Test environment</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">QPS Testmiljö</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Quality and control system for the education at the Faculty of Medicine</mdui:Description>
-        <mdui:Description xml:lang="sv">Kvalitets- och uppföljningssystem för utbildningen vid Medicinska fakulteten</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>www.ortrac.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ortrac.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/DCCAmSgAwIBAgIUIdrYO7SXSTpQdQMUN0OaFNDfNeYwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAxMOd3d3Lm9ydHJhYy5jb20wHhcNMjAwMTA1MjM1ODUxWhcN
-MzAwMTAyMjM1ODUxWjAZMRcwFQYDVQQDEw53d3cub3J0cmFjLmNvbTCCAaIwDQYJ
-KoZIhvcNAQEBBQADggGPADCCAYoCggGBAL2eD02Ch/WpMfgA8Bmsy1C3etN1QmvQ
-WROGi9nlm9A1tYg6A/E99nebNNuaDjOhlf2bFEmrUvXNZV2htZxp9Dk3iS3LoQen
-n6j+hlxHVZKBm8ns/NMyO7wSVKimJCx6YXpisPPYBQn9Q3LQFARDXdkNndOtnIja
-Jy6+bpmSUM7J90kTlinZ++VXYv2fTnVpWQie6ir422n+MvfJli9XFi8pri895XZZ
-CExeTOe4u5FIoVrVxLp+TIolb4xsvpZo6PCHKpCW0nyfX2EUe94yAP+i9wwtqnRB
-lHRDIbjitnpoVn0wIw/JkpY6Uk6Qs46vm1bxo9RlILY9+NoaUJuqOvXg7sGvGcC2
-wHcHEwzzb44V43mUkgOA8/QUwiOzkgzpTKZZpwwTKvKFCiMcQ9ck/hy9372TRX4L
-qOpkwxOAS5gQzlJQ3UKpn7sJavzjZgpUbWn9yHWVGxAaKHpbW0I7Sa+lHqtWoVJX
-h56LH/K2FmGtA9fCIKi3pCaC/FBZXCIfHQIDAQABozwwOjAZBgNVHREEEjAQgg53
-d3cub3J0cmFjLmNvbTAdBgNVHQ4EFgQUid+qBStC7mLmxpz2tc7WqmrBB9EwDQYJ
-KoZIhvcNAQELBQADggGBAB+1zL/mJGZZ6DHN9ohhrv3Kw47bNgn8MEiSrrE9bjwH
-/0WaqJFUwiBcmH1N3EA25uZT4mUK0AwlnuQlPwkkDgj3Y5yrSE21//99+Xf8Ksfe
-91Yjx4hMUUmZnMxJQl1JsvuZ3KF8kgHk+ijmWJGlz7u2NKTDY6m9y/RsaDoycqOp
-S/r9HFuPYBYdFw3DivQmjM0jwOtt4JuWZDYg75sYjelR8RnxSIQnxgk5St4GKLq0
-URB0VnbbiYt1vGpVvbpXcEnlrwCo+gWUMM6a35Q5eKgKantfkhd1ElfFB6OIZCXd
-InqHD3/3ZgqTfdYZ8IzIsMxqyTEbCWwSlisE7L2JQ2wNKUO5gDMRD/IrwvQZc+UG
-zIbTFrMZ+RPS8CVwt0NlvzYfKSM/12HjZ/FUluKIcJwXC3sPnyn0V5fJZjQm3qf1
-kJ+sjgFwjYk3lFoOmYnXU8NZQWlyfNO0XNNiZK+4RU2zyDDNARD95j0FueYVFvA3
-yQ8Fym8zwW/5KlfigfEnLA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.lu.ortrac.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.lu.ortrac.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.lu.ortrac.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.lu.ortrac.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.lu.ortrac.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.lu.ortrac.com/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Jakob Donnér</md:SurName>
-    <md:EmailAddress>mailto:jakob.donner@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Johan Agardh</md:SurName>
-    <md:EmailAddress>mailto:johan.agardh@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/test.mp.uu.se-Shibboleth.sso.xml b/metadata/swamid-testing/test.mp.uu.se-Shibboleth.sso.xml
deleted file mode 100644
index f2d4999e..00000000
--- a/metadata/swamid-testing/test.mp.uu.se-Shibboleth.sso.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test.mp.uu.se/Shibboleth.sso">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-11-14T18:24:20Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.mp.uu.se/Shibboleth.sso/Login"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.mp.uu.se/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.mp.uu.se/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Medarbetarportalen vid Uppsala universitet (TEST)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala University (TEST)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Medarbetarportalen är ett intranät för anställda vid Uppsala universitet, men är även åtkomlig för studenter och externa användare.</mdui:Description>
-        <mdui:Description xml:lang="en">The Staff Portal (Medarbetarportalen) is an intranet for employees at Uppsala University, but it's also available for students and external users.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://test.mp.uu.se/sv/web/support/om-mp</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://test.mp.uu.se/en/web/support/om-mp</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://mp.uu.se/en/web/support/behandlingpersonuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://mp.uu.se/sv/web/support/behandlingpersonuppgifter</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIE8DCCAtigAwIBAgIJAM5IksMD367xMA0GCSqGSIb3DQEBCwUAMBgxFjAUBgNV
-BAMTDXRlc3QubXAudXUuc2UwIBcNMjIxMDE0MDcwNDI4WhgPMjEyMjA5MjAwNzA0
-MjhaMBgxFjAUBgNVBAMTDXRlc3QubXAudXUuc2UwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQCqYz4WJSxnNPzQHvjLUzMkwPP00F1PUJRkQdbRdLLCshTj
-0VBhXE7LR+I86WW2HRhjR+EYuEgcKCPptIAuVPutO5sfljMnfkrgUAqW3AygjA4W
-2w0L5Bc2+RV3mPnjkGFogUdPZ4TjnYn3AHlF7ocwkoLr45iRiL0o0s1vckIMTpI4
-LkZlHmdUnHmm2Ae3rNhQ0FoPmx/wov3radxCpnQazdhVaUlKkDBuvZ8xP0qcKaPw
-yul5bW6/Wut8gSHrESR9yMH3Gnh0p9StoMwEW3h0kxjik+FSwn8qN+EeIURryNxm
-XgauBZSF3kYwFrUxeR8g4tVq/Pw6h1hhCc2j9P+Cktfa+et46YC4H9RIUJpiBAPg
-ySQnpx+uGQzxC700RnN8y8pHg1rpv+CkDiuA4PIIzMpCcUBBhNeSwZJq8yKH91u0
-Mz0MwPKF6hJsQzJ3/S3o/uRsFLntska0HMpBdWt5nZvY/YVWvgEgGWU+hwtAnxRl
-Vy2KuaIf6fQTNIKux4ShdjtPTSH7H9scqxx+Xf3BNKMBJQvefavt9qftbmlzl+JX
-xl8ZqsX+LON6EYBVQfmuBUdP75Kc7tIOaJVd6q6duqZcCkz73ZpNj3IY6YKOAp7i
-HiJJiq3TfqkN/8baIh0++YlrjeYoY7/baIvP/+8zOMUK5jJwvWfks5DZClK+ywID
-AQABozswOTAYBgNVHREEETAPgg10ZXN0Lm1wLnV1LnNlMB0GA1UdDgQWBBTFQL5E
-u3ewVGP07MsTOp3cSbUHrzANBgkqhkiG9w0BAQsFAAOCAgEALnypaHbunBiyZGeI
-1wW+6nLEPjwK9lDF2Mq0kASN1dP1ZPqju9E4cXx98DBAyD5r7YuQd8JqOU6hBhMe
-Mnz6WcUjbyTzMdvk7ergG9CVjKneYuLXgdcW3PvK2YeaAviMnYiHQqi2tYMWLU+Z
-zAK5a47U0EUku2F9riQeDvcvl9YSBlFt/81c9q8A/j5f5Ece2ux6rdILeUf9tKWb
-SB24AeFBd9UJ11+XiJdnAZ2KkKeAAjznradSL034guALL6KqhvPPdGkGTA32fQjI
-ub3vsCBtOeZIXGHK4NysN0bwDiWpOHmNEfM5a2jH8/pIs5SA03Iz2KH3b/tFgUTN
-yTso2QH9eM2cHBUCLyLUpoH7cyqzbh8dFU3hklLcrveoXW2KNXc2TYQbUSRw96Pp
-BFwkmr6Czx0hQP6HFJMnymYIlHEXxsDBCzM/xJtDFEjxDP/bl9jWyFTAyPisq3ZU
-ssQ2JFLVEyQ6GtfaoRzG/1SPO8LqPNQTC9GMOO7Gr9NdwKEPz1OI4nI7QvspS/Wd
-fA/5tndXaVrbpD22WQWPiNxdKBrNh6K296dmx0nWhpkoMN1LKXqBwCCkTgbKNP+F
-EygWvHCGgDVriBh6+tcRwV0fZ+YiwfvxtKsfOP6eI/2YQMw9BfusXUOx4/4KeFuY
-xeSNu6jmKOMefPbRNSYIBOTTQFI=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.mp.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.mp.uu.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.mp.uu.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.mp.uu.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.mp.uu.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.mp.uu.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.mp.uu.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.mp.uu.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.mp.uu.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.mp.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.mp.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.mp.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="sv">Medarbetarportalen vid Uppsala universitet (TEST)</md:ServiceName>
-      <md:ServiceName xml:lang="en">The Staff Portal (Medarbetarportalen) at Uppsala University (TEST)</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:liferay-datordrift@its.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>IT Support</md:SurName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/test.ortrac.com-saml-sp.xml b/metadata/swamid-testing/test.ortrac.com-saml-sp.xml
deleted file mode 100644
index bd9a2561..00000000
--- a/metadata/swamid-testing/test.ortrac.com-saml-sp.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test.ortrac.com/saml/sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-06-11T13:35:41Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://test.ortrac.com/Shibboleth.sso/DS/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://test.ortrac.com/Shibboleth.sso/DS/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">QPS testmiljö</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">QPS test environment</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testmiljö för medicinska fakultetens utbildningsplattform</mdui:Description>
-        <mdui:Description xml:lang="en">Test environment for the Quality and Performance System at the Faculty of Medicine</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://test.ortrac.com/Shibboleth.sso/DS/Login</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://test.ortrac.com/Shibboleth.sso/DS/Login</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.medarbetarwebben.lu.se/stod-och-verktyg/juridik-dokument-och-arendehantering/personuppgifter-och-dataskydd/overgripande-information/allmanna-principer-for-personuppgiftshantering</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.medarbetarwebben.lu.se/stod-och-verktyg/juridik-dokument-och-arendehantering/personuppgifter-och-dataskydd/overgripande-information/allmanna-principer-for-personuppgiftshantering</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>www.ortrac.com</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.ortrac.com</ds:X509SubjectName>
-          <ds:X509Certificate>MIID/DCCAmSgAwIBAgIUIdrYO7SXSTpQdQMUN0OaFNDfNeYwDQYJKoZIhvcNAQEL
-BQAwGTEXMBUGA1UEAxMOd3d3Lm9ydHJhYy5jb20wHhcNMjAwMTA1MjM1ODUxWhcN
-MzAwMTAyMjM1ODUxWjAZMRcwFQYDVQQDEw53d3cub3J0cmFjLmNvbTCCAaIwDQYJ
-KoZIhvcNAQEBBQADggGPADCCAYoCggGBAL2eD02Ch/WpMfgA8Bmsy1C3etN1QmvQ
-WROGi9nlm9A1tYg6A/E99nebNNuaDjOhlf2bFEmrUvXNZV2htZxp9Dk3iS3LoQen
-n6j+hlxHVZKBm8ns/NMyO7wSVKimJCx6YXpisPPYBQn9Q3LQFARDXdkNndOtnIja
-Jy6+bpmSUM7J90kTlinZ++VXYv2fTnVpWQie6ir422n+MvfJli9XFi8pri895XZZ
-CExeTOe4u5FIoVrVxLp+TIolb4xsvpZo6PCHKpCW0nyfX2EUe94yAP+i9wwtqnRB
-lHRDIbjitnpoVn0wIw/JkpY6Uk6Qs46vm1bxo9RlILY9+NoaUJuqOvXg7sGvGcC2
-wHcHEwzzb44V43mUkgOA8/QUwiOzkgzpTKZZpwwTKvKFCiMcQ9ck/hy9372TRX4L
-qOpkwxOAS5gQzlJQ3UKpn7sJavzjZgpUbWn9yHWVGxAaKHpbW0I7Sa+lHqtWoVJX
-h56LH/K2FmGtA9fCIKi3pCaC/FBZXCIfHQIDAQABozwwOjAZBgNVHREEEjAQgg53
-d3cub3J0cmFjLmNvbTAdBgNVHQ4EFgQUid+qBStC7mLmxpz2tc7WqmrBB9EwDQYJ
-KoZIhvcNAQELBQADggGBAB+1zL/mJGZZ6DHN9ohhrv3Kw47bNgn8MEiSrrE9bjwH
-/0WaqJFUwiBcmH1N3EA25uZT4mUK0AwlnuQlPwkkDgj3Y5yrSE21//99+Xf8Ksfe
-91Yjx4hMUUmZnMxJQl1JsvuZ3KF8kgHk+ijmWJGlz7u2NKTDY6m9y/RsaDoycqOp
-S/r9HFuPYBYdFw3DivQmjM0jwOtt4JuWZDYg75sYjelR8RnxSIQnxgk5St4GKLq0
-URB0VnbbiYt1vGpVvbpXcEnlrwCo+gWUMM6a35Q5eKgKantfkhd1ElfFB6OIZCXd
-InqHD3/3ZgqTfdYZ8IzIsMxqyTEbCWwSlisE7L2JQ2wNKUO5gDMRD/IrwvQZc+UG
-zIbTFrMZ+RPS8CVwt0NlvzYfKSM/12HjZ/FUluKIcJwXC3sPnyn0V5fJZjQm3qf1
-kJ+sjgFwjYk3lFoOmYnXU8NZQWlyfNO0XNNiZK+4RU2zyDDNARD95j0FueYVFvA3
-yQ8Fym8zwW/5KlfigfEnLA==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ortrac.com/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://test.ortrac.com/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.ortrac.com/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ortrac.com/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ortrac.com/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ortrac.com/Shibboleth.sso/SAML2/POST" index="1"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Jakob</md:GivenName>
-    <md:SurName>Donner</md:SurName>
-    <md:EmailAddress>mailto:jakob.donner@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Johan</md:GivenName>
-    <md:SurName>Agardh</md:SurName>
-    <md:EmailAddress>mailto:johan.agardh@med.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:SurName>Support</md:SurName>
-    <md:EmailAddress>mailto:support@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/test.play.gu.se.xml b/metadata/swamid-testing/test.play.gu.se.xml
deleted file mode 100644
index 33652d6c..00000000
--- a/metadata/swamid-testing/test.play.gu.se.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://test.play.gu.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-11-25T14:22:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">GU Play - Test</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">GU Play - Test</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Video platform at the university of Gothenburg - Test</mdui:Description>
-        <mdui:Description xml:lang="sv">Göteborgs universitets videohanteringstjänst - Test</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://medarbetarportalen.gu.se/verktyg/guplay/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://medarbetarportalen.gu.se/verktyg/guplay/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.gu.se/om-webbplatsen/behandling-av-personuppgifter</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.gu.se/en/about-the-website/processing-personal-data</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIENjCCAx6gAwIBAgIJAKLxSTc8gMTfMA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpHb3RoZW5idXJnMRMwEQYDVQQHEwpHb3RoZW5idXJnMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIEdvdGhlbmJ1cmcxEzARBgNVBAMTCnBsYXkuZ3Uuc2UwHhcNMTUwNTIxMTQzMjQxWhcNMjUwNTIwMTQzMjQxWjBvMQswCQYDVQQGEwJTRTETMBEGA1UECBMKR290aGVuYnVyZzETMBEGA1UEBxMKR290aGVuYnVyZzEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBHb3RoZW5idXJnMRMwEQYDVQQDEwpwbGF5Lmd1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw0zx6/c1e2J0uk/ogk8xb/4TGEp7P0bY/PxlVm1das5lvohBXQgUJ2w6pr65hKe/wpLy465u8dS+10UQM5HeDBdTLw+uriuylwVzb9xlE9zSGF21P5SFcrLwkyzVD7nwLmj63EdJsX6kV7dB5ve4N30ZOoNjNsnkoOCbU6JToY6GbAQZ58tkga8ltFkXgnnSWOWYZYpvQ+BmwnHuGkbPZ7l1vV7ASaR6iIkfvrc2CKemGh3R9sjxvq1hEkAW5CkLX4haFCCEp6dB6e+rYe6rOuLYVE2eiMYVTtHJ5gQrtt4JzF2ctKGOqcVoqfq0Wjy5JMtH3D92cIa3BGdyPir3VwIDAQABo4HUMIHRMB0GA1UdDgQWBBRsL+vMdXJeopoPTDqn4/ZYXWPjDTCBoQYDVR0jBIGZMIGWgBRsL+vMdXJeopoPTDqn4/ZYXWPjDaFzpHEwbzELMAkGA1UEBhMCU0UxEzARBgNVBAgTCkdvdGhlbmJ1cmcxEzARBgNVBAcTCkdvdGhlbmJ1cmcxITAfBgNVBAoTGFVuaXZlcnNpdHkgb2YgR290aGVuYnVyZzETMBEGA1UEAxMKcGxheS5ndS5zZYIJAKLxSTc8gMTfMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAALL4gucIVyMfBKlhB1i91SOYnuQ4cqhiQ8+084K6segEP5Ilmm+7fky5DlUcQlp0H+DpNZmOTSOT/eG6HjNTapEosLcWHj/HBvoWjYjLndz4JOh3btoxQinlpPUFTVtJJE2WuXkgaa2v6ioWbnrimLNWjKifwih6zMBvi6a+e9nhL1cs2uk6zR6zt6Hc8Xr2TkBpr20dPFFmVhgFyQ4WDGEP4lgM2O0ZYyBSqVWyTW1ny2MR/KchsEm7hAB19lYcAA9lEkQ6fUIpIdYc5cJhbcl/Zp4gu8Cmcv8OpkB7eh7c9Mzz6nBO6SXwTtr2tAWeCa+J/+T4V/K78+l9K9AtP4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIENjCCAx6gAwIBAgIJAKLxSTc8gMTfMA0GCSqGSIb3DQEBBQUAMG8xCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpHb3RoZW5idXJnMRMwEQYDVQQHEwpHb3RoZW5idXJnMSEwHwYDVQQKExhVbml2ZXJzaXR5IG9mIEdvdGhlbmJ1cmcxEzARBgNVBAMTCnBsYXkuZ3Uuc2UwHhcNMTUwNTIxMTQzMjQxWhcNMjUwNTIwMTQzMjQxWjBvMQswCQYDVQQGEwJTRTETMBEGA1UECBMKR290aGVuYnVyZzETMBEGA1UEBxMKR290aGVuYnVyZzEhMB8GA1UEChMYVW5pdmVyc2l0eSBvZiBHb3RoZW5idXJnMRMwEQYDVQQDEwpwbGF5Lmd1LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAw0zx6/c1e2J0uk/ogk8xb/4TGEp7P0bY/PxlVm1das5lvohBXQgUJ2w6pr65hKe/wpLy465u8dS+10UQM5HeDBdTLw+uriuylwVzb9xlE9zSGF21P5SFcrLwkyzVD7nwLmj63EdJsX6kV7dB5ve4N30ZOoNjNsnkoOCbU6JToY6GbAQZ58tkga8ltFkXgnnSWOWYZYpvQ+BmwnHuGkbPZ7l1vV7ASaR6iIkfvrc2CKemGh3R9sjxvq1hEkAW5CkLX4haFCCEp6dB6e+rYe6rOuLYVE2eiMYVTtHJ5gQrtt4JzF2ctKGOqcVoqfq0Wjy5JMtH3D92cIa3BGdyPir3VwIDAQABo4HUMIHRMB0GA1UdDgQWBBRsL+vMdXJeopoPTDqn4/ZYXWPjDTCBoQYDVR0jBIGZMIGWgBRsL+vMdXJeopoPTDqn4/ZYXWPjDaFzpHEwbzELMAkGA1UEBhMCU0UxEzARBgNVBAgTCkdvdGhlbmJ1cmcxEzARBgNVBAcTCkdvdGhlbmJ1cmcxITAfBgNVBAoTGFVuaXZlcnNpdHkgb2YgR290aGVuYnVyZzETMBEGA1UEAxMKcGxheS5ndS5zZYIJAKLxSTc8gMTfMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAALL4gucIVyMfBKlhB1i91SOYnuQ4cqhiQ8+084K6segEP5Ilmm+7fky5DlUcQlp0H+DpNZmOTSOT/eG6HjNTapEosLcWHj/HBvoWjYjLndz4JOh3btoxQinlpPUFTVtJJE2WuXkgaa2v6ioWbnrimLNWjKifwih6zMBvi6a+e9nhL1cs2uk6zR6zt6Hc8Xr2TkBpr20dPFFmVhgFyQ4WDGEP4lgM2O0ZYyBSqVWyTW1ny2MR/KchsEm7hAB19lYcAA9lEkQ6fUIpIdYc5cJhbcl/Zp4gu8Cmcv8OpkB7eh7c9Mzz6nBO6SXwTtr2tAWeCa+J/+T4V/K78+l9K9AtP4=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.play.gu.se/user/logout"/>
-    <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://test.play.gu.se/user/authenticate" index="0"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Gothenburg</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Göteborgs Universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Gothenburg</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Göteborgs Universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.gu.se/en</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.gu.se/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:gukonto@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:EmailAddress>mailto:gukonto@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>mailto:support@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IRT</md:GivenName>
-    <md:EmailAddress>mailto:irt@gu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml b/metadata/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
deleted file mode 100644
index 6b4d1d25..00000000
--- a/metadata/swamid-testing/testidpv4.lu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://testidpv4.lu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2020-04-21T08:31:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al3</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://saml-error.lu.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Lunds universitet (Test)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Lund University (Test)</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Testidentitetstjänst för anställda och studenter vid Lunds universitet (Shibboleth IdPv4)</mdui:Description>
-        <mdui:Description xml:lang="en">Test identity provider for employees and students at Lund University (Shibboleth IdPv4)</mdui:Description>
-        <mdui:Keywords xml:lang="sv">lu lth</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">lu lth</mdui:Keywords>
-        <mdui:InformationURL xml:lang="sv">https://www.lu.se/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://www.lunduniversity.lu.se/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.it.lu.se/fileadmin/user_upload/itlu/personuppgiftshantering.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.it.lu.se/fileadmin/user_upload/itlu/personaldata.html</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="sv" height="146" width="121">https://testidpv4.lu.se/idp/images/mdui-logo-sv.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="146" width="116">https://testidpv4.lu.se/idp/images/mdui-logo-en.png</mdui:Logo>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>lu.se</mdui:DomainHint>
-        <mdui:DomainHint>lth.se</mdui:DomainHint>
-        <mdui:IPHint>130.235.0.0/16</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUax5wlSZ9mfr4nj6Nq3lG3OJ/rlAwDQYJKoZIhvcNAQEL
-                        BQAwGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMB4XDTIwMDIyODE0MTkzMloX
-                        DTQwMDIyODE0MTkzMlowGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMIIBojAN
-                        BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAjSLQZe0gVwlmXmX7Aodd7RtVIq7x
-                        SdGkUMzXKWmu0RrGoEYiIqWGPl4vwepj8rxpB+3fn1ICYLNzDZ/uZjIrQpRRLVFo
-                        EpkvPtio7DiBP67CFBrW8dqeFljyyeJ1x9LXEElM5RTnduwLZfz19QnhKT3BJ6nl
-                        ErtQX6AEhDaGBQr5xPcx6MOmEL6Z3l8oOuIHEJzs++CWUsaGGratFalk1mRKPjOS
-                        OVS8ABKTL2WSGFWN9lg262YSozDg/b9A2Yb1CO9BfqSQLf7dqDjT8ncuQSeJ0F+k
-                        9TbVgoclFPwCGW2ozi0I521UePRaAIQ9K9ogdyHntcGzg6CI4vBIiQTwBqxxBwQc
-                        6Y0E9SKeNajx2zBUuXKhU7Ny+xk/fCSB8/tCn/hU1cSI+3nOpD7I+W5AkI1aJarE
-                        16qmpeqnE0hVsSnJrRvR3RXcUkuFfjNR4ZDSzPgvF4zRgbXHDuN7CQAi+6zhdcnW
-                        M8mxrv0Kv8+2x1rrKsqU2O0ug/N5vaEDasZXAgMBAAGjZTBjMB0GA1UdDgQWBBRQ
-                        E/8BKrHdzUJ77Gwu73rUEDJGMDBCBgNVHREEOzA5gg90ZXN0aWRwdjQubHUuc2WG
-                        Jmh0dHBzOi8vdGVzdGlkcHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-                        DQEBCwUAA4IBgQAEX8bVUgn4Fx11xpM1InUKTX5PCFABCCEHrcogdisG+i9D/6vp
-                        lByz8+htRhWK3NiQcFeEvb22+vWSdILQ2Orxkr5pKnq/gwwtxCtwyLLzppN9Apk8
-                        MdGKykZhTt5q2vC+z5QIYVAFqop+Aur8PV8/jh5hfOS1A8qP9f4CdDbJ4yut9slD
-                        ezmhSDyBzwBGw9Gp9MMwki8wUxPABnYSO0tB9hHqHcNs66L9TnU7MHFwgttWkVAe
-                        fEtnmE3TOfhDvPKfA0GvxMx+8Yq33l5ULYpe7VTIZ9cnB8JDyVmxQEVY/OzfBTzr
-                        4+MRo+Mla4dxpRFZCjjPzJfIoWZ4zyRCknVyITj10tVFDyZhgoGlwj3OXrny8HEz
-                        syr6g6Dv3/Dvpa2hfvagYaV7MCS63lxnEwhrfHR9s8BwYhmLzKybVc+V+39cddMb
-                        rQxCop8QUrH5asbJFtrD181RVvg+78kE6+06+ZpRK3fMWOxaXYQNgTsV9SUknt9W
-                        vfDfE7lmEmBH3KU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVALKujwaVHaZhGOqyCUibFCDSPg+WMA0GCSqGSIb3DQEB
-                        CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
-                        Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
-                        DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKV4FKUullzDjlhIueafuIMUklq4
-                        PnkRpcLedmblQ52Vla7kA4ZWJlTihFBuxNrnV3zrRMMdvjZI1u69HgdgZHSwtCFc
-                        TsqiKc3Mj2LaWrRn9+CXPvgsoHNLSVJNHBugm1lDrX/9ON5qPfcF4ojaYdvUVi56
-                        ZNNhSGYUQ0zZ1+BhdUMGNAJDPL1keqsxS+OHlJzcAAhWWLEwiEohfZEcKItvE5w4
-                        m53q1nJaPKZCmNRMu/U0cS5Kglr6mkF9x11HmVswdIrWEtTD7n5cfqt/2d/fimK5
-                        TErL4tHLnxN8iXp5k/2ZvXKEhgT8RLczVArl7ji3WG7Uyf/+tCvbMQxsZDx5lfar
-                        237f/lBQz98/73hNa6eu20Jk4aiz5RnWQDJVr5J0vxKnls6CVZ7VvckLQazQLLRw
-                        LiEngXL3vRw9ZgDioKudpiPwTRvbL7Q5VjYr4WBAMImSR//AEdW14O6xSq11eKmI
-                        ydEHHvH+mfEu1jwc5obRnKPgtRi44FqqVTnU3wIDAQABo2UwYzAdBgNVHQ4EFgQU
-                        AFbJB7RnXcAZhzFHErMsHIWyvtMwQgYDVR0RBDswOYIPdGVzdGlkcHY0Lmx1LnNl
-                        hiZodHRwczovL3Rlc3RpZHB2NC5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-                        9w0BAQsFAAOCAYEAJH5eXOsHdSeq29vW0v0NJs3WhQILiyykp6I7yyy8gM8LSv4j
-                        mQvzKDwGZUYkbhpGHm0zlKc+hMUA/xwZ6aoIk2/rj/ZZRa5HX0/y+UWMiQJ1mnF5
-                        3PPxR/95cAwD7dOJVM5gn4Bos8DWSNI6dgSaqS59FkSFrVtWFxRLbsyviq8eRfT0
-                        mVqBszBh3YYvsv3YCgVlDhW9UmvA7DsHD1UK4Ot3dfV7NkB4XMb1o6LJ1/fjP8Jt
-                        Vhi0fmZx/Jjf7yBZZsZvXuty9NSeJYSFl4CrV5FtZyDjv81PpT1Ho5tFDGF+MWAP
-                        xZlszLFdompzKrg4GV0hOYCVzbYHP87okyKexYqM+ILsjnbiBaYPhvbT0OvqzCyB
-                        3xR3z6v9VJ7iZb6s53/6hfPIOaqoigCVVs9kryL/LWxAcONVe3j+LHSpO/LbVeVl
-                        PhPdkKEJlNSh0fl1He/4tDRgn6oxtriCeGhkgkgec1Wts9ToVkVTx8Qj7KOH5pY7
-                        /3I+s2NlmSzSfJF2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVAL5LJ0uT+Dd+w/aIz5bHK/9jbaYQMA0GCSqGSIb3DQEB
-                        CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
-                        Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
-                        DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIxmBcbFnCYXL5QozP0c1RSoAs9R
-                        +LLhYdFM8zXE1pfg0MGlNGylU/OyrDG80pRV3RvNFYLWWJ8y0w2I2aVmWjxrcCt0
-                        g95qQC/MbIc7yMJXL5X8jzIJ7dTT3npW+QCzgXOvV+9kk9ukG0/Z6tJiRz2Ici6a
-                        1fvJU8QjfRJqJsm4iRGYvoxLZiLlQcwyGerzoS2rDgIor99KSQEONYjoRdp/6VNy
-                        yCNBta9/ZWCxAd8TFfU2QmilDR+t846IeSWuZ0lhLywr+GzxmEycklAPN/xaNQ1K
-                        /nConoYA6TiJD3ecLm/K9fEay+wCN918ENJABHiQ+i2KStnhqL8oUeudPL5zUgen
-                        D767tUYSjJ10orRSv0agqX7HMYMBl65Zqw9asjZNL9DZkyomyL40QIv5eFV7GmvD
-                        0XyBtem7IR7SGdxloOxFE8PdRYBW655e8ojxIKoMEyoHkelhEtobzIJlYCpE44/I
-                        LDxgt+NRgQ7Cjq2vh/A89JpWbYo0h2hoy6zUvwIDAQABo2UwYzAdBgNVHQ4EFgQU
-                        I5jXm8+Npq8IslUUAkBW3tlyrGMwQgYDVR0RBDswOYIPdGVzdGlkcHY0Lmx1LnNl
-                        hiZodHRwczovL3Rlc3RpZHB2NC5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-                        9w0BAQsFAAOCAYEAN1yFroy/gJAvGQ/wcKLrbWHCeCBp8HXGRh+bJIzJoE6/JKSw
-                        BNGLbd6Jp2rYobG4AnyThYn3FeaCWwq0cSyCJZ+7r+xf/X7nqWp1Hz9ols2pM7l2
-                        Gszd3DP3Op8Dv1MPPbb1vWiYHhQY/AwH0dDGpkMiouxyhL7bRkId1tka6/y4olYb
-                        JsqFquFZzWxiicBiY/xPqBgOA1Xd3nusiXfpawtP/5cH+HwJTMaQqDDqW9yzhZAI
-                        jm8y85Vo2h4lXtqRcOJKt7m2mpGEJHKEODr7ZnmCi8gpjlwXYBqn/4ztEQCgsQwy
-                        K8iUARfquSCvJbq9u68bpfG85c3CPwX4Wjke71CV50P1fwWosXUZDawR+am6PEP6
-                        OJ8Dg60C40ih35vpVLw3Ro7L/48vDtE79Ncc6jPEoincmJNHsdzhWwhB0kdPC2hy
-                        BOk5y8w16iqOOkOJmt1bBG5Y3fxXxFKsqecJnGu+bz++xLjtCOJhV2WEsevWKelB
-                        S1UOXyr6n+XEbwgu</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testidpv4.lu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidpv4.lu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testidpv4.lu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testidpv4.lu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" ns1:supportsRequestedAttributes="true" Location="https://testidpv4.lu.se/idp/profile/SAML2/Redirect/SSO"/>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testidpv4.lu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService xmlns:ns1="urn:oasis:names:tc:SAML:protocol:ext:req-attr" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" ns1:supportsRequestedAttributes="true" Location="https://testidpv4.lu.se/idp/profile/SAML2/POST/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">lu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEJzCCAo+gAwIBAgIUax5wlSZ9mfr4nj6Nq3lG3OJ/rlAwDQYJKoZIhvcNAQEL
-                        BQAwGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMB4XDTIwMDIyODE0MTkzMloX
-                        DTQwMDIyODE0MTkzMlowGjEYMBYGA1UEAwwPdGVzdGlkcHY0Lmx1LnNlMIIBojAN
-                        BgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAjSLQZe0gVwlmXmX7Aodd7RtVIq7x
-                        SdGkUMzXKWmu0RrGoEYiIqWGPl4vwepj8rxpB+3fn1ICYLNzDZ/uZjIrQpRRLVFo
-                        EpkvPtio7DiBP67CFBrW8dqeFljyyeJ1x9LXEElM5RTnduwLZfz19QnhKT3BJ6nl
-                        ErtQX6AEhDaGBQr5xPcx6MOmEL6Z3l8oOuIHEJzs++CWUsaGGratFalk1mRKPjOS
-                        OVS8ABKTL2WSGFWN9lg262YSozDg/b9A2Yb1CO9BfqSQLf7dqDjT8ncuQSeJ0F+k
-                        9TbVgoclFPwCGW2ozi0I521UePRaAIQ9K9ogdyHntcGzg6CI4vBIiQTwBqxxBwQc
-                        6Y0E9SKeNajx2zBUuXKhU7Ny+xk/fCSB8/tCn/hU1cSI+3nOpD7I+W5AkI1aJarE
-                        16qmpeqnE0hVsSnJrRvR3RXcUkuFfjNR4ZDSzPgvF4zRgbXHDuN7CQAi+6zhdcnW
-                        M8mxrv0Kv8+2x1rrKsqU2O0ug/N5vaEDasZXAgMBAAGjZTBjMB0GA1UdDgQWBBRQ
-                        E/8BKrHdzUJ77Gwu73rUEDJGMDBCBgNVHREEOzA5gg90ZXN0aWRwdjQubHUuc2WG
-                        Jmh0dHBzOi8vdGVzdGlkcHY0Lmx1LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3
-                        DQEBCwUAA4IBgQAEX8bVUgn4Fx11xpM1InUKTX5PCFABCCEHrcogdisG+i9D/6vp
-                        lByz8+htRhWK3NiQcFeEvb22+vWSdILQ2Orxkr5pKnq/gwwtxCtwyLLzppN9Apk8
-                        MdGKykZhTt5q2vC+z5QIYVAFqop+Aur8PV8/jh5hfOS1A8qP9f4CdDbJ4yut9slD
-                        ezmhSDyBzwBGw9Gp9MMwki8wUxPABnYSO0tB9hHqHcNs66L9TnU7MHFwgttWkVAe
-                        fEtnmE3TOfhDvPKfA0GvxMx+8Yq33l5ULYpe7VTIZ9cnB8JDyVmxQEVY/OzfBTzr
-                        4+MRo+Mla4dxpRFZCjjPzJfIoWZ4zyRCknVyITj10tVFDyZhgoGlwj3OXrny8HEz
-                        syr6g6Dv3/Dvpa2hfvagYaV7MCS63lxnEwhrfHR9s8BwYhmLzKybVc+V+39cddMb
-                        rQxCop8QUrH5asbJFtrD181RVvg+78kE6+06+ZpRK3fMWOxaXYQNgTsV9SUknt9W
-                        vfDfE7lmEmBH3KU=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVALKujwaVHaZhGOqyCUibFCDSPg+WMA0GCSqGSIb3DQEB
-                        CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
-                        Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
-                        DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAKV4FKUullzDjlhIueafuIMUklq4
-                        PnkRpcLedmblQ52Vla7kA4ZWJlTihFBuxNrnV3zrRMMdvjZI1u69HgdgZHSwtCFc
-                        TsqiKc3Mj2LaWrRn9+CXPvgsoHNLSVJNHBugm1lDrX/9ON5qPfcF4ojaYdvUVi56
-                        ZNNhSGYUQ0zZ1+BhdUMGNAJDPL1keqsxS+OHlJzcAAhWWLEwiEohfZEcKItvE5w4
-                        m53q1nJaPKZCmNRMu/U0cS5Kglr6mkF9x11HmVswdIrWEtTD7n5cfqt/2d/fimK5
-                        TErL4tHLnxN8iXp5k/2ZvXKEhgT8RLczVArl7ji3WG7Uyf/+tCvbMQxsZDx5lfar
-                        237f/lBQz98/73hNa6eu20Jk4aiz5RnWQDJVr5J0vxKnls6CVZ7VvckLQazQLLRw
-                        LiEngXL3vRw9ZgDioKudpiPwTRvbL7Q5VjYr4WBAMImSR//AEdW14O6xSq11eKmI
-                        ydEHHvH+mfEu1jwc5obRnKPgtRi44FqqVTnU3wIDAQABo2UwYzAdBgNVHQ4EFgQU
-                        AFbJB7RnXcAZhzFHErMsHIWyvtMwQgYDVR0RBDswOYIPdGVzdGlkcHY0Lmx1LnNl
-                        hiZodHRwczovL3Rlc3RpZHB2NC5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-                        9w0BAQsFAAOCAYEAJH5eXOsHdSeq29vW0v0NJs3WhQILiyykp6I7yyy8gM8LSv4j
-                        mQvzKDwGZUYkbhpGHm0zlKc+hMUA/xwZ6aoIk2/rj/ZZRa5HX0/y+UWMiQJ1mnF5
-                        3PPxR/95cAwD7dOJVM5gn4Bos8DWSNI6dgSaqS59FkSFrVtWFxRLbsyviq8eRfT0
-                        mVqBszBh3YYvsv3YCgVlDhW9UmvA7DsHD1UK4Ot3dfV7NkB4XMb1o6LJ1/fjP8Jt
-                        Vhi0fmZx/Jjf7yBZZsZvXuty9NSeJYSFl4CrV5FtZyDjv81PpT1Ho5tFDGF+MWAP
-                        xZlszLFdompzKrg4GV0hOYCVzbYHP87okyKexYqM+ILsjnbiBaYPhvbT0OvqzCyB
-                        3xR3z6v9VJ7iZb6s53/6hfPIOaqoigCVVs9kryL/LWxAcONVe3j+LHSpO/LbVeVl
-                        PhPdkKEJlNSh0fl1He/4tDRgn6oxtriCeGhkgkgec1Wts9ToVkVTx8Qj7KOH5pY7
-                        /3I+s2NlmSzSfJF2</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEKDCCApCgAwIBAgIVAL5LJ0uT+Dd+w/aIz5bHK/9jbaYQMA0GCSqGSIb3DQEB
-                        CwUAMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTAeFw0yMDAyMjgxNDE5MTNa
-                        Fw00MDAyMjgxNDE5MTNaMBoxGDAWBgNVBAMMD3Rlc3RpZHB2NC5sdS5zZTCCAaIw
-                        DQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBAIxmBcbFnCYXL5QozP0c1RSoAs9R
-                        +LLhYdFM8zXE1pfg0MGlNGylU/OyrDG80pRV3RvNFYLWWJ8y0w2I2aVmWjxrcCt0
-                        g95qQC/MbIc7yMJXL5X8jzIJ7dTT3npW+QCzgXOvV+9kk9ukG0/Z6tJiRz2Ici6a
-                        1fvJU8QjfRJqJsm4iRGYvoxLZiLlQcwyGerzoS2rDgIor99KSQEONYjoRdp/6VNy
-                        yCNBta9/ZWCxAd8TFfU2QmilDR+t846IeSWuZ0lhLywr+GzxmEycklAPN/xaNQ1K
-                        /nConoYA6TiJD3ecLm/K9fEay+wCN918ENJABHiQ+i2KStnhqL8oUeudPL5zUgen
-                        D767tUYSjJ10orRSv0agqX7HMYMBl65Zqw9asjZNL9DZkyomyL40QIv5eFV7GmvD
-                        0XyBtem7IR7SGdxloOxFE8PdRYBW655e8ojxIKoMEyoHkelhEtobzIJlYCpE44/I
-                        LDxgt+NRgQ7Cjq2vh/A89JpWbYo0h2hoy6zUvwIDAQABo2UwYzAdBgNVHQ4EFgQU
-                        I5jXm8+Npq8IslUUAkBW3tlyrGMwQgYDVR0RBDswOYIPdGVzdGlkcHY0Lmx1LnNl
-                        hiZodHRwczovL3Rlc3RpZHB2NC5sdS5zZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG
-                        9w0BAQsFAAOCAYEAN1yFroy/gJAvGQ/wcKLrbWHCeCBp8HXGRh+bJIzJoE6/JKSw
-                        BNGLbd6Jp2rYobG4AnyThYn3FeaCWwq0cSyCJZ+7r+xf/X7nqWp1Hz9ols2pM7l2
-                        Gszd3DP3Op8Dv1MPPbb1vWiYHhQY/AwH0dDGpkMiouxyhL7bRkId1tka6/y4olYb
-                        JsqFquFZzWxiicBiY/xPqBgOA1Xd3nusiXfpawtP/5cH+HwJTMaQqDDqW9yzhZAI
-                        jm8y85Vo2h4lXtqRcOJKt7m2mpGEJHKEODr7ZnmCi8gpjlwXYBqn/4ztEQCgsQwy
-                        K8iUARfquSCvJbq9u68bpfG85c3CPwX4Wjke71CV50P1fwWosXUZDawR+am6PEP6
-                        OJ8Dg60C40ih35vpVLw3Ro7L/48vDtE79Ncc6jPEoincmJNHsdzhWwhB0kdPC2hy
-                        BOk5y8w16iqOOkOJmt1bBG5Y3fxXxFKsqecJnGu+bz++xLjtCOJhV2WEsevWKelB
-                        S1UOXyr6n+XEbwgu</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testidpv4.lu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Lund University</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Lunds universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Lunds universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Lund University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.lunduniversity.lu.se</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">https://www.lu.se</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>LU IdP administrators</md:GivenName>
-    <md:EmailAddress>mailto:idpadmin@epic.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>LU Servicedesk</md:GivenName>
-    <md:EmailAddress>mailto:servicedesk@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>IRT Lund University</md:GivenName>
-    <md:EmailAddress>mailto:abuse@lu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>LU IdP administrators</md:GivenName>
-    <md:EmailAddress>mailto:idpadmin@epic.lu.se</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/urn-mace-feide.no-services-no.inspera.assessment.test.xml b/metadata/swamid-testing/urn-mace-feide.no-services-no.inspera.assessment.test.xml
deleted file mode 100644
index 38c69779..00000000
--- a/metadata/swamid-testing/urn-mace-feide.no-services-no.inspera.assessment.test.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="urn:mace:feide.no:services:no.inspera.assessment.test">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-04-13T08:34:27Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol" AuthnRequestsSigned="false" WantAssertionsSigned="false">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Inspera Assessment (T)</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Inspera Assessment is a leading European SaaS provider for high stakes assessment.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.inspera.com</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.inspera.com/legal/privacy-notice</mdui:PrivacyStatementURL>
-        <mdui:Logo xml:lang="en" width="126" height="18">https://www.inspera.com/hubfs/InsperaFall2015/insperaassessment.svg</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDVzCCAj+gAwIBAgIJAI4CnpvwSXWDMA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNV
-            BAYTAk5PMQ8wDQYDVQQIDAZOb3J3YXkxDTALBgNVBAcMBE9zbG8xEzARBgNVBAoM
-            Ckluc3BlcmEgQVMwHhcNMTgwMzA1MTEyMjEzWhcNMjMwMzA0MTEyMjEzWjBCMQsw
-            CQYDVQQGEwJOTzEPMA0GA1UECAwGTm9yd2F5MQ0wCwYDVQQHDARPc2xvMRMwEQYD
-            VQQKDApJbnNwZXJhIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-            9xP6LbR7o7xE+4Nfyc+ERYEEdBfFzMoi3RlkXaNnyfz5KhK7J9X8PNQv7OOd+hQ3
-            ygbM7OuWzkvq030C4Qfu0HGNT6/cDQikCjvE4gKZzeqInSkK0fouiaOMBGAwNdDW
-            tWFsoCYPvtuuDlWgxTSem93tL0oxKk8Kq3HVMYEldELlb8WJlBpK+fW7pZyKGiv/
-            0BZoDwt49aJTMI9xixwuZ25XseHd0m8uyE3jWkMZFGEC4f20MrwhPIml9T8V/ZI9
-            a8HUcfarqjKkAL3cvlBu0F3RQxIjZZUlVWLZzGvkejnJELzaCoQertLaZOnTpm2G
-            V87SLqFDrbgb51arOr7hYQIDAQABo1AwTjAdBgNVHQ4EFgQUdwYeh/Do5h3spm/u
-            uJBAa6FZ9uwwHwYDVR0jBBgwFoAUdwYeh/Do5h3spm/uuJBAa6FZ9uwwDAYDVR0T
-            BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAbve3Ezx+JaUpAxC3VlcI/nNUp4hu
-            gTtwAFENo8aFQDkl+d+UjwG8s7+DVg5QKfq86PC3eLqHoVQYfJkyFpCg0mYnd+j3
-            DKrQpGHvHhygLalAAxdLt3iWkOO44+UXI/x9BQfmKz8FxeKhgZUsYeoOu6dMqHEO
-            fqAoHlectwQPkYwBtRFiRPjFVDFYQ6ByJgpvWC74YireWwTG7VBjXmwxH6fRI9Vd
-            s54PP7vYL+FDAc/phqyD/DejCQ6VSEzvujI1n7LhvLrgnPYpcnP9qPQQ4lo8SdPu
-            QbmZguNk1osxdUK0XH/eBFCYKEygmK+7iKPg4C9/w53uSTdolnmsssOWGQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-            MIIDVzCCAj+gAwIBAgIJAI4CnpvwSXWDMA0GCSqGSIb3DQEBCwUAMEIxCzAJBgNV
-            BAYTAk5PMQ8wDQYDVQQIDAZOb3J3YXkxDTALBgNVBAcMBE9zbG8xEzARBgNVBAoM
-            Ckluc3BlcmEgQVMwHhcNMTgwMzA1MTEyMjEzWhcNMjMwMzA0MTEyMjEzWjBCMQsw
-            CQYDVQQGEwJOTzEPMA0GA1UECAwGTm9yd2F5MQ0wCwYDVQQHDARPc2xvMRMwEQYD
-            VQQKDApJbnNwZXJhIEFTMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-            9xP6LbR7o7xE+4Nfyc+ERYEEdBfFzMoi3RlkXaNnyfz5KhK7J9X8PNQv7OOd+hQ3
-            ygbM7OuWzkvq030C4Qfu0HGNT6/cDQikCjvE4gKZzeqInSkK0fouiaOMBGAwNdDW
-            tWFsoCYPvtuuDlWgxTSem93tL0oxKk8Kq3HVMYEldELlb8WJlBpK+fW7pZyKGiv/
-            0BZoDwt49aJTMI9xixwuZ25XseHd0m8uyE3jWkMZFGEC4f20MrwhPIml9T8V/ZI9
-            a8HUcfarqjKkAL3cvlBu0F3RQxIjZZUlVWLZzGvkejnJELzaCoQertLaZOnTpm2G
-            V87SLqFDrbgb51arOr7hYQIDAQABo1AwTjAdBgNVHQ4EFgQUdwYeh/Do5h3spm/u
-            uJBAa6FZ9uwwHwYDVR0jBBgwFoAUdwYeh/Do5h3spm/uuJBAa6FZ9uwwDAYDVR0T
-            BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAbve3Ezx+JaUpAxC3VlcI/nNUp4hu
-            gTtwAFENo8aFQDkl+d+UjwG8s7+DVg5QKfq86PC3eLqHoVQYfJkyFpCg0mYnd+j3
-            DKrQpGHvHhygLalAAxdLt3iWkOO44+UXI/x9BQfmKz8FxeKhgZUsYeoOu6dMqHEO
-            fqAoHlectwQPkYwBtRFiRPjFVDFYQ6ByJgpvWC74YireWwTG7VBjXmwxH6fRI9Vd
-            s54PP7vYL+FDAc/phqyD/DejCQ6VSEzvujI1n7LhvLrgnPYpcnP9qPQQ4lo8SdPu
-            QbmZguNk1osxdUK0XH/eBFCYKEygmK+7iKPg4C9/w53uSTdolnmsssOWGQ==
-          </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc">
-        <ns6:KeySize xmlns:ns6="http://www.w3.org/2001/04/xmlenc#">128</ns6:KeySize>
-      </md:EncryptionMethod>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso-test.inspera.no/edugain/endpoint/logout"/>
-    <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://sso-test.inspera.no/edugain/endpoint/assertion" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Inspera Assessment Login
-        service (test)</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Inspera
-        Assessment Login service, test environment</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName" isRequired="true"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail" isRequired="false"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Inspera AS</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Inspera</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">https://www.inspera.com/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Inspera Assessment Technical Support Team</md:GivenName>
-    <md:EmailAddress>mailto:support@inspera.no</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Inspera Assessment Administration</md:GivenName>
-    <md:EmailAddress>mailto:firmapost@inspera.no</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Inspera Assessment Service Desk</md:GivenName>
-    <md:EmailAddress>mailto:support@inspera.no</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/use-uu.sitevision.se.xml b/metadata/swamid-testing/use-uu.sitevision.se.xml
deleted file mode 100644
index 03943eff..00000000
--- a/metadata/swamid-testing/use-uu.sitevision.se.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://use-uu.sitevision.se">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2021-05-24T15:33:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Uppsala universitet</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Uppsala University</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Här loggar du in till de interna sidorna för studenter och anställda vid Uppsala universitet. Har du frågor om inloggningen eller hur du använder de interna sidorna? Kontakta servicedesk@.uu.se</mdui:Description>
-        <mdui:Description xml:lang="en">On this page you log in to the internal pages for students and employees at Uppsala University. If you have questions about the login function or how to use the internal pages please contact servicedesk@uu.se</mdui:Description>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://www.uu.se/om-uu/dataskyddspolicy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://www.uu.se/en/about-uu/data-protection-policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIGAXl6Z5EuMA0GCSqGSIb3DQEBCwUAMD8xJTAjBgNVBAMMHGh0dHBzOi8v
-dXNlLXV1LnNpdGV2aXNpb24uc2UxFjAUBgNVBAsMDXNpdGV2aXNpb24tc3AwHhcNMjEwNTE3MTI1
-NzU4WhcNMzEwNTE1MTI1NzU4WjA/MSUwIwYDVQQDDBxodHRwczovL3VzZS11dS5zaXRldmlzaW9u
-LnNlMRYwFAYDVQQLDA1zaXRldmlzaW9uLXNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAkZpF9FI4GGy1BVD2iFH21yVx+Dmx3XC39vo3wET/xNoZLTSM2DYRotFgeeO6fl/2weNevKJ7
-XKPj45oiFUmApXgNSDdpW029G/4mzlVcCZwPKoSE/9TgSX8fJjRylbL2dRuOMY46HQHijplEEQZA
-QeBQCnuEk3cLWUohXFg9umtHJJKgXmYVHKCLDuVvcO6YHPhmLJ4HPeSxFyBUlD/bZ1jqyIR1tY8K
-XhxwAL2dlshehB9yYvqFd3C/MqJD1ZhlkWX2k6KvRW3kpNosMWirtPmAkx1RsQudTELnBJS1g/0x
-VK0IB3ZbE21ud5bXtK5aaQLPqk29rteah4LGlaSMuwIDAQABo0IwQDAdBgNVHQ4EFgQUszSp3juS
-ZqgVwA6K1pEZNATrmg8wHwYDVR0jBBgwFoAUszSp3juSZqgVwA6K1pEZNATrmg8wDQYJKoZIhvcN
-AQELBQADggEBAEeXZZAhXv8cQb3Z8EMPgbdIfSEeJz44T/dl5VPuGA2JyMCmzHs0hOmf45WZL+YV
-NYMGR+q+9wheRd5zKF000tQnafOa98rRw8yBjTN6Bo71cLmMfIp4Mc7I8f0M/g5shtZeW7FoFH16
-gYxDCI2Mnq6cYBUc077lNclKAlJx4AvaGIsJGz04DWTz4/8tuTktZaH6GDXrsMHM63ZcluGFSrOq
-AccfOhkZn9ZamLQp54W4/Ge2E8zfW7znk7seZiRel4dQn3Cg3Miy9D46BsN7WGulIE81cYtEtWHV
-7PlPpWDWTq6acw0sdjOc9dLtnoeT3RuyOj+nk1iN8LGf/mdR5IE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDQDCCAiigAwIBAgIGAXl6Z5EuMA0GCSqGSIb3DQEBCwUAMD8xJTAjBgNVBAMMHGh0dHBzOi8v
-dXNlLXV1LnNpdGV2aXNpb24uc2UxFjAUBgNVBAsMDXNpdGV2aXNpb24tc3AwHhcNMjEwNTE3MTI1
-NzU4WhcNMzEwNTE1MTI1NzU4WjA/MSUwIwYDVQQDDBxodHRwczovL3VzZS11dS5zaXRldmlzaW9u
-LnNlMRYwFAYDVQQLDA1zaXRldmlzaW9uLXNwMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAkZpF9FI4GGy1BVD2iFH21yVx+Dmx3XC39vo3wET/xNoZLTSM2DYRotFgeeO6fl/2weNevKJ7
-XKPj45oiFUmApXgNSDdpW029G/4mzlVcCZwPKoSE/9TgSX8fJjRylbL2dRuOMY46HQHijplEEQZA
-QeBQCnuEk3cLWUohXFg9umtHJJKgXmYVHKCLDuVvcO6YHPhmLJ4HPeSxFyBUlD/bZ1jqyIR1tY8K
-XhxwAL2dlshehB9yYvqFd3C/MqJD1ZhlkWX2k6KvRW3kpNosMWirtPmAkx1RsQudTELnBJS1g/0x
-VK0IB3ZbE21ud5bXtK5aaQLPqk29rteah4LGlaSMuwIDAQABo0IwQDAdBgNVHQ4EFgQUszSp3juS
-ZqgVwA6K1pEZNATrmg8wHwYDVR0jBBgwFoAUszSp3juSZqgVwA6K1pEZNATrmg8wDQYJKoZIhvcN
-AQELBQADggEBAEeXZZAhXv8cQb3Z8EMPgbdIfSEeJz44T/dl5VPuGA2JyMCmzHs0hOmf45WZL+YV
-NYMGR+q+9wheRd5zKF000tQnafOa98rRw8yBjTN6Bo71cLmMfIp4Mc7I8f0M/g5shtZeW7FoFH16
-gYxDCI2Mnq6cYBUc077lNclKAlJx4AvaGIsJGz04DWTz4/8tuTktZaH6GDXrsMHM63ZcluGFSrOq
-AccfOhkZn9ZamLQp54W4/Ge2E8zfW7znk7seZiRel4dQn3Cg3Miy9D46BsN7WGulIE81cYtEtWHV
-7PlPpWDWTq6acw0sdjOc9dLtnoeT3RuyOj+nk1iN8LGf/mdR5IE=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://use-uu.sitevision.se/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://use-uu.sitevision.se/saml/LogoutServiceHTTPRedirectResponse"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://use-uu.sitevision.se/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
-    <md:AttributeConsumingService index="0" isDefault="true">
-      <md:ServiceName xml:lang="sv">Uppsala universitet</md:ServiceName>
-      <md:ServiceName xml:lang="en">Uppsala University</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Operations</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:SurName>Servicedesk</md:SurName>
-    <md:EmailAddress>mailto:servicedesk@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/vhs-dev01.dyndns.org-shibboleth-sp.xml b/metadata/swamid-testing/vhs-dev01.dyndns.org-shibboleth-sp.xml
deleted file mode 100644
index d0a420ac..00000000
--- a/metadata/swamid-testing/vhs-dev01.dyndns.org-shibboleth-sp.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://vhs-dev01.dyndns.org/shibboleth-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>ip-10-228-21-235.eu-west-1.compute.internal</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ip-10-228-21-235.eu-west-1.compute.internal</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAOOKwExQhI7MMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
-BAMTK2lwLTEwLTIyOC0yMS0yMzUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
-HhcNMTAxMDA2MDg0MjExWhcNMjAxMDAzMDg0MjExWjA2MTQwMgYDVQQDEytpcC0x
-MC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv11UTIKVlVN7DfY78bJ187coQZmLt3ey
-J1Qf1EkSufI1Iyz49XkCZslWEMBJiNcH0bcjdLIqm9NCuJtd+Bk0fZxg1yZJ1qAA
-2nt7fQ/wZrnkMlnbOkpzDLh0+CSynD76Z4Iv5BeSOUxSQuqzxB5+pGqDjdrX7NHZ
-vb13fYoMy76zAJnnRBjwnTCNnQiuzsisC9bdEJmFZEzWy0/QZYS8/RNanI8yOpPk
-hEXCm2YToWA+8vWiTo5qKzYwwDjsOwTAh4+NJhSIHS2QVKa3yIDR/LSRsSJHhVT+
-BOr/H+41m3FHebryU+OyM+nr02onkpDDIqAe1BAo1Ae6BlHukkd8jQIDAQABo1kw
-VzA2BgNVHREELzAtgitpcC0xMC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRl
-LmludGVybmFsMB0GA1UdDgQWBBQIudTe1ZcxpNPgLs9PaX2TtzBxvjANBgkqhkiG
-9w0BAQUFAAOCAQEAgr6asZTswOFw7iBfD5mWu2Yon2IRMnEZDmq3aIvbzqeM2K6X
-+CQzlmyP36Ctt3F3yMDfl4AyA4thju3wsCH50sD2g8CACFMUvIk2v8/cbpbURNoV
-1mZwqVS7xQ+CmwWTVgqmPKk7WXQ9kqbknA5jVYzJmRBhylS6kwFGkjQUKlVaS29j
-Ou/sOMAgf9ub7LI0tWT1e6Mz83uFx+vdTuzvUVc+ufuUIDTdVeV9ZdjBRusc/FQe
-OrhnrrEum5QGmuXYb1mFs/TAqiQrGKbLoHAOqqAvDKOg5rX774JGnuv9DSVaeawB
-wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>ip-10-228-21-235.eu-west-1.compute.internal</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=ip-10-228-21-235.eu-west-1.compute.internal</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDSDCCAjCgAwIBAgIJAOOKwExQhI7MMA0GCSqGSIb3DQEBBQUAMDYxNDAyBgNV
-BAMTK2lwLTEwLTIyOC0yMS0yMzUuZXUtd2VzdC0xLmNvbXB1dGUuaW50ZXJuYWww
-HhcNMTAxMDA2MDg0MjExWhcNMjAxMDAzMDg0MjExWjA2MTQwMgYDVQQDEytpcC0x
-MC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRlLmludGVybmFsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv11UTIKVlVN7DfY78bJ187coQZmLt3ey
-J1Qf1EkSufI1Iyz49XkCZslWEMBJiNcH0bcjdLIqm9NCuJtd+Bk0fZxg1yZJ1qAA
-2nt7fQ/wZrnkMlnbOkpzDLh0+CSynD76Z4Iv5BeSOUxSQuqzxB5+pGqDjdrX7NHZ
-vb13fYoMy76zAJnnRBjwnTCNnQiuzsisC9bdEJmFZEzWy0/QZYS8/RNanI8yOpPk
-hEXCm2YToWA+8vWiTo5qKzYwwDjsOwTAh4+NJhSIHS2QVKa3yIDR/LSRsSJHhVT+
-BOr/H+41m3FHebryU+OyM+nr02onkpDDIqAe1BAo1Ae6BlHukkd8jQIDAQABo1kw
-VzA2BgNVHREELzAtgitpcC0xMC0yMjgtMjEtMjM1LmV1LXdlc3QtMS5jb21wdXRl
-LmludGVybmFsMB0GA1UdDgQWBBQIudTe1ZcxpNPgLs9PaX2TtzBxvjANBgkqhkiG
-9w0BAQUFAAOCAQEAgr6asZTswOFw7iBfD5mWu2Yon2IRMnEZDmq3aIvbzqeM2K6X
-+CQzlmyP36Ctt3F3yMDfl4AyA4thju3wsCH50sD2g8CACFMUvIk2v8/cbpbURNoV
-1mZwqVS7xQ+CmwWTVgqmPKk7WXQ9kqbknA5jVYzJmRBhylS6kwFGkjQUKlVaS29j
-Ou/sOMAgf9ub7LI0tWT1e6Mz83uFx+vdTuzvUVc+ufuUIDTdVeV9ZdjBRusc/FQe
-OrhnrrEum5QGmuXYb1mFs/TAqiQrGKbLoHAOqqAvDKOg5rX774JGnuv9DSVaeawB
-wcg2i07qM4SR0O7n7fkIYQvX5IUeicF8SLu++A==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vhs-dev01.dyndns.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/vmfront.lan.kth.se-shibboleth.xml b/metadata/swamid-testing/vmfront.lan.kth.se-shibboleth.xml
deleted file mode 100644
index e6102b96..00000000
--- a/metadata/swamid-testing/vmfront.lan.kth.se-shibboleth.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://vmfront.lan.kth.se/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2019-06-12T08:15:13Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://vmfront.lan.kth.se/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:KeyName>vmfront.lan.kth.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vmfront.lan.kth.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAIZPkpPDLV8WMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnZtZnJvbnQubGFuLmt0aC5zZTAeFw0xMDA1MjAxMzM1MTFaFw0yMDA1MTcx
-MzM1MTFaMB0xGzAZBgNVBAMTEnZtZnJvbnQubGFuLmt0aC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANG4IsTSEChitjEA/isd7hZVlzXCUwJWOrXs
-xjtLzFsFaU+3Of99SrRfhlB866d0L6U6VfVkuvonOw/2HCXGA1JpPIfIc10vEIZL
-iLPvPdBDCRk09qUDlyqDj5P2hD8G+pA/luA1DIXTd6bImV+ciCWM1/AOuPhiAt7A
-zsawVY6S0K2rkDO3pPs13pfhJEdC8+w7HDJG5WWA79rp0MVr1REUh2p71EWfVWh/
-ecXdLvMLrBpMToP5e9v1ZUIEFBFlbQiI2wetvcWNdo7kJYfplZ/g3zLxvtMfFa0q
-JWeV01bOKFXprQz8xsqzdhGq9zD3VezIzu6EdWdQ8T0tAgWHpvUCAwEAAaNUMFIw
-MQYDVR0RBCowKIISdm1mcm9udC5sYW4ua3RoLnNlhhJ2bWZyb250Lmxhbi5rdGgu
-c2UwHQYDVR0OBBYEFJuONt6BkLHzl/nbr7xujmkWlT5CMA0GCSqGSIb3DQEBBQUA
-A4IBAQBOEYkvNmbN23mTD5Kt7/gvcsIxIP9MEYNXn04u1oJhWVT4FhbXfdrxeapi
-7Mu7ozsQazUq0wQ7OK5UgYu53gz3lCp9rIr4X51CMDKaXlIIzba/cAw8WTQmvygu
-hPGS63MlZux4dw9N7a4yxffmKhokW2ZAamoMjbojgPUj/2uqLrc4rmxmg2g5XV/s
-lfZ0HfL19JANfzFtjeapBcllg/lnYuCNh/CzMB1z2RQqXNI+kdR3nWTUiaegtdmo
-OX/SIGPWQxxjY47ggv4d3pW5orhZzzM5Qjj8WbZ3hrK0thaZzebh3gzJ9mGEakoF
-nvPUXwQpAourZJSyt5BJwx3dJT1b
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:KeyName>vmfront.lan.kth.se</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=vmfront.lan.kth.se</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDETCCAfmgAwIBAgIJAIZPkpPDLV8WMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
-BAMTEnZtZnJvbnQubGFuLmt0aC5zZTAeFw0xMDA1MjAxMzM1MTFaFw0yMDA1MTcx
-MzM1MTFaMB0xGzAZBgNVBAMTEnZtZnJvbnQubGFuLmt0aC5zZTCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANG4IsTSEChitjEA/isd7hZVlzXCUwJWOrXs
-xjtLzFsFaU+3Of99SrRfhlB866d0L6U6VfVkuvonOw/2HCXGA1JpPIfIc10vEIZL
-iLPvPdBDCRk09qUDlyqDj5P2hD8G+pA/luA1DIXTd6bImV+ciCWM1/AOuPhiAt7A
-zsawVY6S0K2rkDO3pPs13pfhJEdC8+w7HDJG5WWA79rp0MVr1REUh2p71EWfVWh/
-ecXdLvMLrBpMToP5e9v1ZUIEFBFlbQiI2wetvcWNdo7kJYfplZ/g3zLxvtMfFa0q
-JWeV01bOKFXprQz8xsqzdhGq9zD3VezIzu6EdWdQ8T0tAgWHpvUCAwEAAaNUMFIw
-MQYDVR0RBCowKIISdm1mcm9udC5sYW4ua3RoLnNlhhJ2bWZyb250Lmxhbi5rdGgu
-c2UwHQYDVR0OBBYEFJuONt6BkLHzl/nbr7xujmkWlT5CMA0GCSqGSIb3DQEBBQUA
-A4IBAQBOEYkvNmbN23mTD5Kt7/gvcsIxIP9MEYNXn04u1oJhWVT4FhbXfdrxeapi
-7Mu7ozsQazUq0wQ7OK5UgYu53gz3lCp9rIr4X51CMDKaXlIIzba/cAw8WTQmvygu
-hPGS63MlZux4dw9N7a4yxffmKhokW2ZAamoMjbojgPUj/2uqLrc4rmxmg2g5XV/s
-lfZ0HfL19JANfzFtjeapBcllg/lnYuCNh/CzMB1z2RQqXNI+kdR3nWTUiaegtdmo
-OX/SIGPWQxxjY47ggv4d3pW5orhZzzM5Qjj8WbZ3hrK0thaZzebh3gzJ9mGEakoF
-nvPUXwQpAourZJSyt5BJwx3dJT1b
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmfront.lan.kth.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://vmfront.lan.kth.se/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://vmfront.lan.kth.se/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmfront.lan.kth.se/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vmfront.lan.kth.se/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://vmfront.lan.kth.se/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml b/metadata/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml
deleted file mode 100644
index c3a08699..00000000
--- a/metadata/swamid-testing/weblogin.test.uu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://weblogin.test.uu.se/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2016-04-22T10:26:32Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes>
-      <samla:Attribute Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al1</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/policy/assurance/al2</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/sirtfi</samla:AttributeValue>
-      </samla:Attribute>
-      <samla:Attribute NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
-        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/anonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/pseudonymous</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/personalized</samla:AttributeValue>
-        <samla:AttributeValue>https://myacademicid.org/entity-categories/esi</samla:AttributeValue>
-        <samla:AttributeValue>https://refeds.org/category/code-of-conduct/v2</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0" errorURL="https://error.swamid.se/?errorurl_code=ERRORURL_CODE&amp;errorurl_ts=ERRORURL_TS&amp;errorurl_rp=ERRORURL_RP&amp;errorurl_tid=ERRORURL_TID&amp;errorurl_ctx=ERRORURL_CTX&amp;entityid=https://weblogin.test.uu.se/idp/shibboleth">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">test.uu.se</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitet TEST</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Uppsala University TEST</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Gemensam webbinloggning TEST för anställda, studenter och övriga verksamma vid Uppsala universitet.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University TEST Identity Provider is used by employees and students at the university.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://weblogin.test.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogin.test.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.test.uu.se/#2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.test.uu.se/english.html#2</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">uppsala+university</mdui:Keywords>
-      </mdui:UIInfo>
-      <mdui:DiscoHints>
-        <mdui:DomainHint>uu.se</mdui:DomainHint>
-        <mdui:IPHint>130.238.0.0/18</mdui:IPHint>
-        <mdui:IPHint>130.238.64.0/19</mdui:IPHint>
-        <mdui:IPHint>130.238.128.0/17</mdui:IPHint>
-        <mdui:IPHint>130.242.96.0/20</mdui:IPHint>
-        <mdui:IPHint>130.243.128.0/17</mdui:IPHint>
-        <mdui:IPHint>212.25.130.0/24</mdui:IPHint>
-        <mdui:IPHint>212.25.144.0/21</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:B::/48</mdui:IPHint>
-        <mdui:IPHint>2001:6b0:C::/48</mdui:IPHint>
-        <mdui:GeolocationHint>geo:59.857583,17.629500</mdui:GeolocationHint>
-        <mdui:GeolocationHint>geo:57.639379,18.288630</mdui:GeolocationHint>
-        <mdui:IPHint>193.11.8.0/21</mdui:IPHint>
-        <mdui:IPHint>212.25.152.0/22</mdui:IPHint>
-      </mdui:DiscoHints>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIVAOozXeL6OV8Cp5Hn+Ypqd26TK1YiMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwIBcNMjIxMjEyMDk0
-OTAzWhgPMjEyMjEyMTIwOTQ5MDNaMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3Qu
-dXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDB3cxJLYBJFYie
-+hyGm9AL4qGTd6QgshYPVsNDsOZkQmGrZJf+u4oJ1zZzPyGg6fuVYkNz6VibmSO1
-jtK9ZjgW/Vq+ovV7gODux2OphZK3ghq96C3zuMw/oKarlHvrIH92rZR4slYBnbhZ
-3ox0kpOjQpiOqw8nHXLfWgrkEnSfdEPZyygleYUXdlu5sLVKJmuWtdmCtxAxFjOF
-I2cKNQ2ha7HIMK0Pn84opmGDa1akSF5xnKq69IdM6gXMRl4CR5aD1NykAT3txKGp
-L5FrsEOQ8z5wlrQEqDxfpOiAaIoyppnXw+hmk+qvGuyvVp3xTzIZUxWE15o0iu/e
-0GIxwt4axPsxeEE2+pc/MzRTb59v77uonDjacA8p+S38WL7s9Mnf+/RhdL85c3Eu
-ZwdYpM2Jq0ylhUxVzotC4s0ainJXZux5R9iE0vibl0/DdCLaM6u0MJA51xyCvSft
-Wk4dtMVGURMekycmK58M1rbEk6AB/EoqGuf/FDjCJAFESaSCSUXTmZPBLeDqXw0x
-nmsIJ6fGbw11nCUBAAem0Rxgem+QbCTJ5uGL97B5T1GkuWCeWfJygm1nyO6Ooq/G
-B6rILemZMxaO8LXPJYFG/J8/y5OgHlngUypMUBYSETknMW7LxisfUmcR29TSm+aC
-7oMzvBl9IdMwxrspHqgFUFn/BXPllwIDAQABo0EwPzAdBgNVHQ4EFgQUnVNUm7R3
-YqjmTZVTXk8Y3LuU0d4wHgYDVR0RBBcwFYITd2VibG9naW4udGVzdC51dS5zZTAN
-BgkqhkiG9w0BAQsFAAOCAgEAA0lDX5UhY9+QnUBusyhRFRZayfrPbtmUz18Q17IA
-t+tx6N1rxY0Tz1QQR0Mn5UNgIguN1bK64Q0I83P9Nf90IlWh0Grn6RZGD8y/ugVA
-r3DmvzsNLL+IPd2VBYUvxH0Wnple0L8qtd75FncFSflXPUrfaGSSMRqCdXZkMJRg
-HC1zZ54JKm6amGpl6Y8GoxmdlKrz1IPyBMzJtwg+n2HBcTCBj+I6vu29Ay5EIQF5
-Ll3Mu5h74lEw6YGvZJXQerKQHqeSjZzNV3z/nglx7jRRniDsLNoajHivfS4HZ+Sf
-Yzf2s8t+o+S4ynznFef14teuvcEm1oTXrVDaTQGkt+rikAGc6oiW8B3nTNBOSqwc
-XIp5PRBG3hI+GYITWin0vlOd3nGjpcFdAmwIv3WMXNCdbEnSB0sFGJ95ETe1wpRy
-Fbh5HopSoyG4ZwWALsMF7McxWchcXMn5HVDMow9l24bZgZ6O82q2iVSxV9sede0m
-zwXL4xZC4+BCEpN4Qou6NOwIcNiJe6ht9XR7GJi4CmkOIm29SJYSaTCIiI9s63Nn
-kf+gk1HWIZNC2UoCEnKreFyBik0/PlVMQCnRsCJ75i27auZQ2H1Xxlvi1dUGRX/k
-5Q5UDC04tj4SPHIGX/mBTRSqhHq9KEr752HtZ97X32AV/QvvGPgDKJAD9y8Xjl+/
-pvM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIVAICbe3fw3n2RGDHeB9OH0RlskUMCMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwIBcNMjIxMjA5MTMz
-NjE2WhgPMjEyMjEyMDkxMzM2MTZaMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3Qu
-dXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyWTJfQh39HiWi
-6azP70SmmDbxD8U3Z89mvEy3tiZihNmb/Hb2Jcqp8E41QzPDjTx9j/6scUsHWmcZ
-0Sq4FozzjH0KOO0KxCt26zib5p0ue5auVnGLoRuRxFZMPO4qN3nOUITf8GM7H1PF
-MsD/HLJ0XlCqbSIqw9563t5u3vxrj/FomBEMe1HbzYTnJgoYE5E6dXXVpC/LrsQB
-WCAR+1yyR/eA8U2/HL6P6TGW8++QqvS2SbRPO4VwD68v8NWPLuCfBCEQ7KlrfHJs
-W1tAveHp/N8+BR+lqvScNuY8ghVPySo2t/UsEJlhEzIOEAuVygX8NTqFVL8TdMYa
-nGM8xXAKce30fi+XlxEc6m9yDAPSmqCL71ilqKib2f9vuNSvIOmVhxf4FKRwbQ+0
-ck4AoxAZj5+fpTTWo6gMDvKlsZ5zEXD7Oj5sAmtYfc0MzGPZMiq9XVkTh0sjkj6b
-zueHbdYd5/hC+482pO3wdz+jYiII4G1Pdg9PKtvc3m8U2JdvQCQ1RzHxWvi8vNAM
-Bw6UbHHLc9Rewn1X9/h/ZYw0ONCilm5sGMTLBZ4+MWHiCaapzlgbzWOci5JrOBsX
-Q4AbsMmpOyXEZToSossEDWGX8KGk/d18VXYcNz4cICADzcEcq/Ss5ebrr6Gas4AP
-yXkCmm2paQ1J6XYzUP9UTKNh4Q7l0wIDAQABo0EwPzAdBgNVHQ4EFgQUD69sMRfP
-2s/Gwjt4Xgbn8xSD4ucwHgYDVR0RBBcwFYITd2VibG9naW4udGVzdC51dS5zZTAN
-BgkqhkiG9w0BAQsFAAOCAgEAqSAOUB90iJUUz/4e2SWzPAY8/g2Um2y9aLMPJ+Zk
-NjrvPxtdhMIpT7eTUgUbj0MGDpfb9ivH//GNUBmu4Po7xFbeURZYxP9UyZTzCsBe
-sEIEGGwrgzEzs24dfAHZ98Ywsmnbt6on52JKyxW+pI4a4M4EbwV5oDGy30LEcUFZ
-zTF2d6jQ+wz/jMYXv3n/3sGWdyLgACgao0uOwLcNSCJrEcjBUA/AYuzz69krSXrv
-+8MvBrCsNSzznO36JeaNnxP+6td+7SKZeziz5PRk7FMw7iPd6qgCBGPXA7J3thh9
-WuT+mOW63xvMe4zKrw4LdrU0ITFdmaWt8kbDg3kpaSFarKq4YAYZQEIWBRkOxMr5
-dS3BMhve/brs4Ipm1RdQg5qbJ1Xt2PhyaLw2PO1GZexljJw7PFCMsAid2aCAC/8l
-ttE3+f9gVp/hBjPYRTKp3m4iizjqksuGt/kLMyQNNM6RrkIM271IkjRL6ZJLgRHB
-lEAGnbWyYxK9CP+ra633OhBXhpuvl0pNgM5YslCvzklEgrSjjBqf5bVhoap2pvWc
-yHCvcq0zI+vfLe6LO/baWYcQ4C8Ch8GSwi3ocuWGolZryzqYm+4Af4z3DzOuvtrk
-wxWO4Lb1VkqJEMDN50c7o4X0V83icIAiiGliuWjQo7B26TyV8QPvJH89Iqsp76kP
-Mlc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDTCCAvWgAwIBAgIUH7lJvGXYI1T2xTTamSsNEYnQLFAwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTd2VibG9naW4udGVzdC51dS5zZTAgFw0yMjEyMDkxMzM2
-MTNaGA8yMTIyMTIwOTEzMzYxM1owHjEcMBoGA1UEAwwTd2VibG9naW4udGVzdC51
-dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJnMN90M31UULC/+
-v65NZlHGfPV+ZaA4zkfKLDDeb6RXN0lYf5B0c44NoBWsYz2lw03ybOnS7kHnFoP7
-tOWbV7k1F89OxfEFQBPEtBDDAVnAFVDziiKVa+MSNJTw+zIquIkIMrQSpt6SOGtT
-DceouMbSugIfSkDjMwxU9/riqD2OX2Qrcq2GYrjktPcJMW0117BWhuiri98Xwwnp
-QT0/ocJ80+TD6JjwLQMQHK2dnwxD2iuo6zJ08Ta8/yHjG1Ba+HfONv/tZh8Ws+U+
-HBOFqu1JDdqQ5j7Dq/IpsIbUPdalq8gGezfhuKNpQo5gfU6/lR2RcVwMn7LFcvPY
-WBXorxw5E3O5kNrIikkpkF9XeT9BCM9qe5nNhWGUdi+meNUDc6bk8PQDc4SGpAaZ
-HkbMTK2SaF+lfahptK26N/tGOm9NJw2GdxxrAD5BV/TEntEP65o2DoYQiwH48oal
-YEhjBACxaTIJ0ABAnu84ALVc3fnkr+Ut1KpThBBlShgHhTTkTtb8ePvY4cSNM7JT
-oz3SHrC6euOU0ymylriL5l3/Ykbrmj30R0CODqEpS3H86QayTlFsbEfEBspyt4A6
-DCG6T/ffv7rFuZA9g8KI7Ij66DKVN0qNGjpzrDJ7vXHSvQWF8Nmks6C5ObG86urm
-kCw8XInhwZWfKl5P2do+9k4ZrNsNAgMBAAGjQTA/MB0GA1UdDgQWBBTT3CR5Xgq8
-arikWESjPOeScbtzZzAeBgNVHREEFzAVghN3ZWJsb2dpbi50ZXN0LnV1LnNlMA0G
-CSqGSIb3DQEBCwUAA4ICAQApfZe9FHb9J167742VpvyAeqAjoLmhZ/ntNnGRuKJX
-zvBjpT3Sd6jV/si1NWOJhHwKZfO/clzeb9KD/ev1HzlXrjebUqEEqN7IHoKilKik
-HDqmmy14fZQDNziynZOr21Yjl7vCvnFPJar2OkvEHvaCcgyPffC4RxsudSazmdCG
-lmpGxu1q3lmo98jcJ95wQZaHDazf+vHazggFZ7bsJIOWoFjez/+f55hbcmgK9maa
-I1txAnCv+YFR9QdDqlhBkRFzQh50O/3H0QtIR1GpMQvxu6D5boHer52H58sl0Fjs
-qDdtWrVt2BgG1SvV0tIGmIsYhYOTyFMbx7GC2xKeAlzPmWG8YkxWVMbV2UW2mLdf
-m7nInJ+xjzkhXWnTNhAiJ0N6lRkL+qM3/Op++Kvosm85rNir0a+EQfmHo24OeGFB
-NQ5TG6nRm/lgJZYi+qR/wrUCcMgcVUskR/5kx8yfpNo/nCRRLtN7gBLQ9i9cWgOM
-MBsmL/gYjA6iL3I4pJI45Whf/GpQeScVy5r0dZ+7nm1RDVeu3yQSi48w5pNw7iwP
-CZ482+s9c86tsyhICoAzgxnDZi7k/Ryeo1WPBMQpoA3t6PsBmzWosKPROoQgE4Hm
-yA69eCEPQ00mQIVuVC1wY66PHwO7wPgTvqE0UIgTOEAewX4iHT6VY0VSpmGFL5kH
-wg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.test.uu.se/idp/profile/SAML2/Redirect/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.test.uu.se/idp/profile/SAML2/POST/SLO"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://weblogin.test.uu.se/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://weblogin.test.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://weblogin.test.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">test.uu.se</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIVAOozXeL6OV8Cp5Hn+Ypqd26TK1YiMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwIBcNMjIxMjEyMDk0
-OTAzWhgPMjEyMjEyMTIwOTQ5MDNaMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3Qu
-dXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDB3cxJLYBJFYie
-+hyGm9AL4qGTd6QgshYPVsNDsOZkQmGrZJf+u4oJ1zZzPyGg6fuVYkNz6VibmSO1
-jtK9ZjgW/Vq+ovV7gODux2OphZK3ghq96C3zuMw/oKarlHvrIH92rZR4slYBnbhZ
-3ox0kpOjQpiOqw8nHXLfWgrkEnSfdEPZyygleYUXdlu5sLVKJmuWtdmCtxAxFjOF
-I2cKNQ2ha7HIMK0Pn84opmGDa1akSF5xnKq69IdM6gXMRl4CR5aD1NykAT3txKGp
-L5FrsEOQ8z5wlrQEqDxfpOiAaIoyppnXw+hmk+qvGuyvVp3xTzIZUxWE15o0iu/e
-0GIxwt4axPsxeEE2+pc/MzRTb59v77uonDjacA8p+S38WL7s9Mnf+/RhdL85c3Eu
-ZwdYpM2Jq0ylhUxVzotC4s0ainJXZux5R9iE0vibl0/DdCLaM6u0MJA51xyCvSft
-Wk4dtMVGURMekycmK58M1rbEk6AB/EoqGuf/FDjCJAFESaSCSUXTmZPBLeDqXw0x
-nmsIJ6fGbw11nCUBAAem0Rxgem+QbCTJ5uGL97B5T1GkuWCeWfJygm1nyO6Ooq/G
-B6rILemZMxaO8LXPJYFG/J8/y5OgHlngUypMUBYSETknMW7LxisfUmcR29TSm+aC
-7oMzvBl9IdMwxrspHqgFUFn/BXPllwIDAQABo0EwPzAdBgNVHQ4EFgQUnVNUm7R3
-YqjmTZVTXk8Y3LuU0d4wHgYDVR0RBBcwFYITd2VibG9naW4udGVzdC51dS5zZTAN
-BgkqhkiG9w0BAQsFAAOCAgEAA0lDX5UhY9+QnUBusyhRFRZayfrPbtmUz18Q17IA
-t+tx6N1rxY0Tz1QQR0Mn5UNgIguN1bK64Q0I83P9Nf90IlWh0Grn6RZGD8y/ugVA
-r3DmvzsNLL+IPd2VBYUvxH0Wnple0L8qtd75FncFSflXPUrfaGSSMRqCdXZkMJRg
-HC1zZ54JKm6amGpl6Y8GoxmdlKrz1IPyBMzJtwg+n2HBcTCBj+I6vu29Ay5EIQF5
-Ll3Mu5h74lEw6YGvZJXQerKQHqeSjZzNV3z/nglx7jRRniDsLNoajHivfS4HZ+Sf
-Yzf2s8t+o+S4ynznFef14teuvcEm1oTXrVDaTQGkt+rikAGc6oiW8B3nTNBOSqwc
-XIp5PRBG3hI+GYITWin0vlOd3nGjpcFdAmwIv3WMXNCdbEnSB0sFGJ95ETe1wpRy
-Fbh5HopSoyG4ZwWALsMF7McxWchcXMn5HVDMow9l24bZgZ6O82q2iVSxV9sede0m
-zwXL4xZC4+BCEpN4Qou6NOwIcNiJe6ht9XR7GJi4CmkOIm29SJYSaTCIiI9s63Nn
-kf+gk1HWIZNC2UoCEnKreFyBik0/PlVMQCnRsCJ75i27auZQ2H1Xxlvi1dUGRX/k
-5Q5UDC04tj4SPHIGX/mBTRSqhHq9KEr752HtZ97X32AV/QvvGPgDKJAD9y8Xjl+/
-pvM=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDjCCAvagAwIBAgIVAICbe3fw3n2RGDHeB9OH0RlskUMCMA0GCSqGSIb3DQEB
-CwUAMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3QudXUuc2UwIBcNMjIxMjA5MTMz
-NjE2WhgPMjEyMjEyMDkxMzM2MTZaMB4xHDAaBgNVBAMME3dlYmxvZ2luLnRlc3Qu
-dXUuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCyWTJfQh39HiWi
-6azP70SmmDbxD8U3Z89mvEy3tiZihNmb/Hb2Jcqp8E41QzPDjTx9j/6scUsHWmcZ
-0Sq4FozzjH0KOO0KxCt26zib5p0ue5auVnGLoRuRxFZMPO4qN3nOUITf8GM7H1PF
-MsD/HLJ0XlCqbSIqw9563t5u3vxrj/FomBEMe1HbzYTnJgoYE5E6dXXVpC/LrsQB
-WCAR+1yyR/eA8U2/HL6P6TGW8++QqvS2SbRPO4VwD68v8NWPLuCfBCEQ7KlrfHJs
-W1tAveHp/N8+BR+lqvScNuY8ghVPySo2t/UsEJlhEzIOEAuVygX8NTqFVL8TdMYa
-nGM8xXAKce30fi+XlxEc6m9yDAPSmqCL71ilqKib2f9vuNSvIOmVhxf4FKRwbQ+0
-ck4AoxAZj5+fpTTWo6gMDvKlsZ5zEXD7Oj5sAmtYfc0MzGPZMiq9XVkTh0sjkj6b
-zueHbdYd5/hC+482pO3wdz+jYiII4G1Pdg9PKtvc3m8U2JdvQCQ1RzHxWvi8vNAM
-Bw6UbHHLc9Rewn1X9/h/ZYw0ONCilm5sGMTLBZ4+MWHiCaapzlgbzWOci5JrOBsX
-Q4AbsMmpOyXEZToSossEDWGX8KGk/d18VXYcNz4cICADzcEcq/Ss5ebrr6Gas4AP
-yXkCmm2paQ1J6XYzUP9UTKNh4Q7l0wIDAQABo0EwPzAdBgNVHQ4EFgQUD69sMRfP
-2s/Gwjt4Xgbn8xSD4ucwHgYDVR0RBBcwFYITd2VibG9naW4udGVzdC51dS5zZTAN
-BgkqhkiG9w0BAQsFAAOCAgEAqSAOUB90iJUUz/4e2SWzPAY8/g2Um2y9aLMPJ+Zk
-NjrvPxtdhMIpT7eTUgUbj0MGDpfb9ivH//GNUBmu4Po7xFbeURZYxP9UyZTzCsBe
-sEIEGGwrgzEzs24dfAHZ98Ywsmnbt6on52JKyxW+pI4a4M4EbwV5oDGy30LEcUFZ
-zTF2d6jQ+wz/jMYXv3n/3sGWdyLgACgao0uOwLcNSCJrEcjBUA/AYuzz69krSXrv
-+8MvBrCsNSzznO36JeaNnxP+6td+7SKZeziz5PRk7FMw7iPd6qgCBGPXA7J3thh9
-WuT+mOW63xvMe4zKrw4LdrU0ITFdmaWt8kbDg3kpaSFarKq4YAYZQEIWBRkOxMr5
-dS3BMhve/brs4Ipm1RdQg5qbJ1Xt2PhyaLw2PO1GZexljJw7PFCMsAid2aCAC/8l
-ttE3+f9gVp/hBjPYRTKp3m4iizjqksuGt/kLMyQNNM6RrkIM271IkjRL6ZJLgRHB
-lEAGnbWyYxK9CP+ra633OhBXhpuvl0pNgM5YslCvzklEgrSjjBqf5bVhoap2pvWc
-yHCvcq0zI+vfLe6LO/baWYcQ4C8Ch8GSwi3ocuWGolZryzqYm+4Af4z3DzOuvtrk
-wxWO4Lb1VkqJEMDN50c7o4X0V83icIAiiGliuWjQo7B26TyV8QPvJH89Iqsp76kP
-Mlc=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFDTCCAvWgAwIBAgIUH7lJvGXYI1T2xTTamSsNEYnQLFAwDQYJKoZIhvcNAQEL
-BQAwHjEcMBoGA1UEAwwTd2VibG9naW4udGVzdC51dS5zZTAgFw0yMjEyMDkxMzM2
-MTNaGA8yMTIyMTIwOTEzMzYxM1owHjEcMBoGA1UEAwwTd2VibG9naW4udGVzdC51
-dS5zZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAJnMN90M31UULC/+
-v65NZlHGfPV+ZaA4zkfKLDDeb6RXN0lYf5B0c44NoBWsYz2lw03ybOnS7kHnFoP7
-tOWbV7k1F89OxfEFQBPEtBDDAVnAFVDziiKVa+MSNJTw+zIquIkIMrQSpt6SOGtT
-DceouMbSugIfSkDjMwxU9/riqD2OX2Qrcq2GYrjktPcJMW0117BWhuiri98Xwwnp
-QT0/ocJ80+TD6JjwLQMQHK2dnwxD2iuo6zJ08Ta8/yHjG1Ba+HfONv/tZh8Ws+U+
-HBOFqu1JDdqQ5j7Dq/IpsIbUPdalq8gGezfhuKNpQo5gfU6/lR2RcVwMn7LFcvPY
-WBXorxw5E3O5kNrIikkpkF9XeT9BCM9qe5nNhWGUdi+meNUDc6bk8PQDc4SGpAaZ
-HkbMTK2SaF+lfahptK26N/tGOm9NJw2GdxxrAD5BV/TEntEP65o2DoYQiwH48oal
-YEhjBACxaTIJ0ABAnu84ALVc3fnkr+Ut1KpThBBlShgHhTTkTtb8ePvY4cSNM7JT
-oz3SHrC6euOU0ymylriL5l3/Ykbrmj30R0CODqEpS3H86QayTlFsbEfEBspyt4A6
-DCG6T/ffv7rFuZA9g8KI7Ij66DKVN0qNGjpzrDJ7vXHSvQWF8Nmks6C5ObG86urm
-kCw8XInhwZWfKl5P2do+9k4ZrNsNAgMBAAGjQTA/MB0GA1UdDgQWBBTT3CR5Xgq8
-arikWESjPOeScbtzZzAeBgNVHREEFzAVghN3ZWJsb2dpbi50ZXN0LnV1LnNlMA0G
-CSqGSIb3DQEBCwUAA4ICAQApfZe9FHb9J167742VpvyAeqAjoLmhZ/ntNnGRuKJX
-zvBjpT3Sd6jV/si1NWOJhHwKZfO/clzeb9KD/ev1HzlXrjebUqEEqN7IHoKilKik
-HDqmmy14fZQDNziynZOr21Yjl7vCvnFPJar2OkvEHvaCcgyPffC4RxsudSazmdCG
-lmpGxu1q3lmo98jcJ95wQZaHDazf+vHazggFZ7bsJIOWoFjez/+f55hbcmgK9maa
-I1txAnCv+YFR9QdDqlhBkRFzQh50O/3H0QtIR1GpMQvxu6D5boHer52H58sl0Fjs
-qDdtWrVt2BgG1SvV0tIGmIsYhYOTyFMbx7GC2xKeAlzPmWG8YkxWVMbV2UW2mLdf
-m7nInJ+xjzkhXWnTNhAiJ0N6lRkL+qM3/Op++Kvosm85rNir0a+EQfmHo24OeGFB
-NQ5TG6nRm/lgJZYi+qR/wrUCcMgcVUskR/5kx8yfpNo/nCRRLtN7gBLQ9i9cWgOM
-MBsmL/gYjA6iL3I4pJI45Whf/GpQeScVy5r0dZ+7nm1RDVeu3yQSi48w5pNw7iwP
-CZ482+s9c86tsyhICoAzgxnDZi7k/Ryeo1WPBMQpoA3t6PsBmzWosKPROoQgE4Hm
-yA69eCEPQ00mQIVuVC1wY66PHwO7wPgTvqE0UIgTOEAewX4iHT6VY0VSpmGFL5kH
-wg==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://weblogin.test.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="sv">Uppsala universitet</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Uppsala University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="sv">Uppsala universitet TEST</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Uppsala University TEST</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="sv">http://www.uu.se/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.uu.se/en/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Operations</md:GivenName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>Operations</md:GivenName>
-    <md:EmailAddress>mailto:drift@uadm.uu.se</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:Company>Uppsala universitet</md:Company>
-    <md:GivenName>IT Support</md:GivenName>
-    <md:EmailAddress>mailto:itsupport@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
-  </md:ContactPerson>
-  <md:ContactPerson xmlns:remd="http://refeds.org/metadata" contactType="other" remd:contactType="http://refeds.org/metadata/contactType/security">
-    <md:GivenName>Uppsala University Computer Security Incident Response Team</md:GivenName>
-    <md:EmailAddress>mailto:security@uu.se</md:EmailAddress>
-    <md:TelephoneNumber>+46-18-4717560</md:TelephoneNumber>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/metadata/swamid-testing/wl07089.sigma.local-shibboleth.xml b/metadata/swamid-testing/wl07089.sigma.local-shibboleth.xml
deleted file mode 100644
index c2e8f743..00000000
--- a/metadata/swamid-testing/wl07089.sigma.local-shibboleth.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://wl07089.sigma.local/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2014-04-03T09:19:23Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://wl07089.sigma.local/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="http://wl07089.sigma.local/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>wl07089.sigma.local</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wl07089.sigma.local</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJALepnD5Ui80lMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3dsMDcwODkuc2lnbWEubG9jYWwwHhcNMTQwNDAyMDgyMzM5WhcNMjQwMzMw
-MDgyMzM5WjAeMRwwGgYDVQQDExN3bDA3MDg5LnNpZ21hLmxvY2FsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnDLOtt0s0jQOv5rp1haep1OgR0ZVOz4W
-4cT8ohIJRzLKcz750kJVSf2F2tqgNAkKUsVgyutTZCOrFgs+xHrKmkogo8j7Dnfy
-gI6hinQnutijsceWLglY2Mt57CV4XstdBuO9k+suQw+RLiXymfW1qWkUeEEtPpP1
-N5YwE5DDBPuuvzM/Tq/JivaSpOdnbDJkWuNFYcekhWPmfB/wJRPUQgnhaKXOsU9l
-TtbFZAF+y0iOtpxSFC5rLlotN1L1gA0d9OvLDVjxFVSmKLTBtJbL0H6kpxGbgcev
-5TxOWHq9AB0nIeFjN5rFuNN+NKxryOtUJN0Xi6p4rPi/vaoLlQeN5QIDAQABo0Ew
-PzAeBgNVHREEFzAVghN3bDA3MDg5LnNpZ21hLmxvY2FsMB0GA1UdDgQWBBTLjA0/
-pU+uBCzjb9SCJpq733OQezANBgkqhkiG9w0BAQUFAAOCAQEAc/j53vQlfVYgY+XQ
-5LrkmOCmuyjqVzrx+XvDrVxwolQGUw9wviuVtTx0dp+Lq4jhZ5eTt4A28VZxrE8n
-DTAWz8d+QkRdt+kuFUeLqAB26jG4avIsiCmRwdi+ee0d/48vO8CMlgzcRRsevX3z
-mQ9cCSKO4nnymdFFIIH5bDtUi3f/dFPj8+HGYwiI3YpC65N/ItU9B0GKJXtuyMNl
-gwlAlgjWaP/QuiyxqXwhrP3u1F7OVh+mDo+QfwoqkVBd35XMe840E+HzQrji7dTa
-I73xyA+mtnSNj4YOabB3nZ/MEhHaU3Ng/Pwv36Oy25XeBRSHiSLNzASWTF3vJrUQ
-u4Wbjw==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://wl07089.sigma.local/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://wl07089.sigma.local/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://wl07089.sigma.local/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://wl07089.sigma.local/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://wl07089.sigma.local/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://wl07089.sigma.local/Shibboleth.sso/SAML/Artifact" index="5"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>