Resolved SWAMID-3519

8 files changed, 407 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 7520a2f0..33c7916f 100644
--- a/Makefile
+++ b/Makefile
@@ -269,13 +269,13 @@ test: syntaxtest testMDUI testEntCat testSimpleSign testALlevel testEduGAINcheck
 test2: $(SWAMIDXML) schematest testMDUI testEntCat testSimpleSign testALlevel testEduGAINchecks testRefedsRnS testGeantCoCo testMetadataUsage testBadStrings testIdPinSP testRoleDescriptor testAttributeInIdP testValidContact testRegistrationAuthority
 
 .time/%.time: swamid-2.0/%.xml
+	@# make schematest
+	@xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1
+
 	@# make tidy
 	@xsltproc xslt/add-rpi.xsl $< > $<.c && mv $<.c $<
 	@xsltproc xslt/clean-entitydescriptor.xsl $< > $<.c && mv $<.c $<
 
-	@# make schematest
-	@xmllint --xinclude --nowarning --noout --path schema --schema schema.xsd $< 2>&1
-
 	@# make testMDUI
 	@# Lang = ISO_639-1
 	@cat $< | sed -n 's/.*xml:lang="\([^"]*\)".*/\1/p' | sort -u | grep -vxE 'cs|da|de|en|fi|fr|it|sv|no|nn|nb|is' | sed 's/.*/Bad lang code : &/' | grep . && exit 1 || true
diff --git a/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml b/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
new file mode 100644
index 00000000..ec3c1888
--- /dev/null
+++ b/swamid-2.0/akka-adm.test.uu.se-shibboleth.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://akka-adm.test.uu.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University AKKA (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration (TEST)</mdui:Description>
+        <mdui:Description xml:lang="en">Authentication/Control - Directory Administration (TEST)</mdui:Description>
+        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFDDCCAvSgAwIBAgIJAKteO8AenOr0MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF3V1Yy1ha2thMDA0LXQuaXRzLnV1LnNlMB4XDTE1MTAyMDA3Mjc1OVoXDTI1
+MTAxNzA3Mjc1OVowIjEgMB4GA1UEAxMXdXVjLWFra2EwMDQtdC5pdHMudXUuc2Uw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5Yykfh896zzlUMDkKfgP9
+bDEqGjRGLyIJaj+nDqtBzpStcqutIBbFhg59hkCO0rSQ7tTqAfiyTd+Tumu//+Va
+eP5cs98FPMePfRd53xYECQzIw4UtVAjEQJEgnhrtuW6izhKv8QBy7NE/+w44kwx1
+NyHnwk0LhkmPr8t131PfCqktOZ5zuRu/neqx99CPbsBLtFZ7Sq3YFBrQA8w5UhiQ
+EyHR3moUUYxOI/1QzjrEjBOM/3tRnX5JW1vYJUTuTPpOz3/xNUFYuD3WyVfIGS2d
+/qyDmfJF8W9WZHFosKszJ/ptsLFu1htS8M6X5NE75/Axw1Iq7j/tuf6Ie/PyyIpF
+898YdX7ZNb4SrjkaEK28uKmomXW3eA9OtJfzYZI2n9cKmaEHPP0clBDksyPn16q8
+6sAOq0MWOUUZ6/KnWPmZWczEaHzsvlsAdP715c4QjfRN0eh65T0gUJA8YcKqBIef
+qLaW4buj1udWFCfmH3V9DwOcedEU2v90Qxrn/Og7VUoCaaw05OeouRIxPVZVhyX2
+jCxWtVl1HWXDKcDDwh2q70B2TzCnlmHnEINxldAvAfy2vAW/BusCNxrLiscHdj3a
+1+N97p3xHrtMdUTEs1GsQVnVSNHxinshGiIis3lw+W5xuOnEVFpzBjad2oqLCj8t
+m2IzDvqYtNXE91fg0kwMUQIDAQABo0UwQzAiBgNVHREEGzAZghd1dWMtYWtrYTAw
+NC10Lml0cy51dS5zZTAdBgNVHQ4EFgQUUruxH3bOINDbPvFnLUaZzNmRTzwwDQYJ
+KoZIhvcNAQEFBQADggIBADY78qD6b3UWghVabhCLWLW9MPrMiV0FeKaOHOuQYERv
+DsU3//Nc9lwExqfOavsdQu5sWmjv8DwfJkmRxRz83qtFUlcPCc3NTRwLDkB/BFpy
+RUYXQtzbOfAJA5zHZvFeNVtgDNT+492BrdHlovMCkYEmYsEJbH+JlTuPK0qxwRqI
+mrPt0xTY/uTfr3WJWjUuDJfRXBqk7RduPE/OuRmJgR5y2YTuhD7xuH3g2n11Lcqp
+oDANE9jKgPeFD8otFNmDxb8vzFaHvxPN8VAJEzTbtA0ijvpOWFodlv/yVsn8klvE
+WSLRvWzSCXenOaSCaf4y92Fi4n0WjOXtWV4C7nkjrlO6ov9FxDo9U+p7PQ568T8N
+mt3qQBeVbAFb2McyyB4J8XSO2PGOZOfx/P+QREqCCSQK+vd5/WNZdU/O+QEVOA67
+xLEWZrA8ctG8LISaRvo25r6JAnwrQYF7RaCFCBmqBe1JYYdtEaiSVAbo1WKsxRub
+ijMA4vVFfH6jjSOnzquVyciKxDOaCNNT2h8qqBiVA1DyS0m3N403ebwNrzoFwGrk
+54g7VI1jtxz15prFXwN3yIaG14fUHsRiEAWu84QBAQ2wnufJNWqaLiHHUPDaxTpg
+lo0T4kERMhfIMpY98G4xTyJQrk6qqNItEsD8CWePbYFnlo+c2IxU9tvGM6sLA50k
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://akka-adm.test.uu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://akka-adm.test.uu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://akka-adm.test.uu.se/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="sv">Uppsala universitets AKKA (TEST)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Uppsala University AKKA (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: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/swamid-2.0/akka-anv.test.uu.se-shibboleth.xml b/swamid-2.0/akka-anv.test.uu.se-shibboleth.xml
new file mode 100644
index 00000000..c7c7b560
--- /dev/null
+++ b/swamid-2.0/akka-anv.test.uu.se-shibboleth.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://akka-anv.test.uu.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets AKKA användargränssnitt (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University AKKA User Interface (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Autentisering/Kontroll - Katalogadministration (TEST)</mdui:Description>
+        <mdui:Description xml:lang="en">Authentication/Control - Directory Administration (TEST)</mdui:Description>
+        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/images/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">http://akka.uadm.uu.se/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://akka.uadm.uu.se/?languageId=1</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFDDCCAvSgAwIBAgIJAKteO8AenOr0MA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF3V1Yy1ha2thMDA0LXQuaXRzLnV1LnNlMB4XDTE1MTAyMDA3Mjc1OVoXDTI1
+MTAxNzA3Mjc1OVowIjEgMB4GA1UEAxMXdXVjLWFra2EwMDQtdC5pdHMudXUuc2Uw
+ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5Yykfh896zzlUMDkKfgP9
+bDEqGjRGLyIJaj+nDqtBzpStcqutIBbFhg59hkCO0rSQ7tTqAfiyTd+Tumu//+Va
+eP5cs98FPMePfRd53xYECQzIw4UtVAjEQJEgnhrtuW6izhKv8QBy7NE/+w44kwx1
+NyHnwk0LhkmPr8t131PfCqktOZ5zuRu/neqx99CPbsBLtFZ7Sq3YFBrQA8w5UhiQ
+EyHR3moUUYxOI/1QzjrEjBOM/3tRnX5JW1vYJUTuTPpOz3/xNUFYuD3WyVfIGS2d
+/qyDmfJF8W9WZHFosKszJ/ptsLFu1htS8M6X5NE75/Axw1Iq7j/tuf6Ie/PyyIpF
+898YdX7ZNb4SrjkaEK28uKmomXW3eA9OtJfzYZI2n9cKmaEHPP0clBDksyPn16q8
+6sAOq0MWOUUZ6/KnWPmZWczEaHzsvlsAdP715c4QjfRN0eh65T0gUJA8YcKqBIef
+qLaW4buj1udWFCfmH3V9DwOcedEU2v90Qxrn/Og7VUoCaaw05OeouRIxPVZVhyX2
+jCxWtVl1HWXDKcDDwh2q70B2TzCnlmHnEINxldAvAfy2vAW/BusCNxrLiscHdj3a
+1+N97p3xHrtMdUTEs1GsQVnVSNHxinshGiIis3lw+W5xuOnEVFpzBjad2oqLCj8t
+m2IzDvqYtNXE91fg0kwMUQIDAQABo0UwQzAiBgNVHREEGzAZghd1dWMtYWtrYTAw
+NC10Lml0cy51dS5zZTAdBgNVHQ4EFgQUUruxH3bOINDbPvFnLUaZzNmRTzwwDQYJ
+KoZIhvcNAQEFBQADggIBADY78qD6b3UWghVabhCLWLW9MPrMiV0FeKaOHOuQYERv
+DsU3//Nc9lwExqfOavsdQu5sWmjv8DwfJkmRxRz83qtFUlcPCc3NTRwLDkB/BFpy
+RUYXQtzbOfAJA5zHZvFeNVtgDNT+492BrdHlovMCkYEmYsEJbH+JlTuPK0qxwRqI
+mrPt0xTY/uTfr3WJWjUuDJfRXBqk7RduPE/OuRmJgR5y2YTuhD7xuH3g2n11Lcqp
+oDANE9jKgPeFD8otFNmDxb8vzFaHvxPN8VAJEzTbtA0ijvpOWFodlv/yVsn8klvE
+WSLRvWzSCXenOaSCaf4y92Fi4n0WjOXtWV4C7nkjrlO6ov9FxDo9U+p7PQ568T8N
+mt3qQBeVbAFb2McyyB4J8XSO2PGOZOfx/P+QREqCCSQK+vd5/WNZdU/O+QEVOA67
+xLEWZrA8ctG8LISaRvo25r6JAnwrQYF7RaCFCBmqBe1JYYdtEaiSVAbo1WKsxRub
+ijMA4vVFfH6jjSOnzquVyciKxDOaCNNT2h8qqBiVA1DyS0m3N403ebwNrzoFwGrk
+54g7VI1jtxz15prFXwN3yIaG14fUHsRiEAWu84QBAQ2wnufJNWqaLiHHUPDaxTpg
+lo0T4kERMhfIMpY98G4xTyJQrk6qqNItEsD8CWePbYFnlo+c2IxU9tvGM6sLA50k
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://akka-anv.test.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="sv">Uppsala universitets AKKA användargränssnitt (TEST)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Uppsala University AKKA User Interface (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: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/swamid-2.0/castest.weblogin.uu.se-cas.xml b/swamid-2.0/castest.weblogin.uu.se-cas.xml
new file mode 100644
index 00000000..b45c1721
--- /dev/null
+++ b/swamid-2.0/castest.weblogin.uu.se-cas.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://castest.weblogin.uu.se/cas">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</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 xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" 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/swamid-2.0/konto.test.uu.se-shibboleth.xml b/swamid-2.0/konto.test.uu.se-shibboleth.xml
index 6184fd6e..a57858c2 100644
--- a/swamid-2.0/konto.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.test.uu.se-shibboleth.xml
@@ -4,25 +4,18 @@
     <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
-        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
-      </samla:Attribute>
-    </mdattr:EntityAttributes>
   </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+  <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="en">Uppsala University TEST user account activation and password reset</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="sv">Uppsala universitets TEST kontoaktivering och lösenordsåterställning</mdui:DisplayName>
-        <mdui:Description xml:lang="en">As a new user you use this TEST 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:Description xml:lang="sv">Denna TEST 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: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 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="en">https://konto.test.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="sv">https://konto.test.uu.se</mdui:InformationURL>
+        <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:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
@@ -49,8 +42,25 @@ Lf3VcAZi+NsypUL4nVwgn6iHbsaXGfTZPispp6rXJ48r/XnBFQ==
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://konto.test.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <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="employeeType" Name="urn:oid:2.16.840.1.113730.3.1.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="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="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>
@@ -60,9 +70,21 @@ Lf3VcAZi+NsypUL4nVwgn6iHbsaXGfTZPispp6rXJ48r/XnBFQ==
     <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>+46184714400</md:TelephoneNumber>
+    <md:TelephoneNumber>+46-18-4714400</md:TelephoneNumber>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml b/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml
new file mode 100644
index 00000000..c21910dd
--- /dev/null
+++ b/swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://sesamutvf.its.uu.se/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.sunet.se/wp-content/uploads/2016/08/SWAMID-Metadata-Registration-Practice-Statement-v2.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="sv">Uppsala universitets Sesam (TEST)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Uppsala University Sesam (TEST)</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Uppsala universitets Sesam (TEST) administration av passagerättigheter</mdui:Description>
+        <mdui:Description xml:lang="en">Uppsala University Sesam (TEST) administration of contactless smart card access</mdui:Description>
+        <mdui:Logo height="50" width="50">https://weblogin.test.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="sv">https://mp.uu.se/c/perm/link?p=940179&amp;l=sv</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://mp.uu.se/c/perm/link?p=940179&amp;l=en</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIE+jCCAuKgAwIBAgIJAJhSyoAWTFzEMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWZsYW1tZWEuaXRzLnV1LnNlMB4XDTE0MTIxNTEyNTE1MloXDTI0MTIxMjEy
+NTE1MlowHDEaMBgGA1UEAxMRZmxhbW1lYS5pdHMudXUuc2UwggIiMA0GCSqGSIb3
+DQEBAQUAA4ICDwAwggIKAoICAQDOQIdNrT3ozzhbvdlYz2F9xzk1RRmMhbL169sZ
+o5kqUMIC/W1PkFcALskGb9rMelMymp2+fun7hgyLggjWDBjgFfRH3nZniXtil3PI
+C/0aNYoC+9Yl0SOHN5xFvfThIibj0c6ofZU9252ZaL1/GRylvO57fAvZpcULWvlA
++/0ZTc//vsVZC/cs1dcmA4fS5dry1UucqqnAXT6Ws05JB4h8pRjYNFWU7riT6UUn
+Sv3VGmGdzZQ9lkDNzNhseFI2M3WhrVGiBamwDtP8CdJflDpKDkxx+za34P+YiB7S
+l+pbN+igY2oJ+CTNijp0R1USU49IL754ml8rEQI8NzWcTtc4C5YyD8fh1P4jkU8q
+D1UWPBblB/tiKmEL9gmy29gRdi/3Um/6kgV6Hkw4b6WQr1qMLKFdLJrTw0hJ3sab
+ilvU/IdeKVC8vIyRui0C4VSyEQ4WnKnl0P8uUn9GcUXnL8bwjCyQh/M8pfGmWDya
+l8x+DTG6efAobeUi/TnXqNZ1I66bVrgMBAnm9SJHj5xR37mraI1W7FhH6FapyasT
+UCINP0rdiQDDdBQHC+uSONrCFd1xYiaKY1uoqXOYiRB5jFRtacpaln5+/C+2BGOK
+leyP17jUilSN7dKlXQPL6EhDcIVDIke4L6fQopPoDyJa1kjA4B9M/lDfCiL29Iw9
+M2cY7wIDAQABoz8wPTAcBgNVHREEFTATghFmbGFtbWVhLml0cy51dS5zZTAdBgNV
+HQ4EFgQUHuy22CyDNk551MZVbbHRA8xprQMwDQYJKoZIhvcNAQEFBQADggIBAL7I
+wKMMMtIU2dGybNU4VNtsRGpF1o4cYsgHB3N7dpzzI2gXf/tWOzvaW8fEy9/cbxdk
+K5IO/RmjPcVapAsjSStpGIu2FYbV7R1fQfepx0CsUuj8DeAd0y3vM2Qh5nTl0I+e
+ncOAud30RWu50/hMn/EO/BsJjJqFFlYoWIWWYtAKepDOIC12ZM/XhLy2BRbJkdEh
+wQRAOfqxMuRbuCVfhp+kQc99EBSSTj2UQkJy5oUt6758v+HVEewi32iLvwELHCJS
+FnRfNNUZ9CedmGZ1zLKDhKTKOxe89b5xLdokuiyenjeqtCO29/QTJ3mIjpmIOQFg
+TioBNEYdXDEE2kbF7XMeNfwFQEBRSMGGG0NyHFTPYuel4YPpfW5FnXgdRVZ+vjLi
+3Y9WtWCDQnZsqrQUko4QHiZxxzI+Y8NskpAmu/irdqkos8ygIE18sNnRJWiSWyRL
+Pr4QFcrikK81FE9YyU2oDGLpZ2HE6EArRrxf8LWM0QGSLVaVxArBZxQEda8FLLTz
+LdjIlLdoy5HHK3cHBDIXaZsEp8cbqDIirHeu0evE9ooBNX1z5mBk5JK/BxDq5rPr
+7EFPPMjCr52KPie5L8RhFdo/D+4VYTnsQU9vehjYWyS2p+Gen3uSE/wCOdik+d44
+7aLd8zfp9fclH6JrMaiO11A/k3UtsBMCqJmXuWmH
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sesamutvf.its.uu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AttributeConsumingService index="0" isDefault="true">
+      <md:ServiceName xml:lang="sv">Uppsala universitets Sesam (TEST)</md:ServiceName>
+      <md:ServiceName xml:lang="en">Uppsala University Sesam (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: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:GivenName>Sesam applikationsdrift</md:GivenName>
+    <md:EmailAddress>mailto:sesam-applikationsdrift@its.uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717920</md:TelephoneNumber>
+  </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>Sesam applikationsdrift</md:GivenName>
+    <md:EmailAddress>mailto:sesam-applikationsdrift@its.uu.se</md:EmailAddress>
+    <md:TelephoneNumber>+46-18-4717920</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index ca070f87..ca417b0e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -178,7 +178,6 @@
   <xi:include href="swamid-2.0/se.timeedit.net-su-student-sp.xml"/>
   <xi:include href="swamid-2.0/produktwebb.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/activate.du.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/konto.test.uu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/lobo2.lab.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/tools.kib.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shh.pingpong.se-Shibboleth.sso-Metadata.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 77d31fc9..044b9a49 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -62,4 +62,9 @@
   <xi:include href="swamid-2.0/miunidtest.test.miun.se-saml-miun-metadata.xml"/>
   <xi:include href="swamid-2.0/miunidutv.test.miun.se-saml-miun-metadata.xml"/>
   <xi:include href="swamid-2.0/stipendier-utv.its.uu.se-stipendium.xml"/>
+  <xi:include href="swamid-2.0/akka-adm.test.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/akka-anv.test.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/castest.weblogin.uu.se-cas.xml"/>
+  <xi:include href="swamid-2.0/sesamutvf.its.uu.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/konto.test.uu.se-shibboleth.xml"/>
 </EntitiesDescriptor>