new keys for samltest

SWAMIDOPS-7208

10 files changed, 555 insertions, 322 deletions

diff --git a/Makefile b/Makefile
index 9c0bc213..160c6577 100644
--- a/Makefile
+++ b/Makefile
@@ -134,7 +134,7 @@ committest: test
 	@for x in `find $(SRCDIRS) -name \*.xml`; do if ! grep -qx `basename $$x` sp-with-simplesign && grep -q HTTP-POST-SimpleSign $$x ; then echo "  $$x" ; fi ; done | grep . && exit 1 || true
 
 commit: tidy committest
-	@git diff --color
+	@git diff --color || true
 	@echo ; echo -n "Run 'git commit -a'? [Y/n/skip] " ; read x ; case $$x in "Y"|"y"|"") git commit -a ;; s|skip) ;; *) exit 1 ;; esac
 	@git status -u
 	@echo "Checking for not committed files in swamid-2.0/" ; if git status --porcelain --ignored | awk '{print $$2}' | grep "^swamid-2.0/" | sed 's/^/  /' | grep . ; then echo "Not committed files in swamid-2.0/, aborting" ; exit 1 ; fi
diff --git a/swamid-2.0/samltest.swamid.se-coc-sp.xml b/swamid-2.0/samltest.swamid.se-coc-sp.xml
index cfdd1206..d8ac2fc1 100644
--- a/swamid-2.0/samltest.swamid.se-coc-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-coc-sp.xml
@@ -14,23 +14,36 @@
     <ns0:KeyDescriptor use="encryption">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
@@ -38,23 +51,36 @@ Z3dVKh4xfib5HaL6Bl2ks8LF
     <ns0:KeyDescriptor use="signing">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
diff --git a/swamid-2.0/samltest.swamid.se-nren-sp.xml b/swamid-2.0/samltest.swamid.se-nren-sp.xml
index 88c158f4..230e5df6 100644
--- a/swamid-2.0/samltest.swamid.se-nren-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-nren-sp.xml
@@ -14,23 +14,36 @@
     <ns0:KeyDescriptor use="encryption">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
@@ -38,23 +51,36 @@ Z3dVKh4xfib5HaL6Bl2ks8LF
     <ns0:KeyDescriptor use="signing">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
diff --git a/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml b/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml
index 45f49ea9..df18c232 100644
--- a/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-r_and_s-sp.xml
@@ -1,5 +1,5 @@
 <?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="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://samltest.swamid.se/r_and_s/sp.xml">
+<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://samltest.swamid.se/r_and_s/sp.xml">
   <ns0:Extensions>
     <ns1:EntityAttributes>
       <ns2:Attribute Name="http://macedir.org/entity-category">
@@ -8,53 +8,82 @@
     </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://samltest.swamid.se/disco" index="1"/>
+    </ns0:Extensions>
     <ns0:KeyDescriptor use="encryption">
-      <ns4:KeyInfo>
-        <ns4:X509Data>
-          <ns4:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
-</ns4:X509Certificate>
-        </ns4:X509Data>
-      </ns4:KeyInfo>
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
     </ns0:KeyDescriptor>
     <ns0:KeyDescriptor use="signing">
-      <ns4:KeyInfo>
-        <ns4:X509Data>
-          <ns4:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
-</ns4:X509Certificate>
-        </ns4:X509Data>
-      </ns4:KeyInfo>
+      <ns5:KeyInfo>
+        <ns5:X509Data>
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
+</ns5:X509Certificate>
+        </ns5:X509Data>
+      </ns5:KeyInfo>
     </ns0:KeyDescriptor>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://samltest.swamid.se/acs/r_and_s/redirect" index="1"/>
     <ns0:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://samltest.swamid.se/acs/r_and_s/post" index="2"/>
diff --git a/swamid-2.0/samltest.swamid.se-re_eu-sp.xml b/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
index 53e62418..56ac19f5 100644
--- a/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-re_eu-sp.xml
@@ -4,7 +4,6 @@
     <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>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/eu-adequate-protection</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
@@ -16,23 +15,36 @@
     <ns0:KeyDescriptor use="encryption">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
@@ -40,23 +52,36 @@ Z3dVKh4xfib5HaL6Bl2ks8LF
     <ns0:KeyDescriptor use="signing">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
diff --git a/swamid-2.0/samltest.swamid.se-re_hei-sp.xml b/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
index 168ccf9b..8874c7cc 100644
--- a/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-re_hei-sp.xml
@@ -4,7 +4,6 @@
     <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>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/hei-service</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
@@ -16,23 +15,36 @@
     <ns0:KeyDescriptor use="encryption">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
@@ -40,23 +52,36 @@ Z3dVKh4xfib5HaL6Bl2ks8LF
     <ns0:KeyDescriptor use="signing">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
diff --git a/swamid-2.0/samltest.swamid.se-re_nren-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
index 5cc5323f..86fbe8db 100644
--- a/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-re_nren-sp.xml
@@ -4,7 +4,6 @@
     <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>http://refeds.org/category/research-and-scholarship</ns2:AttributeValue>
         <ns2:AttributeValue xsi:type="xs:string">http://www.swamid.se/category/nren-service</ns2:AttributeValue>
       </ns2:Attribute>
     </ns1:EntityAttributes>
@@ -16,23 +15,36 @@
     <ns0:KeyDescriptor use="encryption">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
@@ -40,23 +52,36 @@ Z3dVKh4xfib5HaL6Bl2ks8LF
     <ns0:KeyDescriptor use="signing">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
diff --git a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
index fb34ddc5..2687b689 100644
--- a/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-re_nren_sfs-sp.xml
@@ -4,7 +4,6 @@
     <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>http://refeds.org/category/research-and-scholarship</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>
@@ -17,23 +16,36 @@
     <ns0:KeyDescriptor use="encryption">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
@@ -41,23 +53,36 @@ Z3dVKh4xfib5HaL6Bl2ks8LF
     <ns0:KeyDescriptor use="signing">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
diff --git a/swamid-2.0/samltest.swamid.se-sfs-sp.xml b/swamid-2.0/samltest.swamid.se-sfs-sp.xml
index f8f9d0fe..fbad7f2c 100644
--- a/swamid-2.0/samltest.swamid.se-sfs-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-sfs-sp.xml
@@ -14,23 +14,36 @@
     <ns0:KeyDescriptor use="encryption">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
@@ -38,23 +51,36 @@ Z3dVKh4xfib5HaL6Bl2ks8LF
     <ns0:KeyDescriptor use="signing">
       <ns5:KeyInfo>
         <ns5:X509Data>
-          <ns5:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns5:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns5:X509Certificate>
         </ns5:X509Data>
       </ns5:KeyInfo>
diff --git a/swamid-2.0/samltest.swamid.se-sp.xml b/swamid-2.0/samltest.swamid.se-sp.xml
index bc7046c8..b209ece7 100644
--- a/swamid-2.0/samltest.swamid.se-sp.xml
+++ b/swamid-2.0/samltest.swamid.se-sp.xml
@@ -7,23 +7,36 @@
     <ns0:KeyDescriptor use="encryption">
       <ns2:KeyInfo>
         <ns2:X509Data>
-          <ns2:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns2:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns2:X509Certificate>
         </ns2:X509Data>
       </ns2:KeyInfo>
@@ -31,23 +44,36 @@ Z3dVKh4xfib5HaL6Bl2ks8LF
     <ns0:KeyDescriptor use="signing">
       <ns2:KeyInfo>
         <ns2:X509Data>
-          <ns2:X509Certificate>MIIDDjCCAfYCCQCyJwhhhC3+9zANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJz
-ZTELMAkGA1UECAwCYWMxDTALBgNVBAcMBFVtZWExDzANBgNVBAoMBlN3YW1pZDEN
-MAsGA1UECwwERElSRzAeFw0xNDAzMDQxNjEyNTVaFw0yNDAzMDExNjEyNTVaMEkx
-CzAJBgNVBAYTAnNlMQswCQYDVQQIDAJhYzENMAsGA1UEBwwEVW1lYTEPMA0GA1UE
-CgwGU3dhbWlkMQ0wCwYDVQQLDARESVJHMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAvmfd/7sZ/TMpTEU28iIctdrw0wZe2A40rjW8xnOARmxT3Vea6r8U
-VCqjSlxtbkdO8bxcIGR1wQp6XFAdb4ecXMGUkZIfIk7n3rCC98nRbpnvJts3uiWT
-EjUiRZ6pQhowmD1ymIQiFikB7zejzGNefRkLUuD72rnTa0BTEDFinEsE9DitFKXZ
-pE+z5bBDxa9nKJSVD1rhwnKYCJXEKZk2enl3Dk3VwpKIPvbh4ZxJrBudJ/QfHWke
-P9X4xv+TB3aBukORIWGhDdPdEDJnTfCNx2UNXqxUzbQfH/jKz7X5jAhpNsa3RMiN
-Ki1DOGMsIeTkbVuH7k2u1GQqZcm0Nnj3vQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCmTjWBrUtEkxNiU5sX/957am1LrYBIcbCBXxONQRVVdtB/HvmsGAJ64wUX/g90
-6QFwRaNjbhG1Eem0XX1hq9tGT46RB1Ox+Qnihh2WmjAarlXS38rd9ygG4B7sOkOI
-idxy0HQEB2iU186Jg7eE3sdQWCNaZBtLV1kOwGgarT9kjKWMPqBW5/hOAba1E2t1
-5bUhuhRGgmKc8bnzwMcXzDmo4YNhLAFBXGKwzBzPr0QQ3LAG2Z67XLlCAD7DVsxm
-xFwzoJbmUVe/sxQ2jc0FkuY83pcytEpAr32oOGtKWUDGH/1EC+yB5wnc8r5rMaK6
-Z3dVKh4xfib5HaL6Bl2ks8LF
+          <ns2:X509Certificate>MIIFcTCCBFmgAwIBAgIQIu7k1beHBKgWb27d90Ad9jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwODAwMDAwMFoXDTE3MDQwNzIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJzYW1sdGVzdC5z
+d2FtaWQuc2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCcJfNqCJmM
+CWZ9+h9MAT9WbT/e+eRpGE9H8eucnnq4weTeFbT+2Ma15hY8hI6gP4GsDIZsaxTu
+DGgIYXctfnl9MTz+9rlANOo8Wjuz6CJ2trJ6BdhPvkoITuSqmIWkFbmP7/0NGkoG
+167CGp/Eq5yZnUOdiKXquH2S5OCw3mB4HGpjUk7T13cN0jOOPiK2cQhUTuUUMaVO
+ei0QblIfK/+9fusfYOjd5uzNg1QZ9FvvbB/wTw4Z11eGcZWKpAprIrbx6iw119eL
+U7dvJhgA96VJmesDQejf96Xtpn7bCbxdyBqw2AtooamyrVjnAeQ8NDXW7td9MUuM
+4/yhN9H+fHTVJNs8dCX5FKayw5YoxF8eTMjRk0ObICMrLl8M/EiOG9Eqfc3TPGTF
+dn81sOGc3WzifRyG5fXUx/Xw9vXVkRAkVO6T4n6OUQxn2be9hwXR7yFw9tTplPIl
+dabhc7iWU7NgEBcBI3RWCcRNv0OVsXIMDeGZ64SOm4mpKbXMVebsnSLXxV69T1l4
+M8EegMpraRWHrbtF27FkKZPZgCbNaQbfW4vtJoN9rN07Flz8GLr200WXAepXT14L
+dGwXqjx6Cu2oilkl2OoNWQbRg3dvn1j6XqnRLbio4bvuiCYYEPpjuWcHOs/GwMnz
+pml7EL51yz9PTwNZTQXsLH/xKlzWf1BuBQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFG40O0IHvLK2kXS6s4hN
+Cq0DTtPLMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJz
+YW1sdGVzdC5zd2FtaWQuc2UwDQYJKoZIhvcNAQEFBQADggEBAHnWOLDwhrYWfd7q
+2fwTaiRP/x/tVPocNgi/wgwo6oZzC1Ru/HPjfUmnj11zkOOHeF8cf2BT2diRptPi
+qDc+7HN8GrM87+Deqvjj4pw7j4hwMpcfNd2AzqW4nPmw4LgiRehITtUtMxL9mkDh
+eN0pgldD544xQRUdxYmD9nUWiIaTmuxNqusKkqUTD/kO41i+BxIeaWiXsw6IC7o6
+kPPUQHr1h2na805Kjoy5ML8K2EO+kcvFqfo42gtwa7mN38hKB+jbKF5VqqmoSb4m
+ln/3lobOqcV8rrFKjvnjC6iNTbdpQ65o8CoOcfzhWmb/7RxkZ4a9fyzxVS8fMAi6
+u3Qzm3Q=
 </ns2:X509Certificate>
         </ns2:X509Data>
       </ns2:KeyInfo>