Few minor bug fixes and code corrections
Also, some name changes
moving away from testing with apache-ldap
Some code cleanup