- adjust expectations now that we normalize our entry DNs

34 files changed, 82 insertions, 82 deletions

diff --git a/tests/test00-schema-add-set/after.txt b/tests/test00-schema-add-set/after.txt
index a2b90fe..54dad06 100644
--- a/tests/test00-schema-add-set/after.txt
+++ b/tests/test00-schema-add-set/after.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test01-schema-remove-set/before.txt b/tests/test01-schema-remove-set/before.txt
index a2b90fe..54dad06 100644
--- a/tests/test01-schema-remove-set/before.txt
+++ b/tests/test01-schema-remove-set/before.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test02-schema-modrdn-set/after.txt b/tests/test02-schema-modrdn-set/after.txt
index a2b90fe..54dad06 100644
--- a/tests/test02-schema-modrdn-set/after.txt
+++ b/tests/test02-schema-modrdn-set/after.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test02-schema-modrdn-set/before.txt b/tests/test02-schema-modrdn-set/before.txt
index a2b90fe..54dad06 100644
--- a/tests/test02-schema-modrdn-set/before.txt
+++ b/tests/test02-schema-modrdn-set/before.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test03-schema-modify-set/after.txt b/tests/test03-schema-modify-set/after.txt
index ada87b9..fbad600 100644
--- a/tests/test03-schema-modify-set/after.txt
+++ b/tests/test03-schema-modify-set/after.txt
@@ -1,6 +1,6 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd2,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd2,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd2,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test03-schema-modify-set/before.txt b/tests/test03-schema-modify-set/before.txt
index a2b90fe..54dad06 100644
--- a/tests/test03-schema-modify-set/before.txt
+++ b/tests/test03-schema-modify-set/before.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test04-schema-modify-set/after.txt b/tests/test04-schema-modify-set/after.txt
index 840bd38..93819c6 100644
--- a/tests/test04-schema-modify-set/after.txt
+++ b/tests/test04-schema-modify-set/after.txt
@@ -1,9 +1,9 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: cn=compat2,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat2,cn=Accounts,dc=example,dc=com
-dn: ou=passwd2,cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd2,cn=compat2,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: cn=compat2,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat2,cn=accounts,dc=example,dc=com
+dn: ou=passwd2,cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd2,cn=compat2,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat2,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd2,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test04-schema-modify-set/before.txt b/tests/test04-schema-modify-set/before.txt
index a2b90fe..54dad06 100644
--- a/tests/test04-schema-modify-set/before.txt
+++ b/tests/test04-schema-modify-set/before.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test05-schema-modify-set/after.txt b/tests/test05-schema-modify-set/after.txt
index c4879a8..e7003ad 100644
--- a/tests/test05-schema-modify-set/after.txt
+++ b/tests/test05-schema-modify-set/after.txt
@@ -1,3 +1,3 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test05-schema-modify-set/before.txt b/tests/test05-schema-modify-set/before.txt
index a2b90fe..54dad06 100644
--- a/tests/test05-schema-modify-set/before.txt
+++ b/tests/test05-schema-modify-set/before.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test07-schema-add-entry/after.txt b/tests/test07-schema-add-entry/after.txt
index 6d66c5a..581213c 100644
--- a/tests/test07-schema-add-entry/after.txt
+++ b/tests/test07-schema-add-entry/after.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test07-schema-add-entry/before.txt b/tests/test07-schema-add-entry/before.txt
index a2b90fe..54dad06 100644
--- a/tests/test07-schema-add-entry/before.txt
+++ b/tests/test07-schema-add-entry/before.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test08-schema-remove-entry/after.txt b/tests/test08-schema-remove-entry/after.txt
index 1afddc2..b4253f6 100644
--- a/tests/test08-schema-remove-entry/after.txt
+++ b/tests/test08-schema-remove-entry/after.txt
@@ -1,4 +1,4 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test08-schema-remove-entry/before.txt b/tests/test08-schema-remove-entry/before.txt
index a2b90fe..54dad06 100644
--- a/tests/test08-schema-remove-entry/before.txt
+++ b/tests/test08-schema-remove-entry/before.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test09-schema-modrdn-entry/after.txt b/tests/test09-schema-modrdn-entry/after.txt
index 1afddc2..b4253f6 100644
--- a/tests/test09-schema-modrdn-entry/after.txt
+++ b/tests/test09-schema-modrdn-entry/after.txt
@@ -1,4 +1,4 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test09-schema-modrdn-entry/before.txt b/tests/test09-schema-modrdn-entry/before.txt
index a2b90fe..54dad06 100644
--- a/tests/test09-schema-modrdn-entry/before.txt
+++ b/tests/test09-schema-modrdn-entry/before.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test10-schema-modrdn-entry/after.txt b/tests/test10-schema-modrdn-entry/after.txt
index c5ed80b..d5f4da8 100644
--- a/tests/test10-schema-modrdn-entry/after.txt
+++ b/tests/test10-schema-modrdn-entry/after.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user3a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test10-schema-modrdn-entry/before.txt b/tests/test10-schema-modrdn-entry/before.txt
index a2b90fe..54dad06 100644
--- a/tests/test10-schema-modrdn-entry/before.txt
+++ b/tests/test10-schema-modrdn-entry/before.txt
@@ -1,5 +1,5 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1b,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
diff --git a/tests/test11-schema-modify-entry/after.txt b/tests/test11-schema-modify-entry/after.txt
index 30b0229..4bbbd1c 100644
--- a/tests/test11-schema-modify-entry/after.txt
+++ b/tests/test11-schema-modify-entry/after.txt
@@ -1,6 +1,6 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
diff --git a/tests/test11-schema-modify-entry/before.txt b/tests/test11-schema-modify-entry/before.txt
index 6b7cad2..4b3c121 100644
--- a/tests/test11-schema-modify-entry/before.txt
+++ b/tests/test11-schema-modify-entry/before.txt
@@ -1,6 +1,6 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
diff --git a/tests/test12-schema-modify-entry/after.txt b/tests/test12-schema-modify-entry/after.txt
index a1c80b3..adfb628 100644
--- a/tests/test12-schema-modify-entry/after.txt
+++ b/tests/test12-schema-modify-entry/after.txt
@@ -1,6 +1,6 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
diff --git a/tests/test12-schema-modify-entry/before.txt b/tests/test12-schema-modify-entry/before.txt
index 6b7cad2..4b3c121 100644
--- a/tests/test12-schema-modify-entry/before.txt
+++ b/tests/test12-schema-modify-entry/before.txt
@@ -1,6 +1,6 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
diff --git a/tests/test13-schema-modify-entry/after.txt b/tests/test13-schema-modify-entry/after.txt
index 81155eb..8bf8300 100644
--- a/tests/test13-schema-modify-entry/after.txt
+++ b/tests/test13-schema-modify-entry/after.txt
@@ -1,6 +1,6 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
diff --git a/tests/test13-schema-modify-entry/before.txt b/tests/test13-schema-modify-entry/before.txt
index 6b7cad2..4b3c121 100644
--- a/tests/test13-schema-modify-entry/before.txt
+++ b/tests/test13-schema-modify-entry/before.txt
@@ -1,6 +1,6 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
diff --git a/tests/test14-schema-scope/before.txt b/tests/test14-schema-scope/before.txt
index 2b827f2..90e2d25 100644
--- a/tests/test14-schema-scope/before.txt
+++ b/tests/test14-schema-scope/before.txt
@@ -49,7 +49,7 @@ dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 [ou=passwd,cn=compat,cn=accounts,dc=example,dc=com:base]
 result: 0 Success
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 
 [ou=passwd,cn=compat,cn=accounts,dc=example,dc=com:one]
@@ -63,7 +63,7 @@ dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 [ou=passwd,cn=compat,cn=accounts,dc=example,dc=com:sub]
 result: 0 Success
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
@@ -74,19 +74,19 @@ dn: uid=user1c,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 [cn=compat,cn=accounts,dc=example,dc=com:base]
 result: 0 Success
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
 
 [cn=compat,cn=accounts,dc=example,dc=com:one]
 result: 0 Success
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 
 [cn=compat,cn=accounts,dc=example,dc=com:sub]
 result: 0 Success
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1a,ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
@@ -110,7 +110,7 @@ dn: cn=Users1,cn=Accounts,dc=example,dc=com
 
 dn: cn=Users2,cn=Accounts,dc=example,dc=com
 
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
 
 [cn=accounts,dc=example,dc=com:sub]
@@ -125,9 +125,9 @@ dn: cn=Users1,cn=Accounts,dc=example,dc=com
 
 dn: cn=Users2,cn=Accounts,dc=example,dc=com
 
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
-dn: ou=passwd,cn=compat,cn=Accounts,dc=example,dc=com
+dn: ou=passwd,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1a,cn=Users1,cn=Accounts,dc=example,dc=com
 
diff --git a/tests/test15-schema-nested/after.txt b/tests/test15-schema-nested/after.txt
index 02859b3..03a5e7a 100644
--- a/tests/test15-schema-nested/after.txt
+++ b/tests/test15-schema-nested/after.txt
@@ -1,4 +1,4 @@
-dn: cn=ng,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=ng,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: ng
 
diff --git a/tests/test15-schema-nested/before.txt b/tests/test15-schema-nested/before.txt
index 9c4fbd8..2501c73 100644
--- a/tests/test15-schema-nested/before.txt
+++ b/tests/test15-schema-nested/before.txt
@@ -1,4 +1,4 @@
-dn: cn=ng,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=ng,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: ng
 
diff --git a/tests/test16-schema-nested/after.txt b/tests/test16-schema-nested/after.txt
index a29e175..fa3c44b 100644
--- a/tests/test16-schema-nested/after.txt
+++ b/tests/test16-schema-nested/after.txt
@@ -1,4 +1,4 @@
-dn: cn=ng,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=ng,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: ng
 
diff --git a/tests/test16-schema-nested/before.txt b/tests/test16-schema-nested/before.txt
index 7db15dc..6f0e207 100644
--- a/tests/test16-schema-nested/before.txt
+++ b/tests/test16-schema-nested/before.txt
@@ -1,4 +1,4 @@
-dn: cn=ng,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=ng,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: ng
 
diff --git a/tests/test17-schema-compat/after.txt b/tests/test17-schema-compat/after.txt
index 01ab7c4..d414e5a 100644
--- a/tests/test17-schema-compat/after.txt
+++ b/tests/test17-schema-compat/after.txt
@@ -1,4 +1,4 @@
-dn: cn=users,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=users,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: users
 
@@ -101,7 +101,7 @@ objectClass: top
 gidNumber: 4002
 cn: group2c
 
-dn: cn=groups,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=groups,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: groups
 
diff --git a/tests/test17-schema-compat/before.txt b/tests/test17-schema-compat/before.txt
index 226e712..0bb3890 100644
--- a/tests/test17-schema-compat/before.txt
+++ b/tests/test17-schema-compat/before.txt
@@ -1,4 +1,4 @@
-dn: cn=users,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=users,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: users
 
@@ -98,7 +98,7 @@ objectClass: top
 gidNumber: 4002
 cn: group2c
 
-dn: cn=groups,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=groups,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: groups
 
diff --git a/tests/test18-schema-compat/after.txt b/tests/test18-schema-compat/after.txt
index 6657723..4ab3a95 100644
--- a/tests/test18-schema-compat/after.txt
+++ b/tests/test18-schema-compat/after.txt
@@ -91,7 +91,7 @@ objectClass: top
 member: cn=group2b,cn=Groups,cn=Accounts,dc=example,dc=com
 gidNumber: 4002
 
-dn: cn=users,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=users,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: users
 
@@ -155,10 +155,6 @@ homeDirectory: /home/user2c
 loginShell: /bin/sh
 uid: user2c
 
-dn: cn=Groups,cn=compat,cn=Accounts,dc=example,dc=com
-objectClass: extensibleObject
-cn: Groups
-
 dn: cn=group1a,cn=groups,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: posixgroup
 objectClass: top
@@ -197,3 +193,7 @@ gidNumber: 4002
 memberUid: user2b
 cn: group2c
 
+dn: cn=groups,cn=compat,cn=accounts,dc=example,dc=com
+objectClass: extensibleObject
+cn: groups
+
diff --git a/tests/test18-schema-compat/before.txt b/tests/test18-schema-compat/before.txt
index 44b2859..8e9c9d3 100644
--- a/tests/test18-schema-compat/before.txt
+++ b/tests/test18-schema-compat/before.txt
@@ -88,7 +88,7 @@ objectClass: top
 member: cn=group2b,cn=Groups,cn=Accounts,dc=example,dc=com
 gidNumber: 4002
 
-dn: cn=users,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=users,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: users
 
@@ -152,10 +152,6 @@ homeDirectory: /home/user2c
 loginShell: /bin/sh
 uid: user2c
 
-dn: cn=Groups,cn=compat,cn=Accounts,dc=example,dc=com
-objectClass: extensibleObject
-cn: Groups
-
 dn: cn=group1a,cn=groups,cn=compat,cn=accounts,dc=example,dc=com
 objectClass: posixgroup
 objectClass: top
@@ -192,3 +188,7 @@ objectClass: top
 gidNumber: 4002
 cn: group2c
 
+dn: cn=groups,cn=compat,cn=accounts,dc=example,dc=com
+objectClass: extensibleObject
+cn: groups
+
diff --git a/tests/test23-schema-link/before.txt b/tests/test23-schema-link/before.txt
index 5d0f5e8..abd7230 100644
--- a/tests/test23-schema-link/before.txt
+++ b/tests/test23-schema-link/before.txt
@@ -1,6 +1,6 @@
-dn: cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=compat,cn=accounts,dc=example,dc=com
 
-dn: cn=example,cn=compat,cn=Accounts,dc=example,dc=com
+dn: cn=example,cn=compat,cn=accounts,dc=example,dc=com
 
 dn: uid=user1,cn=example,cn=compat,cn=accounts,dc=example,dc=com
 thingy: -,user1,user1,user1|user1