diff --git a/projects/cadcAccessControl-Server/build.xml b/projects/cadcAccessControl-Server/build.xml
index 41e56c2ebf86098192c10bde96d9d8907a239801..ffce2a44d269f01ac219420cb0eb9d35692df95a 100644
--- a/projects/cadcAccessControl-Server/build.xml
+++ b/projects/cadcAccessControl-Server/build.xml
@@ -133,7 +133,7 @@
     <target name="test" depends="compile-test,resources">
         <echo message="Running test" />
 
-        <!-- Run the junit test suite -->
+         Run the junit test suite 
         <echo message="Running test suite..." />
         <junit printsummary="yes" haltonfailure="yes" fork="yes">
             <classpath>
@@ -141,10 +141,10 @@
                 <pathelement path="${build}/test/class"/>
                 <pathelement path="${testingJars}"/>
             </classpath>
-            <!--<test name="ca.nrc.cadc.ac.server.ldap.LdapDAOTest" />-->
+            <test name="ca.nrc.cadc.ac.server.ldap.LdapDAOTest" />
             <test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />
-            <!--<test name="ca.nrc.cadc.ac.server.web.GroupActionFactoryTest" />-->
-            <!--<test name="ca.nrc.cadc.ac.server.ldap.LdapUserDAOTest" />-->
+            <test name="ca.nrc.cadc.ac.server.web.GroupActionFactoryTest" />
+            <test name="ca.nrc.cadc.ac.server.ldap.LdapUserDAOTest" />
             <formatter type="plain" usefile="false" />
         </junit>
     </target>
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
index 06d927727f067e0a18c14126b2d8d6338b9e4fff..caa18b20c505d98444c4b428ca8a8a9dad7b0aba 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
@@ -112,6 +112,7 @@ public class PluginFactory
         }
     }
 
+    @SuppressWarnings("unchecked")
     public <T extends Principal> GroupPersistence<T> getGroupPersistence()
     {
         GroupPersistence<T> ret = null;
@@ -136,6 +137,7 @@ public class PluginFactory
         return ret;
     }
 
+    @SuppressWarnings("unchecked")
     public <T extends Principal> UserPersistence<T> getUserPersistence()
     {
         UserPersistence<T> ret = null;
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
index dad14550543545ec7a7fbdff7493b6ecf45f47e7..aabfca8a2d92705cc34fd980fa6af7975549521d 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
@@ -101,8 +101,7 @@ import javax.security.auth.x500.X500Principal;
 import javax.servlet.http.HttpServletResponse;
 import org.apache.log4j.Logger;
 
-public class ACSearchRunner
-    implements JobRunner
+public class ACSearchRunner implements JobRunner
 {
     private static Logger log = Logger.getLogger(ACSearchRunner.class);
     
@@ -149,6 +148,7 @@ public class ACSearchRunner
         log.info(endMessage);
     }
     
+    @SuppressWarnings("unchecked")
     private void search()
     {
         try
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java
index 3862f48ea7f501c8e0dc0b3dd0cd551412e49b23..d8a84b2650cf2b3d4cd191b5fbf7f4a54014235c 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/AddUserMemberAction.java
@@ -94,6 +94,7 @@ public class AddUserMemberAction extends GroupsAction
         this.userIDType = userIDType;
     }
 
+    @SuppressWarnings("unchecked")
     public Object run()
         throws Exception
     {
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java
index 67b342924c2fa67dd07f82e5331b8f0124142395..c9612f663c5009d88c9d00d17fa82974a266a6bb 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/RemoveUserMemberAction.java
@@ -92,6 +92,7 @@ public class RemoveUserMemberAction extends GroupsAction
         this.userIDType = userIDType;
     }
 
+    @SuppressWarnings("unchecked")
     public Object run()
         throws Exception
     {