Pull in changes from PR

test/test_pdo.py

@@ -76,7 +76,7 @@ def test_pdo_export(self):
         for pdo in "tpdo", "rpdo":
             with tempfile.NamedTemporaryFile(suffix=".csv") as tmp:
                 fn = tmp.name
-                with self.subTest(pdo=pdo, filename=fn):
+                with self.subTest(filename=fn, pdo=pdo):
                     getattr(self.node, pdo).export(fn)
                     with open(fn) as csv:
                         header = csv.readline()