diff --git a/test-compose/compose.sh b/test-compose/compose.sh
index 435144b..28d6353 100755
--- a/test-compose/compose.sh
+++ b/test-compose/compose.sh
@@ -5,10 +5,4 @@ echo ""
 echo "If everything above was successful, your IdP metadata can be retreived with this command (after a minute or two):"
 echo "                    curl -k https://127.0.0.1/idp/shibboleth"
 echo ""
-echo "By default, this test IdP is pre-integrated with the samltest.id testing service."
-echo ""
-echo "If you are testing the default test config and have port 443 open,"
-echo " map your IP to idp.example.edu in your hosts file,"
-echo " then proceed to https://samltest.id/start-idp-test to test this IdP test instance."
-echo ""
 
diff --git a/test-compose/docker-compose.yml b/test-compose/docker-compose.yml
index ef12cd2..ddc465b 100644
--- a/test-compose/docker-compose.yml
+++ b/test-compose/docker-compose.yml
@@ -6,15 +6,15 @@ services:
     build: 
       context: ./idp/
       args:
-        TOMCFG: ./container_files/shib-idp/config/tomcat
-        TOMCERT: ./container_files/shib-idp/credentials/tomcat
-        TOMWWWROOT: ./container_files/shib-idp/wwwroot
-        SHBCFG: ./container_files/shib-idp/config/shib-idp/conf
-        SHBCREDS: ./container_files/shib-idp/credentials/shib-idp
-        SHBVIEWS: ./container_files/shib-idp/config/shib-idp/views
-        SHBEDWAPP: ./container_files/shib-idp/config/shib-idp/edit-webapp
-        SHBMSGS: ./container_files/shib-idp/config/shib-idp/messages
-        SHBMD: ./container_files/shib-idp/config/shib-idp/metadata
+        TOMCFG: ./container_files/config/tomcat
+        TOMCERT: ./container_files/credentials/tomcat
+        TOMWWWROOT: ./container_files/wwwroot
+        SHBCFG: ./container_files/config/shib-idp/conf
+        SHBCREDS: ./container_files/credentials/shib-idp
+        SHBVIEWS: ./container_files/config/shib-idp/views
+        SHBEDWAPP: ./container_files/config/shib-idp/edit-webapp
+        SHBMSGS: ./container_files/config/shib-idp/messages
+        SHBMD: ./container_files/config/shib-idp/metadata
     depends_on:
      - data
     networks:
diff --git a/test-compose/idp/Dockerfile b/test-compose/idp/Dockerfile
index d851db6..617c62d 100644
--- a/test-compose/idp/Dockerfile
+++ b/test-compose/idp/Dockerfile
@@ -1,4 +1,4 @@
-FROM tier/shib-idp:latest
+FROM tier/shib-idp:3.4.0_181002
 
 # The build args below can be used at build-time to tell the build process where to find your config files.  This is for a completely burned-in config.
 ARG TOMCFG=config/tomcat
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/access-control.xml b/test-compose/idp/container_files/config/shib-idp/conf/access-control.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/access-control.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/access-control.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/admin/general-admin.xml b/test-compose/idp/container_files/config/shib-idp/conf/admin/general-admin.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/admin/general-admin.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/admin/general-admin.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/admin/metrics.xml b/test-compose/idp/container_files/config/shib-idp/conf/admin/metrics.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/admin/metrics.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/admin/metrics.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-filter.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-filter.xml
similarity index 99%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-filter.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-filter.xml
index 678e14d..326dfe9 100644
--- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-filter.xml
+++ b/test-compose/idp/container_files/config/shib-idp/conf/attribute-filter.xml
@@ -115,5 +115,5 @@
     </AttributeFilterPolicy>
     <!-- end of SAMLtest SP -->
 
-	
+
 </AttributeFilterPolicyGroup>
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-default.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-default.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-default.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-default.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-full.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml
similarity index 69%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-full.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml
index 4681b64..32647a3 100644
--- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-full.xml
+++ b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-full.xml
@@ -15,10 +15,8 @@
 -->
 <AttributeResolver
         xmlns="urn:mace:shibboleth:2.0:resolver"
-        xmlns:sec="urn:mace:shibboleth:2.0:security"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd
-                            urn:mace:shibboleth:2.0:security http://shibboleth.net/schema/idp/shibboleth-security.xsd">
+        xsi:schemaLocation="urn:mace:shibboleth:2.0:resolver http://shibboleth.net/schema/idp/shibboleth-attribute-resolver.xsd">
 
     <!-- ========================================== -->
     <!--      Attribute Definitions                 -->
@@ -26,116 +24,117 @@
 
     <!-- Schema: Core schema attributes-->
 <!--
-    <AttributeDefinition xsi:type="Simple" id="uid" sourceAttributeID="uid">
-        <Dependency ref="myLDAP" />
+
+    <AttributeDefinition xsi:type="Simple" id="uid">
+        <InputDataConnector ref="myLDAP" attributeNames="uid"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:uid" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="mail" sourceAttributeID="mail">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="mail">
+        <InputDataConnector ref="myLDAP" attributeNames="mail"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mail" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="homePhone" sourceAttributeID="homePhone">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="homePhone">
+        <InputDataConnector ref="myLDAP" attributeNames="homePhone"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:homePhone" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.20" friendlyName="homePhone" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="homePostalAddress" sourceAttributeID="homePostalAddress">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="homePostalAddress">
+        <InputDataConnector ref="myLDAP" attributeNames="homePostalAddress"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:homePostalAddress" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.39" friendlyName="homePostalAddress" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="mobileNumber" sourceAttributeID="mobile">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="mobileNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="mobile"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mobile" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.41" friendlyName="mobile" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="pagerNumber" sourceAttributeID="pager">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="pagerNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="pager"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:pager" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.42" friendlyName="pager" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="surname" sourceAttributeID="sn">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="surname">
+        <InputDataConnector ref="myLDAP" attributeNames="sn"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:sn" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.4" friendlyName="sn" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="locality" sourceAttributeID="l">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="locality">
+        <InputDataConnector ref="myLDAP" attributeNames="l"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:l" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.7" friendlyName="l" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="stateProvince" sourceAttributeID="st">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="stateProvince">
+        <InputDataConnector ref="myLDAP" attributeNames="st"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:st" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.8" friendlyName="st" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="street" sourceAttributeID="street">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="street">
+        <InputDataConnector ref="myLDAP" attributeNames="street"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:street" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.9" friendlyName="street" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="organizationName" sourceAttributeID="o">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="organizationName">
+        <InputDataConnector ref="myLDAP" attributeNames="o"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:o" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.10" friendlyName="o" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="organizationalUnit" sourceAttributeID="ou">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="organizationalUnit">
+        <InputDataConnector ref="myLDAP" attributeNames="ou"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:ou" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.11" friendlyName="ou" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="title" sourceAttributeID="title">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="title">
+        <InputDataConnector ref="myLDAP" attributeNames="title"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:title" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.12" friendlyName="title" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="postalAddress" sourceAttributeID="postalAddress">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="postalAddress">
+        <InputDataConnector ref="myLDAP" attributeNames="postalAddress"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:postalAddress" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.16" friendlyName="postalAddress" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="postalCode" sourceAttributeID="postalCode">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="postalCode">
+        <InputDataConnector ref="myLDAP" attributeNames="postalCode"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:postalCode" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.17" friendlyName="postalCode" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="postOfficeBox" sourceAttributeID="postOfficeBox">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="postOfficeBox">
+        <InputDataConnector ref="myLDAP" attributeNames="postOfficeBox"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:postOfficeBox" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.18" friendlyName="postOfficeBox" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="telephoneNumber" sourceAttributeID="telephoneNumber">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="telephoneNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="telephoneNumber"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:telephoneNumber" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.20" friendlyName="telephoneNumber" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="givenName" sourceAttributeID="givenName">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="givenName">
+        <InputDataConnector ref="myLDAP" attributeNames="givenName"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:givenName" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.42" friendlyName="givenName" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="initials" sourceAttributeID="initials">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="initials">
+        <InputDataConnector ref="myLDAP" attributeNames="initials"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:initials" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.43" friendlyName="initials" encodeType="false" />
     </AttributeDefinition>
@@ -143,112 +142,120 @@
 
     <!-- Schema: inetOrgPerson attributes-->
 <!--
-    <AttributeDefinition xsi:type="Simple" id="departmentNumber" sourceAttributeID="departmentNumber">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="departmentNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="departmentNumber"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:departmentNumber" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.2" friendlyName="departmentNumber" encodeType="false" />
     </AttributeDefinition>
     
-    <AttributeDefinition xsi:type="Simple" id="displayName" sourceAttributeID="displayName">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="displayName">
+        <InputDataConnector ref="myLDAP" attributeNames="displayName"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:displayName" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.241" friendlyName="displayName" encodeType="false" />
     </AttributeDefinition> 
 
-    <AttributeDefinition xsi:type="Simple" id="employeeNumber" sourceAttributeID="employeeNumber">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="employeeNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="employeeNumber"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:employeeNumber" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.3" friendlyName="employeeNumber" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="employeeType" sourceAttributeID="employeeType">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="employeeType">
+        <InputDataConnector ref="myLDAP" attributeNames="employeeType"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:employeeType" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.4" friendlyName="employeeType" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="jpegPhoto" sourceAttributeID="jpegPhoto">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="jpegPhoto">
+        <InputDataConnector ref="myLDAP" attributeNames="jpegPhoto"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:jpegPhoto" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.60" friendlyName="jpegPhoto" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="preferredLanguage" sourceAttributeID="preferredLanguage">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="preferredLanguage">
+        <InputDataConnector ref="myLDAP" attributeNames="preferredLanguage"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:preferredLanguage" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.39" friendlyName="preferredLanguage" encodeType="false" />
     </AttributeDefinition>
 -->
-
     <!-- Schema: eduPerson attributes -->
-<!--
-    <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation" sourceAttributeID="eduPersonAffiliation">
-        <Dependency ref="myLDAP" />
+<!-- 
+    <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonAffiliation" />
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAffiliation" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" friendlyName="eduPersonAffiliation" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="eduPersonEntitlement" sourceAttributeID="eduPersonEntitlement">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="eduPersonEntitlement">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonEntitlement"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonEntitlement" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" friendlyName="eduPersonEntitlement" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="eduPersonNickname" sourceAttributeID="eduPersonNickname">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="eduPersonNickname">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonNickname"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonNickname" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" friendlyName="eduPersonNickname" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="eduPersonPrimaryAffiliation" sourceAttributeID="eduPersonPrimaryAffiliation">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="eduPersonPrimaryAffiliation">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrimaryAffiliation"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" friendlyName="eduPersonPrimaryAffiliation" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Scoped" id="eduPersonUniqueId" scope="%{idp.scope}" sourceAttributeID="localUniqueId">
-        <Dependency ref="myLDAP" />
-        <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" encodeType="false" />
-        <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" friendlyName="eduPersonUniqueId" encodeType="false" />
-    </AttributeDefinition>
-
-    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalName" sourceAttributeID="eduPersonPrincipalName">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalName">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalName"/>
         <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonPrincipalName" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" friendlyName="eduPersonPrincipalName" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalNamePrior" sourceAttributeID="eduPersonPrincipalNamePrior">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalNamePrior">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalNamePrior"/>
         <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.12" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.12" friendlyName="eduPersonPrincipalNamePrior" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Scoped" id="eduPersonScopedAffiliation" scope="%{idp.scope}" sourceAttributeID="eduPersonAffiliation">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Scoped" id="eduPersonScopedAffiliation" scope="%{idp.scope}">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonAffiliation"/>
         <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="eduPersonScopedAffiliation" encodeType="false" />
     </AttributeDefinition>
     
-    <AttributeDefinition xsi:type="Simple" id="eduPersonAssurance" sourceAttributeID="eduPersonAssurance">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="eduPersonAssurance">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonAssurance"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" encodeType="false" />
     </AttributeDefinition>
 -->
 
+    <!-- Semi-deprecated eduPersonUniqueId, should be phased out in favor of SAML subject-id replacement below. -->
+<!-- 
+    <AttributeDefinition xsi:type="Scoped" id="eduPersonUniqueId" scope="%{idp.scope}">
+        <InputDataConnector ref="myLDAP" attributeNames="%{idp.persistentId.sourceAttribute}"/>
+        <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" encodeType="false" />
+        <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" friendlyName="eduPersonUniqueId" encodeType="false" />
+    </AttributeDefinition>
+-->
+
+    <!-- Schema: SAML Subject ID Attributes -->
+<!--
+    <AttributeDefinition xsi:type="Scoped" id="samlSubjectID" scope="%{idp.scope}">
+        <InputDataConnector ref="myLDAP" attributeNames="%{idp.persistentId.sourceAttribute}"/>
+        <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oasis:names:tc:SAML:attribute:subject-id" friendlyName="subject-id" encodeType="false" />
+    </AttributeDefinition>
+
+    <AttributeDefinition xsi:type="Scoped" id="samlPairwiseID" scope="%{idp.scope}">
+        <InputDataConnector ref="computed" attributeNames="computedId"/>
+        <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oasis:names:tc:SAML:attribute:pairwise-id" friendlyName="pairwise-id" encodeType="false" />
+    </AttributeDefinition>
+-->
+
     <!-- ========================================== -->
     <!--      Data Connectors                       -->
     <!-- ========================================== -->
 
     <!-- Example Static Connector -->
-<!--
-    <DataConnector id="staticAttributes" xsi:type="Static">
-        <Attribute id="eduPersonAffiliation">
-            <Value>member</Value>
-        </Attribute>
-    </DataConnector>
--->
 
     <!-- Example Relational Database Connector -->
 <!--
@@ -277,16 +284,37 @@
         principalCredential="%{idp.attribute.resolver.LDAP.bindDNCredential}"
         useStartTLS="%{idp.attribute.resolver.LDAP.useStartTLS:true}"
         connectTimeout="%{idp.attribute.resolver.LDAP.connectTimeout}"
+                trustFile="%{idp.attribute.resolver.LDAP.trustCertificates}"
         responseTimeout="%{idp.attribute.resolver.LDAP.responseTimeout}">
         <FilterTemplate>
             <![CDATA[
                 %{idp.attribute.resolver.LDAP.searchFilter}
             ]]>
         </FilterTemplate>
-        <StartTLSTrustCredential id="LDAPtoIdPCredential" xsi:type="sec:X509ResourceBacked">
-            <sec:Certificate>%{idp.attribute.resolver.LDAP.trustCertificates}</sec:Certificate>
-        </StartTLSTrustCredential>
+            <ConnectionPool
+            minPoolSize="%{idp.pool.LDAP.minSize:3}"
+            maxPoolSize="%{idp.pool.LDAP.maxSize:10}"
+            blockWaitTime="%{idp.pool.LDAP.blockWaitTime:PT3S}"
+            validatePeriodically="%{idp.pool.LDAP.validatePeriodically:true}"
+            validateTimerPeriod="%{idp.pool.LDAP.validatePeriod:PT5M}"
+            expirationTime="%{idp.pool.LDAP.idleTime:PT10M}"
+            failFastInitialize="%{idp.pool.LDAP.failFastInitialize:false}" />
     </DataConnector>
 -->
 
+    <!-- DataConector for pairwise-id (example depends on saml-nameid.properties). -->
+
+<!-- 
+    <DataConnector id="computed" xsi:type="ComputedId"
+            generatedAttributeID="computedId"
+            salt="%{idp.persistentId.salt}"
+            algorithm="%{idp.persistentId.algorithm:SHA}"
+        encoding="%{idp.persistentId.encoding:BASE32}">
+            
+        <InputDataConnector ref="myLDAP" attributeNames="%{idp.persistentId.sourceAttribute}" />
+        
+        </DataConnector>
+-->
+
 </AttributeResolver>
+
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-ldap.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-ldap.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver-ldap.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver-ldap.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver.xml b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml
similarity index 78%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml
index e1396dc..fb963b2 100644
--- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/attribute-resolver.xml
+++ b/test-compose/idp/container_files/config/shib-idp/conf/attribute-resolver.xml
@@ -25,217 +25,217 @@
     <!-- ========================================== -->
 
     <!-- Schema: Core schema attributes-->
-    <AttributeDefinition xsi:type="Simple" id="uid" sourceAttributeID="uid">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="uid">
+        <InputDataConnector ref="myLDAP" attributeNames="uid"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:uid" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.1" friendlyName="uid" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="mail" sourceAttributeID="mail">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="mail">
+        <InputDataConnector ref="myLDAP" attributeNames="mail"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mail" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="homePhone" sourceAttributeID="homePhone">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="homePhone">
+        <InputDataConnector ref="myLDAP" attributeNames="homePhone"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:homePhone" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.20" friendlyName="homePhone" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="homePostalAddress" sourceAttributeID="homePostalAddress">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="homePostalAddress">
+        <InputDataConnector ref="myLDAP" attributeNames="homePostalAddress"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:homePostalAddress" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.39" friendlyName="homePostalAddress" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="mobileNumber" sourceAttributeID="mobile">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="mobileNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="mobile"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:mobile" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.41" friendlyName="mobile" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="pagerNumber" sourceAttributeID="pager">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="pagerNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="pager"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:pager" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.42" friendlyName="pager" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="surname" sourceAttributeID="sn">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="surname">
+        <InputDataConnector ref="myLDAP" attributeNames="sn"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:sn" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.4" friendlyName="sn" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="locality" sourceAttributeID="l">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="locality">
+        <InputDataConnector ref="myLDAP" attributeNames="l"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:l" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.7" friendlyName="l" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="stateProvince" sourceAttributeID="st">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="stateProvince">
+        <InputDataConnector ref="myLDAP" attributeNames="st"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:st" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.8" friendlyName="st" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="street" sourceAttributeID="street">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="street">
+        <InputDataConnector ref="myLDAP" attributeNames="street"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:street" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.9" friendlyName="street" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="organizationName" sourceAttributeID="o">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="organizationName">
+        <InputDataConnector ref="myLDAP" attributeNames="o"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:o" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.10" friendlyName="o" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="organizationalUnit" sourceAttributeID="ou">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="organizationalUnit">
+        <InputDataConnector ref="myLDAP" attributeNames="ou"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:ou" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.11" friendlyName="ou" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="title" sourceAttributeID="title">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="title">
+        <InputDataConnector ref="myLDAP" attributeNames="title"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:title" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.12" friendlyName="title" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="postalAddress" sourceAttributeID="postalAddress">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="postalAddress">
+        <InputDataConnector ref="myLDAP" attributeNames="postalAddress"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:postalAddress" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.16" friendlyName="postalAddress" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="postalCode" sourceAttributeID="postalCode">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="postalCode">
+        <InputDataConnector ref="myLDAP" attributeNames="postalCode"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:postalCode" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.17" friendlyName="postalCode" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="postOfficeBox" sourceAttributeID="postOfficeBox">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="postOfficeBox">
+        <InputDataConnector ref="myLDAP" attributeNames="postOfficeBox"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:postOfficeBox" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.18" friendlyName="postOfficeBox" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="telephoneNumber" sourceAttributeID="telephoneNumber">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="telephoneNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="telephoneNumber"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:telephoneNumber" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.20" friendlyName="telephoneNumber" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="givenName" sourceAttributeID="givenName">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="givenName">
+        <InputDataConnector ref="myLDAP" attributeNames="givenName"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:givenName" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.42" friendlyName="givenName" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="initials" sourceAttributeID="initials">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="initials">
+        <InputDataConnector ref="myLDAP" attributeNames="initials"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:initials" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.5.4.43" friendlyName="initials" encodeType="false" />
     </AttributeDefinition>
 
     <!-- Schema: inetOrgPerson attributes-->
-    <AttributeDefinition xsi:type="Simple" id="departmentNumber" sourceAttributeID="departmentNumber">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="departmentNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="departmentNumber"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:departmentNumber" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.2" friendlyName="departmentNumber" encodeType="false" />
     </AttributeDefinition>
     
-    <AttributeDefinition xsi:type="Simple" id="displayName" sourceAttributeID="displayName">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="displayName">
+        <InputDataConnector ref="myLDAP" attributeNames="displayName"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:displayName" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.241" friendlyName="displayName" encodeType="false" />
     </AttributeDefinition> 
 
-    <AttributeDefinition xsi:type="Simple" id="employeeNumber" sourceAttributeID="employeeNumber">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="employeeNumber">
+        <InputDataConnector ref="myLDAP" attributeNames="employeeNumber"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:employeeNumber" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.3" friendlyName="employeeNumber" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="employeeType" sourceAttributeID="employeeType">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="employeeType">
+        <InputDataConnector ref="myLDAP" attributeNames="employeeType"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:employeeType" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.4" friendlyName="employeeType" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="jpegPhoto" sourceAttributeID="jpegPhoto">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="jpegPhoto">
+        <InputDataConnector ref="myLDAP" attributeNames="jpegPhoto"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:jpegPhoto" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:0.9.2342.19200300.100.1.60" friendlyName="jpegPhoto" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="preferredLanguage" sourceAttributeID="preferredLanguage">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="preferredLanguage">
+        <InputDataConnector ref="myLDAP" attributeNames="preferredLanguage"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:preferredLanguage" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:2.16.840.1.113730.3.1.39" friendlyName="preferredLanguage" encodeType="false" />
     </AttributeDefinition>
 
     <!-- Schema: eduPerson attributes -->
-    <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation" sourceAttributeID="eduPersonAffiliation">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="eduPersonAffiliation">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonAffiliation"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAffiliation" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" friendlyName="eduPersonAffiliation" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="eduPersonEntitlement" sourceAttributeID="eduPersonEntitlement">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="eduPersonEntitlement">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonEntitlement"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonEntitlement" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" friendlyName="eduPersonEntitlement" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="eduPersonNickname" sourceAttributeID="eduPersonNickname">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="eduPersonNickname">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonNickname"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonNickname" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" friendlyName="eduPersonNickname" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Simple" id="eduPersonPrimaryAffiliation" sourceAttributeID="eduPersonPrimaryAffiliation">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="eduPersonPrimaryAffiliation">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrimaryAffiliation"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonPrimaryAffiliation" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" friendlyName="eduPersonPrimaryAffiliation" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Scoped" id="eduPersonUniqueId" scope="%{idp.scope}" sourceAttributeID="localUniqueId">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Scoped" id="eduPersonUniqueId" scope="%{idp.scope}">
+        <InputDataConnector ref="myLDAP" attributeNames="localUniqueId"/>
         <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.13" friendlyName="eduPersonUniqueId" encodeType="false" />
     </AttributeDefinition>
 
-    <!-- for pre-scoped eppn -->
+    <!-- below is for pre-scoped eppn -->
     <!--
-    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalName" sourceAttributeID="eduPersonPrincipalName">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalName">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalName"/>
         <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonPrincipalName" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" friendlyName="eduPersonPrincipalName" encodeType="false" />
     </AttributeDefinition>
     -->
 
-    <AttributeDefinition xsi:type="Scoped" id="eduPersonPrincipalName" scope="%{idp.scope}" sourceAttributeID="uid">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Scoped" id="eduPersonPrincipalName" scope="%{idp.scope}">
+        <InputDataConnector ref="myLDAP" attributeNames="uid"/>
         <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonPrincipalName" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" friendlyName="eduPersonPrincipalName" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalNamePrior" sourceAttributeID="eduPersonPrincipalNamePrior">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Prescoped" id="eduPersonPrincipalNamePrior">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonPrincipalNamePrior"/>
         <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.12" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.12" friendlyName="eduPersonPrincipalNamePrior" encodeType="false" />
     </AttributeDefinition>
 
-    <AttributeDefinition xsi:type="Scoped" id="eduPersonScopedAffiliation" scope="%{idp.scope}" sourceAttributeID="eduPersonAffiliation">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Scoped" id="eduPersonScopedAffiliation" scope="%{idp.scope}">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonAffiliation"/>
         <AttributeEncoder xsi:type="SAML1ScopedString" name="urn:mace:dir:attribute-def:eduPersonScopedAffiliation" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2ScopedString" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" friendlyName="eduPersonScopedAffiliation" encodeType="false" />
     </AttributeDefinition>
     
-    <AttributeDefinition xsi:type="Simple" id="eduPersonAssurance" sourceAttributeID="eduPersonAssurance">
-        <Dependency ref="myLDAP" />
+    <AttributeDefinition xsi:type="Simple" id="eduPersonAssurance">
+        <InputDataConnector ref="myLDAP" attributeNames="eduPersonAssurance"/>
         <AttributeEncoder xsi:type="SAML1String" name="urn:mace:dir:attribute-def:eduPersonAssurance" encodeType="false" />
         <AttributeEncoder xsi:type="SAML2String" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" friendlyName="eduPersonAssurance" encodeType="false" />
     </AttributeDefinition>
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/audit.xml b/test-compose/idp/container_files/config/shib-idp/conf/audit.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/audit.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/audit.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/authn-comparison.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-comparison.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/authn-comparison.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/authn-comparison.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/authn-events-flow.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/authn-events-flow.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/authn-events-flow.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/authn-events-flow.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/duo-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/duo-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/duo-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/duo-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/duo.properties b/test-compose/idp/container_files/config/shib-idp/conf/authn/duo.properties
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/duo.properties
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/duo.properties
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/external-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/external-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/external-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/external-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/general-authn.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/general-authn.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/general-authn.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/general-authn.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/ipaddress-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/ipaddress-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/ipaddress-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/ipaddress-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/jaas-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/jaas-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/jaas-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/jaas.config b/test-compose/idp/container_files/config/shib-idp/conf/authn/jaas.config
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/jaas.config
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/jaas.config
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/krb5-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/krb5-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/krb5-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/krb5-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/ldap-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/ldap-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/ldap-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/ldap-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/mfa-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/mfa-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/mfa-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/mfa-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/password-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/password-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/password-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/password-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/remoteuser-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/remoteuser-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/remoteuser-internal-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/spnego-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/spnego-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/spnego-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/spnego-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/x509-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/x509-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/x509-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/x509-internal-authn-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/authn/x509-internal-authn-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/authn/x509-internal-authn-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/authn/x509-internal-authn-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/attribute-sourced-subject-c14n-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/simple-subject-c14n-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n-events-flow.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/subject-c14n.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/subject-c14n.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/subject-c14n.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/c14n/x500-subject-c14n-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/cas-protocol.xml b/test-compose/idp/container_files/config/shib-idp/conf/cas-protocol.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/cas-protocol.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/cas-protocol.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/credentials.xml b/test-compose/idp/container_files/config/shib-idp/conf/credentials.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/credentials.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/credentials.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/errors.xml b/test-compose/idp/container_files/config/shib-idp/conf/errors.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/errors.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/errors.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/global.xml b/test-compose/idp/container_files/config/shib-idp/conf/global.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/global.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/global.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties b/test-compose/idp/container_files/config/shib-idp/conf/idp.properties
similarity index 98%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties
rename to test-compose/idp/container_files/config/shib-idp/conf/idp.properties
index 490d00f..ba38100 100644
--- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties
+++ b/test-compose/idp/container_files/config/shib-idp/conf/idp.properties
@@ -8,7 +8,7 @@ idp.entityID= https://idp.example.edu/idp/shibboleth
 idp.scope= example.edu
 
 # General cookie properties (maxAge only applies to persistent cookies)
-#idp.cookie.secure = false
+idp.cookie.secure = true
 #idp.cookie.httpOnly = true
 #idp.cookie.domain =
 #idp.cookie.path =
@@ -26,8 +26,8 @@ idp.scope= example.edu
 #idp.sealer.aliasBase = secret
 idp.sealer.storeResource= %{idp.home}/credentials/sealer.jks
 idp.sealer.versionResource= %{idp.home}/credentials/sealer.kver
-idp.sealer.storePassword= ce472e68-f433-4a77-aad2-b8697670158a
-idp.sealer.keyPassword= ce472e68-f433-4a77-aad2-b8697670158a
+idp.sealer.storePassword= 90fa668e-ce0f-45e7-82f1-fa4bd0273b51
+idp.sealer.keyPassword= 90fa668e-ce0f-45e7-82f1-fa4bd0273b51
 
 # Settings for public/private signing and encryption key(s)
 # During decryption key rollover, point the ".2" properties at a second
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties.dist b/test-compose/idp/container_files/config/shib-idp/conf/idp.properties.dist
similarity index 99%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties.dist
rename to test-compose/idp/container_files/config/shib-idp/conf/idp.properties.dist
index d7cfea7..2c5dcc0 100644
--- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/idp.properties.dist
+++ b/test-compose/idp/container_files/config/shib-idp/conf/idp.properties.dist
@@ -8,7 +8,7 @@ idp.entityID= https://example.org/idp/shibboleth
 idp.scope= example.org
 
 # General cookie properties (maxAge only applies to persistent cookies)
-#idp.cookie.secure = false
+idp.cookie.secure = true
 #idp.cookie.httpOnly = true
 #idp.cookie.domain =
 #idp.cookie.path =
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/consent-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/consent-intercept-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/consent-intercept-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/consent-intercept-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/context-check-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/context-check-intercept-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/context-check-intercept-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/context-check-intercept-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/expiring-password-intercept-config.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/intercept-events-flow.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/intercept-events-flow.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/intercept-events-flow.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/intercept-events-flow.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/profile-intercept.xml b/test-compose/idp/container_files/config/shib-idp/conf/intercept/profile-intercept.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/intercept/profile-intercept.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/intercept/profile-intercept.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/ldap.properties b/test-compose/idp/container_files/config/shib-idp/conf/ldap.properties
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/ldap.properties
rename to test-compose/idp/container_files/config/shib-idp/conf/ldap.properties
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/ldap.properties.dist b/test-compose/idp/container_files/config/shib-idp/conf/ldap.properties.dist
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/ldap.properties.dist
rename to test-compose/idp/container_files/config/shib-idp/conf/ldap.properties.dist
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/logback.xml b/test-compose/idp/container_files/config/shib-idp/conf/logback.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/logback.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/logback.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/metadata-providers.xml b/test-compose/idp/container_files/config/shib-idp/conf/metadata-providers.xml
similarity index 99%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/metadata-providers.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/metadata-providers.xml
index 80178c4..48f06ca 100644
--- a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/metadata-providers.xml
+++ b/test-compose/idp/container_files/config/shib-idp/conf/metadata-providers.xml
@@ -62,15 +62,6 @@
     <MetadataProvider id="LocalMetadata"  xsi:type="FilesystemMetadataProvider" metadataFile="PATH_TO_YOUR_METADATA"/>
     -->
 
-    <!-- SAMLtest.id SP for test purposes only, delete for production use -->
-    <MetadataProvider id="SAMLtest"
-        xsi:type="FileBackedHTTPMetadataProvider"
-        backingFile="%{idp.home}/metadata/SAMLtest.xml"
-        metadataURL="https://samltest.id/saml/sp">
-    </MetadataProvider>
-    <!-- end of SAMLtest SP -->
-
-
 	<MetadataProvider id="InCommonMetadata"
                 xsi:type="FileBackedHTTPMetadataProvider"
                 backingFile="%{idp.home}/metadata/localCopyFromInCommon.xml"
@@ -88,5 +79,13 @@
 			
     </MetadataProvider>
 
+    <!-- SAMLtest.id SP for test purposes only, delete for production use -->
+    <MetadataProvider id="SAMLtest"
+        xsi:type="FileBackedHTTPMetadataProvider"
+        backingFile="%{idp.home}/metadata/SAMLtest.xml"
+        metadataURL="https://samltest.id/saml/sp">
+    </MetadataProvider>
+    <!-- end of SAMLtest SP -->
+
 	
 </MetadataProvider>
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/mvc-beans.xml b/test-compose/idp/container_files/config/shib-idp/conf/mvc-beans.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/mvc-beans.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/mvc-beans.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/relying-party.xml b/test-compose/idp/container_files/config/shib-idp/conf/relying-party.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/relying-party.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/relying-party.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/saml-nameid.properties b/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.properties
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/saml-nameid.properties
rename to test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.properties
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/saml-nameid.xml b/test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/saml-nameid.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/saml-nameid.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/services.properties b/test-compose/idp/container_files/config/shib-idp/conf/services.properties
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/services.properties
rename to test-compose/idp/container_files/config/shib-idp/conf/services.properties
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/services.xml b/test-compose/idp/container_files/config/shib-idp/conf/services.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/services.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/services.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/conf/session-manager.xml b/test-compose/idp/container_files/config/shib-idp/conf/session-manager.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/conf/session-manager.xml
rename to test-compose/idp/container_files/config/shib-idp/conf/session-manager.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/consent.css b/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/consent.css
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/consent.css
rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/css/consent.css
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/logout.css b/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/logout.css
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/logout.css
rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/css/logout.css
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/main.css b/test-compose/idp/container_files/config/shib-idp/edit-webapp/css/main.css
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/css/main.css
rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/css/main.css
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/dummylogo-mobile.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo-mobile.png
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/dummylogo-mobile.png
rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo-mobile.png
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/dummylogo.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo.png
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/dummylogo.png
rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/images/dummylogo.png
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/failure-32x32.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/failure-32x32.png
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/failure-32x32.png
rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/images/failure-32x32.png
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/success-32x32.png b/test-compose/idp/container_files/config/shib-idp/edit-webapp/images/success-32x32.png
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/edit-webapp/images/success-32x32.png
rename to test-compose/idp/container_files/config/shib-idp/edit-webapp/images/success-32x32.png
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/messages/messages.properties b/test-compose/idp/container_files/config/shib-idp/messages/messages.properties
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/messages/messages.properties
rename to test-compose/idp/container_files/config/shib-idp/messages/messages.properties
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/idp-metadata.xml b/test-compose/idp/container_files/config/shib-idp/metadata/idp-metadata.xml
similarity index 56%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/idp-metadata.xml
rename to test-compose/idp/container_files/config/shib-idp/metadata/idp-metadata.xml
index 2211379..af11f89 100644
--- a/test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/idp-metadata.xml
+++ b/test-compose/idp/container_files/config/shib-idp/metadata/idp-metadata.xml
@@ -7,23 +7,23 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDHDCCAgSgAwIBAgIJAIb+Cd4BoYJmMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
-BAMMD2lkcC5leGFtcGxlLmVkdTAeFw0xODEwMDgyMTUwNTlaFw0yMzEwMDcyMTUw
-NTlaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALPi8zCdYWjcTeWGLvCJrLHJ8kKAMx/U+ol468h+gWkW
-6H9CbV02Bucmnuf7We66NPIhn3+ZjF6svBvS+wflOyBSOqo/BddH0t/CrDI3L4wv
-LkTwogqVcUSubdUaHYVxitD8YyZGozg4l6NOKy2D1bFzzM8qB5Mdp2zW5k5Dbnza
-7JTiSb/a6ILsugszhXA3LdA3NkzhSnWH5M8VbD22VwiWeWVuTLhhShdjWLT0FwMd
-e/HeW3AGePN0/p4lH9excaMOHyxvJ2V89S3HPSZxLEjuo4TqQUqXdt0aeQcX3slj
-w5jkZk/7N7LuEw+UIRIjOXIvZWv6f6QmH8j0kaFFMaUCAwEAAaNlMGMwQgYDVR0R
+MIIDHDCCAgSgAwIBAgIJAPEnL5jgbeVoMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
+BAMMD2lkcC5leGFtcGxlLmVkdTAeFw0xODEwMTAyMDM1NDBaFw0yMzEwMDkyMDM1
+NDBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLmVkdTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKwTrvQhmFX3SUNgJAhQ/YV0UX56Rt53mwbiKuH+Ez83
+7z6XRynBVsfzHfbWe0IpNKx5mIr84dfbGhQKQBEKzQuek7ihW3J6PIVZN1A3icZZ
+B9i7gow902bT0ZfRG8QW49gl7pk3ASutPcO9Dq5Xc/AqWr3OSO/Pei0yBtTdzG3b
+rm0u0gbj3P2tjt7BN77wIB+yjJsND3ITtP0MFXIJxLTlty8thwqQOAOAYcF+rhC5
+znnBLsRNo0E57PtzZs8i/BpEX2uPTxpEyvlU1vtyxcKUiHtK5ZjOsDEkS2rEualr
++FILYg/Oxw1gi0+mNO1a94Ft+UoLiREztq6MQt8OK98CAwEAAaNlMGMwQgYDVR0R
 BDswOYIPaWRwLmV4YW1wbGUuZWR1hiZodHRwczovL2lkcC5leGFtcGxlLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUCSovOIIkWFhQuaIudr7S361IT5AwDQYJ
-KoZIhvcNAQELBQADggEBAHA8ov+paom/K9z4ssKRLb10zkXgDupziGY2rD4QAZ6U
-cDF7nlJX0uaClimhJgwbagb64OVNwQ49RyzzLSLMQtrER1wEl+n2qs2HtPlGVlPk
-9dtYXWL3gUrdGzniaUPP2tKMwtAgB3vh2NFHwQ57Lzyc7B8jNzcF3NtlckYidth/
-c5TjjIcoJMeRJtJsjAOYOUzMpH92qc853FM18FqjRi/lQEc1Sfn7j60vtpsfdlMC
-djZJO1Ru8QqkNC1d/ZBVAxO+R7mN1FzmRDCuNlwredwaAePDrSr5MKv3Cel/I0V6
-D+x6OWB7iBrgi8kIf8j/pVmLqUxy2F0rnJkL8ooJM2o=
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU3ZJ8oHkmlgPtZuZAxnzONccPsb8wDQYJ
+KoZIhvcNAQELBQADggEBAIJ4oZKSMGpF8J3qdfjLZGkc3iVbu/eiE1MD77no0oCz
+nelY0CNUBuFJk1Xv+Bv0fW0cVugtMPz4xi7zv0zkpS2IVxpPZWBosuVabUD9k+V4
+iN5woJdO7e2KRGvhlWmbkmoZUvhygDe0u0vblNfLzDwFQvxHXiWG//P7SanoQrjP
+dE8U21tYz+EFm6s5TvHxVhr9id8c+UacAFCpAtzUB+J8K1abx05XlKsySflkOQV9
+JbM4zOy5gXSI5dY9dGUF77g0muyC+jAhIhLSt/7v3vJgvBurrxPoeBFXOU3D+siT
+VZlKtYzYjJhVqXx1vKrWEE1hkpqm+iYgZe4MvgcdswY=
           </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/localCopyFromInCommon.xml b/test-compose/idp/container_files/config/shib-idp/metadata/localCopyFromInCommon.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/metadata/localCopyFromInCommon.xml
rename to test-compose/idp/container_files/config/shib-idp/metadata/localCopyFromInCommon.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/client-storage/client-storage-read.vm b/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-read.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/client-storage/client-storage-read.vm
rename to test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-read.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/client-storage/client-storage-write.vm b/test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-write.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/client-storage/client-storage-write.vm
rename to test-compose/idp/container_files/config/shib-idp/views/client-storage/client-storage-write.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/duo.vm b/test-compose/idp/container_files/config/shib-idp/views/duo.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/duo.vm
rename to test-compose/idp/container_files/config/shib-idp/views/duo.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/error.vm b/test-compose/idp/container_files/config/shib-idp/views/error.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/error.vm
rename to test-compose/idp/container_files/config/shib-idp/views/error.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/attribute-release.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/attribute-release.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/attribute-release.vm
rename to test-compose/idp/container_files/config/shib-idp/views/intercept/attribute-release.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/expiring-password.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/expiring-password.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/expiring-password.vm
rename to test-compose/idp/container_files/config/shib-idp/views/intercept/expiring-password.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/terms-of-use.vm b/test-compose/idp/container_files/config/shib-idp/views/intercept/terms-of-use.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/intercept/terms-of-use.vm
rename to test-compose/idp/container_files/config/shib-idp/views/intercept/terms-of-use.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/login-error.vm b/test-compose/idp/container_files/config/shib-idp/views/login-error.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/login-error.vm
rename to test-compose/idp/container_files/config/shib-idp/views/login-error.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/login.vm b/test-compose/idp/container_files/config/shib-idp/views/login.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/login.vm
rename to test-compose/idp/container_files/config/shib-idp/views/login.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout-complete.vm b/test-compose/idp/container_files/config/shib-idp/views/logout-complete.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout-complete.vm
rename to test-compose/idp/container_files/config/shib-idp/views/logout-complete.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout-propagate.vm b/test-compose/idp/container_files/config/shib-idp/views/logout-propagate.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout-propagate.vm
rename to test-compose/idp/container_files/config/shib-idp/views/logout-propagate.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout.vm b/test-compose/idp/container_files/config/shib-idp/views/logout.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/logout.vm
rename to test-compose/idp/container_files/config/shib-idp/views/logout.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/spnego-unavailable.vm b/test-compose/idp/container_files/config/shib-idp/views/spnego-unavailable.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/spnego-unavailable.vm
rename to test-compose/idp/container_files/config/shib-idp/views/spnego-unavailable.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/user-prefs.js b/test-compose/idp/container_files/config/shib-idp/views/user-prefs.js
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/user-prefs.js
rename to test-compose/idp/container_files/config/shib-idp/views/user-prefs.js
diff --git a/test-compose/idp/container_files/shib-idp/config/shib-idp/views/user-prefs.vm b/test-compose/idp/container_files/config/shib-idp/views/user-prefs.vm
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/shib-idp/views/user-prefs.vm
rename to test-compose/idp/container_files/config/shib-idp/views/user-prefs.vm
diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/catalina.policy b/test-compose/idp/container_files/config/tomcat/catalina.policy
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/tomcat/catalina.policy
rename to test-compose/idp/container_files/config/tomcat/catalina.policy
diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/catalina.properties b/test-compose/idp/container_files/config/tomcat/catalina.properties
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/tomcat/catalina.properties
rename to test-compose/idp/container_files/config/tomcat/catalina.properties
diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/context.xml b/test-compose/idp/container_files/config/tomcat/context.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/tomcat/context.xml
rename to test-compose/idp/container_files/config/tomcat/context.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/logging.properties b/test-compose/idp/container_files/config/tomcat/logging.properties
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/tomcat/logging.properties
rename to test-compose/idp/container_files/config/tomcat/logging.properties
diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/server.xml b/test-compose/idp/container_files/config/tomcat/server.xml
similarity index 90%
rename from test-compose/idp/container_files/shib-idp/config/tomcat/server.xml
rename to test-compose/idp/container_files/config/tomcat/server.xml
index 9991643..d0df37e 100644
--- a/test-compose/idp/container_files/shib-idp/config/tomcat/server.xml
+++ b/test-compose/idp/container_files/config/tomcat/server.xml
@@ -8,7 +8,7 @@
           protocol="org.apache.coyote.http11.Http11NioProtocol"
           port="443" maxThreads="200"
           scheme="https" secure="true" SSLEnabled="true"
-          keystoreFile="/opt/certs/keystore.jks" keystorePass="34f9a51f-2a3a-42f8-b109-fce47dedeb24"
+          keystoreFile="/opt/certs/keystore.jks" keystorePass="e68cb9bc-bb21-4319-a664-1f755ad8b47c"
           clientAuth="false" sslProtocol="TLS"/>
     <Engine name="Catalina" defaultHost="localhost">
 
diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/server.xml.dist b/test-compose/idp/container_files/config/tomcat/server.xml.dist
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/tomcat/server.xml.dist
rename to test-compose/idp/container_files/config/tomcat/server.xml.dist
diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/tomcat-users.xml b/test-compose/idp/container_files/config/tomcat/tomcat-users.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/tomcat/tomcat-users.xml
rename to test-compose/idp/container_files/config/tomcat/tomcat-users.xml
diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/tomcat-users.xsd b/test-compose/idp/container_files/config/tomcat/tomcat-users.xsd
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/tomcat/tomcat-users.xsd
rename to test-compose/idp/container_files/config/tomcat/tomcat-users.xsd
diff --git a/test-compose/idp/container_files/shib-idp/config/tomcat/web.xml b/test-compose/idp/container_files/config/tomcat/web.xml
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/config/tomcat/web.xml
rename to test-compose/idp/container_files/config/tomcat/web.xml
diff --git a/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.crt b/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.crt
new file mode 100644
index 0000000..52a7085
--- /dev/null
+++ b/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDHDCCAgSgAwIBAgIJAIg/g2B0+JTzMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
+BAMMD2lkcC5leGFtcGxlLmVkdTAeFw0xODEwMTAyMDM1NDBaFw0yMzEwMDkyMDM1
+NDBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLmVkdTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAOXvrrP5G0yLd6OfWPO1NzKjTFqY6l9kyGid98uOOut3
+oFAwrjUgQ1gwVRNSVQNL7pfmiai1prNzzxo6oHXpctwJi+HK6l1JfKsmyOCo974d
+S9HYnRL0HT59lIoT1oaIOr+5SGcSr0iFYLKkNwQz5FJrMIp0jkeFatoJ/FjZG8qy
+z8NAaMTYMoR7pxWn6CuSTFPx0cKkSrxRwcUO+qsqBdrrweNSFUzo/KTmsl9wxga3
+bLdUJ4TzypQKRY5vFTO1yxk8ZM7JTUHYLEFXUyThjfUQLT2uMMGNpBO3dYWttGyY
+yXOzFvuJiMp64JTcoDb698ca7e3oeLNa3SGOiPwHRnkCAwEAAaNlMGMwQgYDVR0R
+BDswOYIPaWRwLmV4YW1wbGUuZWR1hiZodHRwczovL2lkcC5leGFtcGxlLmVkdS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQURsDhZRUa47gaSCOLN4Uq1Jsgv0UwDQYJ
+KoZIhvcNAQELBQADggEBAJ8PShxPRmdUeJJC/6lAGqGXlw3H+eVyC16hkU+Pozva
+bjzDvJapj5r5MyUBkPvm6zPZKk2sDKGm640KVSxEjK+PHfCIIf/d3DQ6DgsvvBUu
+/QLqG4dTOPwN6PJEVceo7jBAmMZk8nCMSMTfEl/nGwn0YxFbFVE6OamkYR9UuOD7
+qBfqXxNQspQvA74kP5iCW+5VNwmcmya2Zhe5yJtD0DS5EOLfu/elrrU6DuR9e8xv
+SQnmhIXnMKQKMYmUcEuksved5NRkzHiojtMHKewlXpnB7rqJi7BUYkKqY3/vgOqD
+iSIkxhgaixWy//7nNHLGeNsZgG9xmnQ41qYsRtw5RdY=
+-----END CERTIFICATE-----
diff --git a/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.key b/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.key
new file mode 100644
index 0000000..1f570b4
--- /dev/null
+++ b/test-compose/idp/container_files/credentials/shib-idp/idp-encryption.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDl766z+RtMi3ej
+n1jztTcyo0xamOpfZMhonffLjjrrd6BQMK41IENYMFUTUlUDS+6X5omotaazc88a
+OqB16XLcCYvhyupdSXyrJsjgqPe+HUvR2J0S9B0+fZSKE9aGiDq/uUhnEq9IhWCy
+pDcEM+RSazCKdI5HhWraCfxY2RvKss/DQGjE2DKEe6cVp+grkkxT8dHCpEq8UcHF
+DvqrKgXa68HjUhVM6Pyk5rJfcMYGt2y3VCeE88qUCkWObxUztcsZPGTOyU1B2CxB
+V1Mk4Y31EC09rjDBjaQTt3WFrbRsmMlzsxb7iYjKeuCU3KA2+vfHGu3t6HizWt0h
+joj8B0Z5AgMBAAECggEBANZTs+TOLkQLPFmoDqIcKHdq/6DzKIQCzUu282MqEIGr
+4CLfPYMHr75kTujTtap8/MlaerZnnBtpt4IbY7aFBCtWOq0dF5gdB7gBTv0agtMT
+O7k+0Cr6oMe/BtYt56k/EoPjkTmCkSBoMtpRd3bTZ9/rSjPEsVq5YgAbjrzCosUs
+YyGoTQC+sjPCOQDglr4tujgveBvGatEonfTxurJrUqHr3QBd3Biop3UXuc3g3wx4
+yqXwHwACyPL9BY0r1e7WzfC1jSjWaxZkNg30XSJPuhvMoLaOunJUTqYMwlSlpuOJ
+AdVPOBUXx5cmn7j8KZaTqdqKXM2G7JKH0BcW6KlMQAECgYEA+6vP9QY2Jw+v6xj1
+qK3QFSQIdvZq2zeJjmEgKkIFDsmdg4dxxu8awUOZFp/JQETsibmvuDlNHfSmmTMg
+0PCMQE924e1fHU7GZfxK2gtM4sKWK/0PxQsLzWD/J8Q8fpMAMS5X4wvVLhyqrIPk
+WrmGZb5RN7kbSvRbRJfCVwNd2rkCgYEA6eQqHxawUHD0lPNWBW4vI1C50H3qSbzB
+TFfunUz1NCmVlxU55pyLlTzUuGxD9wRXVAs1YL6z6a6EjzbB2WfaTTQ7zD2pZldQ
+NrRxigkqm/7RuNL+O26RH0VP8ANAryxnfbnRsU2kraATSt199cFSgb+eKjz3T7OD
+rMrOvoJL6cECgYAGB22p7wYpFWUfeq+X5OIRP5W8U9bnfYMcGBOPL5mzav0NA5ek
+LmIzswzdz+IgWgZYnkwpW6YPS6caEHF+z+RsPfsZGnim2RZDpzGb251x6TtzvlI8
+ZDFaMDKsnzTby2W7x+JvG/91ZVZpX5d+3ObtVQvZC+QtfYEaOZB8SSZccQKBgQDV
+feQI3p/vvTsznu4dJNc4KB6ENfsedYIHmpf+01la1L5r2v8wBiLPBWiyMnjTSA4i
+c9y0Qz5cBmWPiA7n0IkOQah3pK008mwQkyK0Oeu/2pg6WbWgMCudXJo73ew0OZb5
+xxyl99ZieaRCiOzJ3z3dmzfXHDEuehCuL60Jbku2wQKBgQCMN7ETD7apRliJosKb
+UQDEA/hV3Nw3TqCEpCz01pR3HHLedHYwQhUsUNkMycVlV52/STqe/6c8rcZmt7hD
+csAkWpoKHU9v5s6pdu3SMURzHi8q1p8hO49n3eqx2IhJOzpMFygmJgBy6jNiXkAD
+/6HfDYCuMSxoqgofz0jtyZAMow==
+-----END PRIVATE KEY-----
diff --git a/test-compose/idp/container_files/credentials/shib-idp/idp-signing.crt b/test-compose/idp/container_files/credentials/shib-idp/idp-signing.crt
new file mode 100644
index 0000000..5890db7
--- /dev/null
+++ b/test-compose/idp/container_files/credentials/shib-idp/idp-signing.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDHDCCAgSgAwIBAgIJAPEnL5jgbeVoMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
+BAMMD2lkcC5leGFtcGxlLmVkdTAeFw0xODEwMTAyMDM1NDBaFw0yMzEwMDkyMDM1
+NDBaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLmVkdTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAKwTrvQhmFX3SUNgJAhQ/YV0UX56Rt53mwbiKuH+Ez83
+7z6XRynBVsfzHfbWe0IpNKx5mIr84dfbGhQKQBEKzQuek7ihW3J6PIVZN1A3icZZ
+B9i7gow902bT0ZfRG8QW49gl7pk3ASutPcO9Dq5Xc/AqWr3OSO/Pei0yBtTdzG3b
+rm0u0gbj3P2tjt7BN77wIB+yjJsND3ITtP0MFXIJxLTlty8thwqQOAOAYcF+rhC5
+znnBLsRNo0E57PtzZs8i/BpEX2uPTxpEyvlU1vtyxcKUiHtK5ZjOsDEkS2rEualr
++FILYg/Oxw1gi0+mNO1a94Ft+UoLiREztq6MQt8OK98CAwEAAaNlMGMwQgYDVR0R
+BDswOYIPaWRwLmV4YW1wbGUuZWR1hiZodHRwczovL2lkcC5leGFtcGxlLmVkdS9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU3ZJ8oHkmlgPtZuZAxnzONccPsb8wDQYJ
+KoZIhvcNAQELBQADggEBAIJ4oZKSMGpF8J3qdfjLZGkc3iVbu/eiE1MD77no0oCz
+nelY0CNUBuFJk1Xv+Bv0fW0cVugtMPz4xi7zv0zkpS2IVxpPZWBosuVabUD9k+V4
+iN5woJdO7e2KRGvhlWmbkmoZUvhygDe0u0vblNfLzDwFQvxHXiWG//P7SanoQrjP
+dE8U21tYz+EFm6s5TvHxVhr9id8c+UacAFCpAtzUB+J8K1abx05XlKsySflkOQV9
+JbM4zOy5gXSI5dY9dGUF77g0muyC+jAhIhLSt/7v3vJgvBurrxPoeBFXOU3D+siT
+VZlKtYzYjJhVqXx1vKrWEE1hkpqm+iYgZe4MvgcdswY=
+-----END CERTIFICATE-----
diff --git a/test-compose/idp/container_files/credentials/shib-idp/idp-signing.key b/test-compose/idp/container_files/credentials/shib-idp/idp-signing.key
new file mode 100644
index 0000000..46de653
--- /dev/null
+++ b/test-compose/idp/container_files/credentials/shib-idp/idp-signing.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCsE670IZhV90lD
+YCQIUP2FdFF+ekbed5sG4irh/hM/N+8+l0cpwVbH8x321ntCKTSseZiK/OHX2xoU
+CkARCs0LnpO4oVtyejyFWTdQN4nGWQfYu4KMPdNm09GX0RvEFuPYJe6ZNwErrT3D
+vQ6uV3PwKlq9zkjvz3otMgbU3cxt265tLtIG49z9rY7ewTe+8CAfsoybDQ9yE7T9
+DBVyCcS05bcvLYcKkDgDgGHBfq4Quc55wS7ETaNBOez7c2bPIvwaRF9rj08aRMr5
+VNb7csXClIh7SuWYzrAxJEtqxLmpa/hSC2IPzscNYItPpjTtWveBbflKC4kRM7au
+jELfDivfAgMBAAECggEAXcm8qcNFzFUj0V0tRnseMwbbBByRU9/M10ueI97fjq1l
+8K9zUgbWzdRsmIT+WWksFHWR9u8uCQCajiGoGaHRcGvWB+OqfBKzudqOk2Ix7bHI
+3RAWb2mjN4Br1FtcztvLA5xpF4krUiryZyU8QznXLydmnd05U7u507hYkNzy90zI
+ERp3p1PXL6XagW8SlraBbQW6HMCzwaILFT6v9Lxen8cw8VTSFEPfNthfGC2kmWRq
+/ub/bbjx7HaV2p+U7FuXI2tk/pXbZxkHAMJ0OPcSx6lfcKU9m79peIgzA3vqALDj
+QsvHioZ4O0ocOqj4ul1dojYrGYyjwXTNhGmytnXKwQKBgQDcAzg+FGMBDRuPLq7f
+l9WoC4Pz/kN3nY0BGg6Ow5TW9SnDeUSZ5Mt3utuPyMtsHHwdTjR+iHMZv1uFOXCL
+lI0SpkvRHCXCnsZqRPmnoGA0Tf+b1VfwjvZEiYJBnS5eKcy7nB81tBO/nty43eCo
+241VeEX7USkrOqjVyYnK+YUwfQKBgQDIOTXewaEI3X/AOSXd35lZm9egGwTCTG3X
+yIvZ6DghNLaAAVI52o9Y8mpLzdZP81+pATjgedR2UZbVt6blAT9BAqi+K6wZqZ3P
+k8eRxm/h57zV/Ixlzxk6k5xzjzb4ZBSha+kAy8bvVqWYgIbbHEB5gMlorKF7m8Uy
+A78p3N+4iwKBgHKM0pmv76Q6eODhw3bzDPEDnd5JwkLjKukp8e5u8m3BE8+MsiUW
+NMHP7kU8nH1bj1uKvlYrIRKEyVfiAjEKVTEimFL1vstH87Kc2wdlvvE8sxslxzWe
+maYxmjojZmLsjIYZ0T4a1jVstyshirkgJsQbbQRey3qQfhthZXbi12/ZAoGBAIg8
+rVQJ6nnuxUtVV1e2GlEnwjtVxxIyERefhNFbuj2V8Yv92iY1eg5qvDsiLu4tymxj
+wYC0RQXRFFINaYkvJQwmNA1aB/taN2ATzNp67IwJM6ti8WEg3qjF4dGbpCq1ZnhD
+xcJd5dna2kh/Q8N5YMGMCP+pXyONZUtX00431R5rAoGBAMIqlJSFfXtiAs+ox5Wo
+RJTP1jXBMwLxIpAiA2831OG1I2MmuRFfcl7bw0Ei2XWGfanenLd6pCHo5wVWvZ/k
+7f3zg2NItabMZLIpc3ES8Sr1N0IeSOuAlLwWQ4wTeaF673dwLaGJ+doQERc3psoY
+PSJOpnyo7wRfuXWQaKpzcF+w
+-----END PRIVATE KEY-----
diff --git a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/inc-md-cert.pem b/test-compose/idp/container_files/credentials/shib-idp/inc-md-cert.pem
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/credentials/shib-idp/inc-md-cert.pem
rename to test-compose/idp/container_files/credentials/shib-idp/inc-md-cert.pem
diff --git a/test-compose/idp/container_files/credentials/shib-idp/sealer.jks b/test-compose/idp/container_files/credentials/shib-idp/sealer.jks
new file mode 100644
index 0000000..69d21ac
Binary files /dev/null and b/test-compose/idp/container_files/credentials/shib-idp/sealer.jks differ
diff --git a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/sealer.kver b/test-compose/idp/container_files/credentials/shib-idp/sealer.kver
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/credentials/shib-idp/sealer.kver
rename to test-compose/idp/container_files/credentials/shib-idp/sealer.kver
diff --git a/test-compose/idp/container_files/credentials/tomcat/keystore.jks b/test-compose/idp/container_files/credentials/tomcat/keystore.jks
new file mode 100644
index 0000000..531bd96
Binary files /dev/null and b/test-compose/idp/container_files/credentials/tomcat/keystore.jks differ
diff --git a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-encryption.crt b/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-encryption.crt
deleted file mode 100644
index a109911..0000000
--- a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-encryption.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDHDCCAgSgAwIBAgIJAKE7Co4LUwTcMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
-BAMMD2lkcC5leGFtcGxlLmVkdTAeFw0xODEwMDgyMTUwNTlaFw0yMzEwMDcyMTUw
-NTlaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKVGG3/S6hF3Rr/pwy2b1C8T8x4JfI92HApmNyXWPtDl
-UWWkEtwBeakyGxh1XBqVPiwXaurqh1WYzwH8BI6mtOL/VjveCpmBjRS0/GQkhq31
-8GeiEBZ1MZiMSxHq3pAwf51DEiGkX3OALyxnC8ylshqYf9r4FMaHfYHwB7Kz5NT4
-pJt6/AyZ/3tEuV7DZlBtQamFybSGmHz9XU8CzNTMK2g9f/1as4w5JuZTs14X0mIR
-wpZ/qwuR2V5z8hC58V8It+bfNfYrm30EDYDKcmAPgOGrsZaj3g3LCvI1VI+Mz7MT
-R0gv6M+xlMLzGzKx2XHYlq3v0IRURS+zf6dk8MUgZ0sCAwEAAaNlMGMwQgYDVR0R
-BDswOYIPaWRwLmV4YW1wbGUuZWR1hiZodHRwczovL2lkcC5leGFtcGxlLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhEcJaXtVh6q8QI0czSN6olaNU6IwDQYJ
-KoZIhvcNAQELBQADggEBABDln4h5L627SjCgrtT0sz/czMmeVYHU7rk+HUGFTU97
-A3FBV3t097XrqZZAbx2DWyyavxbUrKyp8WBjCiS6E5QbwfBkoSDJL/1H2Yx2AzOv
-ECBdLE2wRUk3qoXBHK9K1fjhRaabD1jeFJVlLTLrHWSNYeKijTyd3Awqwpfe1DM3
-nVHXNxea7WIzqimhO8WbEXOlBwCTfiTcAl0RUX0w39MPUKqw11Qn5UnQqOXghzcn
-7Taju+L/uUCQDGwmumBX9pvkGTQFuyN+Nnnkei+3zUJjeXmqmpA1z5mLYJDBu+k+
-i7ehl6m+iJEYM/uWnN0qV+a9bljBDxKTOJRLUXisrAA=
------END CERTIFICATE-----
diff --git a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-encryption.key b/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-encryption.key
deleted file mode 100644
index 510f6e1..0000000
--- a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-encryption.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQClRht/0uoRd0a/
-6cMtm9QvE/MeCXyPdhwKZjcl1j7Q5VFlpBLcAXmpMhsYdVwalT4sF2rq6odVmM8B
-/ASOprTi/1Y73gqZgY0UtPxkJIat9fBnohAWdTGYjEsR6t6QMH+dQxIhpF9zgC8s
-ZwvMpbIamH/a+BTGh32B8Aeys+TU+KSbevwMmf97RLlew2ZQbUGphcm0hph8/V1P
-AszUzCtoPX/9WrOMOSbmU7NeF9JiEcKWf6sLkdlec/IQufFfCLfm3zX2K5t9BA2A
-ynJgD4Dhq7GWo94NywryNVSPjM+zE0dIL+jPsZTC8xsysdlx2Jat79CEVEUvs3+n
-ZPDFIGdLAgMBAAECggEAKZxBCCmd7M/O7Dp6fV0iSsgHCaTxy1y9KpEZiVkrb4SM
-vb5VUTa93q9SyxGhIsA4avlqXcK2WAKk+6brrs6h9BS9LU119bf8QR5f/QaFMf8d
-i7ntuvm+ht2reNNdPYg4WOuuAPJVZcr8FX3MJrYA5VlHt2WGNYWfP7ui9Ib+MfAQ
-N83uR8k5FX/w8DfebUoBwbeptPFUoXKd3Pic4f9ZBmJ5qokbSOq09PKL39c8mg0J
-u62fb5aPXCKSmkx/2CrXpQtbA6mh/AdmcdHMvblrM1zNWxggTFrhOa4X7eI4K7l6
-J/bALkiuqyFsR5lqKTuQA7MTYOTistuMZ4evMZUdYQKBgQDWTyfbQBET3kmKvRWm
-4Ay0qYRrQFgBnR52ryuEvAOZ6FejU+valMXMfmuVvBcFhMuTjN8kEWX+GrKVS1Uq
-+o+igXHLzZ7EmlMJ0iNGzfJUw8uoTp4FzVlrEdqKlz3fzZg9USABvIdtOxJ5Ps83
-CoGaHTaSFlElRxCG86vn4TntjwKBgQDFbO9tKz89rVlqFUj7fuSBpa9lVUpuHqAr
-FWhJ2ydZnkDXjqRQxjSkktw/2m4VBVcBaXVorEEY+SDkq5ciisjlfLc0Lk/O6n1X
-cfQ1satWvX62ze03UjS38nymKU2KNgJ88Odv1yN/yKrV0cmooXa+BQoPovIgWN6P
-pdHg9zJEhQKBgF5J4T1DiL/3EuAppPcQqEZsNsiBPLcpC5goJbt2hRcX9Eb1y1UW
-E5iPHoJ4iKBy9qZqWlqiFP+he2TYChaour1CunByfSH+y/4MKF0kizPkGRxpyni/
-ClJjPoWvWRe4evyvTqe07NiQHuadTcnno3HM3I+VpgoCpDDb0IxquXPdAoGAfbVp
-lvfMovc4UgYPnKQl2C+pyTpP1GKH1icharWzDqtn2lmnYw9yAcDJoZbyNUxbJDkE
-W4wjP0WSnkhsScBZP1b0SLOcecJx4TZcK7xfvzGV98yT2X/stZwfpqXyC6lsWCYF
-F//DSOB7dv7ICyoUs9X9nAtDZTlxLcKGK1r7lQkCgYBlIqr1oWPhadzTeIe791EM
-FbFnclUf7MzyUr4Ntfw+CXPw3zfuZ0JZNyjrBC7Eo0djD+DYdyzWxkPeYDnRoV0L
-z+xX9gxEfIVyva8GtilDB37mo/aISu9wuZy9qp+9ok3QEqtp4i1yYu2JD2L+mej3
-ti+5YdNTMSWWpCt1oSpGTQ==
------END PRIVATE KEY-----
diff --git a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-signing.crt b/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-signing.crt
deleted file mode 100644
index 7c8eb1b..0000000
--- a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-signing.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDHDCCAgSgAwIBAgIJAIb+Cd4BoYJmMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
-BAMMD2lkcC5leGFtcGxlLmVkdTAeFw0xODEwMDgyMTUwNTlaFw0yMzEwMDcyMTUw
-NTlaMBoxGDAWBgNVBAMMD2lkcC5leGFtcGxlLmVkdTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBALPi8zCdYWjcTeWGLvCJrLHJ8kKAMx/U+ol468h+gWkW
-6H9CbV02Bucmnuf7We66NPIhn3+ZjF6svBvS+wflOyBSOqo/BddH0t/CrDI3L4wv
-LkTwogqVcUSubdUaHYVxitD8YyZGozg4l6NOKy2D1bFzzM8qB5Mdp2zW5k5Dbnza
-7JTiSb/a6ILsugszhXA3LdA3NkzhSnWH5M8VbD22VwiWeWVuTLhhShdjWLT0FwMd
-e/HeW3AGePN0/p4lH9excaMOHyxvJ2V89S3HPSZxLEjuo4TqQUqXdt0aeQcX3slj
-w5jkZk/7N7LuEw+UIRIjOXIvZWv6f6QmH8j0kaFFMaUCAwEAAaNlMGMwQgYDVR0R
-BDswOYIPaWRwLmV4YW1wbGUuZWR1hiZodHRwczovL2lkcC5leGFtcGxlLmVkdS9p
-ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUCSovOIIkWFhQuaIudr7S361IT5AwDQYJ
-KoZIhvcNAQELBQADggEBAHA8ov+paom/K9z4ssKRLb10zkXgDupziGY2rD4QAZ6U
-cDF7nlJX0uaClimhJgwbagb64OVNwQ49RyzzLSLMQtrER1wEl+n2qs2HtPlGVlPk
-9dtYXWL3gUrdGzniaUPP2tKMwtAgB3vh2NFHwQ57Lzyc7B8jNzcF3NtlckYidth/
-c5TjjIcoJMeRJtJsjAOYOUzMpH92qc853FM18FqjRi/lQEc1Sfn7j60vtpsfdlMC
-djZJO1Ru8QqkNC1d/ZBVAxO+R7mN1FzmRDCuNlwredwaAePDrSr5MKv3Cel/I0V6
-D+x6OWB7iBrgi8kIf8j/pVmLqUxy2F0rnJkL8ooJM2o=
------END CERTIFICATE-----
diff --git a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-signing.key b/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-signing.key
deleted file mode 100644
index f234834..0000000
--- a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/idp-signing.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCz4vMwnWFo3E3l
-hi7wiayxyfJCgDMf1PqJeOvIfoFpFuh/Qm1dNgbnJp7n+1nuujTyIZ9/mYxerLwb
-0vsH5TsgUjqqPwXXR9LfwqwyNy+MLy5E8KIKlXFErm3VGh2FcYrQ/GMmRqM4OJej
-Tistg9Wxc8zPKgeTHads1uZOQ2582uyU4km/2uiC7LoLM4VwNy3QNzZM4Up1h+TP
-FWw9tlcIlnllbky4YUoXY1i09BcDHXvx3ltwBnjzdP6eJR/XsXGjDh8sbydlfPUt
-xz0mcSxI7qOE6kFKl3bdGnkHF97JY8OY5GZP+zey7hMPlCESIzlyL2Vr+n+kJh/I
-9JGhRTGlAgMBAAECggEAVx97AzemHwBcJecoQs2bO3yAfd7TY/5l3UEYiUFj8f7r
-Wf9VMojhLQDSg66D7xB2ZjMMqeM3Tf9BGATGGhvW2B+bVCsz7AFYS5Fgju2VdMLB
-GRimkpOwiUAl58k/NQs53V/vsXESyj72ilxooyGv1MMuFcPYaVM6bIdkgdE86PDa
-rCV35uz5vqZJ9sQa2yH7HNCxT5OndnE2evMjt55aj4e0P2PA6qb5wp6mSJlnLlu0
-4X2s8fo8jd9Pb8fKB4G5h3CoSLjzeX+jNfx2cj6D7rBsIV5LLz2x6ItScfrJu1Uk
-pB3ffOE+s3frtZyF2VuaOOjkuaW4RQX0nksdXqutXQKBgQDmuhRt3Y9RmnLQ3HaG
-qSuwrRvg9YXbsgXVtTp0xtsLsQq+xkFp7eoxxoeXSTbpF4pJfSeklTCJsV+qXWYS
-IDkYuA2UWq/m1GgmL0LQhdFbbF5lRrTuagClOB00ifPxMYdY/g+ePJcE/JFtgXQh
-jO3A9yzvXhOb7y9jNNIhjN5HywKBgQDHlztq0lv5BGXfLFFwkZC5qR76VJlfqito
-ANTz4I9A38pZf7qTAYDoN8GHLfICO4bpaDdT55wP22vmOcScsg9vFH0INQdcvkEG
-V1fDbabrgfJ6zH4Vj4zZWlwEvQonXzQUAX1uATTTdra58q5WqJh9zrnsy4d2Nvlq
-zYNYR+HeTwKBgQC4ZlvRetQCaif9WVW5RhdO+utfHZs//MXBCTiRACUs8PAfjJ/X
-I3ibE4pmlPM308KH/WjjlwDV61cD9+WN8wbvBJqFyPzwxS3/5qHFuk2afb/rvVj5
-eurNIU3mIaM/T1BXBaZB1zbzm1A3btD7x4B1Spc1L8EITV9YMG0It2cnhQKBgQDE
-DILqnJKG+ZDvNGMShYl5NOwezDaTR123nQmQPAW6nZfvbY1glNuAPjQ0iibrlnkg
-j6O5IQmkcc18qUW8/RI39BIUm7INoTvR9L1aUzzgnBYIFRHML+MUJLO6W827esJ2
-3DfOdBTlmfhGkmA48wZGnWb3d7wpnDpGdHQNpR3x9QKBgA3r7e3FGgs+cupnMygb
-jOFtJZ/CgFsytn6bVX53vuoqnNuvNHdEkvR+NHNJegKfzCJCWYvpJTVpoc/vpwsF
-P8De8wOe74BjU8PX0iWCBkM/B2ppYlUuO8msciLVoAXRyn+ZRfQ593lWQ0bFg1uB
-n70LhPSiEgATnkaczu3/Al0s
------END PRIVATE KEY-----
diff --git a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/sealer.jks b/test-compose/idp/container_files/shib-idp/credentials/shib-idp/sealer.jks
deleted file mode 100644
index 2473609..0000000
Binary files a/test-compose/idp/container_files/shib-idp/credentials/shib-idp/sealer.jks and /dev/null differ
diff --git a/test-compose/idp/container_files/shib-idp/credentials/tomcat/keystore.jks b/test-compose/idp/container_files/shib-idp/credentials/tomcat/keystore.jks
deleted file mode 100644
index 4c2adaa..0000000
Binary files a/test-compose/idp/container_files/shib-idp/credentials/tomcat/keystore.jks and /dev/null differ
diff --git a/test-compose/idp/container_files/shib-idp/wwwroot/robots.txt b/test-compose/idp/container_files/wwwroot/robots.txt
similarity index 100%
rename from test-compose/idp/container_files/shib-idp/wwwroot/robots.txt
rename to test-compose/idp/container_files/wwwroot/robots.txt