diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/DocValuesCache.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/DocValuesCache.java
index 5ab8a8e7f..d5bb1b276 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/DocValuesCache.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/query/DocValuesCache.java
@@ -118,7 +118,6 @@ public class DocValuesCache
         public LongValues(int[] ivalues)
         {
             values = new long[ivalues.length];
-            //TODO: Validate to you can copy an int[] into a long[].
             for(int i=0; i< ivalues.length; i++) {
                 values[i] = ivalues[i];
             }
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java
index 2a3bfea4e..4f3c869bc 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/AlfrescoSolrUtils.java
@@ -240,6 +240,17 @@ public class AlfrescoSolrUtils
         Acl acl = new Acl(aclChangeSet.getId(), generateId());
         return acl;
     }
+
+    /**
+     *
+     * @param aclChangeSet
+     * @return
+     */
+    public static Acl getAcl(AclChangeSet aclChangeSet, long aclId)
+    {
+        Acl acl = new Acl(aclChangeSet.getId(), aclId);
+        return acl;
+    }
     /**
      * Get an AclChangeSet
      * @param aclCount
diff --git a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java
index 0b66797de..a30fb8ce9 100644
--- a/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java
+++ b/search-services/alfresco-search/src/test/java/org/alfresco/solr/tracker/AlfrescoSolrTrackerTest.java
@@ -102,7 +102,7 @@ public class AlfrescoSolrTrackerTest extends AbstractAlfrescoSolrTests
         AclChangeSet aclChangeSet = getAclChangeSet(1);
 
         Acl acl = getAcl(aclChangeSet);
-        Acl acl2 = getAcl(aclChangeSet);
+        Acl acl2 = getAcl(aclChangeSet, Long.MAX_VALUE-10); // Test with long value
 
 
         AclReaders aclReaders = getAclReaders(aclChangeSet, acl, list("joel"), list("phil"), null);
@@ -408,6 +408,5 @@ public class AlfrescoSolrTrackerTest extends AbstractAlfrescoSolrTests
         //And the error node should be present
         waitForDocCount(new TermQuery(new Term("content@s___t@{http://www.alfresco.org/model/content/1.0}content", Long.toString(errorNode.getId()))), 1, MAX_WAIT_TIME);
         logger.info("#################### Passed Nineteenth Test ##############################");
-        //assert(false);
     }
 }