Update refactoring.
Fix LDAP test.