diff --git a/CMakeLists.txt b/CMakeLists.txt
index 91adcf0d1..5fd79a8c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,7 +189,6 @@ if (MRDOX_BUILD_TESTS)
     target_link_libraries(mrdox-test PRIVATE mrdox-api ${llvm_libs})
     target_include_directories(mrdox-test PRIVATE ${PROJECT_SOURCE_DIR}/source/tests)
     add_test(NAME mrdox-test COMMAND mrdox-test
-        "${PROJECT_SOURCE_DIR}/tests/n4944"
         "${PROJECT_SOURCE_DIR}/tests/old-tests"
     )
     source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "" FILES CMakeLists.txt)
diff --git a/tests/generate.py b/tests/generate.py
new file mode 100644
index 000000000..79d84d862
--- /dev/null
+++ b/tests/generate.py
@@ -0,0 +1,43 @@
+#! python3
+
+import exrex
+import os
+
+def ToplevelFolder():
+    scriptPath = os.path.realpath(__file__)
+    parentDirectory = os.path.dirname(scriptPath)
+    return os.path.join(parentDirectory, "py")
+
+def EnumDeclarationsFolder():
+    return os.path.join(ToplevelFolder(), "dcl.enum")
+
+
+def GenerateEnumDeclarations():
+    #https://eel.is/c++draft/enum
+    enum_base = "(|: short|: unsigned int|: const long|: const volatile long long|: decltype\(0\))"
+    enumerator_initializer = "(| = 0| = true \? 1,2 : 3| = \!\+\[\]\(\)\{\})"
+    enumerators = " (|(A" + enumerator_initializer + "|A" + enumerator_initializer + ", B " + enumerator_initializer + "),?) "
+    regex = "enum (|EnumName|class EnumName|struct EnumName) " + enum_base + " (\{" + enumerators + "\})? ;"
+    generator = exrex.generate(regex)
+    declarations = list(generator)
+    # Unfortunately, the regex produces some invalid declarations. We remove them by hand as of now.
+    for invalidDeclaration in ["enum    ;", "enum  : short  ;", "enum  : unsigned int  ;",
+                               "enum  : const long  ;", "enum  : const volatile long long  ;",
+                               "enum  : decltype(0)  ;", "enum EnumName   ;"]:
+        try:
+            declarations.remove(invalidDeclaration)
+        except ValueError:
+            print("The invalid declaration \"" + invalidDeclaration + "\" gets no longer generated, so it can be removed from the list of invalid declarations.")
+    return declarations
+
+
+def GenerateIndexedCppFiles(parentDirectory, fileContents):
+    os.makedirs(parentDirectory, exist_ok=True)
+    for index, aDeclaration in enumerate(fileContents):
+        fileName = str(index) + ".cpp"
+        filePath = os.path.join(parentDirectory, fileName)
+        with open(filePath, "w") as f:
+            f.write(aDeclaration)
+
+
+GenerateIndexedCppFiles(EnumDeclarationsFolder(), GenerateEnumDeclarations())
diff --git a/tests/n4944/dcl.enum/1.cpp b/tests/n4944/dcl.enum/1.cpp
deleted file mode 100644
index e7f17836b..000000000
--- a/tests/n4944/dcl.enum/1.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#pragma clang diagnostic ignored "-Wmissing-declarations"
-enum {};
diff --git a/tests/n4944/dcl.enum/1.xml b/tests/n4944/dcl.enum/1.xml
deleted file mode 100644
index 9634807f6..000000000
--- a/tests/n4944/dcl.enum/1.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mrdox SYSTEM "mrdox.dtd">
-<mrdox>
-<namespace name="">
-  <enum name="" id="6WkHtky3/fMz+BLxKzQ7nsMgc4Y=">
-    <file path="dcl.enum/1.cpp" line="2" class="def"/>
-  </enum>
-</namespace>
-</mrdox>
diff --git a/tests/n4944/dcl.enum/2.cpp b/tests/n4944/dcl.enum/2.cpp
deleted file mode 100644
index d4c945d4e..000000000
--- a/tests/n4944/dcl.enum/2.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum struct X;
diff --git a/tests/n4944/dcl.enum/2.xml b/tests/n4944/dcl.enum/2.xml
deleted file mode 100644
index 1307a28c9..000000000
--- a/tests/n4944/dcl.enum/2.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mrdox SYSTEM "mrdox.dtd">
-<mrdox>
-<namespace name="">
-  <enum name="X" class="scoped" type="int" id="ST00Km++J5YixGbh0q74JrYHXAc=">
-    <file path="dcl.enum/2.cpp" line="1"/>
-  </enum>
-</namespace>
-</mrdox>
diff --git a/tests/n4944/dcl.enum/3.cpp b/tests/n4944/dcl.enum/3.cpp
deleted file mode 100644
index afc79c336..000000000
--- a/tests/n4944/dcl.enum/3.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-enum struct X;
-enum struct X {};
-
diff --git a/tests/n4944/dcl.enum/3.xml b/tests/n4944/dcl.enum/3.xml
deleted file mode 100644
index 338dc64b6..000000000
--- a/tests/n4944/dcl.enum/3.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mrdox SYSTEM "mrdox.dtd">
-<mrdox>
-<namespace name="">
-  <enum name="X" class="scoped" type="int" id="ST00Km++J5YixGbh0q74JrYHXAc=">
-    <file path="dcl.enum/3.cpp" line="2" class="def"/>
-    <file path="dcl.enum/3.cpp" line="1"/>
-  </enum>
-</namespace>
-</mrdox>
diff --git a/tests/n4944/dcl.enum/4.cpp b/tests/n4944/dcl.enum/4.cpp
deleted file mode 100644
index e9f82496d..000000000
--- a/tests/n4944/dcl.enum/4.cpp
+++ /dev/null
@@ -1 +0,0 @@
-enum E : char;
diff --git a/tests/n4944/dcl.enum/4.xml b/tests/n4944/dcl.enum/4.xml
deleted file mode 100644
index 368421982..000000000
--- a/tests/n4944/dcl.enum/4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mrdox SYSTEM "mrdox.dtd">
-<mrdox>
-<namespace name="">
-  <enum name="E" type="char" id="xf6YhxRw8JpsHMwP6Tgyroti2gw=">
-    <file path="dcl.enum/4.cpp" line="1"/>
-  </enum>
-</namespace>
-</mrdox>
diff --git a/tests/n4944/dcl.enum/5.cpp b/tests/n4944/dcl.enum/5.cpp
deleted file mode 100644
index 2cd67cb76..000000000
--- a/tests/n4944/dcl.enum/5.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-enum E : char;
-enum E : char {};
-
diff --git a/tests/n4944/dcl.enum/5.xml b/tests/n4944/dcl.enum/5.xml
deleted file mode 100644
index 8c130aa7b..000000000
--- a/tests/n4944/dcl.enum/5.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mrdox SYSTEM "mrdox.dtd">
-<mrdox>
-<namespace name="">
-  <enum name="E" type="char" id="xf6YhxRw8JpsHMwP6Tgyroti2gw=">
-    <file path="dcl.enum/5.cpp" line="2" class="def"/>
-    <file path="dcl.enum/5.cpp" line="1"/>
-  </enum>
-</namespace>
-</mrdox>
diff --git a/tests/old-tests/mem-fn.xml b/tests/old-tests/mem-fn.xml
index 13f4ead46..b6080d724 100644
--- a/tests/old-tests/mem-fn.xml
+++ b/tests/old-tests/mem-fn.xml
@@ -6,23 +6,19 @@
     <file path="mem-fn.cpp" line="17" class="def"/>
     <function name="f" access="public" id="wSFf8IAx5Twq6aD5T8XdnXGuhw8=">
       <file path="mem-fn.cpp" line="17"/>
-      <volatile/>
     </function>
   </struct>
   <struct name="U" id="FLgkhM3m0U3Lo2o3XLPUizWPH00=">
     <file path="mem-fn.cpp" line="22" class="def"/>
     <function name="f1" access="public" id="DBXd564vaQo7GHkh6XCC6HV78/I=">
       <file path="mem-fn.cpp" line="24" class="def"/>
-      <const/><constexpr/><inline/><noexcept/><trailing/><variadic/><volatile/>
     </function>
     <function name="f2" access="public" id="II436kVwM/ZBYOf9q474VxRXK6c=">
       <file path="mem-fn.cpp" line="25" class="def"/>
-      <constexpr/><inline/><noexcept/><trailing/>
       <return name="char"/>
     </function>
     <function name="f3" access="public" id="YOkqb7VjZXBs2Rg5gWCOYGX3Tnw=">
       <file path="mem-fn.cpp" line="26"/>
-      <const/><noexcept/><pure/><virtual/><volatile/>
       <return name="int"/>
     </function>
   </struct>
@@ -31,7 +27,6 @@
     <base name="T14" access="public" id="SLJhBKx+2u4KxSJ78Fg6wqlObPc="/>
     <function name="f" access="public" id="5+yfyWtDpz80IwKT3xugro18Ev0=">
       <file path="mem-fn.cpp" line="20"/>
-      <override/>
     </function>
   </struct>
   <struct name="T02" id="H+pnPDuG6B+W6+srjVP2qhqXCrQ=">
@@ -44,14 +39,12 @@
     <file path="mem-fn.cpp" line="6" class="def"/>
     <function name="f" access="public" id="G71rDzcAZPSKGoGGoDswQjD1JuA=">
       <file path="mem-fn.cpp" line="6"/>
-      <volatile/>
     </function>
   </struct>
   <struct name="T11" id="MXMa4TZZfdRkREzWSLpIF6ruUyw=">
     <file path="mem-fn.cpp" line="13" class="def"/>
     <function name="f" access="public" id="+NevzZlqigIe1KSKS7eqq7pCd40=">
       <file path="mem-fn.cpp" line="13"/>
-      <trailing/>
       <return name="int"/>
     </function>
   </struct>
@@ -59,7 +52,6 @@
     <file path="mem-fn.cpp" line="15" class="def"/>
     <function name="f" access="public" id="5d5eSOvkYwBOnpbLcrkRuFvJGP4=">
       <file path="mem-fn.cpp" line="15"/>
-      <virtual/>
     </function>
   </struct>
   <struct name="T01" id="O2UBDeG42PMrk1up8f8PGVFhIGk=">
@@ -72,35 +64,30 @@
     <file path="mem-fn.cpp" line="16" class="def"/>
     <function name="f" access="public" id="1Lz3aFupR+OsCqiPOaIFWqGuyCc=">
       <file path="mem-fn.cpp" line="16"/>
-      <pure/><virtual/>
     </function>
   </struct>
   <struct name="T09" id="SX7tpa77UInh7a4AsMFjfiCtoLY=">
     <file path="mem-fn.cpp" line="11" class="def"/>
     <function name="f" access="public" id="u+MePKsNF/sYSk6UpgNS65+USGU=">
       <file path="mem-fn.cpp" line="11"/>
-      <noexcept/>
     </function>
   </struct>
   <struct name="T06" id="SzwXGFnhX4HlHjHolU7XF/KEqDs=">
     <file path="mem-fn.cpp" line="8" class="def"/>
     <function name="f" access="public" id="A3MUO5+pwkURxw+SBeh1y0BKv7c=">
       <file path="mem-fn.cpp" line="8" class="def"/>
-      <constexpr/>
     </function>
   </struct>
   <struct name="T10" id="TJnjDRnoO8E/5XEw8BaODsKxlwQ=">
     <file path="mem-fn.cpp" line="12" class="def"/>
     <function name="f" access="public" id="0hjrVGeDlQhdYkOu4shvWWPqNKU=">
       <file path="mem-fn.cpp" line="12"/>
-      <trailing/>
     </function>
   </struct>
   <struct name="T08" id="WU9ZeQm0IOT8cYJkWXom3NXeWsM=">
     <file path="mem-fn.cpp" line="10" class="def"/>
     <function name="f" access="public" id="jlrEtbnYd1B6OAjYlF0gQ/oYu5w=">
       <file path="mem-fn.cpp" line="10"/>
-      <inline/>
     </function>
   </struct>
   <struct name="T03" id="rM+ml6ikwiS9Twa1IwpCHbSHTbg=">
@@ -113,14 +100,12 @@
     <file path="mem-fn.cpp" line="7" class="def"/>
     <function name="f" access="public" id="rWLMsKBEv1FtDyk7Y7XNzcgmt68=">
       <file path="mem-fn.cpp" line="7"/>
-      <const/>
     </function>
   </struct>
   <struct name="T12" id="7rg34TfmIwu+7zOd7DN+Dq8mLCc=">
     <file path="mem-fn.cpp" line="14" class="def"/>
     <function name="f" access="public" id="I0S8eMgTnTkagm+IrM34MBiU4XI=">
       <file path="mem-fn.cpp" line="14"/>
-      <variadic/>
     </function>
   </struct>
   <struct name="T16" id="75395VGvKeZbe1EhfJwktZuWLs0=">
@@ -134,7 +119,6 @@
     <base name="U" access="public" id="FLgkhM3m0U3Lo2o3XLPUizWPH00="/>
     <function name="f3" access="public" id="/C2pxLlwRMKnr6YRbVnykUArzEI=">
       <file path="mem-fn.cpp" line="31"/>
-      <const/><noexcept/><override/><volatile/>
       <return name="int"/>
     </function>
   </struct>
diff --git a/tests/old-tests/noreturn.xml b/tests/old-tests/noreturn.xml
index 39e2ba0c1..34885cef7 100644
--- a/tests/old-tests/noreturn.xml
+++ b/tests/old-tests/noreturn.xml
@@ -7,17 +7,14 @@
     <friend id="CnO51rIKTzfiVKHkR3TdPa0eo+8="/>
     <function name="f2" access="public" id="QjsWLydQujVa097RP8f2Lq3nLQ4=">
       <file path="noreturn.cpp" line="5"/>
-      <noreturn/>
     </function>
     <function name="f3" access="public" id="TkBjWwqMDycyUbq+TJZ9qfUhSn0=">
       <file path="noreturn.cpp" line="7"/>
-      <noreturn/>
     </function>
   </struct>
   <function name="f1" id="CnO51rIKTzfiVKHkR3TdPa0eo+8=">
     <file path="noreturn.cpp" line="1"/>
     <file path="noreturn.cpp" line="9"/>
-    <noreturn/>
   </function>
 </namespace>
 </mrdox>