diff --git a/bindings/java/build.xml b/bindings/java/build.xml
index e0abb64d1a8256af7cb722c41957c231a170f577..98adf33507ab8d5ca7729f47de8db4b4a31a6edc 100644
--- a/bindings/java/build.xml
+++ b/bindings/java/build.xml
@@ -121,6 +121,7 @@
 	<target name="compile-test" depends="compile" description="compile the tests">
 		<javac debug="on" srcdir="${test}" destdir="${build}" includeantruntime="false">
 			<classpath refid="libraries"/>
+			<compilerarg value="-Xlint" />
 		</javac>
 	</target>
 
diff --git a/bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java b/bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java
index 85e2ed066716a9dbfa139091b4b35c74179c1481..e32295740ddd1ff2560f137671305b4bd9056625 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/TimelineFilter.java
@@ -655,7 +655,8 @@ public boolean equals(Object obj) {
 			if (notEqual(this.fileTypesFilter, other.getFileTypesFilter())) {
 				return false;
 			}
-			return Objects.equals(this.additionalFilters, other.getSubFilters());
+
+			return Objects.equals(this.additionalFilters, new HashSet<>(other.getSubFilters()));
 		}
 
 	}
diff --git a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
index 82c9593f9c251b62a799d19c685142356988ae98..0c22fbd617a741331104c709b3e782f44893c71d 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/DataModelTestSuite.java
@@ -41,7 +41,18 @@
  * default ant target sets properties for the various folders.
  */
 @RunWith(Suite.class)
-@Suite.SuiteClasses({ CommunicationsManagerTest.class, CaseDbSchemaVersionNumberTest.class,org.sleuthkit.datamodel.TopDownTraversal.class, org.sleuthkit.datamodel.SequentialTraversal.class, org.sleuthkit.datamodel.CrossCompare.class, org.sleuthkit.datamodel.BottomUpTest.class, org.sleuthkit.datamodel.CPPtoJavaCompare.class, org.sleuthkit.datamodel.HashDbTest.class})
+@Suite.SuiteClasses({ 
+	CommunicationsManagerTest.class, 
+	CaseDbSchemaVersionNumberTest.class,
+
+//  Note: these tests have dependencies on images being placed in the input folder: nps-2009-canon2-gen6, ntfs1-gen, and small2	
+//	org.sleuthkit.datamodel.TopDownTraversal.class, 
+//	org.sleuthkit.datamodel.SequentialTraversal.class, 
+//	org.sleuthkit.datamodel.CrossCompare.class, 
+//	org.sleuthkit.datamodel.BottomUpTest.class, 
+//	org.sleuthkit.datamodel.CPPtoJavaCompare.class, 
+//	org.sleuthkit.datamodel.HashDbTest.class
+})
 public class DataModelTestSuite {
 
 	static final String TEST_IMAGE_DIR_NAME = "test" + java.io.File.separator + "Input";
diff --git a/bindings/java/test/org/sleuthkit/datamodel/PublicTagName.java b/bindings/java/test/org/sleuthkit/datamodel/PublicTagName.java
index c14d0258ea941cca85e996fdb41f549514673d65..9a777aedd702246d7aa92515389927681fe9932d 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/PublicTagName.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/PublicTagName.java
@@ -7,8 +7,8 @@
  */
 public class PublicTagName extends TagName {
 
-	public PublicTagName(long id, String displayName, String description, HTML_COLOR color, TskData.FileKnown knownStatus) {
-		super(id, displayName, description, color, knownStatus);
+	public PublicTagName(long id, String displayName, String description, HTML_COLOR color, TskData.FileKnown knownStatus, long tagSetId, int rank) {
+		super(id, displayName, description, color, knownStatus, tagSetId, rank);
 	}
 
 	@Override
diff --git a/bindings/java/test/org/sleuthkit/datamodel/timeline/EventTypeFilterTest.java b/bindings/java/test/org/sleuthkit/datamodel/timeline/EventTypeFilterTest.java
index c4b700ba5516a3fcb65ad8094d6d8ed99b307cce..c42b5d5dcc2db66ebcf018ba6f78d3625bb4e264 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/timeline/EventTypeFilterTest.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/timeline/EventTypeFilterTest.java
@@ -51,7 +51,7 @@ public void testGetDisplayName() {
 		EventTypeFilter instance = new EventTypeFilter(TimelineEventType.EMAIL);
 		assertEquals(TimelineEventType.EMAIL.getDisplayName(), instance.getDisplayName());
 		instance = new EventTypeFilter(TimelineEventType.ROOT_EVENT_TYPE);
-		assertEquals("Event Type", instance.getDisplayName());
+		assertEquals("Limit event types to", instance.getDisplayName());
 	}
 
 	/**
diff --git a/bindings/java/test/org/sleuthkit/datamodel/timeline/RootFilterTest.java b/bindings/java/test/org/sleuthkit/datamodel/timeline/RootFilterTest.java
index c675d39c05fcc2403dc3cf0be2fe85d03d26b2ff..15513fa7f0f3c85a3b9cc3d0046228a9e1a3a0c3 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/timeline/RootFilterTest.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/timeline/RootFilterTest.java
@@ -40,13 +40,25 @@ public class RootFilterTest {
 	@Test
 	public void testCopyOf() {
 		System.out.println("copyOf");
-		TimelineFilter instance = getNewRootFilter();
-		assertEquals(instance, instance.copyOf());
+		
+		testCopyOfEqual(new TimelineFilter.TagsFilter());
+		testCopyOfEqual(new TimelineFilter.HashHitsFilter());
+		testCopyOfEqual(new TimelineFilter.TextFilter());
+		testCopyOfEqual(new EventTypeFilter(TimelineEventType.ROOT_EVENT_TYPE));
+		testCopyOfEqual(new TimelineFilter.DataSourcesFilter());
+		testCopyOfEqual(new TimelineFilter.HideKnownFilter());
+		testCopyOfEqual(new TimelineFilter.FileTypesFilter());
+		
+		testCopyOfEqual(getNewRootFilter());
 	}
+	
+	private void testCopyOfEqual(TimelineFilter filter) {
+		assertEquals(filter, filter.copyOf());
+	}
+	
 
 	TimelineFilter.RootFilter getNewRootFilter() {
 		TimelineFilter.TagsFilter tagsFilter = new TimelineFilter.TagsFilter();
-		tagsFilter.addSubFilter(new TimelineFilter.TagNameFilter(new PublicTagName(0, "test tagName", "test tag name description", TagName.HTML_COLOR.NONE, TskData.FileKnown.KNOWN)));
 		TimelineFilter.HashHitsFilter hashHitsFilter = new TimelineFilter.HashHitsFilter();
 		TimelineFilter.TextFilter textFilter = new TimelineFilter.TextFilter();
 		EventTypeFilter eventTypeFilter = new EventTypeFilter(TimelineEventType.ROOT_EVENT_TYPE);
diff --git a/bindings/java/test/org/sleuthkit/datamodel/timeline/TimelineTestSuite.java b/bindings/java/test/org/sleuthkit/datamodel/timeline/TimelineTestSuite.java
index 4879a4d70a1c305ae92b3e4ba002d7aedb149794..4ba1c7bc0328cbe97f522aca8a708197c0d0c4f4 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/timeline/TimelineTestSuite.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/timeline/TimelineTestSuite.java
@@ -27,7 +27,8 @@
 @RunWith(Suite.class)
 @Suite.SuiteClasses({
 	RootFilterTest.class,
-	EventTypeFilterTest.class})
+	EventTypeFilterTest.class
+})
 public class TimelineTestSuite {
 
 }