Add GU and Ladok UU Test IdPs. Remove old LTU test IdP

4 files changed, 384 insertions, 89 deletions

diff --git a/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml b/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..124f87c7
--- /dev/null
+++ b/swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     This is example metadata only. Do *NOT* supply it as is without review,
+     and do *NOT* provide it in real time to your partners.
+
+     This metadata is not dynamic - it will not change as your configuration changes.
+-->
+<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://idp2.it.gu.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <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">New IdP for University of Gothenburg idp2.it.gu.se</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <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>
+    </KeyDescriptor>
+    <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>
+    </KeyDescriptor>
+    <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>
+    </KeyDescriptor>
+    <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"/>
+    <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"/>
+    <!--
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.it.gu.se/idp/profile/SAML2/Redirect/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.it.gu.se/idp/profile/SAML2/POST/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.it.gu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+        -->
+    <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://idp2.it.gu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.it.gu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.it.gu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">gu.se</shibmd:Scope>
+    </Extensions>
+    <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>
+    </KeyDescriptor>
+    <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>
+    </KeyDescriptor>
+    <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>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.it.gu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.it.gu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
+    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
+  </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/nya-00.ladok.umu.se-idp-shibboleth.xml b/swamid-2.0/nya-00.ladok.umu.se-idp-shibboleth.xml
new file mode 100644
index 00000000..01dcb377
--- /dev/null
+++ b/swamid-2.0/nya-00.ladok.umu.se-idp-shibboleth.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+     This is example metadata only. Do *NOT* supply it as is without review,
+     and do *NOT* provide it in real time to your partners.
+
+     This metadata is not dynamic - it will not change as your configuration changes.
+-->
+<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://nya-00.ladok.umu.se/idp/shibboleth">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope regexp="false">ladok.umu.se</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">nya-00.ladok.umu.se test av shib 3</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Enter a description of your IdP at nya-00.ladok.umu.se</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIVAN/EC6uRXiGfFav9ONDVdnkT5X9aMA0GCSqGSIb3DQEB
+CwUAMB4xHDAaBgNVBAMME255YS0wMC5sYWRvay51bXUuc2UwHhcNMTYwMzE0MTMw
+OTU5WhcNMzYwMzE0MTMwOTU5WjAeMRwwGgYDVQQDDBNueWEtMDAubGFkb2sudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqPzndG9Em5/+bgXR
+FQG4h9wYthx7ywsuauA86yY6NZ/lg3wsecpJ82lh5wC5o7Anr9gGh/Ts5/5YZ025
+yFBWlQEfg73+toow67aR6bDWEaFA59Hlj/HyHMHKcH4yTWqaf/5oTtQuY4ACDbzU
+PvrQjZqoX6b+iDC9rI/zX/WFnzXxBEEejeOQdiUp16SHcT7jCgFx2Bn3p7bVILcv
+6PvQ6icYdkgNUPQs+E8hktoAoL5guFMux5si4uubybQt5WaERQVGfgSl5Ota6Xxu
+hsRc8Za56UdknMn2P8Y/bKb+8M/0yVt+r8MRw79au5UrAb50EK6PWIkWZDEdn6iL
+AyfHjQIDAQABo20wazAdBgNVHQ4EFgQUftE6GmsIo/5E3gc+VCZmvOIsRzEwSgYD
+VR0RBEMwQYITbnlhLTAwLmxhZG9rLnVtdS5zZYYqaHR0cHM6Ly9ueWEtMDAubGFk
+b2sudW11LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBh7BK2
+8/cJrZ8BW4pGpUli6iQuyc2QIkaBAUbbw+8SlkoktoxSJlllrRbKWU89eyTol/Hz
+7YUzSve8BfaNxU6c3VXdXG9hM4KAGBAaoxBhQuAWxSpVYLwMMcORIY5DOJ/Nj2G/
+o5xgX0m/hV9vK06cwSPb0YBGzzNtl/qEOKMlnjvj1jbvh1RuOCPsD0J/3n6kHiH4
+p22/xyRX+NTyfIXNqbPO/dZ9PVKW/5tH2obXFPFB8U/SSvOOTizA7vL6VPcXBS/D
+5ee6KMMWZkNhpwxoe0o+zXiTx1xP1sWgECqEJzNLcFO793m/o1TohQ5+ecy4t/qo
++oFtKcxVkASRVG98
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDNzCCAh+gAwIBAgIUT6X94TXEih08TUUz+1Zbfr+8LiIwDQYJKoZIhvcNAQEL
+BQAwHjEcMBoGA1UEAwwTbnlhLTAwLmxhZG9rLnVtdS5zZTAeFw0xNjAzMTQxMzA5
+NThaFw0zNjAzMTQxMzA5NThaMB4xHDAaBgNVBAMME255YS0wMC5sYWRvay51bXUu
+c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeiy0YbSWumS8roM4R
+K53SAMYxEfaBQyWfxYW1pwKBD6EaPVWV6c02o7y9ZBppdJXCHnDAcVS6iqkJ2rLA
+DiNeY7LJYP54me4DJwUFJ8To98V1BSNHXfCeH+xq7DDU/Xg/af92hl+EQW1JgL0p
+DVxl8/EWLo6J34sj36L15j9clJ3xI3eouC6uafE7E0vJemvwWKQMVQDGop+xuO5z
+AbLcTP3SYna2R4wQGwznL1xUjD8C9GnzNEm7rfotbXwvPb+uvwjWpboI4jLy5p+d
+aC+iE9DwE3SalVRNclmTt6rxXEHtsmpHoiUsrcb4DsiknoWPJZqrzIVfCQ/EyI4E
+dsGjAgMBAAGjbTBrMB0GA1UdDgQWBBSTYDtamA9B05lSkMXOYbCZqWAz4jBKBgNV
+HREEQzBBghNueWEtMDAubGFkb2sudW11LnNlhipodHRwczovL255YS0wMC5sYWRv
+ay51bXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAJSH4O4I
+5o5pcszZIZeOP518XFNYzRYP7ZIq7eAs16GsgjZ5/mg4a3Esb+uoxWr+8mOLVhDg
+hS1dorizXporCxAQnYPO2HS+r/cAOknChPKeBRsSv2r6DIVjOxes+uEeTKqWm+uQ
+Zc4fed09EYY13tAyN+8QAie0tdjHEEXe78Hs5johZKM315bLc72z7vmvBkzGx3NS
+6qFehuxrkQxhIsjNAadezs0ZfkiWdL76yaiytPsiyEAB6872Y0dcAmpHuLv33Y8R
+l9G4y2kHGqTzv4uxjntIv7bL+PNFdDn0AaXMIIuLswtVEQqFrnvPv45eVMe8KSI5
+LybfQIpUQEUajec=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIVAO1tG/hzD2TJDfgUa/rJ1rPBVorqMA0GCSqGSIb3DQEB
+CwUAMB4xHDAaBgNVBAMME255YS0wMC5sYWRvay51bXUuc2UwHhcNMTYwMzE0MTMw
+OTU4WhcNMzYwMzE0MTMwOTU4WjAeMRwwGgYDVQQDDBNueWEtMDAubGFkb2sudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtbkOEK86x+s038f/
++w/rVH2awkvqELemrCm7dHdifF2Xg5znfKLktzcYZyQzXitvgmUz4K08gWj2Kjqf
+Ko4AbmF4CGnKdZA9DZlVZjpoiURNJKGSJZyEpQkwJlcZfDDea+ix5Ltd8wraBLHS
+LoZ90/eFwKdtr9w/Rw36it3962AEEDIZSrOMSH/1FH9bgBvgXt88ffpcoUUdPHcF
+0A+KzDz+j1AH+AxHf7A1nVB+JKHesq7Ty8xRzdnYXf9NpUfmwDFYUoRMpsIA5y4l
+BcrKZwaZiVC5V9u2FNf5iPe1qBb47c3U9fEuAkYHtBQ7VSMj6hc14mvY8ee+r+T/
+nlrhNwIDAQABo20wazAdBgNVHQ4EFgQUDYlmTyqdYOH5h8fcQa8KGytBkZ4wSgYD
+VR0RBEMwQYITbnlhLTAwLmxhZG9rLnVtdS5zZYYqaHR0cHM6Ly9ueWEtMDAubGFk
+b2sudW11LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAy0W8E
+jnm5EcPHda2uh1L+jjSo6ctbYcbT7c8ssWX0yymczVvWXUaZl9pPmUGQMtKVMJo9
++xcTX2Mse7u2k3ozUCJwiR2n0YEYC3G5k7Cyxszl76/2wXCeKLXl9PMYudNjbWd3
+vhihd7J1sj/+bYobKVzcxS974BXteqaN3lRbPwbS6Xfi/0HfPMrQ9V7rtkJiUhjk
+JBA1xadJ/uQ0osX1fz3kOnxxyGAYeVezEIFQI/yTszHRW2wnBt5ftPDjEfwGauY4
+kTjBn/rgejgf913B3dZQFtWS8BWHQ1K7byrlI/W0fdpro0X1Apuh3hS5baSwaD8B
+LsY+yPz79/C6y6My
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <!--
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se/idp/profile/SAML2/Redirect/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/idp/profile/SAML2/POST/SLO"/>
+        <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+        -->
+    <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://nya-00.ladok.umu.se/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://nya-00.ladok.umu.se/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://nya-00.ladok.umu.se/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">ladok.umu.se</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIVAN/EC6uRXiGfFav9ONDVdnkT5X9aMA0GCSqGSIb3DQEB
+CwUAMB4xHDAaBgNVBAMME255YS0wMC5sYWRvay51bXUuc2UwHhcNMTYwMzE0MTMw
+OTU5WhcNMzYwMzE0MTMwOTU5WjAeMRwwGgYDVQQDDBNueWEtMDAubGFkb2sudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqPzndG9Em5/+bgXR
+FQG4h9wYthx7ywsuauA86yY6NZ/lg3wsecpJ82lh5wC5o7Anr9gGh/Ts5/5YZ025
+yFBWlQEfg73+toow67aR6bDWEaFA59Hlj/HyHMHKcH4yTWqaf/5oTtQuY4ACDbzU
+PvrQjZqoX6b+iDC9rI/zX/WFnzXxBEEejeOQdiUp16SHcT7jCgFx2Bn3p7bVILcv
+6PvQ6icYdkgNUPQs+E8hktoAoL5guFMux5si4uubybQt5WaERQVGfgSl5Ota6Xxu
+hsRc8Za56UdknMn2P8Y/bKb+8M/0yVt+r8MRw79au5UrAb50EK6PWIkWZDEdn6iL
+AyfHjQIDAQABo20wazAdBgNVHQ4EFgQUftE6GmsIo/5E3gc+VCZmvOIsRzEwSgYD
+VR0RBEMwQYITbnlhLTAwLmxhZG9rLnVtdS5zZYYqaHR0cHM6Ly9ueWEtMDAubGFk
+b2sudW11LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQBh7BK2
+8/cJrZ8BW4pGpUli6iQuyc2QIkaBAUbbw+8SlkoktoxSJlllrRbKWU89eyTol/Hz
+7YUzSve8BfaNxU6c3VXdXG9hM4KAGBAaoxBhQuAWxSpVYLwMMcORIY5DOJ/Nj2G/
+o5xgX0m/hV9vK06cwSPb0YBGzzNtl/qEOKMlnjvj1jbvh1RuOCPsD0J/3n6kHiH4
+p22/xyRX+NTyfIXNqbPO/dZ9PVKW/5tH2obXFPFB8U/SSvOOTizA7vL6VPcXBS/D
+5ee6KMMWZkNhpwxoe0o+zXiTx1xP1sWgECqEJzNLcFO793m/o1TohQ5+ecy4t/qo
++oFtKcxVkASRVG98
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDNzCCAh+gAwIBAgIUT6X94TXEih08TUUz+1Zbfr+8LiIwDQYJKoZIhvcNAQEL
+BQAwHjEcMBoGA1UEAwwTbnlhLTAwLmxhZG9rLnVtdS5zZTAeFw0xNjAzMTQxMzA5
+NThaFw0zNjAzMTQxMzA5NThaMB4xHDAaBgNVBAMME255YS0wMC5sYWRvay51bXUu
+c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCeiy0YbSWumS8roM4R
+K53SAMYxEfaBQyWfxYW1pwKBD6EaPVWV6c02o7y9ZBppdJXCHnDAcVS6iqkJ2rLA
+DiNeY7LJYP54me4DJwUFJ8To98V1BSNHXfCeH+xq7DDU/Xg/af92hl+EQW1JgL0p
+DVxl8/EWLo6J34sj36L15j9clJ3xI3eouC6uafE7E0vJemvwWKQMVQDGop+xuO5z
+AbLcTP3SYna2R4wQGwznL1xUjD8C9GnzNEm7rfotbXwvPb+uvwjWpboI4jLy5p+d
+aC+iE9DwE3SalVRNclmTt6rxXEHtsmpHoiUsrcb4DsiknoWPJZqrzIVfCQ/EyI4E
+dsGjAgMBAAGjbTBrMB0GA1UdDgQWBBSTYDtamA9B05lSkMXOYbCZqWAz4jBKBgNV
+HREEQzBBghNueWEtMDAubGFkb2sudW11LnNlhipodHRwczovL255YS0wMC5sYWRv
+ay51bXUuc2UvaWRwL3NoaWJib2xldGgwDQYJKoZIhvcNAQELBQADggEBAJSH4O4I
+5o5pcszZIZeOP518XFNYzRYP7ZIq7eAs16GsgjZ5/mg4a3Esb+uoxWr+8mOLVhDg
+hS1dorizXporCxAQnYPO2HS+r/cAOknChPKeBRsSv2r6DIVjOxes+uEeTKqWm+uQ
+Zc4fed09EYY13tAyN+8QAie0tdjHEEXe78Hs5johZKM315bLc72z7vmvBkzGx3NS
+6qFehuxrkQxhIsjNAadezs0ZfkiWdL76yaiytPsiyEAB6872Y0dcAmpHuLv33Y8R
+l9G4y2kHGqTzv4uxjntIv7bL+PNFdDn0AaXMIIuLswtVEQqFrnvPv45eVMe8KSI5
+LybfQIpUQEUajec=
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDODCCAiCgAwIBAgIVAO1tG/hzD2TJDfgUa/rJ1rPBVorqMA0GCSqGSIb3DQEB
+CwUAMB4xHDAaBgNVBAMME255YS0wMC5sYWRvay51bXUuc2UwHhcNMTYwMzE0MTMw
+OTU4WhcNMzYwMzE0MTMwOTU4WjAeMRwwGgYDVQQDDBNueWEtMDAubGFkb2sudW11
+LnNlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtbkOEK86x+s038f/
++w/rVH2awkvqELemrCm7dHdifF2Xg5znfKLktzcYZyQzXitvgmUz4K08gWj2Kjqf
+Ko4AbmF4CGnKdZA9DZlVZjpoiURNJKGSJZyEpQkwJlcZfDDea+ix5Ltd8wraBLHS
+LoZ90/eFwKdtr9w/Rw36it3962AEEDIZSrOMSH/1FH9bgBvgXt88ffpcoUUdPHcF
+0A+KzDz+j1AH+AxHf7A1nVB+JKHesq7Ty8xRzdnYXf9NpUfmwDFYUoRMpsIA5y4l
+BcrKZwaZiVC5V9u2FNf5iPe1qBb47c3U9fEuAkYHtBQ7VSMj6hc14mvY8ee+r+T/
+nlrhNwIDAQABo20wazAdBgNVHQ4EFgQUDYlmTyqdYOH5h8fcQa8KGytBkZ4wSgYD
+VR0RBEMwQYITbnlhLTAwLmxhZG9rLnVtdS5zZYYqaHR0cHM6Ly9ueWEtMDAubGFk
+b2sudW11LnNlL2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBCwUAA4IBAQAy0W8E
+jnm5EcPHda2uh1L+jjSo6ctbYcbT7c8ssWX0yymczVvWXUaZl9pPmUGQMtKVMJo9
++xcTX2Mse7u2k3ozUCJwiR2n0YEYC3G5k7Cyxszl76/2wXCeKLXl9PMYudNjbWd3
+vhihd7J1sj/+bYobKVzcxS974BXteqaN3lRbPwbS6Xfi/0HfPMrQ9V7rtkJiUhjk
+JBA1xadJ/uQ0osX1fz3kOnxxyGAYeVezEIFQI/yTszHRW2wnBt5ftPDjEfwGauY4
+kTjBn/rgejgf913B3dZQFtWS8BWHQ1K7byrlI/W0fdpro0X1Apuh3hS5baSwaD8B
+LsY+yPz79/C6y6My
+                        </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://nya-00.ladok.umu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <!-- <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://nya-00.ladok.umu.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/> -->
+    <!-- If you uncomment the above you should add urn:oasis:names:tc:SAML:2.0:protocol to the protocolSupportEnumeration above -->
+  </AttributeAuthorityDescriptor>
+</EntityDescriptor>
diff --git a/swamid-2.0/shibbo-test.ltu.se-idp-shibboleth.xml b/swamid-2.0/shibbo-test.ltu.se-idp-shibboleth.xml
deleted file mode 100644
index 0957b877..00000000
--- a/swamid-2.0/shibbo-test.ltu.se-idp-shibboleth.xml
+++ /dev/null
@@ -1,88 +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://shibbo-test.ltu.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">ltu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVANjoWHVCDRPE8UrTljXc6HDE42N7MA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJiby10ZXN0Lmx0dS5zZTAeFw0xMTAyMjAxMDUx
-NTVaFw0zMTAyMjAxMDUxNTVaMB0xGzAZBgNVBAMTEnNoaWJiby10ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMh2sfBQICTmeRz8b2Qr
-ZZD/BQeq65r9Q5vb1ULEVX2An7apQBGAXTPpkt1g9w2Xzd6aqZmgnQzMMlUCJX54
-0UAWKw3H8pp2srQiF0zh/tS47ppyPMNfJBDYNcIuktjy298wr74aOVG+tNGMLH6b
-5Z0FDZRWx5UpTCWgpe3y5K0LlDx9lpVT32+YaKQAHPL6/szHTo6rrp4y8ltgRPgA
-JaC7X97y3rHNggN/lOqKeJaz+y/rYsbNR1U8i235XGGZ1yptfUAbm86EotB76pVy
-ju/4NNzQawxrzWcSb52BELBkA2PEJcCFfA8Vab0kSh2s7w1jN3AVMG4K7NVVA/r7
-whUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvLXRlc3QubHR1LnNlhilodHRw
-czovL3NoaWJiby10ZXN0Lmx0dS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-mInHp/TSs3Wfh9DWMN4Obju7KH4wDQYJKoZIhvcNAQEFBQADggEBALoUXET07OEs
-nNw6tjaHzvOrv7NWGIXsPqYqpAYvo7Yy4ikfrnyc3PTTcDMKkVOIecyP/rYWuMCu
-CqeRC2eHVcRP6wqk6FbE8PtoMDVCgYYEAkxN91c144UTzkLFzKQtRA/YvXhgXXoq
-w45Fv+3SgC7uhrEhZo1CBM3vuaiLF/ecMrZjykjFkE/Z2xDjXzndfaGKXZ6vqxy0
-F+r2kyV3xvEKkDisCRgMFhYCELlEXQyn7KjKmvb/bKA08noMU3B3r6woAld9yOOk
-HSR/YWlIQD8ISEJMDfBJ7s6HgEe0VvpRSnEPUk5fkk3maAGPQ/pojN4OhTCH1kyD
-oiL/Ag7AxoE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo-test.ltu.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo-test.ltu.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://shibbo-test.ltu.se/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibbo-test.ltu.se/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibbo-test.ltu.se/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibbo-test.ltu.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">ltu.se</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDNDCCAhygAwIBAgIVANjoWHVCDRPE8UrTljXc6HDE42N7MA0GCSqGSIb3DQEB
-BQUAMB0xGzAZBgNVBAMTEnNoaWJiby10ZXN0Lmx0dS5zZTAeFw0xMTAyMjAxMDUx
-NTVaFw0zMTAyMjAxMDUxNTVaMB0xGzAZBgNVBAMTEnNoaWJiby10ZXN0Lmx0dS5z
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMh2sfBQICTmeRz8b2Qr
-ZZD/BQeq65r9Q5vb1ULEVX2An7apQBGAXTPpkt1g9w2Xzd6aqZmgnQzMMlUCJX54
-0UAWKw3H8pp2srQiF0zh/tS47ppyPMNfJBDYNcIuktjy298wr74aOVG+tNGMLH6b
-5Z0FDZRWx5UpTCWgpe3y5K0LlDx9lpVT32+YaKQAHPL6/szHTo6rrp4y8ltgRPgA
-JaC7X97y3rHNggN/lOqKeJaz+y/rYsbNR1U8i235XGGZ1yptfUAbm86EotB76pVy
-ju/4NNzQawxrzWcSb52BELBkA2PEJcCFfA8Vab0kSh2s7w1jN3AVMG4K7NVVA/r7
-whUCAwEAAaNrMGkwSAYDVR0RBEEwP4ISc2hpYmJvLXRlc3QubHR1LnNlhilodHRw
-czovL3NoaWJiby10ZXN0Lmx0dS5zZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-mInHp/TSs3Wfh9DWMN4Obju7KH4wDQYJKoZIhvcNAQEFBQADggEBALoUXET07OEs
-nNw6tjaHzvOrv7NWGIXsPqYqpAYvo7Yy4ikfrnyc3PTTcDMKkVOIecyP/rYWuMCu
-CqeRC2eHVcRP6wqk6FbE8PtoMDVCgYYEAkxN91c144UTzkLFzKQtRA/YvXhgXXoq
-w45Fv+3SgC7uhrEhZo1CBM3vuaiLF/ecMrZjykjFkE/Z2xDjXzndfaGKXZ6vqxy0
-F+r2kyV3xvEKkDisCRgMFhYCELlEXQyn7KjKmvb/bKA08noMU3B3r6woAld9yOOk
-HSR/YWlIQD8ISEJMDfBJ7s6HgEe0VvpRSnEPUk5fkk3maAGPQ/pojN4OhTCH1kyD
-oiL/Ag7AxoE=
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibbo-test.ltu.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibbo-test.ltu.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>
-  <Organization>
-    <OrganizationName xml:lang="en">LTUTEST</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Luleå tekniska universitet (TEST)</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ltu.se</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <Company>Luleå tekniska universitet</Company>
-    <EmailAddress>Magnus.Jacobsson@ltu.se</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 58e8d789..346b6cff 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -9,7 +9,6 @@
   <xi:include href="swamid-2.0/idptest.test.it.gu.se-idp-shibboleth.xml"/>
   <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/shibbo-test.ltu.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"/>
@@ -64,4 +63,6 @@
   <xi:include href="swamid-2.0/idp.ita.chalmers.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-test01.skolfederation.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shib-test02.skolfederation.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/idp2.it.gu.se-idp-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/nya-00.ladok.umu.se-idp-shibboleth.xml"/>
 </EntitiesDescriptor>