20 files changed, 16 insertions, 104 deletions
diff --git a/sp-with-simplesign b/sp-with-simplesign
index efe19918..8f766726 100644
--- a/sp-with-simplesign
+++ b/sp-with-simplesign
@@ -107,9 +107,8 @@ shibboleth.msacademicverify.com-shibboleth-sp.xml
 shibboleth.nyautb.its.umu.se-shibboleth-idp.xml
 shibboleth.turnitin.com-shibboleth.xml
 shibboleth.uhr.se-idp-shibboleth.xml
-shibboleth.umu.se-test.xml
+shibboleth.umu.se-idp-shibboleth.xml
 shibdev.rsc.org-shibboleth.xml
-sigma-test-localhost-sp-130705.xml
 smd-dev.nordu.net-shibboleth.xml
 smd.du.se-shibboleth.xml
 sp-nya.bth.se-shibboleth.xml
diff --git a/swamid-2.0/account.hs.se-shibboleth.xml b/swamid-2.0/account.hh.se-Shibboleth.xml
index 1c780258..1c780258 100644
--- a/swamid-2.0/account.hs.se-shibboleth.xml
+++ b/swamid-2.0/account.hh.se-Shibboleth.xml
diff --git a/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml b/swamid-2.0/gih.pingpong.se-Shibboleth.sso-Metadata.xml
index 551f1784..551f1784 100644
--- a/swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml
+++ b/swamid-2.0/gih.pingpong.se-Shibboleth.sso-Metadata.xml
diff --git a/swamid-2.0/idp-test.comanage.sunet.se-idp.xml b/swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
index 84d8cd7d..84d8cd7d 100644
--- a/swamid-2.0/idp-test.comanage.sunet.se-idp.xml
+++ b/swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
diff --git a/swamid-2.0/idp-test.comanage.sunet.se-sp.xml b/swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml
index 7f0594c6..7f0594c6 100644
--- a/swamid-2.0/idp-test.comanage.sunet.se-sp.xml
+++ b/swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml
diff --git a/swamid-2.0/idp.comanage.sunet.se-idp.xml b/swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
index d9855785..d9855785 100644
--- a/swamid-2.0/idp.comanage.sunet.se-idp.xml
+++ b/swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml
diff --git a/swamid-2.0/idp.comanage.sunet.se-sp.xml b/swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml
index 93e89409..93e89409 100644
--- a/swamid-2.0/idp.comanage.sunet.se-sp.xml
+++ b/swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml
diff --git a/swamid-2.0/idpaas-dev.swamid.se-idp.xml b/swamid-2.0/idpaas-dev.swamid.se-Saml2IDP-SWAMIDStaff.xml
index c787937b..c787937b 100644
--- a/swamid-2.0/idpaas-dev.swamid.se-idp.xml
+++ b/swamid-2.0/idpaas-dev.swamid.se-Saml2IDP-SWAMIDStaff.xml
diff --git a/swamid-2.0/idpaas-dev.swamid.se-sp.xml b/swamid-2.0/idpaas-dev.swamid.se-Saml2SP-sp.xml
index 0ae81b13..0ae81b13 100644
--- a/swamid-2.0/idpaas-dev.swamid.se-sp.xml
+++ b/swamid-2.0/idpaas-dev.swamid.se-Saml2SP-sp.xml
diff --git a/swamid-2.0/keystone.lab.cloud.ipnett.net-shibboleth.xml b/swamid-2.0/keystone.lab.cloud.ipnett.se-shibboleth.xml
index a3e40a79..a3e40a79 100644
--- a/swamid-2.0/keystone.lab.cloud.ipnett.net-shibboleth.xml
+++ b/swamid-2.0/keystone.lab.cloud.ipnett.se-shibboleth.xml
diff --git a/swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml b/swamid-2.0/login.tst.ki.se-idp-shibboleth.xml
index 8d771734..8d771734 100644
--- a/swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml
+++ b/swamid-2.0/login.tst.ki.se-idp-shibboleth.xml
diff --git a/swamid-2.0/moodle.med.lu.se-shibboleth.sso-login.xml b/swamid-2.0/moodle.med.lu.se-shibboleth.xml
index 3043358e..3043358e 100644
--- a/swamid-2.0/moodle.med.lu.se-shibboleth.sso-login.xml
+++ b/swamid-2.0/moodle.med.lu.se-shibboleth.xml
diff --git a/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml b/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.xml
index 6962e96d..6962e96d 100644
--- a/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.sso-login.xml
+++ b/swamid-2.0/moodlealfa.omv.lu.se-shibboleth.xml
diff --git a/swamid-2.0/outscan.outpost24.com-opi-xmlapi-action-showspmetadata.xml b/swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml
index eb7145c8..eb7145c8 100644
--- a/swamid-2.0/outscan.outpost24.com-opi-xmlapi-action-showspmetadata.xml
+++ b/swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml
diff --git a/swamid-2.0/shibboleth.umu.se-test.xml b/swamid-2.0/shibboleth.umu.se-idp-shibboleth.xml
index 93536d7c..93536d7c 100644
--- a/swamid-2.0/shibboleth.umu.se-test.xml
+++ b/swamid-2.0/shibboleth.umu.se-idp-shibboleth.xml
diff --git a/swamid-2.0/sigma-test-localhost-sp-130705.xml b/swamid-2.0/sigma-test-localhost-sp-130705.xml
deleted file mode 100644
index b010d56a..00000000
--- a/swamid-2.0/sigma-test-localhost-sp-130705.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?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.
- -->
-<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://localhost/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.swamid.se/" registrationInstant="2013-10-08T15:03:48Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://swamid.se/policy/mdrps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
-    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
-    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="http://localhost/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="http://localhost/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="sv">Sigma test-SP localhost</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Sigma test-SP localhost</mdui:DisplayName>
-        <mdui:Description xml:lang="sv">Sigma test-SP localhost</mdui:Description>
-        <mdui:Description xml:lang="en">Sigma test-SP localhost</mdui:Description>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:KeyName>wl08127.sigma.local</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wl08127.sigma.local</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDADCCAeigAwIBAgIJAP46l3cH3lTPMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3dsMDgxMjcuc2lnbWEubG9jYWwwHhcNMTMwNzA1MTA0MTU3WhcNMjMwNzAz
-MTA0MTU3WjAeMRwwGgYDVQQDExN3bDA4MTI3LnNpZ21hLmxvY2FsMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArUrZEPBuw44XOFMefJ1Hxut7RX7RH2OG
-GtNUsaIbw2kEsLVS8HBhRkABceMlkLSXifrFwteQcNVSjIFFtVw+vGm9Wp0UT10R
-yv2NUDq2gSMX1ye2Om/piIUobNMbBYLC7cNea9NpUuTsdEgHPB7UVC+DKCQJAlFQ
-p0zwAc8sS75M76vt7sI6AP2LaSePXfSTblAjI2IrEJa3uo758EsmFzD1qAFOi+Jv
-mb1z91UYMZ7JHtfYg/IutDJvOsump5aZZ+Ko2hcamxFCRE6sBcpyNpSFpFVzS/vE
-tlEUGra9dl+dUxixf1iCp3vOAwqeIMRNUkxnP1cTs300UoL8va9hwQIDAQABo0Ew
-PzAeBgNVHREEFzAVghN3bDA4MTI3LnNpZ21hLmxvY2FsMB0GA1UdDgQWBBRskT3C
-cCM+OcHRrR1zuyOihV9ZOjANBgkqhkiG9w0BAQUFAAOCAQEACSBxdVXL8u61hUd8
-ZpSgdSGGIfRqGiV2SmGcNcYsbPOz6Mp5+ZJd1VoXpHNtj6p3JFid9D2BF6K9TWgY
-Kz1F3BX7zN+MjCZWH869BQQV5kULp69SBT0y0Ehrp3gclvCPQf2lOmAPaZIh3q9o
-oU2GkyfgVOYF//nTndt0hTsBBO81KtVwxVjwkJ2wPowGTkjzdEFXjz+fGRk1jxIR
-ZXbT3r0KxAH8eUSPX2cPfPv+j4aU/aVGagGv0nKAcac0ScRCjtOVlSEPLqrE2lwf
-PBz4Lvdo8jju6OsPr1trxlLfiYuEk/zNUeQrzd96siq/5tRp5+9AH2Cq1cLmDDOY
-Zgbubg==
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://localhost/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="http://localhost/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://localhost/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://localhost/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://localhost/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="http://localhost/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="http://localhost/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="http://localhost/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="http://localhost/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="http://localhost/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="http://localhost/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-</md:EntityDescriptor>
diff --git a/swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml b/swamid-2.0/test.valda.i.uhr.se-shibboleth.xml
index 581b0d8d..581b0d8d 100644
--- a/swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml
+++ b/swamid-2.0/test.valda.i.uhr.se-shibboleth.xml
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index b0ee8bdc..7f6e25a4 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -225,7 +225,7 @@
   <xi:include href="swamid-2.0/acc-nais.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/hig-test.blackboard.com-shibboleth-sp.xml"/>
   <xi:include href="swamid-2.0/test.bils.se-auth-metadata.xml"/>
-  <xi:include href="swamid-2.0/gih.pingpong.net-shibboleth.sso-metadata.xml"/>
+  <xi:include href="swamid-2.0/gih.pingpong.se-Shibboleth.sso-Metadata.xml"/>
   <xi:include href="swamid-2.0/testgih.pingpong.net-shibboleth.sso-metadata.xml"/>
   <xi:include href="swamid-2.0/daisy.ict.kth.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/7t.lbic.lu.se.xml"/>
@@ -255,9 +255,9 @@
   <xi:include href="swamid-2.0/nya-gerrit.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ludwig.lub.lu.se-sp.xml"/>
   <xi:include href="swamid-2.0/vartuppdrag.se.xml"/>
-  <xi:include href="swamid-2.0/account.hs.se-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/account.hh.se-Shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.bth.se.xml"/>
-  <xi:include href="swamid-2.0/keystone.lab.cloud.ipnett.net-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/keystone.lab.cloud.ipnett.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ni.sunet.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/luvit.education.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/bibliometri.swepub.kb.se-shibboleth.xml"/>
@@ -301,9 +301,9 @@
   <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/moodlealfa.omv.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/studeranuutv.its.umu.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/moodle.med.lu.se-shibboleth.sso-login.xml"/>
+  <xi:include href="swamid-2.0/moodle.med.lu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/play.hb.se.xml"/>
   <xi:include href="swamid-2.0/sp.haikom.com-saml.xml"/>
   <xi:include href="swamid-2.0/se.timeedit.net-kth-student-sp.xml"/>
@@ -332,9 +332,9 @@
   <xi:include href="swamid-2.0/comanage-test.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/comanage-test-ds.sunet.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/comanage-dev.sunet.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-sp.xml"/>
-  <xi:include href="swamid-2.0/idp.comanage.sunet.se-sp.xml"/>
-  <xi:include href="swamid-2.0/idpaas-dev.swamid.se-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-Saml2SP-sp.xml"/>
+  <xi:include href="swamid-2.0/idp.comanage.sunet.se-Saml2SP-sp.xml"/>
+  <xi:include href="swamid-2.0/idpaas-dev.swamid.se-Saml2SP-sp.xml"/>
   <xi:include href="swamid-2.0/registry-test.swamid.se-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/test.play.rkh.se.xml"/>
   <xi:include href="swamid-2.0/ladok3.its.umu.se-shibboleth.xml"/>
@@ -377,7 +377,7 @@
   <xi:include href="swamid-2.0/sp.spraakbanken.gu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/login.ifmsa.se-spp.xml"/>
   <xi:include href="swamid-2.0/dev.valda.uhr.se-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/test.valda.i.uhr.se-shibbboleth.xml"/>
+  <xi:include href="swamid-2.0/test.valda.i.uhr.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira-dev.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira-next.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/jira-readonly.its.umu.se-shibboleth.xml"/>
@@ -554,7 +554,7 @@
   <xi:include href="swamid-2.0/intranet.nai.uu.se.xml"/>
   <xi:include href="swamid-2.0/nai.uu.se.xml"/>
   <xi:include href="swamid-2.0/swamid-2.grandid.com-module.php-saml-sp-metadata.php-proxysp-swamid-retendo.xml"/>
-  <xi:include href="swamid-2.0/outscan.outpost24.com-opi-xmlapi-action-showspmetadata.xml"/>
+  <xi:include href="swamid-2.0/outscan.outpost24.com-opi-XMLAPI-ACTION-SHOWSPMETADATA.xml"/>
   <xi:include href="swamid-2.0/test.redcap.its.umu.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/adfs.artologik.net-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/bookings.kib.ki.se-shibboleth.xml"/>
diff --git a/swamid-testing-idp-1.0.mxml b/swamid-testing-idp-1.0.mxml
index 413395e7..aa183611 100644
--- a/swamid-testing-idp-1.0.mxml
+++ b/swamid-testing-idp-1.0.mxml
@@ -19,10 +19,10 @@
   <xi:include href="swamid-2.0/idp2.test.umu.se-saml2-idp-metadata.php.xml"/>
   <xi:include href="swamid-2.0/ladok3.its.umu.se-user-idp.xml"/>
   <xi:include href="swamid-2.0/kitstidp01.tst.ki.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/shibboleth.umu.se-test.xml"/>
+  <xi:include href="swamid-2.0/shibboleth.umu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.suni.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/ls00002.ad.mah.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/login.tst.ki.se-ipd-shibboleth.xml"/>
+  <xi:include href="swamid-2.0/login.tst.ki.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/ladok3-00.ladok.umu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/shibbo3test.ltu.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/miunidptest.miun.se-idp-shibboleth.xml"/>
@@ -44,9 +44,9 @@
   <xi:include href="swamid-2.0/adfs.test.umu.se-adfs-services-trust.xml"/>
   <xi:include href="swamid-2.0/hbidp-test.test.hb.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idp-test.it.su.se-idp-shibboleth.xml"/>
-  <xi:include href="swamid-2.0/idp.comanage.sunet.se-idp.xml"/>
-  <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-idp.xml"/>
-  <xi:include href="swamid-2.0/idpaas-dev.swamid.se-idp.xml"/>
+  <xi:include href="swamid-2.0/idp.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml"/>
+  <xi:include href="swamid-2.0/idp-test.comanage.sunet.se-Saml2IDP-sp-SUNET-TEST.xml"/>
+  <xi:include href="swamid-2.0/idpaas-dev.swamid.se-Saml2IDP-SWAMIDStaff.xml"/>
   <xi:include href="swamid-2.0/shibboleth-test.uhr.se-idp-shibboleth.xml"/>
   <xi:include href="swamid-2.0/idpproxy.dev.eduid.se-idp.xml"/>
   <xi:include href="swamid-2.0/idp.test.sunet.se-idp.xml"/>
diff --git a/swamid-testing-sp-1.0.mxml b/swamid-testing-sp-1.0.mxml
index 35683e7f..5e82c35c 100644
--- a/swamid-testing-sp-1.0.mxml
+++ b/swamid-testing-sp-1.0.mxml
@@ -12,7 +12,6 @@
   <xi:include href="swamid-2.0/minasidor.ladok.umu.se-shib-sp.xml"/>
   <xi:include href="swamid-2.0/bhb-00.its.umu.se-gui-sp.xml"/>
   <xi:include href="swamid-2.0/imogen.surfnet.nl-proxy-module.php-saml-sp-metadata.php-default-sp.xml"/>
-  <xi:include href="swamid-2.0/sigma-test-localhost-sp-130705.xml"/>
   <xi:include href="swamid-2.0/kisetest2.user.ki.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/admin-tug-1.eduid.se-6544-saml2-metadata.xml"/>
   <xi:include href="swamid-2.0/kitstidp02.tst.ki.se.xml"/>