From 9871e60b6cd9c0fc18f1430c6e4056d321a91887 Mon Sep 17 00:00:00 2001
From: labkey-tchad <tchad@labkey.com>
Date: Wed, 18 Mar 2026 14:53:19 -0700
Subject: [PATCH] Remove miscategorized tests from CustomModules suite

---
 .../test/tests/wnprc_ehr/WNPRCComplianceTrainingTest.java      | 3 +--
 .../src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java     | 3 +--
 .../labkey/test/tests/wnprc_virology/WNPRC_VirologyTest.java   | 3 ++-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRCComplianceTrainingTest.java b/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRCComplianceTrainingTest.java
index 4defec233..70db85a41 100644
--- a/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRCComplianceTrainingTest.java
+++ b/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRCComplianceTrainingTest.java
@@ -3,7 +3,6 @@
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.labkey.test.Locator;
-import org.labkey.test.categories.CustomModules;
 import org.labkey.test.categories.EHR;
 import org.labkey.test.categories.WNPRC_EHR;
 import org.labkey.test.tests.ehr.ComplianceTrainingTest;
@@ -16,7 +15,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-@Category({CustomModules.class, EHR.class, WNPRC_EHR.class})
+@Category({EHR.class, WNPRC_EHR.class})
 public class WNPRCComplianceTrainingTest extends ComplianceTrainingTest implements PostgresOnlyTest
 {
     @Override
diff --git a/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java b/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java
index dd6705693..8a1a982c5 100644
--- a/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java
+++ b/WNPRC_EHR/test/src/org/labkey/test/tests/wnprc_ehr/WNPRC_EHRTest.java
@@ -42,7 +42,6 @@
 import org.labkey.test.TestFileUtils;
 import org.labkey.test.WebDriverWrapper;
 import org.labkey.test.WebTestHelper;
-import org.labkey.test.categories.CustomModules;
 import org.labkey.test.categories.EHR;
 import org.labkey.test.categories.WNPRC_EHR;
 import org.labkey.test.components.bootstrap.ModalDialog;
@@ -116,7 +115,7 @@
  * NOTE: EHRApiTest may be a better location for tests designed to test server-side trigger scripts
  * or similar business logic.
  */
-@Category({CustomModules.class, EHR.class, WNPRC_EHR.class})
+@Category({EHR.class, WNPRC_EHR.class})
 public class WNPRC_EHRTest extends AbstractGenericEHRTest implements PostgresOnlyTest
 {
     public static final String PROJECT_NAME = "WNPRC";
diff --git a/WNPRC_Virology/test/src/org/labkey/test/tests/wnprc_virology/WNPRC_VirologyTest.java b/WNPRC_Virology/test/src/org/labkey/test/tests/wnprc_virology/WNPRC_VirologyTest.java
index ecf5306f1..5dc0ff32a 100644
--- a/WNPRC_Virology/test/src/org/labkey/test/tests/wnprc_virology/WNPRC_VirologyTest.java
+++ b/WNPRC_Virology/test/src/org/labkey/test/tests/wnprc_virology/WNPRC_VirologyTest.java
@@ -16,6 +16,7 @@
 import org.labkey.test.ModulePropertyValue;
 import org.labkey.test.TestFileUtils;
 import org.labkey.test.WebTestHelper;
+import org.labkey.test.categories.EHR;
 import org.labkey.test.categories.WNPRC_EHR;
 import org.labkey.test.components.dumbster.EmailRecordTable;
 import org.labkey.test.components.ext4.Window;
@@ -49,7 +50,7 @@
 import static org.labkey.test.util.PermissionsHelper.FOLDER_ADMIN_ROLE;
 import static org.labkey.test.util.PermissionsHelper.READER_ROLE;
 
-@Category({WNPRC_EHR.class})
+@Category({EHR.class, WNPRC_EHR.class})
 public class WNPRC_VirologyTest extends ViralLoadAssayTest
 {