Merge branch 'master' of md-master.swamid.se:swamid-metadata

11 files changed, 221 insertions, 114 deletions

diff --git a/sp-with-simplesign b/sp-with-simplesign
index 4b060ad2..54004457 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -227,7 +227,6 @@ test.mp.uu.se-shibboleth-sso.xml
 testakt.it.ki.se-shibboleth.xml
 testgag.it.ki.se-shibboleth.xml
 testshib.msacademicverify.com-shibboleth-sp.xml
-testshib.user.uu.se-idp-shibboleth.xml
 tta-portal.misc.kth.se-shibboleth.xml
 umdac-olho0001.ad.umu.se-shibboleth.xml
 umdac-stdout.umdc.umu.se-shibboleth.xml
diff --git a/swamid-2.0/idp.mah.se-idp-shibboleth.xml b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
index e83ba1a0..00ad0d73 100644
--- a/swamid-2.0/idp.mah.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.mah.se-idp-shibboleth.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" entityID="https://idp.mah.se/idp/shibboleth">
   <Extensions>
-     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-        <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-          <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
-        </saml:Attribute>
-      </mdattr:EntityAttributes>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns="" Name="urn:oasis:names:tc:SAML:attribute:assurance-certification" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.swamid.se/policy/assurance/al1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-2.0/konto.test.uu.se-shibboleth.xml b/swamid-2.0/konto.test.uu.se-shibboleth.xml
index 74b662a5..2b17ad96 100644
--- a/swamid-2.0/konto.test.uu.se-shibboleth.xml
+++ b/swamid-2.0/konto.test.uu.se-shibboleth.xml
@@ -16,8 +16,8 @@
         <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:Logo height="50" width="50">https://testshib.user.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://testshib.user.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
+        <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:UIInfo>
diff --git a/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml b/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml
new file mode 100644
index 00000000..fe0a14b4
--- /dev/null
+++ b/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://moodlealfa.omv.lu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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 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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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>
+      <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://moodlealfa.omv.lu.se/Shibboleth.sso/Login"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Moodle alfa</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Moodle alfa</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">En test-server för att logga in till moodle med shibboleth</mdui:Description>
+        <mdui:Description xml:lang="en">A test server for logging into moodle with shibboleth</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://moodlealfa.omv.lu.se</ds:KeyName>
+        <ds:KeyName>moodlealfa.omv.lu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=moodlealfa.omv.lu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDITCCAgmgAwIBAgIJAMyYl63TsQR8MA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFG1vb2RsZWFsZmEub212Lmx1LnNlMB4XDTE2MDkxNDA5NTQyNVoXDTI2MDkx
+MjA5NTQyNVowHzEdMBsGA1UEAxMUbW9vZGxlYWxmYS5vbXYubHUuc2UwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDEhDc+gALeEsWpXYLl4LMTPDyiJh2G
+vQRJ++YuI+G0FjshjvZPDx6nJRPq1IFysTKFR2gFrNcYAAigqP6ZBOHqyxwoohp9
+LbTCICE1JNsXjVjdYTEr/awg1qOlCtd3nZ9OfznX7OCIRV5ftratL62o0dIq1Q2n
+F7JT39XqfVttxJA09BL82CWF6MTiGo9wZyu9omn51n0zu4yKCXL6sN30WaP+7VcW
+nI6kkTTOtKpof08xpRxrrgVPkL00+SZuvn4fJoR3Ec+iJ1TMwz+HR2mIclCK7QvC
+LhSOU6hGz5ft81BrqsQr+K6ikg2/LEx1o4TOxbH4Vb7zn2dpgp7iQQxJAgMBAAGj
+YDBeMD0GA1UdEQQ2MDSCFG1vb2RsZWFsZmEub212Lmx1LnNlhhxodHRwczovL21v
+b2RsZWFsZmEub212Lmx1LnNlMB0GA1UdDgQWBBTIVRGxXl9M0qFoEIpEFZYi3xNl
+3TANBgkqhkiG9w0BAQUFAAOCAQEAelpwmM9Zj3y7Yhmfx0O7A+K2Q/R+qvImKL9u
+LWDuWtXZp1q9cUkSrlMghE7UY1Bzj4+z2PdN8c8flajfwQAtUNeyM2PpQ0U//9jV
+dfKx890Hw7r5X5F4nJ09IAdecPqFPMiYw6gyAZvvLyNisTdzC71scZFkOyBYoV/2
+tgrNdEmMb4tK2MXsv4t1L4oXLpATlYeSwAEg/01/Z8z18xpP9X+/Jdo568J87eta
+39b/stDSeqaqgReOBjDAeZdZKiYk7onlDCcjE0NW8F40Bnj9bEiIoL1mIe13Vv88
+jxMTwv+5jPOuJ1cD3OgQ/0w5fGcafO+Bpe/hJmCn5+wMHUCOvg==
+</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://moodlealfa.omv.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://moodlealfa.omv.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Rikard</md:GivenName>
+    <md:SurName>Johansson</md:SurName>
+    <md:EmailAddress>mailto:rikard.johansson@med.lu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/play.mdh.se.xml b/swamid-2.0/play.mdh.se.xml
index ef87a725..caaa13eb 100644
--- a/swamid-2.0/play.mdh.se.xml
+++ b/swamid-2.0/play.mdh.se.xml
@@ -20,28 +20,28 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEJDCCAwygAwIBAgIJAJAfz1P1z6TJMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpTb21lLVN0YXRlMRMwEQYDVQQHFApWw6RzdGVyw6VzMQwwCgYDVQQKEwNNZGgxDDAKBgNVBAsTA01kaDEUMBIGA1UEAxMLcGxheS5tZGguc2UwHhcNMTYwNjIxMDkwMjM2WhcNMjYwNjIxMDkwMjM2WjBpMQswCQYDVQQGEwJTRTETMBEGA1UECBMKU29tZS1TdGF0ZTETMBEGA1UEBxQKVsOkc3RlcsOlczEMMAoGA1UEChMDTWRoMQwwCgYDVQQLEwNNZGgxFDASBgNVBAMTC3BsYXkubWRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Ln+Nf0ALiCv/S6BmojYu4JObudgWVgIhiX85XUEQ5CqP0Ytr+XvdMTI9e0T3t6pMWDe7von4zGdx80lD0ifgGLpPZogLYVaJBAqdBE00BmJ7xx0hAckhwAwiXlWMaJFTZSl9EeOlwUVDjH+9pt1evbT6X6V4JZ3GJ3/ItRlwd52eYq9iLGf2FwaL7iwK/5raN1BU4Z58iY4GNTM4ueLph4BJJCu25EahxUW7X5aGu8cfQ+w7p3eDHNl9RzhyJzDvK2yrqRwH5l45GcYeRrThoVdwDk0Vw5C50x9w/lJY4zVwGpuK/6QhOo0U3mdsmNDsNjEcAZg4tIJ5t+6T6W8UwIDAQABo4HOMIHLMB0GA1UdDgQWBBRsryNn/aDCFGa5RUDzd/BcYqlaTjCBmwYDVR0jBIGTMIGQgBRsryNn/aDCFGa5RUDzd/BcYqlaTqFtpGswaTELMAkGA1UEBhMCU0UxEzARBgNVBAgTClNvbWUtU3RhdGUxEzARBgNVBAcUClbDpHN0ZXLDpXMxDDAKBgNVBAoTA01kaDEMMAoGA1UECxMDTWRoMRQwEgYDVQQDEwtwbGF5Lm1kaC5zZYIJAJAfz1P1z6TJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALkYleYmKA5GC4eNkJOHv85yQrY7kO0VWhcSZEZI5o8OrWMu2v7L8Ltt+Pj/A9U3HO+AB7zXSdhacmoJkb9UGX4K6ZpvcV2WrVdHLaUr3rhEjo2sZ44O5hTucU+67n+nzu/cB+GnGDp7ECb/oooxvsBnj6sfEsRPZKCIKzIJa3npP3AzNwUhCAmh8H1fEQ4+yx+ybOREq3hWyoqq2BOcfb98JrwMwiD895+yc4/e3iiBMjSvMaymGnHrCDC+Zfjt/0dikO3lnCF28vwtY/eYJACRXIEyfYDvoHSb+oUhAPsD6z0iz0RpHMDcCWrxfxFqu61Nok/zl5jrySRSgUQkHD0=</ds:X509Certificate>
+          <ds:X509Certificate>MIID+jCCAuKgAwIBAgIJANlsiVbbj7iTMA0GCSqGSIb3DQEBBQUAMFsxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazERMA8GA1UEBxMITmV3IFlvcmsxEDAOBgNVBAoTB0thbHR1cmExFDASBgNVBAMTC3BsYXkubWRoLnNlMB4XDTE2MDkxNjA4MDUwM1oXDTI2MDkxNjA4MDUwM1owWzELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEQMA4GA1UEChMHS2FsdHVyYTEUMBIGA1UEAxMLcGxheS5tZGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjSU0nl+c+ryL9WrpDbk/paGwkelzuj8+AMBEv2VLT0pLTtTJj/8XBhczmgCFdCeL7gQd954VvVa9oYXfPkdekCj0NxR9pIiizbXVEhS81RTSd66VoxFhJ7W237wfbd2v7bDdEm9XOfmodvnp0yDFK8L8MXFA+l7sTcojC3D6lBtVnwzkhP5HUN7qSlOcwru0leMlolZWz5OdBy+QKIAJWxxyTiyrTWx4sIRF9UXy7XhLBz42M3ccO+iSAQ7KcX3DA8YpuetCO8HVoZlXqh31KqGHW2bwviXMYEUBgFtJaIBr2ahPMsWc8XKijbFZGg5lC4GbIaTRBdunUoc/I6UAdAgMBAAGjgcAwgb0wHQYDVR0OBBYEFAVjMGKiJWdplVjKkuSVRikpIgXZMIGNBgNVHSMEgYUwgYKAFAVjMGKiJWdplVjKkuSVRikpIgXZoV+kXTBbMQswCQYDVQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRAwDgYDVQQKEwdLYWx0dXJhMRQwEgYDVQQDEwtwbGF5Lm1kaC5zZYIJANlsiVbbj7iTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGObNmQX2V3GBftL4XGHEUzdCJrqM5yvDoAKD/mQdx3lDVLiU8eL97qw8Eu2CsoA4dxB5mEIwgBq3Sz36umd2hfpeRYJ0OPhKTptSVNxl57eeaSvDpg5k309+m5Yl5F65wHQXYhylFErbmogp1dAA9aIJLiJaHED1/th1aKdFl0xG4ULZomVycuuqQKCNH6pO6ItievhPXeiLAO/+rs1q6wOst9uSjMbr3kcY7FzBkYKd9MZewipcwMxzcHOuSiZTdMajg7O9uw8XabnJoY7+xNbfu0KjYPpXWoQn7tsFVfTsZ6FuDLMG1DP5kJ5iFPE+NcQIrHQ18Y6eo4A1L1bB4M=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIEJDCCAwygAwIBAgIJAJAfz1P1z6TJMA0GCSqGSIb3DQEBBQUAMGkxCzAJBgNVBAYTAlNFMRMwEQYDVQQIEwpTb21lLVN0YXRlMRMwEQYDVQQHFApWw6RzdGVyw6VzMQwwCgYDVQQKEwNNZGgxDDAKBgNVBAsTA01kaDEUMBIGA1UEAxMLcGxheS5tZGguc2UwHhcNMTYwNjIxMDkwMjM2WhcNMjYwNjIxMDkwMjM2WjBpMQswCQYDVQQGEwJTRTETMBEGA1UECBMKU29tZS1TdGF0ZTETMBEGA1UEBxQKVsOkc3RlcsOlczEMMAoGA1UEChMDTWRoMQwwCgYDVQQLEwNNZGgxFDASBgNVBAMTC3BsYXkubWRoLnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4Ln+Nf0ALiCv/S6BmojYu4JObudgWVgIhiX85XUEQ5CqP0Ytr+XvdMTI9e0T3t6pMWDe7von4zGdx80lD0ifgGLpPZogLYVaJBAqdBE00BmJ7xx0hAckhwAwiXlWMaJFTZSl9EeOlwUVDjH+9pt1evbT6X6V4JZ3GJ3/ItRlwd52eYq9iLGf2FwaL7iwK/5raN1BU4Z58iY4GNTM4ueLph4BJJCu25EahxUW7X5aGu8cfQ+w7p3eDHNl9RzhyJzDvK2yrqRwH5l45GcYeRrThoVdwDk0Vw5C50x9w/lJY4zVwGpuK/6QhOo0U3mdsmNDsNjEcAZg4tIJ5t+6T6W8UwIDAQABo4HOMIHLMB0GA1UdDgQWBBRsryNn/aDCFGa5RUDzd/BcYqlaTjCBmwYDVR0jBIGTMIGQgBRsryNn/aDCFGa5RUDzd/BcYqlaTqFtpGswaTELMAkGA1UEBhMCU0UxEzARBgNVBAgTClNvbWUtU3RhdGUxEzARBgNVBAcUClbDpHN0ZXLDpXMxDDAKBgNVBAoTA01kaDEMMAoGA1UECxMDTWRoMRQwEgYDVQQDEwtwbGF5Lm1kaC5zZYIJAJAfz1P1z6TJMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALkYleYmKA5GC4eNkJOHv85yQrY7kO0VWhcSZEZI5o8OrWMu2v7L8Ltt+Pj/A9U3HO+AB7zXSdhacmoJkb9UGX4K6ZpvcV2WrVdHLaUr3rhEjo2sZ44O5hTucU+67n+nzu/cB+GnGDp7ECb/oooxvsBnj6sfEsRPZKCIKzIJa3npP3AzNwUhCAmh8H1fEQ4+yx+ybOREq3hWyoqq2BOcfb98JrwMwiD895+yc4/e3iiBMjSvMaymGnHrCDC+Zfjt/0dikO3lnCF28vwtY/eYJACRXIEyfYDvoHSb+oUhAPsD6z0iz0RpHMDcCWrxfxFqu61Nok/zl5jrySRSgUQkHD0=</ds:X509Certificate>
+          <ds:X509Certificate>MIID+jCCAuKgAwIBAgIJANlsiVbbj7iTMA0GCSqGSIb3DQEBBQUAMFsxCzAJBgNVBAYTAlVTMREwDwYDVQQIEwhOZXcgWW9yazERMA8GA1UEBxMITmV3IFlvcmsxEDAOBgNVBAoTB0thbHR1cmExFDASBgNVBAMTC3BsYXkubWRoLnNlMB4XDTE2MDkxNjA4MDUwM1oXDTI2MDkxNjA4MDUwM1owWzELMAkGA1UEBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMREwDwYDVQQHEwhOZXcgWW9yazEQMA4GA1UEChMHS2FsdHVyYTEUMBIGA1UEAxMLcGxheS5tZGguc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjSU0nl+c+ryL9WrpDbk/paGwkelzuj8+AMBEv2VLT0pLTtTJj/8XBhczmgCFdCeL7gQd954VvVa9oYXfPkdekCj0NxR9pIiizbXVEhS81RTSd66VoxFhJ7W237wfbd2v7bDdEm9XOfmodvnp0yDFK8L8MXFA+l7sTcojC3D6lBtVnwzkhP5HUN7qSlOcwru0leMlolZWz5OdBy+QKIAJWxxyTiyrTWx4sIRF9UXy7XhLBz42M3ccO+iSAQ7KcX3DA8YpuetCO8HVoZlXqh31KqGHW2bwviXMYEUBgFtJaIBr2ahPMsWc8XKijbFZGg5lC4GbIaTRBdunUoc/I6UAdAgMBAAGjgcAwgb0wHQYDVR0OBBYEFAVjMGKiJWdplVjKkuSVRikpIgXZMIGNBgNVHSMEgYUwgYKAFAVjMGKiJWdplVjKkuSVRikpIgXZoV+kXTBbMQswCQYDVQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsxETAPBgNVBAcTCE5ldyBZb3JrMRAwDgYDVQQKEwdLYWx0dXJhMRQwEgYDVQQDEwtwbGF5Lm1kaC5zZYIJANlsiVbbj7iTMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGObNmQX2V3GBftL4XGHEUzdCJrqM5yvDoAKD/mQdx3lDVLiU8eL97qw8Eu2CsoA4dxB5mEIwgBq3Sz36umd2hfpeRYJ0OPhKTptSVNxl57eeaSvDpg5k309+m5Yl5F65wHQXYhylFErbmogp1dAA9aIJLiJaHED1/th1aKdFl0xG4ULZomVycuuqQKCNH6pO6ItievhPXeiLAO/+rs1q6wOst9uSjMbr3kcY7FzBkYKd9MZewipcwMxzcHOuSiZTdMajg7O9uw8XabnJoY7+xNbfu0KjYPpXWoQn7tsFVfTsZ6FuDLMG1DP5kJ5iFPE+NcQIrHQ18Y6eo4A1L1bB4M=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://play.mdh.se/user/logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://play.mdh.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="http://play.mdh.se/user/authenticate" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://play.mdh.se/user/authenticate" index="0"/>
   </md:SPSSODescriptor>
   <md:Organization>
     <md:OrganizationName xml:lang="en">Mälardalens Högskola (PROD)</md:OrganizationName>
     <md:OrganizationDisplayName xml:lang="en">Mälardalens Högskola (PROD)</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://play.mdh.se</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">https://play.mdh.se</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>saml_admin@kaltura.com</md:EmailAddress>
+    <md:EmailAddress>mailto:saml_admin@kaltura.com</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-2.0/sam.control.lth.se-shibboleth.xml b/swamid-2.0/sam.control.lth.se-shibboleth.xml
index 3b353e03..40d8917e 100644
--- a/swamid-2.0/sam.control.lth.se-shibboleth.xml
+++ b/swamid-2.0/sam.control.lth.se-shibboleth.xml
@@ -17,6 +17,12 @@
     <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 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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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>
diff --git a/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml b/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml
new file mode 100644
index 00000000..94c376b9
--- /dev/null
+++ b/swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://studeranuutv.its.umu.se/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <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 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/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</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>
+      <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://studeranuutv.its.umu.se/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="sv">Testsite för Bedömningshandboken för ITS, Umeå universitet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Test site for Bedömningshandboken for ITS, Umeå University</mdui:DisplayName>
+        <mdui:Description xml:lang="sv">Utveckling av Bedömningshandboken</mdui:Description>
+        <mdui:Description xml:lang="en">Development of Bedömningshandboken</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>its-studutv01.ad.umu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=its-studutv01.ad.umu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEDDCCAnSgAwIBAgIJAO5Cjru9EaeUMA0GCSqGSIb3DQEBCwUAMCIxIDAeBgNV
+BAMTF2l0cy1zdHVkdXR2MDEuYWQudW11LnNlMB4XDTE2MDgyNDA4NDA1NloXDTI2
+MDgyMjA4NDA1NlowIjEgMB4GA1UEAxMXaXRzLXN0dWR1dHYwMS5hZC51bXUuc2Uw
+ggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCZK0gSWCW2v1SIshG5ZBjW
+uYtuj2iAqWd/QewIF2fS9grx0C+EAUB5ufurlGoSY4YcyKzxoq9L7CgDratVsdcm
+vBEkieESpGChxDpt5znZygE5QH6vV+32nofNEaatbJIR8zXOLYHva+UVIMfjQ7oj
+epgApdTDREk2wU4XcFhrK0OXu/XXDfNXkJkl10akS4em5/AQYeaCML5S7S06t0Ok
+dCQL1lSf3cDN4xTgpXtMMonmT3LLr21Q5jBe5n/AQIu8xv3IenVfX/cru6hoqB+d
+ctZMeBzYwRIxdcfIr+g6wFadggvCHRGF7YdfXXMMQXfjj5UV81m0xImCXClx9aME
+2nBXNT+WSmlGBMHzecb13r950bGwLYIyo9rgxlNJdsAmP4rW9zu2wCZA2kOvK0ZN
+z1GAR9pfUTv6rtp2T4lEZ2pxNzYw00PX7pRQWjdj13Uuh+c4Cy2fBdhCgS6SWZL/
+F6VXATCh2T1HEi2E5xWEpfi7sbJ3PDyOfFsmA6vZLqcCAwEAAaNFMEMwIgYDVR0R
+BBswGYIXaXRzLXN0dWR1dHYwMS5hZC51bXUuc2UwHQYDVR0OBBYEFF1RLZYx7wwE
+c+R7W7o5rHElUm/iMA0GCSqGSIb3DQEBCwUAA4IBgQAxF5fjqdfqeuM+5ZHFNq98
+qWzD6IzDhtGKMOTXd+SqSQ/RKFX8HZw5QHu6mnQ0rbyRX1DAjdU25IgbvtcnWT1A
+LLI1g4xAhXh9d/sMkXJtORU5VjjO+0QHYkyhsQ44h0ht7MIWbOArTaOqcWOiJWLC
+B4HrPxzoffpv9hblMj3fsbJL88QCWu7YfCEFLgxI/jJp1de7tVsaO4Q+Fk9AMSP5
+vAhz+7sXQOg4ywUAsygyyh7+xfkPenafrmjeNneMXez68bNRilUp3Jq1Aug+yYJG
+SDP/+ZWYz2mwuFAkxhuJKHjQZLlg/Abc3ZXNq9tw7JaOKDmvYxOb6zI1jIJs5diO
+CWYCnGEwb3vfKqREk3UlTGWxgyN2ndVkXvIP/3InqlG0xrA0wIyjiMkFNj+dGY2v
+OetizLpLG5SL/++9ALGrAQGtzKFtAAl6fa486zX6PsfpJ+2yQj9v83unnjzOYfXP
+A1TJgm8iwv1lbM4AwMqlLlWC+wOm7YV2zUrEYYcoPp8=
+</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://studeranuutv.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/Artifact/SOAP" index="2"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://studeranuutv.its.umu.se/Shibboleth.sso/SAML2/POST" index="7"/>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Erik</md:GivenName>
+    <md:SurName>Jonsson</md:SurName>
+    <md:EmailAddress>mailto:erik.jonsson@umu.se</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml b/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml
deleted file mode 100644
index 2a09eda4..00000000
--- a/swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://testshib.user.uu.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <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 för anställda, studenter och övriga verksamma vid Uppsala universitet. TEST.</mdui:Description>
-        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university. TEST.</mdui:Description>
-        <mdui:InformationURL xml:lang="sv">https://weblogin.uu.se</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://weblogin.uu.se/english.html</mdui:InformationURL>
-        <mdui:Logo height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="sv" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:Logo xml:lang="en" height="50" width="50">https://weblogin.uu.se/idp/UUlogin/img/logga-50.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="sv">https://weblogin.uu.se/#2</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.uu.se/english.html#2</mdui:PrivacyStatementURL>
-        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
-        <mdui:Keywords xml:lang="en">uppsala+universitet</mdui:Keywords>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAJ/MP/fwynj0V2a6SuWq0ff5AJIdMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3Rlc3RzaGliLnVzZXIudXUuc2UwHhcNMTEwMzA5MTAw
-OTE3WhcNMzEwMzA5MTAwOTE3WjAeMRwwGgYDVQQDExN0ZXN0c2hpYi51c2VyLnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6szgtt3FMHTkikEZ
-rtOFE8j45IWdTO+LWU8/U2FUoqxCbNsezC4v4N/AU2/hhXdTyytv08Wcer/vKEUL
-lAmHjyxJfbY8JDbI5WlRqTNIE5svOeIWz2ZmuTpbgvLR6XT3V6QXptVTvmbwxvMv
-342HGuf2CWh7lJsjol/tt4DQb5OHPGIMtmmnm3TkJ4fC6DssVME9pU1P0d4dxJf4
-DLwuHoU60tbh35vjRMU9oXx094UB5HVvE52lX86BXKYKwRtSrSiqqafRz1JXwQTn
-5El0FC/VjpDjk4HSHqIA//PnIkGMKJfjdBKpeRfcs/xa4zF044IqYeiBBIDeKVvV
-sYtt0QIDAQABo20wazBKBgNVHREEQzBBghN0ZXN0c2hpYi51c2VyLnV1LnNlhipo
-dHRwczovL3Rlc3RzaGliLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFOoLZ2+a6gjtAe7HDIJr0X6UMj7KMA0GCSqGSIb3DQEBBQUAA4IBAQB3FnXh
-R7dTQFj6j+4B+DztizzR0WQNOg3zq1neO6CPVytz0UC/j/XYlQuUXZxmV0C7X6mS
-iBdhi2WqU5NqW7m+B3awKo9TZr6mnGZoLdv2I0ugMq3f+kM+PfOAGlRL41/Wihec
-entYIdNNqkgindg5H7CiF2lcKwcXwYfBfjnynmBLsfO3bD5S4bWfNsFjTdXobVcc
-75wWrC66FRW0DfUmqwXKDlLOid6wy6eyNoOoUVs90DCRgTw1rrWN7Y9uD84/axfr
-1gqh8YWIrrg9bvEUM0gO1ngrv486yKJjR/iBxSaEWqD5zQ3vrPFGBnafgBmxqEit
-c/xUut3UPRusaRjG
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.user.uu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://testshib.user.uu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://testshib.user.uu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://testshib.user.uu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://testshib.user.uu.se/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">user.uu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDODCCAiCgAwIBAgIVAJ/MP/fwynj0V2a6SuWq0ff5AJIdMA0GCSqGSIb3DQEB
-BQUAMB4xHDAaBgNVBAMTE3Rlc3RzaGliLnVzZXIudXUuc2UwHhcNMTEwMzA5MTAw
-OTE3WhcNMzEwMzA5MTAwOTE3WjAeMRwwGgYDVQQDExN0ZXN0c2hpYi51c2VyLnV1
-LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6szgtt3FMHTkikEZ
-rtOFE8j45IWdTO+LWU8/U2FUoqxCbNsezC4v4N/AU2/hhXdTyytv08Wcer/vKEUL
-lAmHjyxJfbY8JDbI5WlRqTNIE5svOeIWz2ZmuTpbgvLR6XT3V6QXptVTvmbwxvMv
-342HGuf2CWh7lJsjol/tt4DQb5OHPGIMtmmnm3TkJ4fC6DssVME9pU1P0d4dxJf4
-DLwuHoU60tbh35vjRMU9oXx094UB5HVvE52lX86BXKYKwRtSrSiqqafRz1JXwQTn
-5El0FC/VjpDjk4HSHqIA//PnIkGMKJfjdBKpeRfcs/xa4zF044IqYeiBBIDeKVvV
-sYtt0QIDAQABo20wazBKBgNVHREEQzBBghN0ZXN0c2hpYi51c2VyLnV1LnNlhipo
-dHRwczovL3Rlc3RzaGliLnVzZXIudXUuc2UvaWRwL3NoaWJib2xldGgwHQYDVR0O
-BBYEFOoLZ2+a6gjtAe7HDIJr0X6UMj7KMA0GCSqGSIb3DQEBBQUAA4IBAQB3FnXh
-R7dTQFj6j+4B+DztizzR0WQNOg3zq1neO6CPVytz0UC/j/XYlQuUXZxmV0C7X6mS
-iBdhi2WqU5NqW7m+B3awKo9TZr6mnGZoLdv2I0ugMq3f+kM+PfOAGlRL41/Wihec
-entYIdNNqkgindg5H7CiF2lcKwcXwYfBfjnynmBLsfO3bD5S4bWfNsFjTdXobVcc
-75wWrC66FRW0DfUmqwXKDlLOid6wy6eyNoOoUVs90DCRgTw1rrWN7Y9uD84/axfr
-1gqh8YWIrrg9bvEUM0gO1ngrv486yKJjR/iBxSaEWqD5zQ3vrPFGBnafgBmxqEit
-c/xUut3UPRusaRjG
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://testshib.user.uu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://testshib.user.uu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-</EntityDescriptor>
diff --git a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
index c396b084..d7753536 100644
--- a/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.test.uu.se-idp-shibboleth.xml
@@ -4,9 +4,19 @@
     <Extensions>
       <shibmd:Scope regexp="false">test.uu.se</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Uppsala universitet test idp v3</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Uppsala Enter a description of your IdP at weblogin.test.uu.se</mdui:Description>
-        <mdui:Logo height="80" width="80">https://weblogin.test.uu.se/Path/To/Logo.png</mdui:Logo>
+        <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 för anställda, studenter och övriga verksamma vid Uppsala universitet. TEST</mdui:Description>
+        <mdui:Description xml:lang="en">The Uppsala University Identity Provider is used by employees and students at the university. TEST</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 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: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/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://weblogin.test.uu.se/english.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="sv">uppsala+universitet</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">uppsala+university</mdui:Keywords>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
@@ -186,8 +196,8 @@ dqPteAxhBzLEflg+
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">UU</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Uppsala universitet test idp v3</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">Uppsala university</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Uppsala University TEST</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.uu.se</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index 5f8e4f07..1636da1e 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -608,4 +608,6 @@
   <xi:include href="swamid-2.0/rb.lbic.lu.se.xml"/>
   <xi:include href="swamid-2.0/test.play.hv.se.xml"/>
   <xi:include href="swamid-2.0/play.hv.se.xml"/>
+  <xi:include href="swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml"/>
+  <xi:include href="swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 43420ace..5da18372 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -10,7 +10,6 @@
   <xi:include href="swamid-2.0/login-dev.du.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-1-r.referens.sys.kth.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/testshib.user.uu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/dwidp.nyautb.its.umu.se-dw-idp.xml"/>
   <xi:include href="swamid-2.0/shibboleth.nyautb.its.umu.se-shibboleth-idp.xml"/>
   <xi:include href="swamid-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>