Adding 2 million entries for idp-test (replacing samltest any day now) :)

10 files changed, 573 insertions, 0 deletions

diff --git a/swamid-2.0/idp-test.swamid.se-coc-sp.xml b/swamid-2.0/idp-test.swamid.se-coc-sp.xml
new file mode 100644
index 00000000..bdd035da
--- /dev/null
+++ b/swamid-2.0/idp-test.swamid.se-coc-sp.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.swamid.se/coc/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.geant.net/uri/dataprotection-code-of-conduct/v1</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-test.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.swamid.se/acs/coc/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.swamid.se/acs/coc/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.swamid.se-nren-sp.xml b/swamid-2.0/idp-test.swamid.se-nren-sp.xml
new file mode 100644
index 00000000..9a68a74d
--- /dev/null
+++ b/swamid-2.0/idp-test.swamid.se-nren-sp.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.swamid.se/nren/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-test.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>        
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.swamid.se/acs/nren/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.swamid.se/acs/nren/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.swamid.se-r_and_s-sp.xml b/swamid-2.0/idp-test.swamid.se-r_and_s-sp.xml
new file mode 100644
index 00000000..11a75599
--- /dev/null
+++ b/swamid-2.0/idp-test.swamid.se-r_and_s-sp.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.swamid.se/r_and_s/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-test.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.swamid.se/acs/r_and_s/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.swamid.se/acs/r_and_s/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.swamid.se-re_eu-sp.xml b/swamid-2.0/idp-test.swamid.se-re_eu-sp.xml
new file mode 100644
index 00000000..9bc094cf
--- /dev/null
+++ b/swamid-2.0/idp-test.swamid.se-re_eu-sp.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.swamid.se/re_eu/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-test.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.swamid.se/acs/re_eu/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.swamid.se/acs/re_eu/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.swamid.se-re_hei-sp.xml b/swamid-2.0/idp-test.swamid.se-re_hei-sp.xml
new file mode 100644
index 00000000..6ecd70ab
--- /dev/null
+++ b/swamid-2.0/idp-test.swamid.se-re_hei-sp.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.swamid.se/re_hei/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-test.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.swamid.se/acs/re_hei/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.swamid.se/acs/re_hei/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.swamid.se-re_nren-sp.xml b/swamid-2.0/idp-test.swamid.se-re_nren-sp.xml
new file mode 100644
index 00000000..e1ee3884
--- /dev/null
+++ b/swamid-2.0/idp-test.swamid.se-re_nren-sp.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.swamid.se/re_nren/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-test.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.swamid.se/acs/re_nren/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.swamid.se/acs/re_nren/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.swamid.se-re_nren_sfs-sp.xml b/swamid-2.0/idp-test.swamid.se-re_nren_sfs-sp.xml
new file mode 100644
index 00000000..194f4294
--- /dev/null
+++ b/swamid-2.0/idp-test.swamid.se-re_nren_sfs-sp.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.swamid.se/re_nren_sfs/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/research-and-education</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-test.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.swamid.se/acs/re_nren_sfs/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.swamid.se/acs/re_nren_sfs/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.swamid.se-sfs-sp.xml b/swamid-2.0/idp-test.swamid.se-sfs-sp.xml
new file mode 100644
index 00000000..c1c8f297
--- /dev/null
+++ b/swamid-2.0/idp-test.swamid.se-sfs-sp.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:ns2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns4="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns5="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-test.swamid.se/sfs/sp.xml">
+  <ns0:Extensions>
+    <ns1:EntityAttributes>
+      <ns2:Attribute Name="http://macedir.org/entity-category">
+        <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/sfs-1993-1153</ns2:AttributeValue>
+      </ns2:Attribute>
+    </ns1:EntityAttributes>
+  </ns0:Extensions>
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns4:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-test.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.swamid.se/acs/sfs/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.swamid.se/acs/sfs/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-2.0/idp-test.swamid.se-sp.xml b/swamid-2.0/idp-test.swamid.se-sp.xml
new file mode 100644
index 00000000..c85f1f13
--- /dev/null
+++ b/swamid-2.0/idp-test.swamid.se-sp.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ns0:EntityDescriptor xmlns:ns0="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp-test.swamid.se/sp.xml">
+  <ns0:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <ns0:Extensions>
+      <ns1:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idp-test.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
+    <ns0:KeyDescriptor use="encryption">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:KeyDescriptor use="signing">
+      <ns2:KeyInfo>
+        <ns2:X509Data>
+          <ns2:X509Certificate>
+MIICyjCCAbKgAwIBAgIJAJYG08dRBmQEMA0GCSqGSIb3DQEBCwUAMB0xGzAZBgNV
+BAMMEmlkcC10ZXN0LnN3YW1pZC5zZTAeFw0xNzExMDIxMDA3MjdaFw0yNzEwMzEx
+MDA3MjdaMB0xGzAZBgNVBAMMEmlkcC10ZXN0LnN3YW1pZC5zZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMQyT1iH4JO5NluvvWUGTlSqGRrXtuKH+Bpx
+1RYNYC+w93khw6cZHRNKxte3NKXB6iqAdpE4564UaAGHbI8UWeg0HAyTeLo4qg/y
+Vx0pJ8uT+fFYZuO4zUFbWNYotlqB52x0fy7IBiwH3oLU4rhux/CGs4BjoEdiSr+3
+GYnhYHVQN5/9qj5MSpMgwnwOVWV1qbaXvifyeEPQHzW9i5PlrG+m57lefPeKHmA4
+yRM44hZMmhq/sXwPPxxeEeCxZVspAC8tlZERAs6kLi/b5uatM232GP0Dwzyu23PG
+E9Dx1Ajk+el5I0iX3y9XAqTgYdK7v3NDuibn67z5YFWhptIvnD0CAwEAAaMNMAsw
+CQYDVR0TBAIwADANBgkqhkiG9w0BAQsFAAOCAQEAlEHDm4GYPP/8iapNWouWzO2j
+ns7CDrDLyH1oaDb0vdPzFHFRAeg8FRmhDyzNsPHMdfKeimfgtaoRH4gTP+88O5lz
+lRS6D+EhwPVb3rpK1CowCB8cN4hIn+m4WxsFMkufkmu51HbL6nhfvEY9HLJj10LP
+Do5vsMJ0pY+BEQxuaXeRLTgyY3u0FQXaKHIYCj0Tg+t7rT3FT4Gdn/vBgkG9c9Kf
+Uj8tu3Uh/5Xwpr9Tfura9rTVp5vYgzbXNwsowjacTip/HSoekd01nNMCGyWa73AG
+4rXuPM2bMzCWglmDUO4OqmYvXe2D6IKr6vF+AmPy9vPlHePxNhipiwdo54h5Xg==
+          </ns2:X509Certificate>
+        </ns2:X509Data>
+      </ns2:KeyInfo>
+    </ns0:KeyDescriptor>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-test.swamid.se/acs/redirect" index="1"/>
+    <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-test.swamid.se/acs/post" index="2"/>
+  </ns0:SPSSODescriptor>
+</ns0:EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index de74e757..fc69df81 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -225,6 +225,14 @@
   <xi:include href="swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml"/>
   <xi:include href="swamid-2.0/samltest.swamid.se-sfs-sp.xml"/>
   <xi:include href="swamid-2.0/samltest.swamid.se-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.swamid.se-coc-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.swamid.se-nren-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.swamid.se-re_eu-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.swamid.se-re_hei-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.swamid.se-re_nren-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.swamid.se-re_nren_sfs-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.swamid.se-sfs-sp.xml"/>
+  <xi:include href="swamid-2.0/idp-test.swamid.se-sp.xml"/>
   <xi:include href="swamid-2.0/meta.swamid.se-shibboleth.xml"/>
   <xi:include href="swamid-2.0/samltest.swamid.se-r_and_s-sp.xml"/>
   <xi:include href="swamid-2.0/dirg.org.umu.se-sp.xml"/>