diff --git a/OpenLdapSync/src/org/labkey/openldapsync/OpenLdapSyncModule.java b/OpenLdapSync/src/org/labkey/openldapsync/OpenLdapSyncModule.java
index c5a39011f..17a79b2c2 100644
--- a/OpenLdapSync/src/org/labkey/openldapsync/OpenLdapSyncModule.java
+++ b/OpenLdapSync/src/org/labkey/openldapsync/OpenLdapSyncModule.java
@@ -119,7 +119,7 @@ public boolean isAvailable(DefaultSchema schema, Module module)
     }
 
     @Override
-    public @NotNull Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
         return PageFlowUtil.set(LdapSyncRunner.TestCase.class);
     }
diff --git a/OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncAuditProvider.java b/OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncAuditProvider.java
index f631670ee..86ca19c95 100644
--- a/OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncAuditProvider.java
+++ b/OpenLdapSync/src/org/labkey/openldapsync/ldap/LdapSyncAuditProvider.java
@@ -36,8 +36,8 @@ public class LdapSyncAuditProvider extends AbstractAuditTypeProvider implements
 
     static final List<FieldKey> defaultVisibleColumns = new ArrayList<>();
 
-    static {
-
+    static
+    {
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED));
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_CREATED_BY));
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_IMPERSONATED_BY));
@@ -47,6 +47,11 @@ public class LdapSyncAuditProvider extends AbstractAuditTypeProvider implements
         defaultVisibleColumns.add(FieldKey.fromParts(COLUMN_NAME_COMMENT));
     }
 
+    public LdapSyncAuditProvider()
+    {
+        super(new LdapSyncAuditDomainKind());
+    }
+
     @Override
     public String getEventName()
     {
@@ -68,7 +73,7 @@ public String getDescription()
     @Override
     public TableInfo createTableInfo(UserSchema userSchema, ContainerFilter cf)
     {
-        DefaultAuditTypeTable table = new DefaultAuditTypeTable(this, createStorageTableInfo(), userSchema, cf, defaultVisibleColumns)
+        return new DefaultAuditTypeTable(LdapSyncAuditProvider.this, createStorageTableInfo(), userSchema, cf, defaultVisibleColumns)
         {
             @Override
             protected void initColumn(MutableColumnInfo col)
@@ -87,7 +92,6 @@ else if (COLUMN_NAME_MEMBERSHIPS_CHANGED.equalsIgnoreCase(col.getName()))
                 }
             }
         };
-        return table;
     }
 
     @Override
@@ -96,12 +100,6 @@ public List<FieldKey> getDefaultVisibleColumns()
         return defaultVisibleColumns;
     }
 
-    @Override
-    protected AbstractAuditDomainKind getDomainKind()
-    {
-        return new LdapSyncAuditDomainKind();
-    }
-
     @Override
     public Map<FieldKey, String> legacyNameMap()
     {
diff --git a/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisModule.java b/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisModule.java
index 3099f8083..466c12ac7 100644
--- a/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisModule.java
+++ b/SequenceAnalysis/src/org/labkey/sequenceanalysis/SequenceAnalysisModule.java
@@ -505,40 +505,35 @@ protected void registerContainerListeners()
     }
 
     @Override
-    @NotNull
-    public Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
-        @SuppressWarnings({"unchecked"})
-        Set<Class> testClasses = new HashSet<>(Arrays.asList(
-                Barcoder.TestCase.class,
-                BamIterator.TestCase.class,
-                SequenceIntegrationTests.SequenceImportPipelineTestCase.class,
-                //SequenceIntegrationTests.SequenceAnalysisPipelineTestCase3.class,
-                SequenceIntegrationTests.SequenceAnalysisPipelineTestCase1.class,
-                SequenceIntegrationTests.SequenceAnalysisPipelineTestCase2.class,
-                OutputIntegrationTests.VariantProcessingTest.class,
-                SequenceRemoteIntegrationTests.class,
-                SequenceTriggerHelper.TestCase.class,
-                SequencePipelineServiceImpl.TestCase.class
-        ));
-
-        return testClasses;
+        return Set.of(
+            Barcoder.TestCase.class,
+            BamIterator.TestCase.class,
+            SequenceIntegrationTests.SequenceImportPipelineTestCase.class,
+            //SequenceIntegrationTests.SequenceAnalysisPipelineTestCase3.class,
+            SequenceIntegrationTests.SequenceAnalysisPipelineTestCase1.class,
+            SequenceIntegrationTests.SequenceAnalysisPipelineTestCase2.class,
+            OutputIntegrationTests.VariantProcessingTest.class,
+            SequenceRemoteIntegrationTests.class,
+            SequenceTriggerHelper.TestCase.class,
+            SequencePipelineServiceImpl.TestCase.class
+        );
     }
 
     @Override
-    @NotNull
-    public Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
-        return PageFlowUtil.set(
-                SequenceAlignmentTask.TestCase.class,
-                SequenceAnalysisManager.TestCase.class,
-                SequenceJob.TestCase.class,
-                SequenceJobSupportImpl.TestCase.class,
-                ProcessVariantsHandler.TestCase.class,
-                VariantProcessingJob.TestCase.class,
-                ScatterGatherUtils.TestCase.class,
-                ChainFileValidator.TestCase.class,
-                FastqcRunner.TestCase.class
+        return Set.of(
+            SequenceAlignmentTask.TestCase.class,
+            SequenceAnalysisManager.TestCase.class,
+            SequenceJob.TestCase.class,
+            SequenceJobSupportImpl.TestCase.class,
+            ProcessVariantsHandler.TestCase.class,
+            VariantProcessingJob.TestCase.class,
+            ScatterGatherUtils.TestCase.class,
+            ChainFileValidator.TestCase.class,
+            FastqcRunner.TestCase.class
         );
     }
 
diff --git a/Studies/src/org/labkey/studies/StudiesModule.java b/Studies/src/org/labkey/studies/StudiesModule.java
index b4d204551..c6c14306f 100644
--- a/Studies/src/org/labkey/studies/StudiesModule.java
+++ b/Studies/src/org/labkey/studies/StudiesModule.java
@@ -14,7 +14,6 @@
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.studies.query.StudiesUserSchema;
 import org.labkey.api.studies.security.StudiesDataAdminRole;
-import org.labkey.studies.query.StudiesUserSchema;
 import org.labkey.studies.study.StudiesFilterProvider;
 import org.labkey.studies.study.StudyEnrollmentEventProvider;
 
@@ -83,10 +82,8 @@ public QuerySchema createSchema(final DefaultSchema schema, Module module)
     }
 
     @Override
-    public @NotNull Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
-        return PageFlowUtil.set(
-                StudiesManager.TestCase.class
-        );
+        return Set.of(StudiesManager.TestCase.class);
     }
 }
\ No newline at end of file
diff --git a/cluster/src/org/labkey/cluster/ClusterModule.java b/cluster/src/org/labkey/cluster/ClusterModule.java
index fa3f86a7b..6e4edf8d7 100644
--- a/cluster/src/org/labkey/cluster/ClusterModule.java
+++ b/cluster/src/org/labkey/cluster/ClusterModule.java
@@ -122,23 +122,15 @@ public Set<String> getSchemaNames()
     }
 
     @Override
-    @NotNull
-    public Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
-        @SuppressWarnings({"unchecked"})
-        Set<Class> testClasses = new HashSet<>(List.of(
-                TestCase.class
-        ));
-
-        return testClasses;
+        return Set.of(TestCase.class);
     }
 
     @Override
-    public @NotNull Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
-        return new HashSet<>(List.of(
-                SlurmExecutionEngine.TestCase.class
-        ));
+        return Set.of(SlurmExecutionEngine.TestCase.class);
     }
 
     @Override
diff --git a/discvrcore/src/org/labkey/discvrcore/DiscvrCoreModule.java b/discvrcore/src/org/labkey/discvrcore/DiscvrCoreModule.java
index 152241120..9f21c33ba 100644
--- a/discvrcore/src/org/labkey/discvrcore/DiscvrCoreModule.java
+++ b/discvrcore/src/org/labkey/discvrcore/DiscvrCoreModule.java
@@ -87,7 +87,7 @@ public Set<String> getSchemaNames()
 
 
     @Override
-    public @NotNull Set<Class> getIntegrationTests()
+    public @NotNull Set<Class<?>> getIntegrationTests()
     {
         return PageFlowUtil.set(AuditSummaryUserSchema.TestCase.class);
     }
diff --git a/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java b/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java
index 772c210bd..15feab9e5 100644
--- a/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java
+++ b/jbrowse/src/org/labkey/jbrowse/JBrowseModule.java
@@ -142,11 +142,8 @@ public Set<String> getSchemaNames()
     }
 
     @Override
-    @NotNull
-    public Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
-        return PageFlowUtil.set(
-                JBrowseManager.TestCase.class
-        );
+        return Set.of(JBrowseManager.TestCase.class);
     }
 }
\ No newline at end of file
diff --git a/singlecell/src/org/labkey/singlecell/SingleCellModule.java b/singlecell/src/org/labkey/singlecell/SingleCellModule.java
index def91fcd7..29ec88138 100644
--- a/singlecell/src/org/labkey/singlecell/SingleCellModule.java
+++ b/singlecell/src/org/labkey/singlecell/SingleCellModule.java
@@ -310,12 +310,11 @@ public static void registerPipelineSteps()
     }
 
     @Override
-    @NotNull
-    public Set<Class> getUnitTests()
+    public @NotNull Set<Class<?>> getUnitTests()
     {
-        return PageFlowUtil.set(
-                AbstractSingleCellHandler.TestCase.class,
-                PrepareRawCounts.TestCase.class
+        return Set.of(
+            AbstractSingleCellHandler.TestCase.class,
+            PrepareRawCounts.TestCase.class
         );
     }
 }
\ No newline at end of file