LDAP-257: More JUnit style cleanup.