diff --git a/config-liberty-alliance.xml b/config-liberty-alliance.xml
index c1408d8..9ffd8b1 100644
--- a/config-liberty-alliance.xml
+++ b/config-liberty-alliance.xml
@@ -26,8 +26,7 @@
  <module name="expression.modules.xforms.xforms"/>
 
  <virtualHost>
-  <ip>127.0.0.3</ip>
-  <port>80</port>
+  <port>1999</port>
   <serverName>idp2</serverName>
   <title>Identity Provider</title>
   <documentRoot>vhosts/identity-provider/</documentRoot>
@@ -35,8 +34,7 @@
  </virtualHost>
 
  <sslVirtualHost>
-  <ip>127.0.0.3</ip>
-  <port>443</port>
+  <port>2000</port>
   <serverName>idp2</serverName>
   <title>Identity Provider</title>
   <documentRoot>vhosts/identity-provider/</documentRoot>
@@ -46,8 +44,7 @@
  </sslVirtualHost>
 
  <virtualHost>
-  <ip>127.0.0.7</ip>
-  <port>80</port>
+  <port>2007</port>
   <serverName>sp2</serverName>
   <title>Service Provider</title>
   <documentRoot>vhosts/service-provider/</documentRoot>
@@ -55,8 +52,7 @@
  </virtualHost>
 
  <sslVirtualHost>
-  <ip>127.0.0.7</ip>
-  <port>443</port>
+  <port>2008</port>
   <serverName>sp2</serverName>
   <title>Service Provider</title>
   <documentRoot>vhosts/service-provider/</documentRoot>
diff --git a/src/modules/libertyalliance.py b/src/modules/libertyalliance.py
index 926e4db..6c2f201 100644
--- a/src/modules/libertyalliance.py
+++ b/src/modules/libertyalliance.py
@@ -508,17 +508,23 @@ You have been succesfully authenticated; click ok to go back to the service prov
         return self._lassoServerDump
 
     def getMetadata(self):
-        directoryHolder = self.getDataHolder().getUriPrevious()
-        try:
-            metadataHolder = directoryHolder.walkToLocation(
-                directoryHolder.getSubPathInternUri("metadata.xml"))
-        except faults.PathNotFound:
+        nodes = self.evaluateXpath("yep:metadata/@src")
+        if not nodes:
             return None
+        location = nodes[0].content.strip()
+        metadataAbsolutePath = self.convertRelativeLocationToAbsolutePath(location)
+        metadataHolder = dataholders.DataHolder(
+            pathFragment = metadataAbsolutePath, mimeType = "text/xml", isRootElder = True,
+            containedFileSystem = filesystems.PartialFileSystem(metadataAbsolutePath))
         return metadataHolder.getRootElement()
 
     def getMetadataFilePath(self):
-        location = "metadata.xml"
-        return self.convertRelativeLocationToAbsolutePath(location)
+        nodes = self.evaluateXpath("yep:metadata/@src")
+        if nodes:
+            location = nodes[0].content.strip()
+            return self.convertRelativeLocationToAbsolutePath(location)
+        else:
+            return None
 
     def getPeerCertificationAuthorityCertificateFilePath(self):
         nodes = self.evaluateXpath("yep:peerCACertificateFile")
@@ -534,12 +540,10 @@ You have been succesfully authenticated; click ok to go back to the service prov
         if not nodes:
             return None
         location = nodes[0].content.strip()
-        directoryHolder = self.getDataHolder().getUriPrevious()
-        try:
-            metadataHolder = directoryHolder.walkToLocation(
-                directoryHolder.getSubPathInternUri(location))
-        except faults.PathNotFound:
-            return None
+        metadataAbsolutePath = self.convertRelativeLocationToAbsolutePath(location)
+        metadataHolder = dataholders.DataHolder(
+            pathFragment = metadataAbsolutePath, mimeType = "text/xml", isRootElder = True,
+            containedFileSystem = filesystems.PartialFileSystem(metadataAbsolutePath))
         return metadataHolder.getRootElement()
 
     def getPeerMetadataFilePath(self):
diff --git a/tests/data/idp1-la/metadata.xml b/tests/data/idp1-la/metadata.xml
new file mode 100644
index 0000000..6fd8b8d
--- /dev/null
+++ b/tests/data/idp1-la/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://idp1/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+ <IDPDescriptor>
+
+  <SingleSignOnServiceURL>https://idp1:1998/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+
+  <SingleLogoutServiceURL>https://idp1:1998/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://idp1:1998/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://idp1:1998/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+</IDPDescriptor>
+</EntityDescriptor>
diff --git a/vhosts/identity-provider/liberty-alliance/metadata.xml b/tests/data/idp2-la/metadata.xml
similarity index 52%
rename from vhosts/identity-provider/liberty-alliance/metadata.xml
rename to tests/data/idp2-la/metadata.xml
index 667667e..bbd44e2 100644
--- a/vhosts/identity-provider/liberty-alliance/metadata.xml
+++ b/tests/data/idp2-la/metadata.xml
@@ -3,12 +3,17 @@
     providerID="https://idp2/liberty-alliance/metadata"
     xmlns="urn:liberty:metadata:2003-08">
  <IDPDescriptor>
-  <SingleLogoutServiceURL>https://idp2/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
-  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
-  <SoapEndpoint>https://idp2/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
-  <SingleSignOnServiceURL>https://idp2/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
+
+  <SingleSignOnServiceURL>https://idp2:2000/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
   <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+
+  <SingleLogoutServiceURL>https://idp2:2000/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
   <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
-  <RegisterNameIdentifierServiceURL>https://idp2/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+
+  <RegisterNameIdentifierServiceURL>https://idp2:2000/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://idp2:2000/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
 </IDPDescriptor>
 </EntityDescriptor>
diff --git a/tests/data/idp3-la/metadata.xml b/tests/data/idp3-la/metadata.xml
new file mode 100644
index 0000000..a2d6ce1
--- /dev/null
+++ b/tests/data/idp3-la/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://idp3/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+ <IDPDescriptor>
+
+  <SingleSignOnServiceURL>https://idp3:2002/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+
+  <SingleLogoutServiceURL>https://idp3:2002/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://idp3:2002/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://idp3:2002/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+</IDPDescriptor>
+</EntityDescriptor>
diff --git a/tests/data/idp4-la/metadata.xml b/tests/data/idp4-la/metadata.xml
new file mode 100644
index 0000000..ac51c10
--- /dev/null
+++ b/tests/data/idp4-la/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://idp4/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+ <IDPDescriptor>
+
+  <SingleSignOnServiceURL>https://idp4:2004/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+
+  <SingleLogoutServiceURL>https://idp4:2004/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://idp4:2004/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://idp4:2004/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+</IDPDescriptor>
+</EntityDescriptor>
diff --git a/tests/data/lecp1-la/metadata.xml b/tests/data/lecp1-la/metadata.xml
new file mode 100644
index 0000000..c0b967d
--- /dev/null
+++ b/tests/data/lecp1-la/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://lecp1/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+
+ <IDPDescriptor>
+
+  <SingleSignOnServiceURL>https://lecp1:2014/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+  <SingleLogoutServiceURL>https://lecp1:2014/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://lecp1:2014/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://lecp1:2014/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+ </IDPDescriptor>
+
+ <SPDescriptor>
+
+  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://lecp1:2014/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+
+  <SingleLogoutServiceURL>https://lecp1:2014/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://lecp1:2014/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://lecp1:2014/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+  <AuthnRequestsSigned>true</AuthnRequestsSigned>
+
+ </SPDescriptor>
+
+</EntityDescriptor>
diff --git a/tests/data/lecp2-la/metadata.xml b/tests/data/lecp2-la/metadata.xml
new file mode 100644
index 0000000..afe05ae
--- /dev/null
+++ b/tests/data/lecp2-la/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://lecp2/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+
+ <IDPDescriptor>
+
+  <SingleSignOnServiceURL>https://lecp2:2016/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+  <SingleLogoutServiceURL>https://lecp2:2016/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://lecp2:2016/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://lecp2:2016/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+ </IDPDescriptor>
+
+ <SPDescriptor>
+
+  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://lecp2:2016/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+
+  <SingleLogoutServiceURL>https://lecp2:2016/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://lecp2:2016/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://lecp2:2016/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+  <AuthnRequestsSigned>true</AuthnRequestsSigned>
+
+ </SPDescriptor>
+
+</EntityDescriptor>
diff --git a/tests/data/lecp3-la/metadata.xml b/tests/data/lecp3-la/metadata.xml
new file mode 100644
index 0000000..c9afc80
--- /dev/null
+++ b/tests/data/lecp3-la/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://lecp3/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+
+ <IDPDescriptor>
+
+  <SingleSignOnServiceURL>https://lecp3:2018/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+  <SingleLogoutServiceURL>https://lecp3:2018/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://lecp3:2018/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://lecp3:2018/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+ </IDPDescriptor>
+
+ <SPDescriptor>
+
+  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://lecp3:2018/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+
+  <SingleLogoutServiceURL>https://lecp3:2018/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://lecp3:2018/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://lecp3:2018/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+  <AuthnRequestsSigned>true</AuthnRequestsSigned>
+
+ </SPDescriptor>
+
+</EntityDescriptor>
diff --git a/tests/data/lecp4-la/metadata.xml b/tests/data/lecp4-la/metadata.xml
new file mode 100644
index 0000000..b552b35
--- /dev/null
+++ b/tests/data/lecp4-la/metadata.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://lecp4/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+
+ <IDPDescriptor>
+
+  <SingleSignOnServiceURL>https://lecp4:2020/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
+  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
+  <SingleLogoutServiceURL>https://lecp4:2020/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://lecp4:2020/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://lecp4:2020/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+ </IDPDescriptor>
+
+ <SPDescriptor>
+
+  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://lecp4:2020/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+
+  <SingleLogoutServiceURL>https://lecp4:2020/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://lecp4:2020/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://lecp4:2020/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+  <AuthnRequestsSigned>true</AuthnRequestsSigned>
+
+ </SPDescriptor>
+
+</EntityDescriptor>
diff --git a/tests/data/sp1-la/metadata.xml b/tests/data/sp1-la/metadata.xml
new file mode 100644
index 0000000..8269e5d
--- /dev/null
+++ b/tests/data/sp1-la/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://sp1/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+ <SPDescriptor>
+
+  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://sp1:2006/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+
+  <SingleLogoutServiceURL>https://sp1:2006/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://sp1:2006/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://sp1:2006/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+  <AuthnRequestsSigned>true</AuthnRequestsSigned>
+
+ </SPDescriptor>
+</EntityDescriptor>
diff --git a/vhosts/service-provider/liberty-alliance/metadata.xml b/tests/data/sp2-la/metadata.xml
similarity index 51%
rename from vhosts/service-provider/liberty-alliance/metadata.xml
rename to tests/data/sp2-la/metadata.xml
index f99739e..4568c0e 100644
--- a/vhosts/service-provider/liberty-alliance/metadata.xml
+++ b/tests/data/sp2-la/metadata.xml
@@ -3,12 +3,18 @@
     providerID="https://sp2/liberty-alliance/metadata"
     xmlns="urn:liberty:metadata:2003-08">
  <SPDescriptor>
-  <SingleLogoutServiceURL>https://sp2/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
-  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
-  <SoapEndpoint>https://sp2/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://sp2:2008/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+
+  <SingleLogoutServiceURL>https://sp2:2008/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
   <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
-  <RegisterNameIdentifierServiceURL>https://sp2/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
-  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://sp2/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+
+  <RegisterNameIdentifierServiceURL>https://sp2:2008/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://sp2:2008/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
   <AuthnRequestsSigned>true</AuthnRequestsSigned>
-</SPDescriptor>
+
+ </SPDescriptor>
 </EntityDescriptor>
diff --git a/tests/data/sp3-la/metadata.xml b/tests/data/sp3-la/metadata.xml
new file mode 100644
index 0000000..73a393f
--- /dev/null
+++ b/tests/data/sp3-la/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://sp3/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+ <SPDescriptor>
+
+  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://sp3:2010/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+
+  <SingleLogoutServiceURL>https://sp3:2010/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://sp3:2010/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://sp3:2010/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+  <AuthnRequestsSigned>true</AuthnRequestsSigned>
+
+ </SPDescriptor>
+</EntityDescriptor>
diff --git a/tests/data/sp4-la/metadata.xml b/tests/data/sp4-la/metadata.xml
new file mode 100644
index 0000000..30a7ff2
--- /dev/null
+++ b/tests/data/sp4-la/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<EntityDescriptor
+    providerID="https://sp4/liberty-alliance/metadata"
+    xmlns="urn:liberty:metadata:2003-08">
+ <SPDescriptor>
+
+  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://sp4:2012/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
+
+  <SingleLogoutServiceURL>https://sp4:2012/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
+  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
+
+  <RegisterNameIdentifierServiceURL>https://sp4:2012/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
+  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
+
+  <SoapEndpoint>https://sp4:2012/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
+
+  <AuthnRequestsSigned>true</AuthnRequestsSigned>
+
+ </SPDescriptor>
+</EntityDescriptor>
diff --git a/vhosts/identity-provider/liberty-alliance/liberty-alliance.xml b/vhosts/identity-provider/liberty-alliance/liberty-alliance.xml
index 4592624..9f4d5c9 100644
--- a/vhosts/identity-provider/liberty-alliance/liberty-alliance.xml
+++ b/vhosts/identity-provider/liberty-alliance/liberty-alliance.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <libertyAlliance xmlns="http://www.entrouvert.org/namespaces/expression/0.0">
+ <metadata src="../../../tests/data/idp2-la/metadata.xml"/>
  <privateKeyFile>../../../tests/data/idp2-la/private-key-raw.pem</privateKeyFile>
  <publicKeyFile>../../../tests/data/idp2-la/public-key.pem</publicKeyFile>
  <certificateFile>../../../tests/data/idp2-la/certificate.pem</certificateFile>
- <peerMetadata src="service-providers/sp2-metadata.xml"/>
+ <peerMetadata src="../../../tests/data/sp2-la/metadata.xml"/>
  <peerPublicKeyFile>../../../tests/data/sp2-la/public-key.pem</peerPublicKeyFile>
  <peerCACertificateFile>../../../tests/data/ca2-la/certificate.pem</peerCACertificateFile>
 
diff --git a/vhosts/identity-provider/liberty-alliance/service-providers/sp2-metadata.xml b/vhosts/identity-provider/liberty-alliance/service-providers/sp2-metadata.xml
deleted file mode 100644
index f99739e..0000000
--- a/vhosts/identity-provider/liberty-alliance/service-providers/sp2-metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor
-    providerID="https://sp2/liberty-alliance/metadata"
-    xmlns="urn:liberty:metadata:2003-08">
- <SPDescriptor>
-  <SingleLogoutServiceURL>https://sp2/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
-  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-soap</RegisterNameIdentifierProtocolProfile>
-  <SoapEndpoint>https://sp2/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
-  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
-  <RegisterNameIdentifierServiceURL>https://sp2/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
-  <AssertionConsumerServiceURL id="AssertionConsumerServiceURL1" isDefault="true">https://sp2/liberty-alliance/liberty-alliance/assertionConsumer</AssertionConsumerServiceURL>
-  <AuthnRequestsSigned>true</AuthnRequestsSigned>
-</SPDescriptor>
-</EntityDescriptor>
diff --git a/vhosts/service-provider/liberty-alliance/identity-providers/idp2-metadata.xml b/vhosts/service-provider/liberty-alliance/identity-providers/idp2-metadata.xml
deleted file mode 100644
index 667667e..0000000
--- a/vhosts/service-provider/liberty-alliance/identity-providers/idp2-metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor
-    providerID="https://idp2/liberty-alliance/metadata"
-    xmlns="urn:liberty:metadata:2003-08">
- <IDPDescriptor>
-  <SingleLogoutServiceURL>https://idp2/liberty-alliance/liberty-alliance/singleLogout</SingleLogoutServiceURL>
-  <RegisterNameIdentifierProtocolProfile>http://projectliberty.org/profiles/rni-sp-http</RegisterNameIdentifierProtocolProfile>
-  <SoapEndpoint>https://idp2/liberty-alliance/liberty-alliance/soapEndpoint</SoapEndpoint>
-  <SingleSignOnServiceURL>https://idp2/liberty-alliance/liberty-alliance/singleSignOn</SingleSignOnServiceURL>
-  <SingleSignOnProtocolProfile>http://projectliberty.org/profiles/sso-get</SingleSignOnProtocolProfile>
-  <SingleLogoutProtocolProfile>http://projectliberty.org/profiles/slo-idp-soap</SingleLogoutProtocolProfile>
-  <RegisterNameIdentifierServiceURL>https://idp2/liberty-alliance/liberty-alliance/registerNameIdentifier</RegisterNameIdentifierServiceURL>
-</IDPDescriptor>
-</EntityDescriptor>
diff --git a/vhosts/service-provider/liberty-alliance/liberty-alliance.xml b/vhosts/service-provider/liberty-alliance/liberty-alliance.xml
index a7d786a..2e01567 100644
--- a/vhosts/service-provider/liberty-alliance/liberty-alliance.xml
+++ b/vhosts/service-provider/liberty-alliance/liberty-alliance.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0"?>
 <libertyAlliance xmlns="http://www.entrouvert.org/namespaces/expression/0.0">
+ <metadata src="../../../tests/data/sp2-la/metadata.xml"/>
  <privateKeyFile>../../../tests/data/sp2-la/private-key-raw.pem</privateKeyFile>
  <publicKeyFile>../../../tests/data/sp2-la/public-key.pem</publicKeyFile>
  <certificateFile>../../../tests/data/sp2-la/certificate.pem</certificateFile>
- <peerMetadata src="identity-providers/idp2-metadata.xml"/>
+ <peerMetadata src="../../../tests/data/idp2-la/metadata.xml"/>
  <peerPublicKeyFile>../../../tests/data/idp2-la/public-key.pem</peerPublicKeyFile>
  <peerCACertificateFile>../../../tests/data/ca2-la/certificate.pem</peerCACertificateFile>