Removed some deprecated methods and updated some LDAP tests