diff --git a/test/results/arena.py b/test/results/arena.py
index 3d1abacc..1896d2cd 100644
--- a/test/results/arena.py
+++ b/test/results/arena.py
@@ -23,9 +23,9 @@ __tests__ = (
     "filename" : str,
     "count"    : 6,
     "num"      : range(1, 5),
-    #  "source"   : {None, dict},
+    "source"   : {None, dict},
     "block"    : {
-        #  "attachment"      : {None, dict},
+        "attachment"      : {None, dict},
         "base_class"      : "Block",
         "class"           : {"Link", "Attachment", "Image"},
         "comment_count"   : 0,
diff --git a/test/test_results.py b/test/test_results.py
index e7fcabfd..78228874 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -310,10 +310,13 @@ class TestExtractorResults(unittest.TestCase):
         elif isinstance(test, range):
             self.assertRange(value, test, msg=path)
         elif isinstance(test, set):
-            try:
-                self.assertIn(value, test, msg=path)
-            except AssertionError:
-                self.assertIn(type(value), test, msg=path)
+            for item in test:
+                if isinstance(item, type) and isinstance(value, item) or \
+                        value == item:
+                    break
+            else:
+                v = type(value) if len(str(value)) > 64 else value
+                self.fail(f"{v!r} not in {test}: {path}")
         elif isinstance(test, list):
             subtest = False
             for idx, item in enumerate(test):