diff --git a/user_saml-dirsrv/Dockerfile b/user_saml-dirsrv/Dockerfile
index 78b231c0..c696a92f 100644
--- a/user_saml-dirsrv/Dockerfile
+++ b/user_saml-dirsrv/Dockerfile
@@ -6,9 +6,10 @@ ENV DS_SUFFIX_NAME dc=idptestbed
 ADD conf/* /var/opt/
 
 RUN rm -Rf /data/*
+
 RUN /usr/libexec/dirsrv/dscontainer -r & \
-    sleep 60; \
-    WAIT_TIME=60; \
+    WAIT_TIME=25; \
+    sleep ${WAIT_TIME}; \
     while : ; do \
     	if /usr/libexec/dirsrv/dscontainer -H; then \
     		break; \
@@ -25,8 +26,9 @@ RUN /usr/libexec/dirsrv/dscontainer -r & \
     dsconf localhost schema reload; \
     dsconf localhost plugin memberof enable; \
     dsconf localhost plugin memberof set --autoaddoc inetOrgPerson; \
-    dsctl localhost restart; \
+    echo "### Memberof Status" \
     dsconf localhost plugin memberof status; \
+    echo "### Memberof Show" \
     dsconf localhost plugin memberof show; \
     dsconf localhost backend import "dc=idptestbed" /var/opt/entries.ldif; \
     rm /var/opt/entries.ldif;
diff --git a/user_saml-dirsrv/conf/entries.ldif b/user_saml-dirsrv/conf/entries.ldif
index efda14b0..c8dac029 100644
--- a/user_saml-dirsrv/conf/entries.ldif
+++ b/user_saml-dirsrv/conf/entries.ldif
@@ -56,6 +56,21 @@ mail: student2@idptestbed.edu
 userPassword: password
 nextcloudQuota: 1 GB
 
+dn: uid=student3,ou=People,dc=idptestbed
+objectClass: organizationalPerson
+objectClass: person
+objectClass: top
+objectClass: inetuser
+objectClass: inetOrgPerson
+objectClass: nextcloudUser
+givenName: Alice
+uid: student3
+sn: Alisson
+cn: Alice Alisson
+mail: student3@idptestbed.edu
+userPassword: password
+nextcloudQuota: 5 GB
+
 dn: uid=staff1,ou=People,dc=idptestbed
 objectClass: organizationalPerson
 objectClass: person
@@ -78,6 +93,7 @@ objectClass: groupOfNames
 cn: Students
 member: uid=student1,ou=People,dc=idptestbed
 member: uid=student2,ou=People,dc=idptestbed
+member: uid=student3,ou=People,dc=idptestbed
 
 dn: cn=Professors,ou=Groups,dc=idptestbed
 objectClass: groupOfNames
@@ -89,3 +105,8 @@ objectClass: groupOfNames
 cn: Astrophysics
 member: uid=student1,ou=People,dc=idptestbed
 member: uid=staff1,ou=People,dc=idptestbed
+
+dn: cn=AGroupNameContainingMoreThan64CharactersRepeatAGroupNameContainingMoreThan64Characters,ou=Groups,dc=idptestbed
+objectClass: groupOfNames
+cn: AGroupNameContainingMoreThan64CharactersRepeatAGroupNameContainingMoreThan64Characters
+member: uid=student3,ou=People,dc=idptestbed