1 files changed, 29 insertions, 29 deletions
diff --git a/tests/test18-schema-compat/after.txt b/tests/test18-schema-compat/after.txt
index 5b69796..15ab312 100644
--- a/tests/test18-schema-compat/after.txt
+++ b/tests/test18-schema-compat/after.txt
@@ -1,9 +1,9 @@
-dn: cn=Users2, cn=Accounts, dc=example, dc=com
+dn: cn=Users2,cn=Accounts,dc=example,dc=com
 objectClass: nsContainer
 objectClass: top
 cn: Users2
 
-dn: uid=user2a, cn=Users2, cn=Accounts, dc=example, dc=com
+dn: uid=user2a,cn=Users2,cn=Accounts,dc=example,dc=com
 objectClass: posixAccount
 objectClass: inetUser
 objectClass: top
@@ -15,7 +15,7 @@ gecos: User 2 A
 loginShell: /bin/sh
 homeDirectory: /home/user2a
 
-dn: uid=user2b, cn=Users2, cn=Accounts, dc=example, dc=com
+dn: uid=user2b,cn=Users2,cn=Accounts,dc=example,dc=com
 objectClass: posixAccount
 objectClass: inetUser
 objectClass: top
@@ -26,10 +26,10 @@ cn: User 2 B
 gecos: User 2 B
 loginShell: /bin/sh
 homeDirectory: /home/user2b
-memberOf: cn=group2b,cn=groups,cn=accounts,dc=example,dc=com
-memberOf: cn=group2c,cn=groups,cn=accounts,dc=example,dc=com
+memberOf: cn=group2b,cn=Groups,cn=accounts,dc=example,dc=com
+memberOf: cn=group2c,cn=Groups,cn=accounts,dc=example,dc=com
 
-dn: uid=user2c, cn=Users2, cn=Accounts, dc=example, dc=com
+dn: uid=user2c,cn=Users2,cn=Accounts,dc=example,dc=com
 objectClass: posixAccount
 objectClass: inetUser
 objectClass: top
@@ -41,61 +41,61 @@ gecos: User 2 C
 loginShell: /bin/sh
 homeDirectory: /home/user2c
 
-dn: cn=Groups, cn=Accounts, dc=example, dc=com
+dn: cn=Groups,cn=Accounts,dc=example,dc=com
 objectClass: nsContainer
 objectClass: top
 cn: Groups
 
-dn: cn=group1a,cn=groups,cn=accounts,dc=example,dc=com
+dn: cn=group1a,cn=Groups,cn=Accounts,dc=example,dc=com
 cn: group1a
 objectClass: posixgroup
 objectClass: groupofnames
 objectClass: top
 gidNumber: 3001
 
-dn: cn=group1b,cn=groups,cn=accounts,dc=example,dc=com
+dn: cn=group1b,cn=Groups,cn=Accounts,dc=example,dc=com
 cn: group1b
 objectClass: posixgroup
 objectClass: groupofnames
 objectClass: top
 gidNumber: 3002
 
-dn: cn=group1c,cn=groups,cn=accounts,dc=example,dc=com
+dn: cn=group1c,cn=Groups,cn=Accounts,dc=example,dc=com
 cn: group1c
 objectClass: posixgroup
 objectClass: groupofnames
 objectClass: top
 gidNumber: 3002
 
-dn: cn=group2a,cn=groups,cn=accounts,dc=example,dc=com
+dn: cn=group2a,cn=Groups,cn=Accounts,dc=example,dc=com
 cn: group2a
 objectClass: posixgroup
 objectClass: groupofnames
 objectClass: top
 gidNumber: 4001
 
-dn: cn=group2b,cn=groups,cn=accounts,dc=example,dc=com
+dn: cn=group2b,cn=Groups,cn=Accounts,dc=example,dc=com
 cn: group2b
 objectClass: posixgroup
 objectClass: groupofnames
 objectClass: top
-member: cn=group2a,cn=groups,cn=accounts,dc=example,dc=com
-member: uid=user2b,cn=users2,cn=accounts,dc=example,dc=com
+member: cn=group2a,cn=Groups,cn=Accounts,dc=example,dc=com
+member: uid=user2b,cn=users2,cn=Accounts,dc=example,dc=com
 gidNumber: 4002
 
-dn: cn=group2c,cn=groups,cn=accounts,dc=example,dc=com
+dn: cn=group2c,cn=Groups,cn=Accounts,dc=example,dc=com
 cn: group2c
 objectClass: posixgroup
 objectClass: groupofnames
 objectClass: top
-member: cn=group2b,cn=groups,cn=accounts,dc=example,dc=com
+member: cn=group2b,cn=Groups,cn=Accounts,dc=example,dc=com
 gidNumber: 4002
 
 dn: cn=users,cn=compat,cn=Accounts,dc=example,dc=com
 objectClass: extensibleObject
 cn: users
 
-dn: uid=user1a,cn=users,cn=compat,cn=accounts,dc=example,dc=com
+dn: uid=user1a,cn=users,cn=compat,cn=Accounts,dc=example,dc=com
 cn: user1a
 objectClass: posixaccount
 objectClass: top
@@ -105,7 +105,7 @@ homeDirectory: /home/user1a
 loginShell: /bin/sh
 uid: user1a
 
-dn: uid=user1b,cn=users,cn=compat,cn=accounts,dc=example,dc=com
+dn: uid=user1b,cn=users,cn=compat,cn=Accounts,dc=example,dc=com
 cn: user1b
 objectClass: posixaccount
 objectClass: top
@@ -115,7 +115,7 @@ homeDirectory: /home/user1b
 loginShell: /bin/sh
 uid: user1b
 
-dn: uid=user1c,cn=users,cn=compat,cn=accounts,dc=example,dc=com
+dn: uid=user1c,cn=users,cn=compat,cn=Accounts,dc=example,dc=com
 cn: user1c
 objectClass: posixaccount
 objectClass: top
@@ -125,7 +125,7 @@ homeDirectory: /home/user1c
 loginShell: /bin/sh
 uid: user1c
 
-dn: uid=user2a,cn=users,cn=compat,cn=accounts,dc=example,dc=com
+dn: uid=user2a,cn=users,cn=compat,cn=Accounts,dc=example,dc=com
 cn: user2a
 objectClass: posixaccount
 objectClass: top
@@ -135,7 +135,7 @@ homeDirectory: /home/user2a
 loginShell: /bin/sh
 uid: user2a
 
-dn: uid=user2b,cn=users,cn=compat,cn=accounts,dc=example,dc=com
+dn: uid=user2b,cn=users,cn=compat,cn=Accounts,dc=example,dc=com
 cn: user2b
 objectClass: posixaccount
 objectClass: top
@@ -145,7 +145,7 @@ homeDirectory: /home/user2b
 loginShell: /bin/sh
 uid: user2b
 
-dn: uid=user2c,cn=users,cn=compat,cn=accounts,dc=example,dc=com
+dn: uid=user2c,cn=users,cn=compat,cn=Accounts,dc=example,dc=com
 cn: user2c
 objectClass: posixaccount
 objectClass: top
@@ -155,45 +155,45 @@ homeDirectory: /home/user2c
 loginShell: /bin/sh
 uid: user2c
 
-dn: cn=group1a,cn=groups,cn=compat,cn=accounts,dc=example,dc=com
+dn: cn=group1a,cn=Groups,cn=compat,cn=Accounts,dc=example,dc=com
 objectClass: posixgroup
 objectClass: top
 gidNumber: 3001
 cn: group1a
 
-dn: cn=group1b,cn=groups,cn=compat,cn=accounts,dc=example,dc=com
+dn: cn=group1b,cn=Groups,cn=compat,cn=Accounts,dc=example,dc=com
 objectClass: posixgroup
 objectClass: top
 gidNumber: 3002
 cn: group1b
 
-dn: cn=group1c,cn=groups,cn=compat,cn=accounts,dc=example,dc=com
+dn: cn=group1c,cn=Groups,cn=compat,cn=Accounts,dc=example,dc=com
 objectClass: posixgroup
 objectClass: top
 gidNumber: 3002
 cn: group1c
 
-dn: cn=group2a,cn=groups,cn=compat,cn=accounts,dc=example,dc=com
+dn: cn=group2a,cn=Groups,cn=compat,cn=Accounts,dc=example,dc=com
 objectClass: posixgroup
 objectClass: top
 gidNumber: 4001
 cn: group2a
 
-dn: cn=group2b,cn=groups,cn=compat,cn=accounts,dc=example,dc=com
+dn: cn=group2b,cn=Groups,cn=compat,cn=Accounts,dc=example,dc=com
 objectClass: posixgroup
 objectClass: top
 gidNumber: 4002
 memberUid: user2b
 cn: group2b
 
-dn: cn=group2c,cn=groups,cn=compat,cn=accounts,dc=example,dc=com
+dn: cn=group2c,cn=Groups,cn=compat,cn=Accounts,dc=example,dc=com
 objectClass: posixgroup
 objectClass: top
 gidNumber: 4002
 memberUid: user2b
 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