diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3c8f735..3ea97d9 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         ats-tool: [ats, ats3, atsflux, atsformat, atslite1, atslite3]
-        python-version: ["3.8", "3.9", "3.10"]
+        python-version: ["3.8", "3.9", "3.10", "3.13"]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/ats/configuration.py b/ats/configuration.py
index cf771a8..25a2d4f 100644
--- a/ats/configuration.py
+++ b/ats/configuration.py
@@ -525,12 +525,13 @@ def get_machine_entry_points(machine_class):
     log("Machine Factory: looping over available machine plugins:",
         echo=False)
     if sys.version_info >= (3, 12):
-        ats_machines = entry_points().select(group='ats.machines', value=machine_class)
+        ats_machines = entry_points().select(group='ats.machines')
         log(f"Machine Factory: found machine plugins: {ats_machines}",
             echo=False)
         for machine_factory in ats_machines:
-            log(f"Machine Factory: Found machine {machine_factory.name} of class {machine_factory.value}: {machine_factory}")
-            return machine_factory.load()(machine_class, -1)
+            if machine_class in machine_factory.value:
+                log(f"Machine Factory: Found machine {machine_factory.name} of class {machine_factory.value}: {machine_factory}")
+                return machine_factory.load()(machine_class, -1)
     else:
         ats_machines = {machine.name: machine
                         for group, machines in entry_points().items()
diff --git a/ats/tests.py b/ats/tests.py
index fc2aba5..f048e15 100644
--- a/ats/tests.py
+++ b/ats/tests.py
@@ -90,7 +90,7 @@ def setName(self, name):
            Set namebase to a version without special chars or blanks.
         """
         self.name = name
-        self.namebase = re.sub('\W', '_', name)
+        self.namebase = re.sub(r'\W', '_', name)
         #print "DEBUG setName = %s\n" % self.name
 
     def __init__ (self, *fixedargs, **options):