diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_cpp_members/class_diagram_cpp_members.puml b/plantuml/parser/integration_test/class_diagram/class_diagram_cpp_members/class_diagram_cpp_members.puml
new file mode 100644
index 0000000..0c554de
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_cpp_members/class_diagram_cpp_members.puml
@@ -0,0 +1,27 @@
+' *******************************************************************************
+' Copyright (c) 2026 Contributors to the Eclipse Foundation
+'
+' See the NOTICE file(s) distributed with this work for additional
+' information regarding copyright ownership.
+'
+' This program and the accompanying materials are made available under the
+' terms of the Apache License Version 2.0 which is available at
+' https://www.apache.org/licenses/LICENSE-2.0
+'
+' SPDX-License-Identifier: Apache-2.0
+' *******************************************************************************
+@startuml class_diagram_cpp_members
+
+package cpp_case {
+    class ServiceImpl {
+        + ~ServiceImpl()
+        + operator()(amp::stop_token) : ResultBlank
+        + Submit<CallableType, ArgumentTypes...>(callable, arguments)
+        + Submit(CallableType&&, ArgumentTypes&&)<T> : auto
+        + operator->() : Result<Artifact>*
+        + Visit(visitor : amp::callback<void(Flashing&)>)
+        + VisitUnnamed(amp::callback<void(FlashingMinion&)>)
+    }
+}
+
+@enduml
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_cpp_members/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_cpp_members/output.json
new file mode 100644
index 0000000..9135210
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_cpp_members/output.json
@@ -0,0 +1,130 @@
+{
+  "class_diagram_cpp_members.puml": {
+    "name": "class_diagram_cpp_members",
+    "entities": [
+      {
+        "id": "cpp_case.ServiceImpl",
+        "name": "ServiceImpl",
+        "enclosing_namespace_id": "cpp_case",
+        "entity_type": "Class",
+        "type_aliases": [],
+        "methods": [
+          {
+            "name": "~ServiceImpl",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [],
+            "template_parameters": null,
+            "modifiers": [
+              "Destructor"
+            ]
+          },
+          {
+            "name": "operator()",
+            "return_type": "ResultBlank",
+            "visibility": "public",
+            "parameters": [
+              {
+                "name": "",
+                "param_type": "amp::stop_token",
+                "is_variadic": false
+              }
+            ],
+            "template_parameters": null,
+            "modifiers": []
+          },
+          {
+            "name": "Submit",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [
+              {
+                "name": "callable",
+                "param_type": null,
+                "is_variadic": false
+              },
+              {
+                "name": "arguments",
+                "param_type": null,
+                "is_variadic": false
+              }
+            ],
+            "template_parameters": [
+              "CallableType",
+              "ArgumentTypes..."
+            ],
+            "modifiers": []
+          },
+          {
+            "name": "Submit",
+            "return_type": "auto",
+            "visibility": "public",
+            "parameters": [
+              {
+                "name": "",
+                "param_type": "CallableType&&",
+                "is_variadic": false
+              },
+              {
+                "name": "",
+                "param_type": "ArgumentTypes&&",
+                "is_variadic": false
+              }
+            ],
+            "template_parameters": [
+              "T"
+            ],
+            "modifiers": []
+          },
+          {
+            "name": "operator->",
+            "return_type": "Result<Artifact>*",
+            "visibility": "public",
+            "parameters": [],
+            "template_parameters": null,
+            "modifiers": []
+          },
+          {
+            "name": "Visit",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [
+              {
+                "name": "visitor",
+                "param_type": "amp::callback<void(Flashing&)>",
+                "is_variadic": false
+              }
+            ],
+            "template_parameters": null,
+            "modifiers": []
+          },
+          {
+            "name": "VisitUnnamed",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [
+              {
+                "name": "",
+                "param_type": "amp::callback<void(FlashingMinion&)>",
+                "is_variadic": false
+              }
+            ],
+            "template_parameters": null,
+            "modifiers": []
+          }
+        ],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_cpp_members",
+        "source_line": 16,
+        "variables": [],
+        "relationships": []
+      }
+    ],
+    "relationships": [],
+    "source_files": [
+      "class_diagram_cpp_members"
+    ],
+    "version": null
+  }
+}
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/class_diagram_file_level_constructs.puml b/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/class_diagram_file_level_constructs.puml
new file mode 100644
index 0000000..81f8f26
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/class_diagram_file_level_constructs.puml
@@ -0,0 +1,48 @@
+' *******************************************************************************
+' Copyright (c) 2026 Contributors to the Eclipse Foundation
+'
+' See the NOTICE file(s) distributed with this work for additional
+' information regarding copyright ownership.
+'
+' This program and the accompanying materials are made available under the
+' terms of the Apache License Version 2.0 which is available at
+' https://www.apache.org/licenses/LICENSE-2.0
+'
+' SPDX-License-Identifier: Apache-2.0
+' *******************************************************************************
+@startuml class_diagram_file_level_constructs
+
+title File-level Syntax Coverage
+
+set namespaceSeparator ::
+
+together {
+    class GroupedA
+    class GroupedB
+}
+
+legend top left
+|= Color |= Meaning |
+| <#Lavender> | Internal |
+end legend
+
+note top of GroupedA : top-level note coverage
+
+package sample::file_level #Lavender
+{
+    interface IActivateTask [[cd_activate_task.puml]] {
+        + Execute(amp::stop_token) : ResultBlank
+    }
+
+    class "<<template>>\nTest<T>" as TestTemplate <<service>> #Khaki {
+        + Bind()
+    }
+
+    class MultiLineMethods {
+        + CreateJobs(const amp::stop_token&,\n InfrastructureContext, Context)
+        + ChangeHandler(amp::pmr::unique_ptr<ExecutorFactory>,\
+                               \n  std::shared_ptr<mw::diag::IConversations>)
+    }
+}
+
+@enduml
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/output.json
new file mode 100644
index 0000000..403beac
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_file_level_constructs/output.json
@@ -0,0 +1,152 @@
+{
+  "class_diagram_file_level_constructs.puml": {
+    "name": "class_diagram_file_level_constructs",
+    "entities": [
+      {
+        "id": "GroupedA",
+        "name": "GroupedA",
+        "enclosing_namespace_id": null,
+        "entity_type": "Class",
+        "type_aliases": [],
+        "methods": [],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_file_level_constructs",
+        "source_line": 20,
+        "variables": [],
+        "relationships": []
+      },
+      {
+        "id": "GroupedB",
+        "name": "GroupedB",
+        "enclosing_namespace_id": null,
+        "entity_type": "Class",
+        "type_aliases": [],
+        "methods": [],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_file_level_constructs",
+        "source_line": 21,
+        "variables": [],
+        "relationships": []
+      },
+      {
+        "id": "sample.file_level.IActivateTask",
+        "name": "IActivateTask",
+        "enclosing_namespace_id": "sample.file_level",
+        "entity_type": "Interface",
+        "type_aliases": [],
+        "methods": [
+          {
+            "name": "Execute",
+            "return_type": "ResultBlank",
+            "visibility": "public",
+            "parameters": [
+              {
+                "name": "",
+                "param_type": "amp::stop_token",
+                "is_variadic": false
+              }
+            ],
+            "template_parameters": null,
+            "modifiers": []
+          }
+        ],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_file_level_constructs",
+        "source_line": 33,
+        "variables": [],
+        "relationships": []
+      },
+      {
+        "id": "sample.file_level.<<template>>\\nTest<T>",
+        "name": "TestTemplate",
+        "enclosing_namespace_id": "sample.file_level",
+        "entity_type": "Class",
+        "type_aliases": [],
+        "methods": [
+          {
+            "name": "Bind",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [],
+            "template_parameters": null,
+            "modifiers": []
+          }
+        ],
+        "template_parameters": [
+          "T"
+        ],
+        "enum_literals": [],
+        "source_file": "class_diagram_file_level_constructs",
+        "source_line": 37,
+        "variables": [],
+        "relationships": []
+      },
+      {
+        "id": "sample.file_level.MultiLineMethods",
+        "name": "MultiLineMethods",
+        "enclosing_namespace_id": "sample.file_level",
+        "entity_type": "Class",
+        "type_aliases": [],
+        "methods": [
+          {
+            "name": "CreateJobs",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [
+              {
+                "name": "",
+                "param_type": "const amp::stop_token&",
+                "is_variadic": false
+              },
+              {
+                "name": "",
+                "param_type": "InfrastructureContext",
+                "is_variadic": false
+              },
+              {
+                "name": "",
+                "param_type": "Context",
+                "is_variadic": false
+              }
+            ],
+            "template_parameters": null,
+            "modifiers": []
+          },
+          {
+            "name": "ChangeHandler",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [
+              {
+                "name": "",
+                "param_type": "amp::pmr::unique_ptr<ExecutorFactory>",
+                "is_variadic": false
+              },
+              {
+                "name": "",
+                "param_type": "std::shared_ptr<mw::diag::IConversations>",
+                "is_variadic": false
+              }
+            ],
+            "template_parameters": null,
+            "modifiers": []
+          }
+        ],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_file_level_constructs",
+        "source_line": 41,
+        "variables": [],
+        "relationships": []
+      }
+    ],
+    "relationships": [],
+    "source_files": [
+      "class_diagram_file_level_constructs"
+    ],
+    "version": null
+  }
+}
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_modifiers/class_diagram_modifiers.puml b/plantuml/parser/integration_test/class_diagram/class_diagram_modifiers/class_diagram_modifiers.puml
new file mode 100644
index 0000000..3151ba0
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_modifiers/class_diagram_modifiers.puml
@@ -0,0 +1,31 @@
+' *******************************************************************************
+' Copyright (c) 2026 Contributors to the Eclipse Foundation
+'
+' See the NOTICE file(s) distributed with this work for additional
+' information regarding copyright ownership.
+'
+' This program and the accompanying materials are made available under the
+' terms of the Apache License Version 2.0 which is available at
+' https://www.apache.org/licenses/LICENSE-2.0
+'
+' SPDX-License-Identifier: Apache-2.0
+' *******************************************************************************
+@startuml class_diagram_modifiers
+
+package modifier_case {
+    abstract class BaseJob {
+        func() = 0
+    }
+
+    class ServiceImpl {
+        {abstract} + Run() : ResultBlank
+        {static} + Finalize()
+    }
+
+    class AllowModeChangeService {
+        using AllowOpModeChangeOutput = std::uint8_t;
+        + Func(const AllowOpModeChangeOutput input_1, std::shared_ptr<std::uint32_t> json_parser = nullptr) noexcept : static std::Result<Uptr>
+    }
+}
+
+@enduml
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_modifiers/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_modifiers/output.json
new file mode 100644
index 0000000..c2e269d
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_modifiers/output.json
@@ -0,0 +1,113 @@
+{
+  "class_diagram_modifiers.puml": {
+    "name": "class_diagram_modifiers",
+    "entities": [
+      {
+        "id": "modifier_case.BaseJob",
+        "name": "BaseJob",
+        "enclosing_namespace_id": "modifier_case",
+        "entity_type": "AbstractClass",
+        "type_aliases": [],
+        "methods": [
+          {
+            "name": "func",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [],
+            "template_parameters": null,
+            "modifiers": [
+              "Abstract"
+            ]
+          }
+        ],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_modifiers",
+        "source_line": 16,
+        "variables": [],
+        "relationships": []
+      },
+      {
+        "id": "modifier_case.ServiceImpl",
+        "name": "ServiceImpl",
+        "enclosing_namespace_id": "modifier_case",
+        "entity_type": "Class",
+        "type_aliases": [],
+        "methods": [
+          {
+            "name": "Run",
+            "return_type": "ResultBlank",
+            "visibility": "public",
+            "parameters": [],
+            "template_parameters": null,
+            "modifiers": [
+              "Abstract"
+            ]
+          },
+          {
+            "name": "Finalize",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [],
+            "template_parameters": null,
+            "modifiers": [
+              "Static"
+            ]
+          }
+        ],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_modifiers",
+        "source_line": 20,
+        "variables": [],
+        "relationships": []
+      },
+      {
+        "id": "modifier_case.AllowModeChangeService",
+        "name": "AllowModeChangeService",
+        "enclosing_namespace_id": "modifier_case",
+        "entity_type": "Class",
+        "type_aliases": [
+          {
+            "alias": "AllowOpModeChangeOutput",
+            "original_type": "std::uint8_t"
+          }
+        ],
+        "methods": [
+          {
+            "name": "Func",
+            "return_type": "std::Result<Uptr>",
+            "visibility": "public",
+            "parameters": [
+              {
+                "name": "input_1",
+                "param_type": "const AllowOpModeChangeOutput",
+                "is_variadic": false
+              },
+              {
+                "name": "json_parser",
+                "param_type": "std::shared_ptr<std::uint32_t>",
+                "is_variadic": false
+              }
+            ],
+            "template_parameters": null,
+            "modifiers": [
+              "Static"
+            ]
+          }
+        ],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_modifiers",
+        "source_line": 25,
+        "variables": [],
+        "relationships": []
+      }
+    ],
+    "relationships": [],
+    "source_files": [
+      "class_diagram_modifiers"
+    ],
+    "version": null
+  }
+}
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_object_syntax/class_diagram_object_syntax.puml b/plantuml/parser/integration_test/class_diagram/class_diagram_object_syntax/class_diagram_object_syntax.puml
new file mode 100644
index 0000000..c4f606a
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_object_syntax/class_diagram_object_syntax.puml
@@ -0,0 +1,27 @@
+' *******************************************************************************
+' Copyright (c) 2026 Contributors to the Eclipse Foundation
+'
+' See the NOTICE file(s) distributed with this work for additional
+' information regarding copyright ownership.
+'
+' This program and the accompanying materials are made available under the
+' terms of the Apache License Version 2.0 which is available at
+' https://www.apache.org/licenses/LICENSE-2.0
+'
+' SPDX-License-Identifier: Apache-2.0
+' *******************************************************************************
+@startuml class_diagram_object_syntax
+
+package object_case {
+    object "FactoryFunctor" as FactoryFunctor {
+        + operator()()
+    }
+
+    class ServiceImpl {
+        + Build()
+    }
+
+    FactoryFunctor --> ServiceImpl : creates
+}
+
+@enduml
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_object_syntax/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_object_syntax/output.json
new file mode 100644
index 0000000..9c2e8e3
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_object_syntax/output.json
@@ -0,0 +1,35 @@
+{
+  "class_diagram_object_syntax.puml": {
+    "name": "class_diagram_object_syntax",
+    "entities": [
+      {
+        "id": "object_case.ServiceImpl",
+        "name": "ServiceImpl",
+        "enclosing_namespace_id": "object_case",
+        "entity_type": "Class",
+        "type_aliases": [],
+        "methods": [
+          {
+            "name": "Build",
+            "return_type": null,
+            "visibility": "public",
+            "parameters": [],
+            "template_parameters": null,
+            "modifiers": []
+          }
+        ],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_object_syntax",
+        "source_line": 20,
+        "variables": [],
+        "relationships": []
+      }
+    ],
+    "relationships": [],
+    "source_files": [
+      "class_diagram_object_syntax"
+    ],
+    "version": null
+  }
+}
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_relationship_variants/class_diagram_relationship_variants.puml b/plantuml/parser/integration_test/class_diagram/class_diagram_relationship_variants/class_diagram_relationship_variants.puml
new file mode 100644
index 0000000..cc6088e
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_relationship_variants/class_diagram_relationship_variants.puml
@@ -0,0 +1,40 @@
+' *******************************************************************************
+' Copyright (c) 2026 Contributors to the Eclipse Foundation
+'
+' See the NOTICE file(s) distributed with this work for additional
+' information regarding copyright ownership.
+'
+' This program and the accompanying materials are made available under the
+' terms of the Apache License Version 2.0 which is available at
+' https://www.apache.org/licenses/LICENSE-2.0
+'
+' SPDX-License-Identifier: Apache-2.0
+' *******************************************************************************
+@startuml class_diagram_relationship_variants
+
+set namespaceSeparator ::
+
+package sample::relationships {
+    interface ParentContract
+    interface WorkerContract
+
+    class WorkerImpl
+
+    struct WorkerResponse {
+        + WorkerStatus
+    }
+
+    interface CheckFlag {
+        + Get() : WorkerStatus
+    }
+
+    enum WorkerStatus
+
+    ParentContract <|-- WorkerContract
+    WorkerImpl ..|> WorkerContract
+    WorkerResponse --> WorkerStatus
+    WorkerResponse o- WorkerStatus
+    WorkerImpl "1" *-- "0..*" WorkerStatus
+}
+
+@enduml
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_relationship_variants/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_relationship_variants/output.json
new file mode 100644
index 0000000..32dc8d5
--- /dev/null
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_relationship_variants/output.json
@@ -0,0 +1,188 @@
+{
+  "class_diagram_relationship_variants.puml": {
+    "name": "class_diagram_relationship_variants",
+    "entities": [
+      {
+        "id": "sample.relationships.ParentContract",
+        "name": "ParentContract",
+        "enclosing_namespace_id": "sample.relationships",
+        "entity_type": "Interface",
+        "type_aliases": [],
+        "methods": [],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_relationship_variants",
+        "source_line": 18,
+        "variables": [],
+        "relationships": []
+      },
+      {
+        "id": "sample.relationships.WorkerContract",
+        "name": "WorkerContract",
+        "enclosing_namespace_id": "sample.relationships",
+        "entity_type": "Interface",
+        "type_aliases": [],
+        "methods": [],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_relationship_variants",
+        "source_line": 19,
+        "variables": [],
+        "relationships": [
+          {
+            "source": "sample.relationships.WorkerContract",
+            "target": "sample.relationships.ParentContract",
+            "relation_type": "Inheritance",
+            "source_multiplicity": null,
+            "target_multiplicity": null
+          }
+        ]
+      },
+      {
+        "id": "sample.relationships.WorkerImpl",
+        "name": "WorkerImpl",
+        "enclosing_namespace_id": "sample.relationships",
+        "entity_type": "Class",
+        "type_aliases": [],
+        "methods": [],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_relationship_variants",
+        "source_line": 21,
+        "variables": [],
+        "relationships": [
+          {
+            "source": "sample.relationships.WorkerImpl",
+            "target": "sample.relationships.WorkerContract",
+            "relation_type": "Implementation",
+            "source_multiplicity": null,
+            "target_multiplicity": null
+          }
+        ]
+      },
+      {
+        "id": "sample.relationships.WorkerResponse",
+        "name": "WorkerResponse",
+        "enclosing_namespace_id": "sample.relationships",
+        "entity_type": "Struct",
+        "type_aliases": [],
+        "methods": [],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_relationship_variants",
+        "source_line": 23,
+        "variables": [
+          {
+            "name": "WorkerStatus",
+            "data_type": null,
+            "visibility": "public",
+            "is_static": false,
+            "is_const": false
+          }
+        ],
+        "relationships": [
+          {
+            "source": "sample.relationships.WorkerResponse",
+            "target": "sample.relationships.WorkerStatus",
+            "relation_type": "Association",
+            "source_multiplicity": null,
+            "target_multiplicity": null
+          }
+        ]
+      },
+      {
+        "id": "sample.relationships.CheckFlag",
+        "name": "CheckFlag",
+        "enclosing_namespace_id": "sample.relationships",
+        "entity_type": "Interface",
+        "type_aliases": [],
+        "methods": [
+          {
+            "name": "Get",
+            "return_type": "WorkerStatus",
+            "visibility": "public",
+            "parameters": [],
+            "template_parameters": null,
+            "modifiers": []
+          }
+        ],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_relationship_variants",
+        "source_line": 27,
+        "variables": [],
+        "relationships": []
+      },
+      {
+        "id": "sample.relationships.WorkerStatus",
+        "name": "WorkerStatus",
+        "enclosing_namespace_id": "sample.relationships",
+        "entity_type": "Enum",
+        "type_aliases": [],
+        "methods": [],
+        "template_parameters": null,
+        "enum_literals": [],
+        "source_file": "class_diagram_relationship_variants",
+        "source_line": 31,
+        "variables": [],
+        "relationships": [
+          {
+            "source": "sample.relationships.WorkerStatus",
+            "target": "sample.relationships.WorkerResponse",
+            "relation_type": "Aggregation",
+            "source_multiplicity": null,
+            "target_multiplicity": null
+          },
+          {
+            "source": "sample.relationships.WorkerStatus",
+            "target": "sample.relationships.WorkerImpl",
+            "relation_type": "Composition",
+            "source_multiplicity": "0..*",
+            "target_multiplicity": "1"
+          }
+        ]
+      }
+    ],
+    "relationships": [
+      {
+        "source": "sample.relationships.WorkerContract",
+        "target": "sample.relationships.ParentContract",
+        "relation_type": "Inheritance",
+        "source_multiplicity": null,
+        "target_multiplicity": null
+      },
+      {
+        "source": "sample.relationships.WorkerImpl",
+        "target": "sample.relationships.WorkerContract",
+        "relation_type": "Implementation",
+        "source_multiplicity": null,
+        "target_multiplicity": null
+      },
+      {
+        "source": "sample.relationships.WorkerResponse",
+        "target": "sample.relationships.WorkerStatus",
+        "relation_type": "Association",
+        "source_multiplicity": null,
+        "target_multiplicity": null
+      },
+      {
+        "source": "sample.relationships.WorkerStatus",
+        "target": "sample.relationships.WorkerResponse",
+        "relation_type": "Aggregation",
+        "source_multiplicity": null,
+        "target_multiplicity": null
+      },
+      {
+        "source": "sample.relationships.WorkerStatus",
+        "target": "sample.relationships.WorkerImpl",
+        "relation_type": "Composition",
+        "source_multiplicity": "0..*",
+        "target_multiplicity": "1"
+      }
+    ],
+    "source_files": [
+      "class_diagram_relationship_variants"
+    ],
+    "version": null
+  }
+}
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_unsupported_syntax/class_diagram_unsupported_syntax.puml b/plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/class_diagram_syntax_coverage.puml
similarity index 97%
rename from plantuml/parser/integration_test/class_diagram/class_diagram_unsupported_syntax/class_diagram_unsupported_syntax.puml
rename to plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/class_diagram_syntax_coverage.puml
index bc4f10c..29a7059 100644
--- a/plantuml/parser/integration_test/class_diagram/class_diagram_unsupported_syntax/class_diagram_unsupported_syntax.puml
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/class_diagram_syntax_coverage.puml
@@ -10,9 +10,9 @@
 '
 ' SPDX-License-Identifier: Apache-2.0
 ' *******************************************************************************
-@startuml class_diagram_unsupported_syntax
+@startuml class_diagram_syntax_coverage
 
-title Unsupported Class Diagram Syntax Coverage
+title Class Diagram Syntax Coverage
 
 ' Priority group 1: file-level constructs
 set namespaceSeparator ::
diff --git a/plantuml/parser/integration_test/class_diagram/class_diagram_unsupported_syntax/output.json b/plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/output.json
similarity index 95%
rename from plantuml/parser/integration_test/class_diagram/class_diagram_unsupported_syntax/output.json
rename to plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/output.json
index ad3039a..27a51ea 100644
--- a/plantuml/parser/integration_test/class_diagram/class_diagram_unsupported_syntax/output.json
+++ b/plantuml/parser/integration_test/class_diagram/class_diagram_syntax_coverage/output.json
@@ -1,6 +1,6 @@
 {
-  "class_diagram_unsupported_syntax.puml": {
-    "name": "class_diagram_unsupported_syntax",
+  "class_diagram_syntax_coverage.puml": {
+    "name": "class_diagram_syntax_coverage",
     "entities": [
       {
         "id": "GroupedA",
@@ -11,7 +11,7 @@
         "methods": [],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 21,
         "variables": [],
         "relationships": []
@@ -25,7 +25,7 @@
         "methods": [],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 22,
         "variables": [],
         "relationships": []
@@ -54,7 +54,7 @@
         ],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 39,
         "variables": [],
         "relationships": []
@@ -68,7 +68,7 @@
         "methods": [],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 43,
         "variables": [],
         "relationships": []
@@ -82,7 +82,7 @@
         "methods": [],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 45,
         "variables": [],
         "relationships": [
@@ -111,7 +111,7 @@
         "methods": [],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 48,
         "variables": [],
         "relationships": []
@@ -136,7 +136,7 @@
         ],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 50,
         "variables": [],
         "relationships": []
@@ -159,7 +159,7 @@
         ],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 54,
         "variables": [
         ],
@@ -182,7 +182,7 @@
         "methods": [],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 58,
         "variables": [],
         "relationships": []
@@ -201,7 +201,7 @@
             "value": null
           }
         ],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 60,
         "variables": [],
         "relationships": [
@@ -230,7 +230,7 @@
         "methods": [],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 64,
         "variables": [
           {
@@ -262,7 +262,7 @@
           "T"
         ],
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 68,
         "variables": [],
         "relationships": []
@@ -298,7 +298,7 @@
         ],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 71,
         "variables": [],
         "relationships": []
@@ -347,7 +347,7 @@
         ],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 75,
         "variables": [],
         "relationships": []
@@ -580,7 +580,7 @@
         ],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 79,
         "variables": [
           {
@@ -635,7 +635,7 @@
           "T"
         ],
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 111,
         "variables": [],
         "relationships": []
@@ -689,7 +689,7 @@
         ],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 116,
         "variables": [
           {
@@ -738,7 +738,7 @@
         ],
         "template_parameters": null,
         "enum_literals": [],
-        "source_file": "class_diagram_unsupported_syntax",
+        "source_file": "class_diagram_syntax_coverage",
         "source_line": 128,
         "variables": [],
         "relationships": []
@@ -803,7 +803,7 @@
       }
     ],
     "source_files": [
-      "class_diagram_unsupported_syntax"
+      "class_diagram_syntax_coverage"
     ],
     "version": null
   }
diff --git a/plantuml/parser/puml_resolver/src/class_diagram/test/class_resolver_test.rs b/plantuml/parser/puml_resolver/src/class_diagram/test/class_resolver_test.rs
index a7cff64..e9aaf04 100644
--- a/plantuml/parser/puml_resolver/src/class_diagram/test/class_resolver_test.rs
+++ b/plantuml/parser/puml_resolver/src/class_diagram/test/class_resolver_test.rs
@@ -73,6 +73,31 @@ fn test_class_negative() {
 }
 
 #[test]
-fn test_unsupported_syntax() {
-    run_class_resolver_case("class_diagram_unsupported_syntax");
+fn test_cpp_members() {
+    run_class_resolver_case("class_diagram_cpp_members");
+}
+
+#[test]
+fn test_file_level_constructs() {
+    run_class_resolver_case("class_diagram_file_level_constructs");
+}
+
+#[test]
+fn test_modifiers() {
+    run_class_resolver_case("class_diagram_modifiers");
+}
+
+#[test]
+fn test_object_syntax() {
+    run_class_resolver_case("class_diagram_object_syntax");
+}
+
+#[test]
+fn test_relationship_variants() {
+    run_class_resolver_case("class_diagram_relationship_variants");
+}
+
+#[test]
+fn test_syntax_coverage() {
+    run_class_resolver_case("class_diagram_syntax_coverage");
 }