Test and improve directory service