From bc6081bbfab71221689239fde999cf15124ed7dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miles=20St=C3=B6tzner?= <miles@stoetzner.de>
Date: Sat, 23 Mar 2024 17:55:32 +0100
Subject: [PATCH] hotfix and examples

---
 docs/cmds/variability/generate.ts             | 12 +++++++++++-
 docs/cmds/variability/test.template.ejs       | 10 ++++++++++
 docs/docs/publications.md                     |  4 ++--
 docs/docs/variability4tosca/testing.md        |  2 +-
 .../tests/test-analytical-operators-count.md  |  1 +
 ...ytical-operators-exponential_regression.md |  1 +
 ...-analytical-operators-linear_regression.md |  1 +
 ...ytical-operators-logarithmic_regression.md |  1 +
 .../tests/test-analytical-operators-max.md    |  1 +
 .../tests/test-analytical-operators-mean.md   |  1 +
 .../tests/test-analytical-operators-median.md |  1 +
 .../tests/test-analytical-operators-min.md    |  1 +
 ...lytical-operators-polynomial_regression.md |  1 +
 ...analytical-operators-standard_deviation.md |  1 +
 .../tests/test-analytical-operators-sum.md    |  1 +
 .../test-analytical-operators-variance.md     |  1 +
 .../tests/test-arithmetic-operators-add.md    |  1 +
 .../tests/test-arithmetic-operators-div.md    |  1 +
 .../test-arithmetic-operators-mod-even.md     |  1 +
 .../test-arithmetic-operators-mod-odd.md      |  1 +
 .../tests/test-arithmetic-operators-mul.md    |  1 +
 .../tests/test-arithmetic-operators-sub.md    |  1 +
 ...tifacts-artifact-presence-number-absent.md |  1 +
 ...ifacts-artifact-presence-number-present.md |  1 +
 ...tifacts-artifact-presence-string-absent.md |  1 +
 ...ifacts-artifact-presence-string-present.md |  1 +
 .../tests/test-artifacts-conditional.md       |  1 +
 ...est-artifacts-container-presence-absent.md |  1 +
 ...st-artifacts-container-presence-present.md |  1 +
 ...est-artifacts-default-alternative-false.md |  1 +
 .../test-artifacts-default-alternative.md     |  1 +
 .../tests/test-artifacts-default-condition.md |  1 +
 .../tests/test-artifacts-prune.md             |  1 +
 ...test-artifacts-throw-ambiguous-artifact.md |  1 +
 .../test-artifacts-throw-ambiguous-default.md |  1 +
 ...ifacts-throw-missing-artifact-container.md |  1 +
 .../tests/test-boolean-operators-and-empty.md |  1 +
 .../tests/test-boolean-operators-and-false.md |  1 +
 ...test-boolean-operators-and-nested-false.md |  1 +
 .../test-boolean-operators-and-nested-true.md |  1 +
 .../tests/test-boolean-operators-and-true.md  |  1 +
 ...lean-operators-implies-false-false-true.md |  1 +
 ...olean-operators-implies-false-true-true.md |  1 +
 ...lean-operators-implies-true-false-false.md |  1 +
 ...oolean-operators-implies-true-true-true.md |  1 +
 .../tests/test-boolean-operators-not-false.md |  1 +
 .../tests/test-boolean-operators-not-true.md  |  1 +
 .../tests/test-boolean-operators-or-empty.md  |  1 +
 .../tests/test-boolean-operators-or-false.md  |  1 +
 .../test-boolean-operators-or-true-all.md     |  1 +
 .../tests/test-boolean-operators-or-true.md   |  1 +
 .../test-boolean-operators-xor-false-all.md   |  1 +
 .../test-boolean-operators-xor-true-all.md    |  1 +
 .../tests/test-boolean-operators-xor-true.md  |  1 +
 .../tests/test-circles-alpha.md               |  1 +
 .../tests/test-circles-bravo.md               |  1 +
 .../tests/test-circles-charlie.md             |  1 +
 .../tests/test-circles-delta.md               |  1 +
 .../tests/test-circles-echo.md                |  1 +
 .../tests/test-circles-golf.md                |  1 +
 .../tests/test-circles-hotel.md               |  1 +
 .../tests/test-circles-india.md               |  1 +
 ...row-hosting-relation-missing-constraint.md |  1 +
 ...sistency-throw-hosting-relation-missing.md |  1 +
 ...w-multiple-hosting-relations-constraint.md |  1 +
 ...stency-throw-multiple-hosting-relations.md |  1 +
 ...nsistency-throw-relation-source-missing.md |  1 +
 ...nsistency-throw-relation-target-missing.md |  1 +
 .../test-constraint-operators-equal-false.md  |  1 +
 .../test-constraint-operators-equal-true.md   |  1 +
 ...traint-operators-greater-or-equal-equal.md |  1 +
 ...aint-operators-greater-or-equal-greater.md |  1 +
 ...straint-operators-greater-or-equal-less.md |  1 +
 ...constraint-operators-greater-than-equal.md |  1 +
 ...nstraint-operators-greater-than-greater.md |  1 +
 ...-constraint-operators-greater-than-less.md |  1 +
 ...est-constraint-operators-in_range_false.md |  1 +
 ...test-constraint-operators-in_range_true.md |  1 +
 .../test-constraint-operators-length_false.md |  1 +
 .../test-constraint-operators-length_true.md  |  1 +
 ...onstraint-operators-less_or_equal_equal.md |  1 +
 ...straint-operators-less_or_equal_greater.md |  1 +
 ...constraint-operators-less_or_equal_less.md |  1 +
 ...st-constraint-operators-less_than_equal.md |  1 +
 ...-constraint-operators-less_than_greater.md |  1 +
 ...est-constraint-operators-less_than_less.md |  1 +
 ...t-constraint-operators-max_length_equal.md |  1 +
 ...constraint-operators-max_length_greater.md |  1 +
 ...st-constraint-operators-max_length_less.md |  1 +
 ...t-constraint-operators-min_length_equal.md |  1 +
 ...constraint-operators-min_length_greater.md |  1 +
 ...st-constraint-operators-min_length_less.md |  1 +
 ...constraint-operators-valid_values_false.md |  1 +
 ...-constraint-operators-valid_values_true.md |  1 +
 .../tests/test-date-operators-after-false.md  |  1 +
 ...test-date-operators-after-or-same-false.md |  1 +
 .../test-date-operators-after-or-same-true.md |  1 +
 .../tests/test-date-operators-after-true.md   |  1 +
 .../tests/test-date-operators-before-false.md |  1 +
 ...est-date-operators-before-or-same-false.md |  1 +
 ...test-date-operators-before-or-same-true.md |  1 +
 .../tests/test-date-operators-before-true.md  |  1 +
 .../tests/test-date-operators-same-false.md   |  1 +
 .../tests/test-date-operators-same-true.md    |  1 +
 .../tests/test-date-operators-within-false.md |  1 +
 .../tests/test-date-operators-within-true.md  |  1 +
 .../tests/test-groups-conditional.md          |  1 +
 .../test-groups-default-condition-nothing.md  |  1 +
 .../tests/test-groups-default-condition.md    |  1 +
 .../test-groups-group-presence-absent.md      |  1 +
 .../test-groups-group-presence-present.md     |  1 +
 .../tests/test-groups-prune.md                |  1 +
 ...sting-aware-pruning-constraints-elastic.md |  1 +
 ...osting-aware-pruning-constraints-static.md |  1 +
 ...test-hosting-aware-pruning-host-elastic.md |  1 +
 .../test-hosting-aware-pruning-host-static.md |  1 +
 ...osting-aware-pruning-motivation-elastic.md |  1 +
 ...hosting-aware-pruning-motivation-static.md |  1 +
 ...-hosting-aware-pruning-provider-elastic.md |  1 +
 ...t-hosting-aware-pruning-provider-static.md |  1 +
 ...ting-aware-pruning-transitive-ambiguous.md |  1 +
 ...t-hosting-aware-pruning-transitive-both.md |  1 +
 ...ting-aware-pruning-transitive-preserved.md |  1 +
 ...ing-aware-pruning-transitive-unexpected.md |  1 +
 .../tests/test-implications-constraints.md    |  1 +
 .../tests/test-implications-implied-left.md   |  1 +
 .../tests/test-implications-implied-right.md  |  1 +
 .../tests/test-implications-implies-left.md   |  1 +
 .../tests/test-implications-implies-right.md  |  1 +
 .../tests/test-implications-incoming-left.md  |  1 +
 .../tests/test-implications-incoming-right.md |  1 +
 ...-implications-motivating-scenario-cloud.md |  1 +
 ...implications-motivating-scenario-static.md |  1 +
 .../test-implications-naive-constraints.md    |  1 +
 .../test-implications-naive-implied-left.md   |  1 +
 .../test-implications-naive-implied-right.md  |  1 +
 .../test-implications-naive-implies-left.md   |  1 +
 .../test-implications-naive-implies-right.md  |  1 +
 .../test-implications-naive-incoming-left.md  |  1 +
 .../test-implications-naive-incoming-right.md |  1 +
 ...cations-naive-motivating-scenario-cloud.md |  1 +
 ...ations-naive-motivating-scenario-static.md |  1 +
 ...ons-naive-naive-another-no-optimization.md |  1 +
 ...st-implications-naive-naive-another-not.md |  1 +
 .../test-implications-naive-naive-another.md  |  1 +
 .../test-implications-naive-naive-not.md      |  1 +
 .../tests/test-implications-naive-naive.md    |  1 +
 .../tests/test-implications-naive-requires.md |  1 +
 .../test-implications-naive-unexpected.md     |  1 +
 .../tests/test-implications-requires.md       |  1 +
 .../tests/test-implications-unexpected.md     |  1 +
 .../tests/test-import-conditional.md          |  1 +
 .../tests/test-import-empty.md                |  1 +
 .../tests/test-import-get-import-absent.md    |  1 +
 .../tests/test-import-get-import-present.md   |  1 +
 .../tests/test-inputs-conditional-list.md     |  1 +
 .../tests/test-inputs-conditional.md          |  1 +
 .../test-inputs-input-presence-absent.md      |  1 +
 .../test-inputs-input-presence-present.md     |  1 +
 .../test-nodes-conditional-type-default.md    |  1 +
 .../tests/test-nodes-conditional-type.md      |  1 +
 .../tests/test-nodes-conditional.md           |  1 +
 .../tests/test-nodes-default-false-false.md   |  1 +
 .../tests/test-nodes-default-false-true.md    |  1 +
 .../tests/test-nodes-default-host-absent.md   |  1 +
 .../tests/test-nodes-default-host-present.md  |  1 +
 .../tests/test-nodes-default-true-false.md    |  1 +
 .../tests/test-nodes-default-true-true.md     |  1 +
 .../tests/test-nodes-host-presence-absent.md  |  1 +
 .../test-nodes-host-presence-false-false.md   |  1 +
 .../tests/test-nodes-host-presence-present.md |  1 +
 .../test-nodes-host-presence-true-false.md    |  1 +
 ...odes-host-presence-true-true-constraint.md |  1 +
 .../test-nodes-host-presence-true-true.md     |  1 +
 .../tests/test-nodes-node-presence-absent.md  |  1 +
 .../tests/test-nodes-node-presence-present.md |  1 +
 .../tests/test-nodes-type-specific.md         |  1 +
 .../tests/test-other-benchmark.md             |  1 +
 .../tests/test-other-concat.md                |  1 +
 .../test-other-default-variability-input.md   |  1 +
 .../tests/test-other-join.md                  |  1 +
 .../test-other-logic-expression-false.md      |  1 +
 .../tests/test-other-logic-expression-true.md |  1 +
 .../test-other-logic-value-expression.md      |  1 +
 .../tests/test-other-nothing.md               |  1 +
 .../tests/test-other-preset.md                |  1 +
 .../tests/test-other-presets.md               |  1 +
 .../tests/test-other-throw-CONTAINER.md       |  1 +
 .../tests/test-other-throw-SELF.md            |  1 +
 .../tests/test-other-throw-not-unique.md      |  1 +
 .../tests/test-other-token.md                 |  1 +
 .../tests/test-other-value-expression.md      |  1 +
 .../tests/test-other-variability-input.md     |  1 +
 .../tests/test-other-version.md               |  1 +
 .../tests/test-other-weight.md                |  1 +
 .../tests/test-persistent-persistent-false.md |  1 +
 .../tests/test-persistent-persistent-throw.md |  1 +
 .../test-persistent-persistent-undefined.md   |  1 +
 .../tests/test-persistent-persistent.md       |  1 +
 .../tests/test-policies-conditional.md        |  1 +
 ...test-policies-default-condition-nothing.md |  1 +
 .../tests/test-policies-default-condition.md  |  1 +
 ...icies-has-present-target-absent-members.md |  1 +
 ...olicies-has-present-target-absent-nodes.md |  1 +
 ...-policies-has-present-target-no-targets.md |  1 +
 ...icies-has-present-target-present-member.md |  1 +
 ...olicies-has-present-target-present-node.md |  1 +
 ...licies-has-present-target-present-nodes.md |  1 +
 .../test-policies-policy-presence-absent.md   |  1 +
 .../test-policies-policy-presence-present.md  |  1 +
 .../tests/test-policies-prune.md              |  1 +
 ...ties-artifact-container-presence-absent.md |  1 +
 ...ies-artifact-container-presence-present.md |  1 +
 .../tests/test-properties-conditional.md      |  1 +
 ...st-properties-default-alternative-false.md |  1 +
 .../test-properties-default-alternative.md    |  1 +
 .../test-properties-default-condition.md      |  1 +
 .../tests/test-properties-expression.md       |  1 +
 .../tests/test-properties-list-another.md     |  1 +
 .../tests/test-properties-list.md             |  1 +
 .../tests/test-properties-map-another.md      |  1 +
 .../tests/test-properties-map.md              |  1 +
 ...operties-node-container-presence-absent.md |  1 +
 ...perties-node-container-presence-present.md |  1 +
 ...ies-node-node-presence-CONTAINER-absent.md |  1 +
 ...es-node-node-presence-CONTAINER-present.md |  1 +
 ...es-node-property-presence-number-absent.md |  1 +
 ...s-node-property-presence-number-present.md |  1 +
 ...es-node-property-presence-string-absent.md |  1 +
 ...s-node-property-presence-string-present.md |  1 +
 .../tests/test-properties-properties.md       |  1 +
 ...ties-relation-container-presence-absent.md |  1 +
 ...ies-relation-container-presence-present.md |  1 +
 ...est-properties-throw-ambiguous-property.md |  1 +
 ...erties-throw-missing-property-container.md |  1 +
 .../test-properties-throw-multiple-default.md |  1 +
 .../tests/test-pruning-alpha-default-naive.md |  1 +
 .../tests/test-pruning-alpha-default.md       |  1 +
 .../tests/test-pruning-alpha-pruning.md       |  1 +
 .../test-pruning-artifact-default-alpha.md    |  1 +
 .../test-pruning-artifact-default-bravo.md    |  1 +
 .../test-pruning-artifact-default-charlie.md  |  1 +
 .../test-pruning-artifact-default-delta.md    |  1 +
 .../test-pruning-artifact-default-naive.md    |  1 +
 .../tests/test-pruning-bravo-default.md       |  1 +
 .../tests/test-pruning-bravo-pruning.md       |  1 +
 .../tests/test-pruning-charlie-default.md     |  1 +
 .../tests/test-pruning-charlie-pruning.md     |  1 +
 .../tests/test-pruning-delta-default.md       |  1 +
 .../tests/test-pruning-delta-pruning.md       |  1 +
 .../tests/test-pruning-echo-default.md        |  1 +
 .../tests/test-pruning-echo-pruning.md        |  1 +
 .../tests/test-pruning-foxtrott-default.md    |  1 +
 .../tests/test-pruning-foxtrott-pruning.md    |  1 +
 .../tests/test-pruning-hotel-default.md       |  1 +
 .../tests/test-pruning-hotel-pruning.md       |  1 +
 ...pruning-incoming-artifact-pruning-alpha.md |  1 +
 ...pruning-incoming-artifact-pruning-bravo.md |  1 +
 ...uning-incoming-artifact-pruning-charlie.md |  1 +
 ...pruning-incoming-artifact-pruning-delta.md |  1 +
 ...-pruning-incoming-artifact-pruning-echo.md |  1 +
 ...ning-incoming-artifact-pruning-foxtrott.md |  1 +
 ...-pruning-incoming-artifact-pruning-golf.md |  1 +
 ...pruning-incoming-artifact-pruning-hotel.md |  1 +
 ...g-incoming-artifact-pruning-naive-alpha.md |  1 +
 ...g-incoming-artifact-pruning-naive-bravo.md |  1 +
 .../tests/test-pruning-india-default.md       |  1 +
 .../tests/test-pruning-india-pruning.md       |  1 +
 .../tests/test-pruning-juliett-default.md     |  1 +
 .../tests/test-pruning-juliett-pruning.md     |  1 +
 .../tests/test-pruning-kilo-default.md        |  1 +
 .../tests/test-pruning-kilo-pruning.md        |  1 +
 .../tests/test-pruning-lima-default.md        |  1 +
 .../tests/test-pruning-lima-pruning.md        |  1 +
 .../tests/test-pruning-mike-default.md        |  1 +
 .../tests/test-pruning-mike-pruning.md        |  1 +
 .../test-pruning-outgoing-relation-absent.md  |  1 +
 .../test-pruning-outgoing-relation-present.md |  1 +
 .../test-pruning-outgoing-target-absent.md    |  1 +
 .../test-pruning-outgoing-target-present.md   |  1 +
 ...st-pruning-outgoingnaive-target-present.md |  1 +
 .../tests/test-pruning-pruning-false-false.md |  1 +
 .../tests/test-pruning-pruning-false-true.md  |  1 +
 .../tests/test-pruning-pruning-true-false.md  |  1 +
 .../tests/test-pruning-pruning-true-true.md   |  1 +
 .../tests/test-pruning-pruning.md             |  1 +
 .../tests/test-pruning-relation.md            |  1 +
 .../tests/test-relationships-conditional.md   |  1 +
 .../test-relationships-throw-multiple.md      |  1 +
 .../test-relationships-throw-undefined.md     |  1 +
 .../tests/test-relationships-throw-unused.md  |  1 +
 .../tests/test-relationships-type-specific.md |  1 +
 ...test-requirement-assignment-conditional.md |  1 +
 ...nt-assignment-default-alternative-false.md |  1 +
 ...uirement-assignment-default-alternative.md |  1 +
 ...signment-default-condition-throw-source.md |  1 +
 ...signment-default-condition-throw-target.md |  1 +
 ...equirement-assignment-default-condition.md |  1 +
 ...irement-assignment-one-hosting-relation.md |  1 +
 ...signment-relation-presence-index-absent.md |  1 +
 ...ssignment-relation-presence-name-absent.md |  1 +
 ...ement-assignment-source-presence-absent.md |  1 +
 ...ment-assignment-source-presence-present.md |  1 +
 ...ement-assignment-target-presence-absent.md |  1 +
 ...ment-assignment-target-presence-present.md |  1 +
 ...ment-assignment-throw-multiple-defaults.md |  1 +
 .../tests/test-scenario-complex-alpha.md      |  1 +
 .../tests/test-scenario-worker-agent-false.md |  1 +
 .../tests/test-scenario-worker-agent-true.md  |  1 +
 .../test-scenario-worker-worker-false.md      |  1 +
 .../tests/test-scenario-worker-worker-true.md |  1 +
 .../test-technologies-ambiguous-disabled.md   |  1 +
 .../tests/test-technologies-ambiguous.md      |  1 +
 .../tests/test-technologies-conditional.md    |  1 +
 .../test-technologies-constraint-disabled.md  |  1 +
 .../tests/test-technologies-constraint.md     |  1 +
 .../test-technologies-default-multiple.md     |  1 +
 .../tests/test-technologies-default-true.md   |  1 +
 .../test-technologies-expected-disabled.md    |  1 +
 .../tests/test-technologies-expected.md       |  1 +
 .../tests/test-technologies-lowercase.md      |  1 +
 .../test-technologies-missing-disabled.md     |  1 +
 .../tests/test-technologies-missing.md        |  1 +
 .../test-technologies-optimization-double.md  |  1 +
 .../test-technologies-optimization-order.md   |  1 +
 .../test-technologies-optimization-unsat.md   |  1 +
 .../test-technologies-optimization-weight.md  |  1 +
 .../tests/test-technologies-optimization.md   |  1 +
 .../test-technologies-pruning-disabled.md     |  1 +
 .../tests/test-technologies-pruning.md        |  1 +
 .../tests/test-technologies-rules.md          |  1 +
 .../test-technologies-unique-disabled.md      |  1 +
 .../tests/test-technologies-unique.md         |  1 +
 examples/unfurl-aware-manual/.gitignore       |  1 +
 examples/unfurl-aware-manual/config.yaml      |  2 ++
 .../unfurl-aware-manual/tests/cloud/test.yaml |  2 ++
 .../unfurl-aware-manual/tests/local/test.yaml |  2 ++
 .../variable-service-template.yaml            |  0
 .../unfurl-aware/tests/cloud/expected.yaml    |  0
 examples/unfurl-aware/tests/cloud/test.yaml   |  1 +
 .../unfurl-aware/tests/local/expected.yaml    |  0
 examples/unfurl-aware/tests/local/test.yaml   |  1 +
 .../tests/elastic/test.yaml                   |  2 +-
 .../tests/kubernetes/test.yaml                |  2 +-
 .../tests/static-large/test.yaml              |  2 +-
 .../tests/static/test.yaml                    |  2 +-
 .../tests/elastic/test.yaml                   |  2 +-
 .../tests/static-large/test.yaml              |  2 +-
 .../tests/static/test.yaml                    |  2 +-
 .../tests/elastic/test.yaml                   |  2 ++
 .../tests/static-large/test.yaml              |  2 ++
 .../tests/static/test.yaml                    |  2 ++
 .../.gitignore                                |  1 +
 .../config.yaml                               |  2 ++
 .../enrich.sh                                 |  0
 .../enriched.yaml                             |  0
 .../stats.sh                                  |  0
 .../tests/elastic/test.yaml                   |  2 ++
 .../tests/static-large/test.yaml              |  2 ++
 .../tests/static/test.yaml                    |  2 ++
 .../variable-service-template.yaml            |  0
 examples/xopera-pruning-default/.gitignore    |  1 +
 examples/xopera-pruning-default/config.yaml   |  2 ++
 .../xopera-pruning-default}/enrich.sh         |  0
 .../xopera-pruning-default}/enriched.yaml     |  0
 .../xopera-pruning-default}/stats.sh          |  0
 .../tests/elastic/test.yaml                   |  2 ++
 .../tests/static-large/test.yaml              |  2 ++
 .../tests/static/test.yaml                    |  2 ++
 .../variable-service-template.yaml            |  0
 examples/xopera-pruning-manual/.gitignore     |  1 +
 examples/xopera-pruning-manual/config.yaml    |  2 ++
 .../xopera-pruning-manual}/enrich.sh          |  0
 .../xopera-pruning-manual}/enriched.yaml      |  0
 .../xopera-pruning-manual}/stats.sh           |  0
 .../tests/elastic/test.yaml                   |  2 ++
 .../tests/static-large/test.yaml              |  2 ++
 .../tests/static/test.yaml                    |  2 ++
 .../variable-service-template.yaml            |  0
 .../xopera-pruning-semantic-strict/.gitignore |  1 +
 .../config.yaml                               |  2 ++
 .../xopera-pruning-semantic-strict}/enrich.sh |  0
 .../enriched.yaml                             |  0
 .../xopera-pruning-semantic-strict}/stats.sh  |  0
 .../tests/elastic/test.yaml                   |  2 ++
 .../tests/static-large/test.yaml              |  2 ++
 .../tests/static/test.yaml                    |  2 ++
 .../variable-service-template.yaml            |  0
 src/controller/template/test.ts               |  2 +-
 src/utils/files.ts                            | 17 -----------------
 src/utils/utils.ts                            |  7 +++++++
 .../01-manual/cloud/test.yaml                 |  3 ---
 .../01-manual/local/test.yaml                 |  3 ---
 .../02-pruning/cloud/test.yaml                |  3 ---
 .../02-pruning/local/test.yaml                |  3 ---
 .../hosting-aware-pruning.test.ts             |  5 -----
 .../pruning-modes/01-manual/elastic/test.yaml |  3 ---
 .../01-manual/static-large/test.yaml          |  3 ---
 .../pruning-modes/01-manual/static/test.yaml  |  3 ---
 .../02-consistent-strict/elastic/test.yaml    |  3 ---
 .../static-large/test.yaml                    |  3 ---
 .../02-consistent-strict/static/test.yaml     |  3 ---
 .../03-consistent-loose/elastic/test.yaml     |  3 ---
 .../static-large/test.yaml                    |  3 ---
 .../03-consistent-loose/static/test.yaml      |  3 ---
 .../04-default/elastic/test.yaml              |  3 ---
 .../04-default/static-large/test.yaml         |  3 ---
 .../pruning-modes/04-default/static/test.yaml |  3 ---
 .../05-semantic-strict/elastic/test.yaml      |  3 ---
 .../05-semantic-strict/static-large/test.yaml |  3 ---
 .../05-semantic-strict/static/test.yaml       |  3 ---
 .../06-semantic-loose/elastic/test.yaml       |  3 ---
 .../06-semantic-loose/static-large/test.yaml  |  3 ---
 .../06-semantic-loose/static/test.yaml        |  3 ---
 tests/pruning-modes/modes.test.ts             |  5 -----
 tests/utils.ts                                | 19 +++++++++----------
 416 files changed, 428 insertions(+), 115 deletions(-)
 create mode 100644 examples/unfurl-aware-manual/.gitignore
 create mode 100644 examples/unfurl-aware-manual/config.yaml
 create mode 100644 examples/unfurl-aware-manual/tests/cloud/test.yaml
 create mode 100644 examples/unfurl-aware-manual/tests/local/test.yaml
 rename tests/hosting-aware-pruning/01-manual/template.yaml => examples/unfurl-aware-manual/variable-service-template.yaml (100%)
 rename tests/hosting-aware-pruning/cloud.expected.yaml => examples/unfurl-aware/tests/cloud/expected.yaml (100%)
 create mode 100644 examples/unfurl-aware/tests/cloud/test.yaml
 rename tests/hosting-aware-pruning/local.expected.yaml => examples/unfurl-aware/tests/local/expected.yaml (100%)
 create mode 100644 examples/unfurl-aware/tests/local/test.yaml
 create mode 100644 examples/xopera-pruning-consistent-loose/tests/elastic/test.yaml
 create mode 100644 examples/xopera-pruning-consistent-loose/tests/static-large/test.yaml
 create mode 100644 examples/xopera-pruning-consistent-loose/tests/static/test.yaml
 create mode 100644 examples/xopera-pruning-consistent-strict/.gitignore
 create mode 100644 examples/xopera-pruning-consistent-strict/config.yaml
 rename {tests/pruning-modes/02-consistent-strict => examples/xopera-pruning-consistent-strict}/enrich.sh (100%)
 rename {tests/pruning-modes/02-consistent-strict => examples/xopera-pruning-consistent-strict}/enriched.yaml (100%)
 rename {tests/pruning-modes/01-manual => examples/xopera-pruning-consistent-strict}/stats.sh (100%)
 create mode 100644 examples/xopera-pruning-consistent-strict/tests/elastic/test.yaml
 create mode 100644 examples/xopera-pruning-consistent-strict/tests/static-large/test.yaml
 create mode 100644 examples/xopera-pruning-consistent-strict/tests/static/test.yaml
 rename tests/pruning-modes/02-consistent-strict/template.yaml => examples/xopera-pruning-consistent-strict/variable-service-template.yaml (100%)
 create mode 100644 examples/xopera-pruning-default/.gitignore
 create mode 100644 examples/xopera-pruning-default/config.yaml
 rename {tests/pruning-modes/04-default => examples/xopera-pruning-default}/enrich.sh (100%)
 rename {tests/pruning-modes/04-default => examples/xopera-pruning-default}/enriched.yaml (100%)
 rename {tests/pruning-modes/02-consistent-strict => examples/xopera-pruning-default}/stats.sh (100%)
 create mode 100644 examples/xopera-pruning-default/tests/elastic/test.yaml
 create mode 100644 examples/xopera-pruning-default/tests/static-large/test.yaml
 create mode 100644 examples/xopera-pruning-default/tests/static/test.yaml
 rename tests/pruning-modes/04-default/template.yaml => examples/xopera-pruning-default/variable-service-template.yaml (100%)
 create mode 100644 examples/xopera-pruning-manual/.gitignore
 create mode 100644 examples/xopera-pruning-manual/config.yaml
 rename {tests/pruning-modes/01-manual => examples/xopera-pruning-manual}/enrich.sh (100%)
 rename {tests/pruning-modes/01-manual => examples/xopera-pruning-manual}/enriched.yaml (100%)
 rename {tests/pruning-modes/04-default => examples/xopera-pruning-manual}/stats.sh (100%)
 create mode 100644 examples/xopera-pruning-manual/tests/elastic/test.yaml
 create mode 100644 examples/xopera-pruning-manual/tests/static-large/test.yaml
 create mode 100644 examples/xopera-pruning-manual/tests/static/test.yaml
 rename tests/pruning-modes/01-manual/template.yaml => examples/xopera-pruning-manual/variable-service-template.yaml (100%)
 create mode 100644 examples/xopera-pruning-semantic-strict/.gitignore
 create mode 100644 examples/xopera-pruning-semantic-strict/config.yaml
 rename {tests/pruning-modes/05-semantic-strict => examples/xopera-pruning-semantic-strict}/enrich.sh (100%)
 rename {tests/pruning-modes/05-semantic-strict => examples/xopera-pruning-semantic-strict}/enriched.yaml (100%)
 rename {tests/pruning-modes/05-semantic-strict => examples/xopera-pruning-semantic-strict}/stats.sh (100%)
 create mode 100644 examples/xopera-pruning-semantic-strict/tests/elastic/test.yaml
 create mode 100644 examples/xopera-pruning-semantic-strict/tests/static-large/test.yaml
 create mode 100644 examples/xopera-pruning-semantic-strict/tests/static/test.yaml
 rename tests/pruning-modes/05-semantic-strict/template.yaml => examples/xopera-pruning-semantic-strict/variable-service-template.yaml (100%)
 delete mode 100644 tests/hosting-aware-pruning/01-manual/cloud/test.yaml
 delete mode 100644 tests/hosting-aware-pruning/01-manual/local/test.yaml
 delete mode 100644 tests/hosting-aware-pruning/02-pruning/cloud/test.yaml
 delete mode 100644 tests/hosting-aware-pruning/02-pruning/local/test.yaml
 delete mode 100644 tests/hosting-aware-pruning/hosting-aware-pruning.test.ts
 delete mode 100644 tests/pruning-modes/01-manual/elastic/test.yaml
 delete mode 100644 tests/pruning-modes/01-manual/static-large/test.yaml
 delete mode 100644 tests/pruning-modes/01-manual/static/test.yaml
 delete mode 100644 tests/pruning-modes/02-consistent-strict/elastic/test.yaml
 delete mode 100644 tests/pruning-modes/02-consistent-strict/static-large/test.yaml
 delete mode 100644 tests/pruning-modes/02-consistent-strict/static/test.yaml
 delete mode 100644 tests/pruning-modes/03-consistent-loose/elastic/test.yaml
 delete mode 100644 tests/pruning-modes/03-consistent-loose/static-large/test.yaml
 delete mode 100644 tests/pruning-modes/03-consistent-loose/static/test.yaml
 delete mode 100644 tests/pruning-modes/04-default/elastic/test.yaml
 delete mode 100644 tests/pruning-modes/04-default/static-large/test.yaml
 delete mode 100644 tests/pruning-modes/04-default/static/test.yaml
 delete mode 100644 tests/pruning-modes/05-semantic-strict/elastic/test.yaml
 delete mode 100644 tests/pruning-modes/05-semantic-strict/static-large/test.yaml
 delete mode 100644 tests/pruning-modes/05-semantic-strict/static/test.yaml
 delete mode 100644 tests/pruning-modes/06-semantic-loose/elastic/test.yaml
 delete mode 100644 tests/pruning-modes/06-semantic-loose/static-large/test.yaml
 delete mode 100644 tests/pruning-modes/06-semantic-loose/static/test.yaml
 delete mode 100644 tests/pruning-modes/modes.test.ts

diff --git a/docs/cmds/variability/generate.ts b/docs/cmds/variability/generate.ts
index 26343f5d50..2406cf84d8 100644
--- a/docs/cmds/variability/generate.ts
+++ b/docs/cmds/variability/generate.ts
@@ -10,6 +10,7 @@ import * as files from '#files'
 import Loader from '#graph/loader'
 import {ServiceTemplate} from '#spec/service-template'
 import {InputAssignmentMap} from '#spec/topology-template'
+import _ from 'lodash'
 import * as path from 'path'
 
 type Test = {
@@ -40,12 +41,21 @@ async function main() {
             const inputs = getDefaultInputs(dir)
                 ? files.loadYAML<InputAssignmentMap>(getDefaultInputs(dir)!)
                 : undefined
+
+            let expected
+            if (!check.isDefined(config.error)) {
+                expected = loadExpected({dir, file: config.expected})
+                if (check.isDefined(config.merge)) {
+                    expected = _.merge(expected, config.merge)
+                }
+            }
+
             tests.push({
                 id,
                 config,
                 inputs,
                 template,
-                expected: check.isDefined(config.error) ? undefined : loadExpected({dir, file: config.expected}),
+                expected,
                 file: `test-${id}.md`,
             })
         })
diff --git a/docs/cmds/variability/test.template.ejs b/docs/cmds/variability/test.template.ejs
index 3a34cee3c9..beeeb98716 100644
--- a/docs/cmds/variability/test.template.ejs
+++ b/docs/cmds/variability/test.template.ejs
@@ -35,6 +35,16 @@ The following variability preset is used.
 ```
 <% } -%>
 
+<% if (test.config.replace) { -%>
+## Replace
+
+The following strings are searched and replaced in the variability-resolved service template.
+
+```yaml linenums="1"
+<%- utils.toYAML(test.config.replace) -%>
+```
+<% } -%>
+
 <% if (test.expected) { -%>
 ## Variability-Resolved Service Template
 
diff --git a/docs/docs/publications.md b/docs/docs/publications.md
index 7b56cfda19..20858b739c 100644
--- a/docs/docs/publications.md
+++ b/docs/docs/publications.md
@@ -16,7 +16,7 @@ This document holds a list of selected publications.
 - CLOSER 2024
 - _Accepted_
 - [Step-by-Step Guide](variability4tosca/guides/aware/index.md){target=_blank}
-- {{ repo_link('tests/hosting-aware-pruning ', 'Models of the Case Study') }}
+- {{ repo_link('examples ', 'Models of the Case Study') }} (Relevant models start with "unfurl-aware")
 - [GitHub Actions](https://github.com/OpenTOSCA/opentosca-vintner/actions/workflows/night.yaml){target=_blank} (Relevant jobs start with "Unfurl Aware")
 - [GitHub Actions Raw Logs](assets/documents/night.zip){target=_blank} (Relevant jobs start with "Unfurl Aware")
 - [Assets on Zenodo](https://doi.org/10.5281/zenodo.10452506){target=_blank}
@@ -29,7 +29,7 @@ This document holds a list of selected publications.
 - _Accepted_
 - [Step-by-Step Guide](variability4tosca/guides/modes/index.md){target=_blank}
 - {{ repo_link('tests/enricher', 'Models of the Experiments') }}
-- {{ repo_link('tests/pruning-modes', 'Models of the Case Study') }}
+- {{ repo_link('examples ', 'Models of the Case Study') }} (Relevant models start with "xopera-pruning")
 - [GitHub Actions](https://github.com/OpenTOSCA/opentosca-vintner/actions/workflows/night.yaml){target=_blank} (Relevant jobs start with "xOpera Pruning Mode")
 - [GitHub Actions Raw Logs](assets/documents/night.zip){target=_blank} (Relevant jobs start with "xOpera Pruning Mode")
 - [Assets on Zenodo](https://doi.org/10.5281/zenodo.10363694){target=_blank}
diff --git a/docs/docs/variability4tosca/testing.md b/docs/docs/variability4tosca/testing.md
index dddb6f2abe..872279e648 100644
--- a/docs/docs/variability4tosca/testing.md
+++ b/docs/docs/variability4tosca/testing.md
@@ -47,7 +47,7 @@ The following configurations can be configured in the test configuration file.
 | error       | false     | String                                     | The expected error that is thrown.                                                           | 
 | template    | false     | String                                     | Path (relative to `test.yaml`) to the variable service template.                             | 
 | expected    | false     | String                                     | Path (relative to `test.yaml`) to the expected service template after resolving variability. | 
-| renames     | false     | List(Tuple(Find: String, Replace: String)) | An optional list of strings to search and replace for in the generated service template.     | 
+| replace     | false     | List(Tuple(Find: String, Replace: String)) | An optional list of strings to search and replace for in the generated service template.     | 
 | merge       | false     | Object                                     | An optional object that is merged into the expected service template.                        | 
 
 
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-count.md b/docs/docs/variability4tosca/tests/test-analytical-operators-count.md
index dffb379be6..8690f712fd 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-count.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-count.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-exponential_regression.md b/docs/docs/variability4tosca/tests/test-analytical-operators-exponential_regression.md
index 44833f997d..74a58a265e 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-exponential_regression.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-exponential_regression.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-linear_regression.md b/docs/docs/variability4tosca/tests/test-analytical-operators-linear_regression.md
index 6ba9672171..db5dd1e6a7 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-linear_regression.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-linear_regression.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-logarithmic_regression.md b/docs/docs/variability4tosca/tests/test-analytical-operators-logarithmic_regression.md
index 956b9495bb..8ef1485219 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-logarithmic_regression.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-logarithmic_regression.md
@@ -32,6 +32,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-max.md b/docs/docs/variability4tosca/tests/test-analytical-operators-max.md
index 3cf837466d..7ac10835cc 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-max.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-max.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-mean.md b/docs/docs/variability4tosca/tests/test-analytical-operators-mean.md
index d73babc8c7..a00754b850 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-mean.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-mean.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-median.md b/docs/docs/variability4tosca/tests/test-analytical-operators-median.md
index 62a423d90a..2bfd1ae631 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-median.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-median.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-min.md b/docs/docs/variability4tosca/tests/test-analytical-operators-min.md
index 40e71d636c..0bd4f698e0 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-min.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-min.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-polynomial_regression.md b/docs/docs/variability4tosca/tests/test-analytical-operators-polynomial_regression.md
index c1d55718f0..53998e87eb 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-polynomial_regression.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-polynomial_regression.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-standard_deviation.md b/docs/docs/variability4tosca/tests/test-analytical-operators-standard_deviation.md
index fdfcadf986..9d976876d5 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-standard_deviation.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-standard_deviation.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-sum.md b/docs/docs/variability4tosca/tests/test-analytical-operators-sum.md
index 45b4135723..38447b64a9 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-sum.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-sum.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-variance.md b/docs/docs/variability4tosca/tests/test-analytical-operators-variance.md
index 966d7f4366..b3f646afc2 100644
--- a/docs/docs/variability4tosca/tests/test-analytical-operators-variance.md
+++ b/docs/docs/variability4tosca/tests/test-analytical-operators-variance.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-add.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-add.md
index c2d7a1cee3..6b939ab953 100644
--- a/docs/docs/variability4tosca/tests/test-arithmetic-operators-add.md
+++ b/docs/docs/variability4tosca/tests/test-arithmetic-operators-add.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-div.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-div.md
index 31e1e0eb74..3b0c19d7e8 100644
--- a/docs/docs/variability4tosca/tests/test-arithmetic-operators-div.md
+++ b/docs/docs/variability4tosca/tests/test-arithmetic-operators-div.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-even.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-even.md
index 8174cd65f6..ff757f65eb 100644
--- a/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-even.md
+++ b/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-even.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-odd.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-odd.md
index 001adecd88..f9f07ed24d 100644
--- a/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-odd.md
+++ b/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-odd.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-mul.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-mul.md
index 23a1b812fa..9203231d89 100644
--- a/docs/docs/variability4tosca/tests/test-arithmetic-operators-mul.md
+++ b/docs/docs/variability4tosca/tests/test-arithmetic-operators-mul.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-sub.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-sub.md
index f2275cc361..ccbd30d2b1 100644
--- a/docs/docs/variability4tosca/tests/test-arithmetic-operators-sub.md
+++ b/docs/docs/variability4tosca/tests/test-arithmetic-operators-sub.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-number-absent.md b/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-number-absent.md
index 0ae37a8491..b3d5e7c7d8 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-number-absent.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-number-absent.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-number-present.md b/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-number-present.md
index c9d43e43c0..f5b149365f 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-number-present.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-number-present.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-string-absent.md b/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-string-absent.md
index b791a09aa7..d5ef104891 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-string-absent.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-string-absent.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-string-present.md b/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-string-present.md
index ec00485673..71f523e9d3 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-string-present.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-artifact-presence-string-present.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-conditional.md b/docs/docs/variability4tosca/tests/test-artifacts-conditional.md
index 588540d386..a2cf151ef9 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-conditional.md
@@ -45,6 +45,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-container-presence-absent.md b/docs/docs/variability4tosca/tests/test-artifacts-container-presence-absent.md
index 3872cf2302..1445ab75c5 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-container-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-container-presence-absent.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-container-presence-present.md b/docs/docs/variability4tosca/tests/test-artifacts-container-presence-present.md
index 291fea2fd3..434fb8be72 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-container-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-container-presence-present.md
@@ -22,6 +22,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-default-alternative-false.md b/docs/docs/variability4tosca/tests/test-artifacts-default-alternative-false.md
index a230343155..5fb6168861 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-default-alternative-false.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-default-alternative-false.md
@@ -44,6 +44,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-default-alternative.md b/docs/docs/variability4tosca/tests/test-artifacts-default-alternative.md
index 725fe981df..538c661055 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-default-alternative.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-default-alternative.md
@@ -44,6 +44,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-default-condition.md b/docs/docs/variability4tosca/tests/test-artifacts-default-condition.md
index f6ab38cb2e..a635815be1 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-default-condition.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-default-condition.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-prune.md b/docs/docs/variability4tosca/tests/test-artifacts-prune.md
index f29a29b2fc..d7edec43c4 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-prune.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-prune.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-artifact.md b/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-artifact.md
index bb949b257a..646ec27a0e 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-artifact.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-artifact.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-default.md b/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-default.md
index 04d73ed89b..070d635e2c 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-default.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-default.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-artifacts-throw-missing-artifact-container.md b/docs/docs/variability4tosca/tests/test-artifacts-throw-missing-artifact-container.md
index 9e82ca4d03..b386f01824 100644
--- a/docs/docs/variability4tosca/tests/test-artifacts-throw-missing-artifact-container.md
+++ b/docs/docs/variability4tosca/tests/test-artifacts-throw-missing-artifact-container.md
@@ -22,6 +22,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-empty.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-empty.md
index b0861fc603..1eb799b4f0 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-and-empty.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-and-empty.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-false.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-false.md
index 422ed51f37..410d0135fe 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-and-false.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-and-false.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-false.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-false.md
index 3a72fe616d..71f53cf68f 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-false.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-false.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-true.md
index b3cf6981b9..f1a24caa71 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-true.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-true.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-true.md
index 138567494b..9004037d7d 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-and-true.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-and-true.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-implies-false-false-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-implies-false-false-true.md
index 88d387a561..582cddf773 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-implies-false-false-true.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-implies-false-false-true.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-implies-false-true-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-implies-false-true-true.md
index 279ee425ca..900b92724f 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-implies-false-true-true.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-implies-false-true-true.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-implies-true-false-false.md b/docs/docs/variability4tosca/tests/test-boolean-operators-implies-true-false-false.md
index a0439dc206..2b7b1f2c61 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-implies-true-false-false.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-implies-true-false-false.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-implies-true-true-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-implies-true-true-true.md
index ea8c8f5446..94ac61eaeb 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-implies-true-true-true.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-implies-true-true-true.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-not-false.md b/docs/docs/variability4tosca/tests/test-boolean-operators-not-false.md
index 6f0e5838a8..4b5fc5f40a 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-not-false.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-not-false.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-not-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-not-true.md
index d44df091bf..488ceef354 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-not-true.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-not-true.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-or-empty.md b/docs/docs/variability4tosca/tests/test-boolean-operators-or-empty.md
index 49fcf5745a..681c437200 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-or-empty.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-or-empty.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-or-false.md b/docs/docs/variability4tosca/tests/test-boolean-operators-or-false.md
index d3911c21ed..bba717d424 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-or-false.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-or-false.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-or-true-all.md b/docs/docs/variability4tosca/tests/test-boolean-operators-or-true-all.md
index 645cd5cc2f..1f02d4f70d 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-or-true-all.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-or-true-all.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-or-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-or-true.md
index 0c4b1b5cb3..b00ec18b7e 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-or-true.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-or-true.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-xor-false-all.md b/docs/docs/variability4tosca/tests/test-boolean-operators-xor-false-all.md
index f9389c33fa..a12ed1f913 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-xor-false-all.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-xor-false-all.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-xor-true-all.md b/docs/docs/variability4tosca/tests/test-boolean-operators-xor-true-all.md
index 3cf335f704..dc93b0ea5a 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-xor-true-all.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-xor-true-all.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-xor-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-xor-true.md
index 6fe89a1a05..c1719e0d2f 100644
--- a/docs/docs/variability4tosca/tests/test-boolean-operators-xor-true.md
+++ b/docs/docs/variability4tosca/tests/test-boolean-operators-xor-true.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-circles-alpha.md b/docs/docs/variability4tosca/tests/test-circles-alpha.md
index b40809e9c7..2b839ebfa8 100644
--- a/docs/docs/variability4tosca/tests/test-circles-alpha.md
+++ b/docs/docs/variability4tosca/tests/test-circles-alpha.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-circles-bravo.md b/docs/docs/variability4tosca/tests/test-circles-bravo.md
index cd6e725021..4932329a4c 100644
--- a/docs/docs/variability4tosca/tests/test-circles-bravo.md
+++ b/docs/docs/variability4tosca/tests/test-circles-bravo.md
@@ -42,6 +42,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-circles-charlie.md b/docs/docs/variability4tosca/tests/test-circles-charlie.md
index 64978c2aa6..00629b46e5 100644
--- a/docs/docs/variability4tosca/tests/test-circles-charlie.md
+++ b/docs/docs/variability4tosca/tests/test-circles-charlie.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-circles-delta.md b/docs/docs/variability4tosca/tests/test-circles-delta.md
index 44f8cf7041..bd63b3b662 100644
--- a/docs/docs/variability4tosca/tests/test-circles-delta.md
+++ b/docs/docs/variability4tosca/tests/test-circles-delta.md
@@ -43,6 +43,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-circles-echo.md b/docs/docs/variability4tosca/tests/test-circles-echo.md
index 40fd3a9b6f..13ee68ff44 100644
--- a/docs/docs/variability4tosca/tests/test-circles-echo.md
+++ b/docs/docs/variability4tosca/tests/test-circles-echo.md
@@ -42,6 +42,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-circles-golf.md b/docs/docs/variability4tosca/tests/test-circles-golf.md
index d0761eb646..fa27d7f76c 100644
--- a/docs/docs/variability4tosca/tests/test-circles-golf.md
+++ b/docs/docs/variability4tosca/tests/test-circles-golf.md
@@ -46,6 +46,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-circles-hotel.md b/docs/docs/variability4tosca/tests/test-circles-hotel.md
index 497aff7b77..c5ce494cec 100644
--- a/docs/docs/variability4tosca/tests/test-circles-hotel.md
+++ b/docs/docs/variability4tosca/tests/test-circles-hotel.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-circles-india.md b/docs/docs/variability4tosca/tests/test-circles-india.md
index 6680a2935b..9e6e3c3537 100644
--- a/docs/docs/variability4tosca/tests/test-circles-india.md
+++ b/docs/docs/variability4tosca/tests/test-circles-india.md
@@ -45,6 +45,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-consistency-throw-hosting-relation-missing-constraint.md b/docs/docs/variability4tosca/tests/test-consistency-throw-hosting-relation-missing-constraint.md
index 3ea8bcdab8..5ce4f3530a 100644
--- a/docs/docs/variability4tosca/tests/test-consistency-throw-hosting-relation-missing-constraint.md
+++ b/docs/docs/variability4tosca/tests/test-consistency-throw-hosting-relation-missing-constraint.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-consistency-throw-hosting-relation-missing.md b/docs/docs/variability4tosca/tests/test-consistency-throw-hosting-relation-missing.md
index c4d7436e44..0454df960b 100644
--- a/docs/docs/variability4tosca/tests/test-consistency-throw-hosting-relation-missing.md
+++ b/docs/docs/variability4tosca/tests/test-consistency-throw-hosting-relation-missing.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-consistency-throw-multiple-hosting-relations-constraint.md b/docs/docs/variability4tosca/tests/test-consistency-throw-multiple-hosting-relations-constraint.md
index 3f1e788017..cbeefa3376 100644
--- a/docs/docs/variability4tosca/tests/test-consistency-throw-multiple-hosting-relations-constraint.md
+++ b/docs/docs/variability4tosca/tests/test-consistency-throw-multiple-hosting-relations-constraint.md
@@ -33,6 +33,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-consistency-throw-multiple-hosting-relations.md b/docs/docs/variability4tosca/tests/test-consistency-throw-multiple-hosting-relations.md
index f357ecf7ba..0a5d33ab68 100644
--- a/docs/docs/variability4tosca/tests/test-consistency-throw-multiple-hosting-relations.md
+++ b/docs/docs/variability4tosca/tests/test-consistency-throw-multiple-hosting-relations.md
@@ -32,6 +32,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-consistency-throw-relation-source-missing.md b/docs/docs/variability4tosca/tests/test-consistency-throw-relation-source-missing.md
index 22c07e57e7..87b5116ba5 100644
--- a/docs/docs/variability4tosca/tests/test-consistency-throw-relation-source-missing.md
+++ b/docs/docs/variability4tosca/tests/test-consistency-throw-relation-source-missing.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-consistency-throw-relation-target-missing.md b/docs/docs/variability4tosca/tests/test-consistency-throw-relation-target-missing.md
index cff3930c58..3ac17f1c89 100644
--- a/docs/docs/variability4tosca/tests/test-consistency-throw-relation-target-missing.md
+++ b/docs/docs/variability4tosca/tests/test-consistency-throw-relation-target-missing.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-equal-false.md b/docs/docs/variability4tosca/tests/test-constraint-operators-equal-false.md
index 55d1709674..91231b6b82 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-equal-false.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-equal-false.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-equal-true.md b/docs/docs/variability4tosca/tests/test-constraint-operators-equal-true.md
index 94396efb26..9e6a9e84e3 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-equal-true.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-equal-true.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-equal.md b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-equal.md
index 992a5f2e33..8c03ed541d 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-equal.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-equal.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-greater.md b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-greater.md
index 37430b4b3b..9b13e29ba7 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-greater.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-greater.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-less.md b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-less.md
index 4c965ebd21..e0bca0b7a5 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-less.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-or-equal-less.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-equal.md b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-equal.md
index 1709c86015..2456442c81 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-equal.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-equal.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-greater.md b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-greater.md
index ea310b53d0..32414f35f1 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-greater.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-greater.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-less.md b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-less.md
index e096855091..55d24546ba 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-less.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-greater-than-less.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-in_range_false.md b/docs/docs/variability4tosca/tests/test-constraint-operators-in_range_false.md
index efcda73e5c..fb03398dc3 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-in_range_false.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-in_range_false.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-in_range_true.md b/docs/docs/variability4tosca/tests/test-constraint-operators-in_range_true.md
index e66e0a199b..70f61ddec5 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-in_range_true.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-in_range_true.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-length_false.md b/docs/docs/variability4tosca/tests/test-constraint-operators-length_false.md
index a3cb6a987f..5474545b58 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-length_false.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-length_false.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-length_true.md b/docs/docs/variability4tosca/tests/test-constraint-operators-length_true.md
index 9b3cd68536..81b4a6ca32 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-length_true.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-length_true.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_equal.md b/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_equal.md
index e2983c3741..464317717c 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_equal.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_equal.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_greater.md b/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_greater.md
index 6b670034c6..fb5aa0b210 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_greater.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_greater.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_less.md b/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_less.md
index acca798958..ba507cef07 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_less.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-less_or_equal_less.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_equal.md b/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_equal.md
index 2c0a5247cd..4c87d74c77 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_equal.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_equal.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_greater.md b/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_greater.md
index 33fe6cb759..475e686153 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_greater.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_greater.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_less.md b/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_less.md
index 77e65f9ba7..67668fe6a3 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_less.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-less_than_less.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_equal.md b/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_equal.md
index 636bb43605..3766240227 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_equal.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_equal.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_greater.md b/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_greater.md
index 5179f0c22d..49e1df9c84 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_greater.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_greater.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_less.md b/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_less.md
index 549a092890..dbde276edd 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_less.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-max_length_less.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_equal.md b/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_equal.md
index 3080f9b5f8..586f5aa03e 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_equal.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_equal.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_greater.md b/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_greater.md
index 1c8617d3e5..4a48a7d726 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_greater.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_greater.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_less.md b/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_less.md
index 469eadff80..30aabc77a2 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_less.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-min_length_less.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-valid_values_false.md b/docs/docs/variability4tosca/tests/test-constraint-operators-valid_values_false.md
index f474378af8..8d24b665d2 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-valid_values_false.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-valid_values_false.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-constraint-operators-valid_values_true.md b/docs/docs/variability4tosca/tests/test-constraint-operators-valid_values_true.md
index ca2f85dc89..b255aad981 100644
--- a/docs/docs/variability4tosca/tests/test-constraint-operators-valid_values_true.md
+++ b/docs/docs/variability4tosca/tests/test-constraint-operators-valid_values_true.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-after-false.md b/docs/docs/variability4tosca/tests/test-date-operators-after-false.md
index af08bf0c35..8e7a866c6f 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-after-false.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-after-false.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-after-or-same-false.md b/docs/docs/variability4tosca/tests/test-date-operators-after-or-same-false.md
index 86046253dd..9cf5d096eb 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-after-or-same-false.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-after-or-same-false.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-after-or-same-true.md b/docs/docs/variability4tosca/tests/test-date-operators-after-or-same-true.md
index fc58c63425..40b765c02b 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-after-or-same-true.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-after-or-same-true.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-after-true.md b/docs/docs/variability4tosca/tests/test-date-operators-after-true.md
index 38a70b9c55..c3fb80ba3e 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-after-true.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-after-true.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-before-false.md b/docs/docs/variability4tosca/tests/test-date-operators-before-false.md
index bdc564e4bd..447e6ed9e6 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-before-false.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-before-false.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-before-or-same-false.md b/docs/docs/variability4tosca/tests/test-date-operators-before-or-same-false.md
index ce77bc09a4..66a9014065 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-before-or-same-false.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-before-or-same-false.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-before-or-same-true.md b/docs/docs/variability4tosca/tests/test-date-operators-before-or-same-true.md
index 574ad15101..ec38bc7d75 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-before-or-same-true.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-before-or-same-true.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-before-true.md b/docs/docs/variability4tosca/tests/test-date-operators-before-true.md
index 6aaf38e09a..9144f88daa 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-before-true.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-before-true.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-same-false.md b/docs/docs/variability4tosca/tests/test-date-operators-same-false.md
index 64e5dcdfa9..93bf464f6a 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-same-false.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-same-false.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-same-true.md b/docs/docs/variability4tosca/tests/test-date-operators-same-true.md
index 5393456028..0b0bf8ee64 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-same-true.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-same-true.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-within-false.md b/docs/docs/variability4tosca/tests/test-date-operators-within-false.md
index 178dcafafb..0518d9f452 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-within-false.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-within-false.md
@@ -24,6 +24,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-date-operators-within-true.md b/docs/docs/variability4tosca/tests/test-date-operators-within-true.md
index 7747b80aa5..6eab67ba54 100644
--- a/docs/docs/variability4tosca/tests/test-date-operators-within-true.md
+++ b/docs/docs/variability4tosca/tests/test-date-operators-within-true.md
@@ -24,6 +24,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-groups-conditional.md b/docs/docs/variability4tosca/tests/test-groups-conditional.md
index 4afc5c997b..a035928e0b 100644
--- a/docs/docs/variability4tosca/tests/test-groups-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-groups-conditional.md
@@ -74,6 +74,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-groups-default-condition-nothing.md b/docs/docs/variability4tosca/tests/test-groups-default-condition-nothing.md
index 4ef0b31bf9..8a3005e418 100644
--- a/docs/docs/variability4tosca/tests/test-groups-default-condition-nothing.md
+++ b/docs/docs/variability4tosca/tests/test-groups-default-condition-nothing.md
@@ -70,6 +70,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-groups-default-condition.md b/docs/docs/variability4tosca/tests/test-groups-default-condition.md
index 09aa927a9d..b78d599f48 100644
--- a/docs/docs/variability4tosca/tests/test-groups-default-condition.md
+++ b/docs/docs/variability4tosca/tests/test-groups-default-condition.md
@@ -67,6 +67,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-groups-group-presence-absent.md b/docs/docs/variability4tosca/tests/test-groups-group-presence-absent.md
index 2010ac94ed..63ddd346ab 100644
--- a/docs/docs/variability4tosca/tests/test-groups-group-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-groups-group-presence-absent.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-groups-group-presence-present.md b/docs/docs/variability4tosca/tests/test-groups-group-presence-present.md
index 6b6570900b..df15e5aab9 100644
--- a/docs/docs/variability4tosca/tests/test-groups-group-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-groups-group-presence-present.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-groups-prune.md b/docs/docs/variability4tosca/tests/test-groups-prune.md
index a27d184ab1..98aedfcd92 100644
--- a/docs/docs/variability4tosca/tests/test-groups-prune.md
+++ b/docs/docs/variability4tosca/tests/test-groups-prune.md
@@ -68,6 +68,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-constraints-elastic.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-constraints-elastic.md
index 61625eea58..9159c45b33 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-constraints-elastic.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-constraints-elastic.md
@@ -87,6 +87,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-constraints-static.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-constraints-static.md
index 2cd720b20f..5d9dd324a6 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-constraints-static.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-constraints-static.md
@@ -87,6 +87,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-host-elastic.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-host-elastic.md
index f0ec12ef93..8adf4b1bbf 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-host-elastic.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-host-elastic.md
@@ -88,6 +88,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-host-static.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-host-static.md
index 400669c306..ac7095847b 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-host-static.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-host-static.md
@@ -87,6 +87,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-motivation-elastic.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-motivation-elastic.md
index aa8038a03f..5856128491 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-motivation-elastic.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-motivation-elastic.md
@@ -91,6 +91,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-motivation-static.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-motivation-static.md
index e9992943ef..f4fbb50c6e 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-motivation-static.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-motivation-static.md
@@ -109,6 +109,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-provider-elastic.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-provider-elastic.md
index 6cfb5115f1..3af373e05b 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-provider-elastic.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-provider-elastic.md
@@ -86,6 +86,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-provider-static.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-provider-static.md
index d03217edba..17eab8322e 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-provider-static.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-provider-static.md
@@ -89,6 +89,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-ambiguous.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-ambiguous.md
index 7036f2ecf4..e1cfb43355 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-ambiguous.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-ambiguous.md
@@ -43,6 +43,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-both.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-both.md
index c6f0b0d561..27074b37ef 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-both.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-both.md
@@ -43,6 +43,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-preserved.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-preserved.md
index d701c259a4..838391c257 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-preserved.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-preserved.md
@@ -43,6 +43,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-unexpected.md b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-unexpected.md
index 624671c8c7..f445e8f8c7 100644
--- a/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-unexpected.md
+++ b/docs/docs/variability4tosca/tests/test-hosting-aware-pruning-transitive-unexpected.md
@@ -46,6 +46,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-constraints.md b/docs/docs/variability4tosca/tests/test-implications-constraints.md
index 592a6e5b1f..5c789f1539 100644
--- a/docs/docs/variability4tosca/tests/test-implications-constraints.md
+++ b/docs/docs/variability4tosca/tests/test-implications-constraints.md
@@ -90,6 +90,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-implied-left.md b/docs/docs/variability4tosca/tests/test-implications-implied-left.md
index 43bf87c59c..f5dde08967 100644
--- a/docs/docs/variability4tosca/tests/test-implications-implied-left.md
+++ b/docs/docs/variability4tosca/tests/test-implications-implied-left.md
@@ -72,6 +72,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-implied-right.md b/docs/docs/variability4tosca/tests/test-implications-implied-right.md
index 04ff8f696d..da660d966f 100644
--- a/docs/docs/variability4tosca/tests/test-implications-implied-right.md
+++ b/docs/docs/variability4tosca/tests/test-implications-implied-right.md
@@ -72,6 +72,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-implies-left.md b/docs/docs/variability4tosca/tests/test-implications-implies-left.md
index 18ea52eeaf..2307f5095d 100644
--- a/docs/docs/variability4tosca/tests/test-implications-implies-left.md
+++ b/docs/docs/variability4tosca/tests/test-implications-implies-left.md
@@ -73,6 +73,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-implies-right.md b/docs/docs/variability4tosca/tests/test-implications-implies-right.md
index d6ebbbf1c9..fca0af73c1 100644
--- a/docs/docs/variability4tosca/tests/test-implications-implies-right.md
+++ b/docs/docs/variability4tosca/tests/test-implications-implies-right.md
@@ -73,6 +73,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-incoming-left.md b/docs/docs/variability4tosca/tests/test-implications-incoming-left.md
index a9b0b65a13..e8e1233bef 100644
--- a/docs/docs/variability4tosca/tests/test-implications-incoming-left.md
+++ b/docs/docs/variability4tosca/tests/test-implications-incoming-left.md
@@ -64,6 +64,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-incoming-right.md b/docs/docs/variability4tosca/tests/test-implications-incoming-right.md
index 2a9825fcd6..30a608f165 100644
--- a/docs/docs/variability4tosca/tests/test-implications-incoming-right.md
+++ b/docs/docs/variability4tosca/tests/test-implications-incoming-right.md
@@ -64,6 +64,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-motivating-scenario-cloud.md b/docs/docs/variability4tosca/tests/test-implications-motivating-scenario-cloud.md
index ce835c37a0..430536b2f6 100644
--- a/docs/docs/variability4tosca/tests/test-implications-motivating-scenario-cloud.md
+++ b/docs/docs/variability4tosca/tests/test-implications-motivating-scenario-cloud.md
@@ -96,6 +96,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-motivating-scenario-static.md b/docs/docs/variability4tosca/tests/test-implications-motivating-scenario-static.md
index 8f961a7797..7fff1e82e7 100644
--- a/docs/docs/variability4tosca/tests/test-implications-motivating-scenario-static.md
+++ b/docs/docs/variability4tosca/tests/test-implications-motivating-scenario-static.md
@@ -96,6 +96,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-constraints.md b/docs/docs/variability4tosca/tests/test-implications-naive-constraints.md
index f013a35d12..31de741178 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-constraints.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-constraints.md
@@ -100,6 +100,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-implied-left.md b/docs/docs/variability4tosca/tests/test-implications-naive-implied-left.md
index 6363980a38..d6b049f1f5 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-implied-left.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-implied-left.md
@@ -72,6 +72,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-implied-right.md b/docs/docs/variability4tosca/tests/test-implications-naive-implied-right.md
index 5b9d83d554..341e6d15ed 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-implied-right.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-implied-right.md
@@ -72,6 +72,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-implies-left.md b/docs/docs/variability4tosca/tests/test-implications-naive-implies-left.md
index f5868da91f..91dbbf3bad 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-implies-left.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-implies-left.md
@@ -73,6 +73,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-implies-right.md b/docs/docs/variability4tosca/tests/test-implications-naive-implies-right.md
index 58252f5c69..ec7d87e041 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-implies-right.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-implies-right.md
@@ -73,6 +73,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-incoming-left.md b/docs/docs/variability4tosca/tests/test-implications-naive-incoming-left.md
index cad37b793a..3c93bd7bec 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-incoming-left.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-incoming-left.md
@@ -64,6 +64,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-incoming-right.md b/docs/docs/variability4tosca/tests/test-implications-naive-incoming-right.md
index 0f70b4bb64..319fb54f0c 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-incoming-right.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-incoming-right.md
@@ -64,6 +64,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-motivating-scenario-cloud.md b/docs/docs/variability4tosca/tests/test-implications-naive-motivating-scenario-cloud.md
index 953884aff5..b12a2ca0b9 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-motivating-scenario-cloud.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-motivating-scenario-cloud.md
@@ -96,6 +96,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-motivating-scenario-static.md b/docs/docs/variability4tosca/tests/test-implications-naive-motivating-scenario-static.md
index 676fcf4a76..0397c84bc3 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-motivating-scenario-static.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-motivating-scenario-static.md
@@ -96,6 +96,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-naive-another-no-optimization.md b/docs/docs/variability4tosca/tests/test-implications-naive-naive-another-no-optimization.md
index d276e12dab..3d1d4c7c54 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-naive-another-no-optimization.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-naive-another-no-optimization.md
@@ -45,6 +45,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-naive-another-not.md b/docs/docs/variability4tosca/tests/test-implications-naive-naive-another-not.md
index 264d1e9b32..497da28f94 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-naive-another-not.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-naive-another-not.md
@@ -46,6 +46,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-naive-another.md b/docs/docs/variability4tosca/tests/test-implications-naive-naive-another.md
index b4b5e8cd78..0866a2dee9 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-naive-another.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-naive-another.md
@@ -45,6 +45,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-naive-not.md b/docs/docs/variability4tosca/tests/test-implications-naive-naive-not.md
index c728a0fca0..112b9a6492 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-naive-not.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-naive-not.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-naive.md b/docs/docs/variability4tosca/tests/test-implications-naive-naive.md
index 2084f31596..09c1c8a1b8 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-naive.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-naive.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-requires.md b/docs/docs/variability4tosca/tests/test-implications-naive-requires.md
index 494195d4e6..75db5c80b2 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-requires.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-requires.md
@@ -66,6 +66,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-implications-naive-unexpected.md b/docs/docs/variability4tosca/tests/test-implications-naive-unexpected.md
index 99484f6988..f3461889d4 100644
--- a/docs/docs/variability4tosca/tests/test-implications-naive-unexpected.md
+++ b/docs/docs/variability4tosca/tests/test-implications-naive-unexpected.md
@@ -44,6 +44,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-implications-requires.md b/docs/docs/variability4tosca/tests/test-implications-requires.md
index 768fb388e4..2bc6a50a3e 100644
--- a/docs/docs/variability4tosca/tests/test-implications-requires.md
+++ b/docs/docs/variability4tosca/tests/test-implications-requires.md
@@ -66,6 +66,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-implications-unexpected.md b/docs/docs/variability4tosca/tests/test-implications-unexpected.md
index 557b60e01e..2adf65b407 100644
--- a/docs/docs/variability4tosca/tests/test-implications-unexpected.md
+++ b/docs/docs/variability4tosca/tests/test-implications-unexpected.md
@@ -44,6 +44,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-import-conditional.md b/docs/docs/variability4tosca/tests/test-import-conditional.md
index f3de5ded9d..1280768e3e 100644
--- a/docs/docs/variability4tosca/tests/test-import-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-import-conditional.md
@@ -18,6 +18,7 @@ imports:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-import-empty.md b/docs/docs/variability4tosca/tests/test-import-empty.md
index 9aeb766acc..a1230d9458 100644
--- a/docs/docs/variability4tosca/tests/test-import-empty.md
+++ b/docs/docs/variability4tosca/tests/test-import-empty.md
@@ -18,6 +18,7 @@ imports:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-import-get-import-absent.md b/docs/docs/variability4tosca/tests/test-import-get-import-absent.md
index 132f88d962..d642c08ce4 100644
--- a/docs/docs/variability4tosca/tests/test-import-get-import-absent.md
+++ b/docs/docs/variability4tosca/tests/test-import-get-import-absent.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-import-get-import-present.md b/docs/docs/variability4tosca/tests/test-import-get-import-present.md
index 84740f4881..d4bebe6cc1 100644
--- a/docs/docs/variability4tosca/tests/test-import-get-import-present.md
+++ b/docs/docs/variability4tosca/tests/test-import-get-import-present.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-inputs-conditional-list.md b/docs/docs/variability4tosca/tests/test-inputs-conditional-list.md
index c68249acb6..8119e090e5 100644
--- a/docs/docs/variability4tosca/tests/test-inputs-conditional-list.md
+++ b/docs/docs/variability4tosca/tests/test-inputs-conditional-list.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-inputs-conditional.md b/docs/docs/variability4tosca/tests/test-inputs-conditional.md
index 78d5b996a6..d309fd8d30 100644
--- a/docs/docs/variability4tosca/tests/test-inputs-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-inputs-conditional.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-inputs-input-presence-absent.md b/docs/docs/variability4tosca/tests/test-inputs-input-presence-absent.md
index c41ca90db9..2a8861ddbd 100644
--- a/docs/docs/variability4tosca/tests/test-inputs-input-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-inputs-input-presence-absent.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-inputs-input-presence-present.md b/docs/docs/variability4tosca/tests/test-inputs-input-presence-present.md
index 418a3db578..1a03f692b9 100644
--- a/docs/docs/variability4tosca/tests/test-inputs-input-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-inputs-input-presence-present.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-conditional-type-default.md b/docs/docs/variability4tosca/tests/test-nodes-conditional-type-default.md
index 7c4586e432..da832bb6eb 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-conditional-type-default.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-conditional-type-default.md
@@ -21,6 +21,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-conditional-type.md b/docs/docs/variability4tosca/tests/test-nodes-conditional-type.md
index 62ed6e9a44..b1451ad6ef 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-conditional-type.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-conditional-type.md
@@ -21,6 +21,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-conditional.md b/docs/docs/variability4tosca/tests/test-nodes-conditional.md
index 708210f644..f9998e9ba8 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-conditional.md
@@ -32,6 +32,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-default-false-false.md b/docs/docs/variability4tosca/tests/test-nodes-default-false-false.md
index adab64546a..df20960908 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-default-false-false.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-default-false-false.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-default-false-true.md b/docs/docs/variability4tosca/tests/test-nodes-default-false-true.md
index 07dff849df..11f9d3a9bc 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-default-false-true.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-default-false-true.md
@@ -33,6 +33,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-default-host-absent.md b/docs/docs/variability4tosca/tests/test-nodes-default-host-absent.md
index 2b3cc40a02..0783248bb8 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-default-host-absent.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-default-host-absent.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-default-host-present.md b/docs/docs/variability4tosca/tests/test-nodes-default-host-present.md
index e986a4e2f6..171d6c13ea 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-default-host-present.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-default-host-present.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-default-true-false.md b/docs/docs/variability4tosca/tests/test-nodes-default-true-false.md
index e4a1e23c71..0d2a711a1b 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-default-true-false.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-default-true-false.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-default-true-true.md b/docs/docs/variability4tosca/tests/test-nodes-default-true-true.md
index c13558e8a2..dcf2863708 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-default-true-true.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-default-true-true.md
@@ -33,6 +33,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-host-presence-absent.md b/docs/docs/variability4tosca/tests/test-nodes-host-presence-absent.md
index 9a2d2f96b1..118e4bacab 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-host-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-host-presence-absent.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-host-presence-false-false.md b/docs/docs/variability4tosca/tests/test-nodes-host-presence-false-false.md
index 2bf81b7f66..57f9536308 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-host-presence-false-false.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-host-presence-false-false.md
@@ -32,6 +32,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-host-presence-present.md b/docs/docs/variability4tosca/tests/test-nodes-host-presence-present.md
index 4755fe3556..fa1a31d0f9 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-host-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-host-presence-present.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-false.md b/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-false.md
index 2977137185..19173d9f52 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-false.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-false.md
@@ -32,6 +32,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-true-constraint.md b/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-true-constraint.md
index 108717aa14..4c50ecde50 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-true-constraint.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-true-constraint.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-true.md b/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-true.md
index efc227bf6a..18f4d1e712 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-true.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-host-presence-true-true.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-node-presence-absent.md b/docs/docs/variability4tosca/tests/test-nodes-node-presence-absent.md
index 54e5501518..744aed1b62 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-node-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-node-presence-absent.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-node-presence-present.md b/docs/docs/variability4tosca/tests/test-nodes-node-presence-present.md
index a5aef2323d..d5f5939ca0 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-node-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-node-presence-present.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-nodes-type-specific.md b/docs/docs/variability4tosca/tests/test-nodes-type-specific.md
index bb719ae749..7a63e6a658 100644
--- a/docs/docs/variability4tosca/tests/test-nodes-type-specific.md
+++ b/docs/docs/variability4tosca/tests/test-nodes-type-specific.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-benchmark.md b/docs/docs/variability4tosca/tests/test-other-benchmark.md
index d11fcd8a7e..dd3b22af9d 100644
--- a/docs/docs/variability4tosca/tests/test-other-benchmark.md
+++ b/docs/docs/variability4tosca/tests/test-other-benchmark.md
@@ -95,6 +95,7 @@ mode: present
 ```
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-concat.md b/docs/docs/variability4tosca/tests/test-other-concat.md
index ee8ad95742..65cebdf634 100644
--- a/docs/docs/variability4tosca/tests/test-other-concat.md
+++ b/docs/docs/variability4tosca/tests/test-other-concat.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-default-variability-input.md b/docs/docs/variability4tosca/tests/test-other-default-variability-input.md
index 748072ce81..6865dbb1ac 100644
--- a/docs/docs/variability4tosca/tests/test-other-default-variability-input.md
+++ b/docs/docs/variability4tosca/tests/test-other-default-variability-input.md
@@ -32,6 +32,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-join.md b/docs/docs/variability4tosca/tests/test-other-join.md
index 1c384c3ed1..eae8c27fb6 100644
--- a/docs/docs/variability4tosca/tests/test-other-join.md
+++ b/docs/docs/variability4tosca/tests/test-other-join.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-logic-expression-false.md b/docs/docs/variability4tosca/tests/test-other-logic-expression-false.md
index af5bee3f0e..140532e897 100644
--- a/docs/docs/variability4tosca/tests/test-other-logic-expression-false.md
+++ b/docs/docs/variability4tosca/tests/test-other-logic-expression-false.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-logic-expression-true.md b/docs/docs/variability4tosca/tests/test-other-logic-expression-true.md
index c8a9b9b6e9..8a27fdc8e3 100644
--- a/docs/docs/variability4tosca/tests/test-other-logic-expression-true.md
+++ b/docs/docs/variability4tosca/tests/test-other-logic-expression-true.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-logic-value-expression.md b/docs/docs/variability4tosca/tests/test-other-logic-value-expression.md
index 59c6830cc1..2cd5c64f9c 100644
--- a/docs/docs/variability4tosca/tests/test-other-logic-value-expression.md
+++ b/docs/docs/variability4tosca/tests/test-other-logic-value-expression.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-nothing.md b/docs/docs/variability4tosca/tests/test-other-nothing.md
index 66f32c9279..808ca425a9 100644
--- a/docs/docs/variability4tosca/tests/test-other-nothing.md
+++ b/docs/docs/variability4tosca/tests/test-other-nothing.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-preset.md b/docs/docs/variability4tosca/tests/test-other-preset.md
index f3e2a6b468..b54d28fe7f 100644
--- a/docs/docs/variability4tosca/tests/test-other-preset.md
+++ b/docs/docs/variability4tosca/tests/test-other-preset.md
@@ -49,6 +49,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-presets.md b/docs/docs/variability4tosca/tests/test-other-presets.md
index 47618ddee3..11aa89f2e1 100644
--- a/docs/docs/variability4tosca/tests/test-other-presets.md
+++ b/docs/docs/variability4tosca/tests/test-other-presets.md
@@ -49,6 +49,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-throw-CONTAINER.md b/docs/docs/variability4tosca/tests/test-other-throw-CONTAINER.md
index 6f27d4be66..8f27bb7a24 100644
--- a/docs/docs/variability4tosca/tests/test-other-throw-CONTAINER.md
+++ b/docs/docs/variability4tosca/tests/test-other-throw-CONTAINER.md
@@ -18,6 +18,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-other-throw-SELF.md b/docs/docs/variability4tosca/tests/test-other-throw-SELF.md
index 348d905bf5..dd0a61025c 100644
--- a/docs/docs/variability4tosca/tests/test-other-throw-SELF.md
+++ b/docs/docs/variability4tosca/tests/test-other-throw-SELF.md
@@ -18,6 +18,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-other-throw-not-unique.md b/docs/docs/variability4tosca/tests/test-other-throw-not-unique.md
index 9d7abb52bd..c29563e6c2 100644
--- a/docs/docs/variability4tosca/tests/test-other-throw-not-unique.md
+++ b/docs/docs/variability4tosca/tests/test-other-throw-not-unique.md
@@ -37,6 +37,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-other-token.md b/docs/docs/variability4tosca/tests/test-other-token.md
index 72fb56f1dd..37ddf5d1c5 100644
--- a/docs/docs/variability4tosca/tests/test-other-token.md
+++ b/docs/docs/variability4tosca/tests/test-other-token.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-value-expression.md b/docs/docs/variability4tosca/tests/test-other-value-expression.md
index 45c132eb73..15af14a4a8 100644
--- a/docs/docs/variability4tosca/tests/test-other-value-expression.md
+++ b/docs/docs/variability4tosca/tests/test-other-value-expression.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-variability-input.md b/docs/docs/variability4tosca/tests/test-other-variability-input.md
index 18b07c0fe7..6d515204d0 100644
--- a/docs/docs/variability4tosca/tests/test-other-variability-input.md
+++ b/docs/docs/variability4tosca/tests/test-other-variability-input.md
@@ -35,6 +35,7 @@ name: Miles
 ```
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-version.md b/docs/docs/variability4tosca/tests/test-other-version.md
index 8004716420..e45d65a01a 100644
--- a/docs/docs/variability4tosca/tests/test-other-version.md
+++ b/docs/docs/variability4tosca/tests/test-other-version.md
@@ -13,6 +13,7 @@ tosca_definitions_version: tosca_variability_1_0
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-other-weight.md b/docs/docs/variability4tosca/tests/test-other-weight.md
index 5139922bd2..9e4425222c 100644
--- a/docs/docs/variability4tosca/tests/test-other-weight.md
+++ b/docs/docs/variability4tosca/tests/test-other-weight.md
@@ -18,6 +18,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-persistent-persistent-false.md b/docs/docs/variability4tosca/tests/test-persistent-persistent-false.md
index 2777acaf4f..adb1b8196a 100644
--- a/docs/docs/variability4tosca/tests/test-persistent-persistent-false.md
+++ b/docs/docs/variability4tosca/tests/test-persistent-persistent-false.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-persistent-persistent-throw.md b/docs/docs/variability4tosca/tests/test-persistent-persistent-throw.md
index 6342911425..76ecf16fbf 100644
--- a/docs/docs/variability4tosca/tests/test-persistent-persistent-throw.md
+++ b/docs/docs/variability4tosca/tests/test-persistent-persistent-throw.md
@@ -36,6 +36,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-persistent-persistent-undefined.md b/docs/docs/variability4tosca/tests/test-persistent-persistent-undefined.md
index 55e4c0378c..fdae7c44cd 100644
--- a/docs/docs/variability4tosca/tests/test-persistent-persistent-undefined.md
+++ b/docs/docs/variability4tosca/tests/test-persistent-persistent-undefined.md
@@ -37,6 +37,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-persistent-persistent.md b/docs/docs/variability4tosca/tests/test-persistent-persistent.md
index 7a33b1a2fb..557d13b1fa 100644
--- a/docs/docs/variability4tosca/tests/test-persistent-persistent.md
+++ b/docs/docs/variability4tosca/tests/test-persistent-persistent.md
@@ -36,6 +36,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-conditional.md b/docs/docs/variability4tosca/tests/test-policies-conditional.md
index 5bf00c30b9..497e318111 100644
--- a/docs/docs/variability4tosca/tests/test-policies-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-policies-conditional.md
@@ -45,6 +45,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-default-condition-nothing.md b/docs/docs/variability4tosca/tests/test-policies-default-condition-nothing.md
index a436970deb..49c6cdc0fe 100644
--- a/docs/docs/variability4tosca/tests/test-policies-default-condition-nothing.md
+++ b/docs/docs/variability4tosca/tests/test-policies-default-condition-nothing.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-default-condition.md b/docs/docs/variability4tosca/tests/test-policies-default-condition.md
index 56827706aa..3eeae4eb54 100644
--- a/docs/docs/variability4tosca/tests/test-policies-default-condition.md
+++ b/docs/docs/variability4tosca/tests/test-policies-default-condition.md
@@ -37,6 +37,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-has-present-target-absent-members.md b/docs/docs/variability4tosca/tests/test-policies-has-present-target-absent-members.md
index b7f9967cf9..e04cab16e7 100644
--- a/docs/docs/variability4tosca/tests/test-policies-has-present-target-absent-members.md
+++ b/docs/docs/variability4tosca/tests/test-policies-has-present-target-absent-members.md
@@ -50,6 +50,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-has-present-target-absent-nodes.md b/docs/docs/variability4tosca/tests/test-policies-has-present-target-absent-nodes.md
index d1ea0b9d74..4ec6f6eeef 100644
--- a/docs/docs/variability4tosca/tests/test-policies-has-present-target-absent-nodes.md
+++ b/docs/docs/variability4tosca/tests/test-policies-has-present-target-absent-nodes.md
@@ -37,6 +37,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-has-present-target-no-targets.md b/docs/docs/variability4tosca/tests/test-policies-has-present-target-no-targets.md
index c2cd8240c0..86588cc6a9 100644
--- a/docs/docs/variability4tosca/tests/test-policies-has-present-target-no-targets.md
+++ b/docs/docs/variability4tosca/tests/test-policies-has-present-target-no-targets.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-member.md b/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-member.md
index 8734325452..6cc480c5dd 100644
--- a/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-member.md
+++ b/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-member.md
@@ -50,6 +50,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-node.md b/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-node.md
index bfce83244f..a4161f2c86 100644
--- a/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-node.md
+++ b/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-node.md
@@ -37,6 +37,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-nodes.md b/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-nodes.md
index ad30147a86..e44bd87326 100644
--- a/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-nodes.md
+++ b/docs/docs/variability4tosca/tests/test-policies-has-present-target-present-nodes.md
@@ -35,6 +35,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-policy-presence-absent.md b/docs/docs/variability4tosca/tests/test-policies-policy-presence-absent.md
index f24baff2eb..a5f2cd6d2a 100644
--- a/docs/docs/variability4tosca/tests/test-policies-policy-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-policies-policy-presence-absent.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-policy-presence-present.md b/docs/docs/variability4tosca/tests/test-policies-policy-presence-present.md
index bb07ba8af3..8e3f9953b9 100644
--- a/docs/docs/variability4tosca/tests/test-policies-policy-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-policies-policy-presence-present.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-policies-prune.md b/docs/docs/variability4tosca/tests/test-policies-prune.md
index 5df805bf6c..fd53c92ad7 100644
--- a/docs/docs/variability4tosca/tests/test-policies-prune.md
+++ b/docs/docs/variability4tosca/tests/test-policies-prune.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-artifact-container-presence-absent.md b/docs/docs/variability4tosca/tests/test-properties-artifact-container-presence-absent.md
index 2f763ac1ba..4ced4e8eb3 100644
--- a/docs/docs/variability4tosca/tests/test-properties-artifact-container-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-properties-artifact-container-presence-absent.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-artifact-container-presence-present.md b/docs/docs/variability4tosca/tests/test-properties-artifact-container-presence-present.md
index 4fc5c13e23..4083b9196e 100644
--- a/docs/docs/variability4tosca/tests/test-properties-artifact-container-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-properties-artifact-container-presence-present.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-conditional.md b/docs/docs/variability4tosca/tests/test-properties-conditional.md
index b81f951630..fe4fa780e3 100644
--- a/docs/docs/variability4tosca/tests/test-properties-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-properties-conditional.md
@@ -81,6 +81,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-default-alternative-false.md b/docs/docs/variability4tosca/tests/test-properties-default-alternative-false.md
index fa536fa08b..99244bb348 100644
--- a/docs/docs/variability4tosca/tests/test-properties-default-alternative-false.md
+++ b/docs/docs/variability4tosca/tests/test-properties-default-alternative-false.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-default-alternative.md b/docs/docs/variability4tosca/tests/test-properties-default-alternative.md
index 2526fd38ed..e23ba5f1f9 100644
--- a/docs/docs/variability4tosca/tests/test-properties-default-alternative.md
+++ b/docs/docs/variability4tosca/tests/test-properties-default-alternative.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-default-condition.md b/docs/docs/variability4tosca/tests/test-properties-default-condition.md
index d6b5ea4b94..8a44202d1a 100644
--- a/docs/docs/variability4tosca/tests/test-properties-default-condition.md
+++ b/docs/docs/variability4tosca/tests/test-properties-default-condition.md
@@ -24,6 +24,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-expression.md b/docs/docs/variability4tosca/tests/test-properties-expression.md
index 30e697231d..bdccc02f1a 100644
--- a/docs/docs/variability4tosca/tests/test-properties-expression.md
+++ b/docs/docs/variability4tosca/tests/test-properties-expression.md
@@ -32,6 +32,7 @@ some_input: some_value
 ```
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-list-another.md b/docs/docs/variability4tosca/tests/test-properties-list-another.md
index 49ced025b6..6abed6be13 100644
--- a/docs/docs/variability4tosca/tests/test-properties-list-another.md
+++ b/docs/docs/variability4tosca/tests/test-properties-list-another.md
@@ -24,6 +24,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-list.md b/docs/docs/variability4tosca/tests/test-properties-list.md
index c83e403331..f782ca1244 100644
--- a/docs/docs/variability4tosca/tests/test-properties-list.md
+++ b/docs/docs/variability4tosca/tests/test-properties-list.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-map-another.md b/docs/docs/variability4tosca/tests/test-properties-map-another.md
index 38f9392542..5071b347f8 100644
--- a/docs/docs/variability4tosca/tests/test-properties-map-another.md
+++ b/docs/docs/variability4tosca/tests/test-properties-map-another.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-map.md b/docs/docs/variability4tosca/tests/test-properties-map.md
index eda3bb0883..95d36d61b5 100644
--- a/docs/docs/variability4tosca/tests/test-properties-map.md
+++ b/docs/docs/variability4tosca/tests/test-properties-map.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-node-container-presence-absent.md b/docs/docs/variability4tosca/tests/test-properties-node-container-presence-absent.md
index c06e7d8e46..25d11d94c9 100644
--- a/docs/docs/variability4tosca/tests/test-properties-node-container-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-properties-node-container-presence-absent.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-node-container-presence-present.md b/docs/docs/variability4tosca/tests/test-properties-node-container-presence-present.md
index c38587f32d..abf863ed2f 100644
--- a/docs/docs/variability4tosca/tests/test-properties-node-container-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-properties-node-container-presence-present.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-node-node-presence-CONTAINER-absent.md b/docs/docs/variability4tosca/tests/test-properties-node-node-presence-CONTAINER-absent.md
index 8ff769c61c..0ee3077619 100644
--- a/docs/docs/variability4tosca/tests/test-properties-node-node-presence-CONTAINER-absent.md
+++ b/docs/docs/variability4tosca/tests/test-properties-node-node-presence-CONTAINER-absent.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-node-node-presence-CONTAINER-present.md b/docs/docs/variability4tosca/tests/test-properties-node-node-presence-CONTAINER-present.md
index 4d2239f5e4..ab9b835259 100644
--- a/docs/docs/variability4tosca/tests/test-properties-node-node-presence-CONTAINER-present.md
+++ b/docs/docs/variability4tosca/tests/test-properties-node-node-presence-CONTAINER-present.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-node-property-presence-number-absent.md b/docs/docs/variability4tosca/tests/test-properties-node-property-presence-number-absent.md
index 37d17a2589..6a7fb29292 100644
--- a/docs/docs/variability4tosca/tests/test-properties-node-property-presence-number-absent.md
+++ b/docs/docs/variability4tosca/tests/test-properties-node-property-presence-number-absent.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-node-property-presence-number-present.md b/docs/docs/variability4tosca/tests/test-properties-node-property-presence-number-present.md
index d04b32b26e..cefc53c5d4 100644
--- a/docs/docs/variability4tosca/tests/test-properties-node-property-presence-number-present.md
+++ b/docs/docs/variability4tosca/tests/test-properties-node-property-presence-number-present.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-node-property-presence-string-absent.md b/docs/docs/variability4tosca/tests/test-properties-node-property-presence-string-absent.md
index d03287272f..28a857aab5 100644
--- a/docs/docs/variability4tosca/tests/test-properties-node-property-presence-string-absent.md
+++ b/docs/docs/variability4tosca/tests/test-properties-node-property-presence-string-absent.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-node-property-presence-string-present.md b/docs/docs/variability4tosca/tests/test-properties-node-property-presence-string-present.md
index e32550ac81..9ff177d031 100644
--- a/docs/docs/variability4tosca/tests/test-properties-node-property-presence-string-present.md
+++ b/docs/docs/variability4tosca/tests/test-properties-node-property-presence-string-present.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-properties.md b/docs/docs/variability4tosca/tests/test-properties-properties.md
index e51603fec3..7922d2d55f 100644
--- a/docs/docs/variability4tosca/tests/test-properties-properties.md
+++ b/docs/docs/variability4tosca/tests/test-properties-properties.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-relation-container-presence-absent.md b/docs/docs/variability4tosca/tests/test-properties-relation-container-presence-absent.md
index 836ce31d7b..aee055777e 100644
--- a/docs/docs/variability4tosca/tests/test-properties-relation-container-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-properties-relation-container-presence-absent.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-relation-container-presence-present.md b/docs/docs/variability4tosca/tests/test-properties-relation-container-presence-present.md
index dab9d8b034..01226db474 100644
--- a/docs/docs/variability4tosca/tests/test-properties-relation-container-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-properties-relation-container-presence-present.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-properties-throw-ambiguous-property.md b/docs/docs/variability4tosca/tests/test-properties-throw-ambiguous-property.md
index bdbd51737f..cbb7f2e3f0 100644
--- a/docs/docs/variability4tosca/tests/test-properties-throw-ambiguous-property.md
+++ b/docs/docs/variability4tosca/tests/test-properties-throw-ambiguous-property.md
@@ -21,6 +21,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-properties-throw-missing-property-container.md b/docs/docs/variability4tosca/tests/test-properties-throw-missing-property-container.md
index 006a2b49dc..5476b74f8c 100644
--- a/docs/docs/variability4tosca/tests/test-properties-throw-missing-property-container.md
+++ b/docs/docs/variability4tosca/tests/test-properties-throw-missing-property-container.md
@@ -21,6 +21,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-properties-throw-multiple-default.md b/docs/docs/variability4tosca/tests/test-properties-throw-multiple-default.md
index 0bbd5cb561..4bf4d2a604 100644
--- a/docs/docs/variability4tosca/tests/test-properties-throw-multiple-default.md
+++ b/docs/docs/variability4tosca/tests/test-properties-throw-multiple-default.md
@@ -43,6 +43,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-alpha-default-naive.md b/docs/docs/variability4tosca/tests/test-pruning-alpha-default-naive.md
index fb74dc6b68..7a252f02ce 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-alpha-default-naive.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-alpha-default-naive.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-alpha-default.md b/docs/docs/variability4tosca/tests/test-pruning-alpha-default.md
index 8f9b8f5b36..608d3d0d52 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-alpha-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-alpha-default.md
@@ -35,6 +35,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-alpha-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-alpha-pruning.md
index d1eefe885b..56d013524d 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-alpha-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-alpha-pruning.md
@@ -37,6 +37,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-alpha.md b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-alpha.md
index adf74e659f..3c609488fe 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-alpha.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-alpha.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-bravo.md b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-bravo.md
index 61f54d99ef..df8ec8b66c 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-bravo.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-bravo.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-charlie.md b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-charlie.md
index afd718526e..778f4131bf 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-charlie.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-charlie.md
@@ -31,6 +31,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-delta.md b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-delta.md
index 6fb6114bfc..5fc7fe09d1 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-delta.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-delta.md
@@ -31,6 +31,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-naive.md b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-naive.md
index d389d25fed..bc98189e71 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-artifact-default-naive.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-artifact-default-naive.md
@@ -31,6 +31,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-bravo-default.md b/docs/docs/variability4tosca/tests/test-pruning-bravo-default.md
index c9742d7cf5..61dc62a04d 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-bravo-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-bravo-default.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-bravo-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-bravo-pruning.md
index 40d228b4dd..387ca18cca 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-bravo-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-bravo-pruning.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-charlie-default.md b/docs/docs/variability4tosca/tests/test-pruning-charlie-default.md
index 2755f0cf3e..05b6b61071 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-charlie-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-charlie-default.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-charlie-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-charlie-pruning.md
index 8eed81aea4..9cdd773b86 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-charlie-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-charlie-pruning.md
@@ -41,6 +41,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-delta-default.md b/docs/docs/variability4tosca/tests/test-pruning-delta-default.md
index 4848b90b99..5bfb2eff6c 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-delta-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-delta-default.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-delta-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-delta-pruning.md
index 1a3997cb80..4105e42529 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-delta-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-delta-pruning.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-echo-default.md b/docs/docs/variability4tosca/tests/test-pruning-echo-default.md
index eea9f51b45..c19b661e11 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-echo-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-echo-default.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-echo-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-echo-pruning.md
index 7f1ba590d6..5c1cba1528 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-echo-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-echo-pruning.md
@@ -42,6 +42,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-foxtrott-default.md b/docs/docs/variability4tosca/tests/test-pruning-foxtrott-default.md
index 18f2cc47e5..30a98d52fb 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-foxtrott-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-foxtrott-default.md
@@ -43,6 +43,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-foxtrott-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-foxtrott-pruning.md
index fa0ac427ab..d4b4c8624e 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-foxtrott-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-foxtrott-pruning.md
@@ -45,6 +45,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-hotel-default.md b/docs/docs/variability4tosca/tests/test-pruning-hotel-default.md
index 8acfd72135..6ab8c0c8bf 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-hotel-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-hotel-default.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-hotel-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-hotel-pruning.md
index ea21926468..d298284b94 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-hotel-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-hotel-pruning.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-alpha.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-alpha.md
index 51a8655d91..1130c20f73 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-alpha.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-alpha.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-bravo.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-bravo.md
index b8710d182c..1604386600 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-bravo.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-bravo.md
@@ -37,6 +37,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-charlie.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-charlie.md
index de262d8811..0a82aaf676 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-charlie.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-charlie.md
@@ -42,6 +42,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-delta.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-delta.md
index e54e50a61d..f96cd10b77 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-delta.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-delta.md
@@ -47,6 +47,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-echo.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-echo.md
index 0489bc48dc..e14111e03c 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-echo.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-echo.md
@@ -47,6 +47,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-foxtrott.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-foxtrott.md
index e49965f34f..0e9ccbc116 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-foxtrott.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-foxtrott.md
@@ -48,6 +48,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-golf.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-golf.md
index 51f32c7c5e..01a22d1936 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-golf.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-golf.md
@@ -47,6 +47,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-hotel.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-hotel.md
index 3f96af3f5b..50ec47f518 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-hotel.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-hotel.md
@@ -48,6 +48,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-naive-alpha.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-naive-alpha.md
index ad2474b4f6..5279e45a30 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-naive-alpha.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-naive-alpha.md
@@ -42,6 +42,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-naive-bravo.md b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-naive-bravo.md
index b97c5e29b6..2f859d8a8f 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-naive-bravo.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-incoming-artifact-pruning-naive-bravo.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-india-default.md b/docs/docs/variability4tosca/tests/test-pruning-india-default.md
index ee989bd7b8..15131d430d 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-india-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-india-default.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-india-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-india-pruning.md
index e4f8f3807c..678a3f11d3 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-india-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-india-pruning.md
@@ -42,6 +42,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-juliett-default.md b/docs/docs/variability4tosca/tests/test-pruning-juliett-default.md
index 0d20807546..cd6d32b31e 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-juliett-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-juliett-default.md
@@ -47,6 +47,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-juliett-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-juliett-pruning.md
index f1c3329512..7890572475 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-juliett-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-juliett-pruning.md
@@ -49,6 +49,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-kilo-default.md b/docs/docs/variability4tosca/tests/test-pruning-kilo-default.md
index 735b1c30f7..81d1624e6e 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-kilo-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-kilo-default.md
@@ -49,6 +49,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-kilo-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-kilo-pruning.md
index 66126b62c4..e7d1e18f46 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-kilo-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-kilo-pruning.md
@@ -51,6 +51,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-lima-default.md b/docs/docs/variability4tosca/tests/test-pruning-lima-default.md
index 866c6647ad..45e4034281 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-lima-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-lima-default.md
@@ -52,6 +52,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-lima-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-lima-pruning.md
index 7b777a3d13..1cb0b7984a 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-lima-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-lima-pruning.md
@@ -53,6 +53,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-mike-default.md b/docs/docs/variability4tosca/tests/test-pruning-mike-default.md
index 354c5d90dc..0bf149ab36 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-mike-default.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-mike-default.md
@@ -56,6 +56,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-mike-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-mike-pruning.md
index f908a31e51..07c83f8fce 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-mike-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-mike-pruning.md
@@ -58,6 +58,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-outgoing-relation-absent.md b/docs/docs/variability4tosca/tests/test-pruning-outgoing-relation-absent.md
index 9eedca0009..114e9334ca 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-outgoing-relation-absent.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-outgoing-relation-absent.md
@@ -41,6 +41,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-outgoing-relation-present.md b/docs/docs/variability4tosca/tests/test-pruning-outgoing-relation-present.md
index cdc3b1288a..43e0b79a6f 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-outgoing-relation-present.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-outgoing-relation-present.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-outgoing-target-absent.md b/docs/docs/variability4tosca/tests/test-pruning-outgoing-target-absent.md
index c1ec580462..9f71fb673c 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-outgoing-target-absent.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-outgoing-target-absent.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-outgoing-target-present.md b/docs/docs/variability4tosca/tests/test-pruning-outgoing-target-present.md
index 4e1300a951..6a7109b83e 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-outgoing-target-present.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-outgoing-target-present.md
@@ -36,6 +36,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-outgoingnaive-target-present.md b/docs/docs/variability4tosca/tests/test-pruning-outgoingnaive-target-present.md
index 5589bc9174..f88952ffbe 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-outgoingnaive-target-present.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-outgoingnaive-target-present.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-pruning-false-false.md b/docs/docs/variability4tosca/tests/test-pruning-pruning-false-false.md
index a27b836d36..3dccc4c758 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-pruning-false-false.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-pruning-false-false.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-pruning-false-true.md b/docs/docs/variability4tosca/tests/test-pruning-pruning-false-true.md
index ee6ba0f14f..632ecf0b89 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-pruning-false-true.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-pruning-false-true.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-pruning-true-false.md b/docs/docs/variability4tosca/tests/test-pruning-pruning-true-false.md
index f988902d81..08015ac35c 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-pruning-true-false.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-pruning-true-false.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-pruning-true-true.md b/docs/docs/variability4tosca/tests/test-pruning-pruning-true-true.md
index 70e16d7267..dd711e285f 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-pruning-true-true.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-pruning-true-true.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-pruning.md b/docs/docs/variability4tosca/tests/test-pruning-pruning.md
index f64b50c8c1..f297ae0661 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-pruning.md
@@ -48,6 +48,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-pruning-relation.md b/docs/docs/variability4tosca/tests/test-pruning-relation.md
index 066cb5dfa9..2f8824863d 100644
--- a/docs/docs/variability4tosca/tests/test-pruning-relation.md
+++ b/docs/docs/variability4tosca/tests/test-pruning-relation.md
@@ -32,6 +32,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-relationships-conditional.md b/docs/docs/variability4tosca/tests/test-relationships-conditional.md
index 83909e3657..f122621ebf 100644
--- a/docs/docs/variability4tosca/tests/test-relationships-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-relationships-conditional.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-relationships-throw-multiple.md b/docs/docs/variability4tosca/tests/test-relationships-throw-multiple.md
index 908fcb9409..6b43d95ebe 100644
--- a/docs/docs/variability4tosca/tests/test-relationships-throw-multiple.md
+++ b/docs/docs/variability4tosca/tests/test-relationships-throw-multiple.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-relationships-throw-undefined.md b/docs/docs/variability4tosca/tests/test-relationships-throw-undefined.md
index fde736f4d1..489eb4d5fb 100644
--- a/docs/docs/variability4tosca/tests/test-relationships-throw-undefined.md
+++ b/docs/docs/variability4tosca/tests/test-relationships-throw-undefined.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-relationships-throw-unused.md b/docs/docs/variability4tosca/tests/test-relationships-throw-unused.md
index ca2c14cde1..5b0110d3cb 100644
--- a/docs/docs/variability4tosca/tests/test-relationships-throw-unused.md
+++ b/docs/docs/variability4tosca/tests/test-relationships-throw-unused.md
@@ -38,6 +38,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-relationships-type-specific.md b/docs/docs/variability4tosca/tests/test-relationships-type-specific.md
index 6bcbdecb94..62effc32e7 100644
--- a/docs/docs/variability4tosca/tests/test-relationships-type-specific.md
+++ b/docs/docs/variability4tosca/tests/test-relationships-type-specific.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-conditional.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-conditional.md
index dfd0529e51..62de1a5f32 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-conditional.md
@@ -31,6 +31,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-alternative-false.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-alternative-false.md
index 0760b1d8b9..aa09e403f9 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-alternative-false.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-alternative-false.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-alternative.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-alternative.md
index 60e4254acb..737f857691 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-alternative.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-alternative.md
@@ -33,6 +33,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition-throw-source.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition-throw-source.md
index deacb7008a..c1593bf67b 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition-throw-source.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition-throw-source.md
@@ -32,6 +32,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition-throw-target.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition-throw-target.md
index e69bdcef34..d3df7fc341 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition-throw-target.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition-throw-target.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition.md
index a2648d59c6..47af1d80b7 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-default-condition.md
@@ -31,6 +31,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-one-hosting-relation.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-one-hosting-relation.md
index 449276599d..a8949507e4 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-one-hosting-relation.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-one-hosting-relation.md
@@ -33,6 +33,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-relation-presence-index-absent.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-relation-presence-index-absent.md
index 1ddb3c489f..39f5d1dfd2 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-relation-presence-index-absent.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-relation-presence-index-absent.md
@@ -36,6 +36,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-relation-presence-name-absent.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-relation-presence-name-absent.md
index 6f8db26178..cc93111220 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-relation-presence-name-absent.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-relation-presence-name-absent.md
@@ -36,6 +36,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-source-presence-absent.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-source-presence-absent.md
index fb41ecb12b..6470895617 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-source-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-source-presence-absent.md
@@ -35,6 +35,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-source-presence-present.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-source-presence-present.md
index ed1ac240d4..2253bd6a20 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-source-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-source-presence-present.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-target-presence-absent.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-target-presence-absent.md
index 37450d5a9b..3fd344396e 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-target-presence-absent.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-target-presence-absent.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-target-presence-present.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-target-presence-present.md
index 47092d0d2d..cdcf688fd8 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-target-presence-present.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-target-presence-present.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-requirement-assignment-throw-multiple-defaults.md b/docs/docs/variability4tosca/tests/test-requirement-assignment-throw-multiple-defaults.md
index 6a2d54c0ed..2912d80458 100644
--- a/docs/docs/variability4tosca/tests/test-requirement-assignment-throw-multiple-defaults.md
+++ b/docs/docs/variability4tosca/tests/test-requirement-assignment-throw-multiple-defaults.md
@@ -34,6 +34,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-scenario-complex-alpha.md b/docs/docs/variability4tosca/tests/test-scenario-complex-alpha.md
index 8d3d4fce46..9f6f63a1dd 100644
--- a/docs/docs/variability4tosca/tests/test-scenario-complex-alpha.md
+++ b/docs/docs/variability4tosca/tests/test-scenario-complex-alpha.md
@@ -77,6 +77,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-scenario-worker-agent-false.md b/docs/docs/variability4tosca/tests/test-scenario-worker-agent-false.md
index fea15a4b60..9f7785ba5d 100644
--- a/docs/docs/variability4tosca/tests/test-scenario-worker-agent-false.md
+++ b/docs/docs/variability4tosca/tests/test-scenario-worker-agent-false.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-scenario-worker-agent-true.md b/docs/docs/variability4tosca/tests/test-scenario-worker-agent-true.md
index cb54c90e3b..09afcf3370 100644
--- a/docs/docs/variability4tosca/tests/test-scenario-worker-agent-true.md
+++ b/docs/docs/variability4tosca/tests/test-scenario-worker-agent-true.md
@@ -39,6 +39,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-scenario-worker-worker-false.md b/docs/docs/variability4tosca/tests/test-scenario-worker-worker-false.md
index 1636ba371d..3c61ecbaed 100644
--- a/docs/docs/variability4tosca/tests/test-scenario-worker-worker-false.md
+++ b/docs/docs/variability4tosca/tests/test-scenario-worker-worker-false.md
@@ -41,6 +41,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-scenario-worker-worker-true.md b/docs/docs/variability4tosca/tests/test-scenario-worker-worker-true.md
index 46b422eb1e..0154a84c9a 100644
--- a/docs/docs/variability4tosca/tests/test-scenario-worker-worker-true.md
+++ b/docs/docs/variability4tosca/tests/test-scenario-worker-worker-true.md
@@ -40,6 +40,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-ambiguous-disabled.md b/docs/docs/variability4tosca/tests/test-technologies-ambiguous-disabled.md
index b1083dd0cf..b1e50e7408 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-ambiguous-disabled.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-ambiguous-disabled.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-ambiguous.md b/docs/docs/variability4tosca/tests/test-technologies-ambiguous.md
index 4ce736b597..3d33b35510 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-ambiguous.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-ambiguous.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-conditional.md b/docs/docs/variability4tosca/tests/test-technologies-conditional.md
index ab041606a9..5fe85507b4 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-conditional.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-conditional.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-constraint-disabled.md b/docs/docs/variability4tosca/tests/test-technologies-constraint-disabled.md
index 13809f9411..839234fba1 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-constraint-disabled.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-constraint-disabled.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-constraint.md b/docs/docs/variability4tosca/tests/test-technologies-constraint.md
index d0581e45d9..fcae8839c1 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-constraint.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-constraint.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-default-multiple.md b/docs/docs/variability4tosca/tests/test-technologies-default-multiple.md
index 6e8fb81bf0..88d391417b 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-default-multiple.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-default-multiple.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-default-true.md b/docs/docs/variability4tosca/tests/test-technologies-default-true.md
index ec6b4d4297..9bad80cbc3 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-default-true.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-default-true.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-expected-disabled.md b/docs/docs/variability4tosca/tests/test-technologies-expected-disabled.md
index c90b90af2b..e08d94e0ea 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-expected-disabled.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-expected-disabled.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-expected.md b/docs/docs/variability4tosca/tests/test-technologies-expected.md
index 8f112a34b2..188bd4e29c 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-expected.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-expected.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-lowercase.md b/docs/docs/variability4tosca/tests/test-technologies-lowercase.md
index 00ef47bc80..730e62acd3 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-lowercase.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-lowercase.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-missing-disabled.md b/docs/docs/variability4tosca/tests/test-technologies-missing-disabled.md
index 6353efb3d8..c6f1627f8a 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-missing-disabled.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-missing-disabled.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-missing.md b/docs/docs/variability4tosca/tests/test-technologies-missing.md
index 2e0d7f73ab..c2087dd152 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-missing.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-missing.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-optimization-double.md b/docs/docs/variability4tosca/tests/test-technologies-optimization-double.md
index 0dc09cd68e..48f2333e62 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-optimization-double.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-optimization-double.md
@@ -47,6 +47,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-optimization-order.md b/docs/docs/variability4tosca/tests/test-technologies-optimization-order.md
index 4d9a741a35..ce65abb1e8 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-optimization-order.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-optimization-order.md
@@ -36,6 +36,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-optimization-unsat.md b/docs/docs/variability4tosca/tests/test-technologies-optimization-unsat.md
index c28b6e794d..04af7d96ca 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-optimization-unsat.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-optimization-unsat.md
@@ -35,6 +35,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-optimization-weight.md b/docs/docs/variability4tosca/tests/test-technologies-optimization-weight.md
index c05f638b5f..6bf83e25b2 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-optimization-weight.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-optimization-weight.md
@@ -35,6 +35,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-optimization.md b/docs/docs/variability4tosca/tests/test-technologies-optimization.md
index 568204fe92..570516f3e9 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-optimization.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-optimization.md
@@ -33,6 +33,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-pruning-disabled.md b/docs/docs/variability4tosca/tests/test-technologies-pruning-disabled.md
index 3d39ad82be..a632112bd0 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-pruning-disabled.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-pruning-disabled.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-pruning.md b/docs/docs/variability4tosca/tests/test-technologies-pruning.md
index 27da0e71ea..6a484f3ec2 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-pruning.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-pruning.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-rules.md b/docs/docs/variability4tosca/tests/test-technologies-rules.md
index 3447a88b26..aa90b59c5e 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-rules.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-rules.md
@@ -67,6 +67,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-unique-disabled.md b/docs/docs/variability4tosca/tests/test-technologies-unique-disabled.md
index b95d617fed..7f0b333e0d 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-unique-disabled.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-unique-disabled.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.
diff --git a/docs/docs/variability4tosca/tests/test-technologies-unique.md b/docs/docs/variability4tosca/tests/test-technologies-unique.md
index 35dd848819..7208b72cd6 100644
--- a/docs/docs/variability4tosca/tests/test-technologies-unique.md
+++ b/docs/docs/variability4tosca/tests/test-technologies-unique.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.
diff --git a/examples/unfurl-aware-manual/.gitignore b/examples/unfurl-aware-manual/.gitignore
new file mode 100644
index 0000000000..7951405f85
--- /dev/null
+++ b/examples/unfurl-aware-manual/.gitignore
@@ -0,0 +1 @@
+lib
\ No newline at end of file
diff --git a/examples/unfurl-aware-manual/config.yaml b/examples/unfurl-aware-manual/config.yaml
new file mode 100644
index 0000000000..873f3850ea
--- /dev/null
+++ b/examples/unfurl-aware-manual/config.yaml
@@ -0,0 +1,2 @@
+dependencies:
+    - source: ../unfurl-aware/lib
diff --git a/examples/unfurl-aware-manual/tests/cloud/test.yaml b/examples/unfurl-aware-manual/tests/cloud/test.yaml
new file mode 100644
index 0000000000..22e017a730
--- /dev/null
+++ b/examples/unfurl-aware-manual/tests/cloud/test.yaml
@@ -0,0 +1,2 @@
+expected: ../../../unfurl-aware/tests/cloud/expected.yaml
+presets: cloud
diff --git a/examples/unfurl-aware-manual/tests/local/test.yaml b/examples/unfurl-aware-manual/tests/local/test.yaml
new file mode 100644
index 0000000000..f29fcff40c
--- /dev/null
+++ b/examples/unfurl-aware-manual/tests/local/test.yaml
@@ -0,0 +1,2 @@
+expected: ../../../unfurl-aware/tests/local/expected.yaml
+presets: local
diff --git a/tests/hosting-aware-pruning/01-manual/template.yaml b/examples/unfurl-aware-manual/variable-service-template.yaml
similarity index 100%
rename from tests/hosting-aware-pruning/01-manual/template.yaml
rename to examples/unfurl-aware-manual/variable-service-template.yaml
diff --git a/tests/hosting-aware-pruning/cloud.expected.yaml b/examples/unfurl-aware/tests/cloud/expected.yaml
similarity index 100%
rename from tests/hosting-aware-pruning/cloud.expected.yaml
rename to examples/unfurl-aware/tests/cloud/expected.yaml
diff --git a/examples/unfurl-aware/tests/cloud/test.yaml b/examples/unfurl-aware/tests/cloud/test.yaml
new file mode 100644
index 0000000000..28e3c42331
--- /dev/null
+++ b/examples/unfurl-aware/tests/cloud/test.yaml
@@ -0,0 +1 @@
+presets: cloud
diff --git a/tests/hosting-aware-pruning/local.expected.yaml b/examples/unfurl-aware/tests/local/expected.yaml
similarity index 100%
rename from tests/hosting-aware-pruning/local.expected.yaml
rename to examples/unfurl-aware/tests/local/expected.yaml
diff --git a/examples/unfurl-aware/tests/local/test.yaml b/examples/unfurl-aware/tests/local/test.yaml
new file mode 100644
index 0000000000..a9021edfc7
--- /dev/null
+++ b/examples/unfurl-aware/tests/local/test.yaml
@@ -0,0 +1 @@
+presets: local
diff --git a/examples/unfurl-technology-baseline-maintenance/tests/elastic/test.yaml b/examples/unfurl-technology-baseline-maintenance/tests/elastic/test.yaml
index cee2be04d8..3700ffa41d 100644
--- a/examples/unfurl-technology-baseline-maintenance/tests/elastic/test.yaml
+++ b/examples/unfurl-technology-baseline-maintenance/tests/elastic/test.yaml
@@ -1,5 +1,5 @@
 expected: ../../../unfurl-technology-variant-elastic/tests/tau/expected.yaml
-renames:
+replace:
     - - database_terraform
       - database
 
diff --git a/examples/unfurl-technology-baseline-maintenance/tests/kubernetes/test.yaml b/examples/unfurl-technology-baseline-maintenance/tests/kubernetes/test.yaml
index 35d3025c64..c5aa4f7994 100644
--- a/examples/unfurl-technology-baseline-maintenance/tests/kubernetes/test.yaml
+++ b/examples/unfurl-technology-baseline-maintenance/tests/kubernetes/test.yaml
@@ -1,5 +1,5 @@
 expected: ../../../unfurl-technology-variant-kubernetes/tests/tau/expected.yaml
-renames:
+replace:
     - - database_ansible
       - database
 
diff --git a/examples/unfurl-technology-baseline-maintenance/tests/static-large/test.yaml b/examples/unfurl-technology-baseline-maintenance/tests/static-large/test.yaml
index 20eea6f500..6278db9792 100644
--- a/examples/unfurl-technology-baseline-maintenance/tests/static-large/test.yaml
+++ b/examples/unfurl-technology-baseline-maintenance/tests/static-large/test.yaml
@@ -1,5 +1,5 @@
 expected: ../../../unfurl-technology-variant-static-large/tests/tau/expected.yaml
-renames:
+replace:
     - - database_ansible
       - database
 
diff --git a/examples/unfurl-technology-baseline-maintenance/tests/static/test.yaml b/examples/unfurl-technology-baseline-maintenance/tests/static/test.yaml
index e73345627e..853ae7770e 100644
--- a/examples/unfurl-technology-baseline-maintenance/tests/static/test.yaml
+++ b/examples/unfurl-technology-baseline-maintenance/tests/static/test.yaml
@@ -1,5 +1,5 @@
 expected: ../../../unfurl-technology-variant-static/tests/tau/expected.yaml
-renames:
+replace:
     - - database_ansible
       - database
 
diff --git a/examples/unfurl-technology-baseline/tests/elastic/test.yaml b/examples/unfurl-technology-baseline/tests/elastic/test.yaml
index 676232b508..70ab790a8a 100644
--- a/examples/unfurl-technology-baseline/tests/elastic/test.yaml
+++ b/examples/unfurl-technology-baseline/tests/elastic/test.yaml
@@ -1,5 +1,5 @@
 expected: ../../../unfurl-technology-variant-elastic/tests/tau/expected.yaml
-renames:
+replace:
     - - database_terraform
       - database
 
diff --git a/examples/unfurl-technology-baseline/tests/static-large/test.yaml b/examples/unfurl-technology-baseline/tests/static-large/test.yaml
index eed166c359..835bbe237b 100644
--- a/examples/unfurl-technology-baseline/tests/static-large/test.yaml
+++ b/examples/unfurl-technology-baseline/tests/static-large/test.yaml
@@ -1,5 +1,5 @@
 expected: ../../../unfurl-technology-variant-static-large/tests/tau/expected.yaml
-renames:
+replace:
     - - database_ansible
       - database
 
diff --git a/examples/unfurl-technology-baseline/tests/static/test.yaml b/examples/unfurl-technology-baseline/tests/static/test.yaml
index 2ea4c58cd8..abc17ba4be 100644
--- a/examples/unfurl-technology-baseline/tests/static/test.yaml
+++ b/examples/unfurl-technology-baseline/tests/static/test.yaml
@@ -1,5 +1,5 @@
 expected: ../../../unfurl-technology-variant-static/tests/tau/expected.yaml
-renames:
+replace:
     - - database_ansible
       - database
 
diff --git a/examples/xopera-pruning-consistent-loose/tests/elastic/test.yaml b/examples/xopera-pruning-consistent-loose/tests/elastic/test.yaml
new file mode 100644
index 0000000000..7474f82f12
--- /dev/null
+++ b/examples/xopera-pruning-consistent-loose/tests/elastic/test.yaml
@@ -0,0 +1,2 @@
+presets: elastic
+expected: ../../../xopera-pruning/tests/elastic/expected.yaml
diff --git a/examples/xopera-pruning-consistent-loose/tests/static-large/test.yaml b/examples/xopera-pruning-consistent-loose/tests/static-large/test.yaml
new file mode 100644
index 0000000000..7aeb4f5f50
--- /dev/null
+++ b/examples/xopera-pruning-consistent-loose/tests/static-large/test.yaml
@@ -0,0 +1,2 @@
+presets: static-large
+expected: ../../../xopera-pruning/tests/static-large/expected.yaml
diff --git a/examples/xopera-pruning-consistent-loose/tests/static/test.yaml b/examples/xopera-pruning-consistent-loose/tests/static/test.yaml
new file mode 100644
index 0000000000..3f484e06da
--- /dev/null
+++ b/examples/xopera-pruning-consistent-loose/tests/static/test.yaml
@@ -0,0 +1,2 @@
+presets: static
+expected: ../../../xopera-pruning/tests/static/expected.yaml
diff --git a/examples/xopera-pruning-consistent-strict/.gitignore b/examples/xopera-pruning-consistent-strict/.gitignore
new file mode 100644
index 0000000000..7951405f85
--- /dev/null
+++ b/examples/xopera-pruning-consistent-strict/.gitignore
@@ -0,0 +1 @@
+lib
\ No newline at end of file
diff --git a/examples/xopera-pruning-consistent-strict/config.yaml b/examples/xopera-pruning-consistent-strict/config.yaml
new file mode 100644
index 0000000000..7f67d453c2
--- /dev/null
+++ b/examples/xopera-pruning-consistent-strict/config.yaml
@@ -0,0 +1,2 @@
+dependencies:
+    - source: ../xopera-pruning-consistent-loose/lib
diff --git a/tests/pruning-modes/02-consistent-strict/enrich.sh b/examples/xopera-pruning-consistent-strict/enrich.sh
similarity index 100%
rename from tests/pruning-modes/02-consistent-strict/enrich.sh
rename to examples/xopera-pruning-consistent-strict/enrich.sh
diff --git a/tests/pruning-modes/02-consistent-strict/enriched.yaml b/examples/xopera-pruning-consistent-strict/enriched.yaml
similarity index 100%
rename from tests/pruning-modes/02-consistent-strict/enriched.yaml
rename to examples/xopera-pruning-consistent-strict/enriched.yaml
diff --git a/tests/pruning-modes/01-manual/stats.sh b/examples/xopera-pruning-consistent-strict/stats.sh
similarity index 100%
rename from tests/pruning-modes/01-manual/stats.sh
rename to examples/xopera-pruning-consistent-strict/stats.sh
diff --git a/examples/xopera-pruning-consistent-strict/tests/elastic/test.yaml b/examples/xopera-pruning-consistent-strict/tests/elastic/test.yaml
new file mode 100644
index 0000000000..7474f82f12
--- /dev/null
+++ b/examples/xopera-pruning-consistent-strict/tests/elastic/test.yaml
@@ -0,0 +1,2 @@
+presets: elastic
+expected: ../../../xopera-pruning/tests/elastic/expected.yaml
diff --git a/examples/xopera-pruning-consistent-strict/tests/static-large/test.yaml b/examples/xopera-pruning-consistent-strict/tests/static-large/test.yaml
new file mode 100644
index 0000000000..7aeb4f5f50
--- /dev/null
+++ b/examples/xopera-pruning-consistent-strict/tests/static-large/test.yaml
@@ -0,0 +1,2 @@
+presets: static-large
+expected: ../../../xopera-pruning/tests/static-large/expected.yaml
diff --git a/examples/xopera-pruning-consistent-strict/tests/static/test.yaml b/examples/xopera-pruning-consistent-strict/tests/static/test.yaml
new file mode 100644
index 0000000000..3f484e06da
--- /dev/null
+++ b/examples/xopera-pruning-consistent-strict/tests/static/test.yaml
@@ -0,0 +1,2 @@
+presets: static
+expected: ../../../xopera-pruning/tests/static/expected.yaml
diff --git a/tests/pruning-modes/02-consistent-strict/template.yaml b/examples/xopera-pruning-consistent-strict/variable-service-template.yaml
similarity index 100%
rename from tests/pruning-modes/02-consistent-strict/template.yaml
rename to examples/xopera-pruning-consistent-strict/variable-service-template.yaml
diff --git a/examples/xopera-pruning-default/.gitignore b/examples/xopera-pruning-default/.gitignore
new file mode 100644
index 0000000000..7951405f85
--- /dev/null
+++ b/examples/xopera-pruning-default/.gitignore
@@ -0,0 +1 @@
+lib
\ No newline at end of file
diff --git a/examples/xopera-pruning-default/config.yaml b/examples/xopera-pruning-default/config.yaml
new file mode 100644
index 0000000000..7f67d453c2
--- /dev/null
+++ b/examples/xopera-pruning-default/config.yaml
@@ -0,0 +1,2 @@
+dependencies:
+    - source: ../xopera-pruning-consistent-loose/lib
diff --git a/tests/pruning-modes/04-default/enrich.sh b/examples/xopera-pruning-default/enrich.sh
similarity index 100%
rename from tests/pruning-modes/04-default/enrich.sh
rename to examples/xopera-pruning-default/enrich.sh
diff --git a/tests/pruning-modes/04-default/enriched.yaml b/examples/xopera-pruning-default/enriched.yaml
similarity index 100%
rename from tests/pruning-modes/04-default/enriched.yaml
rename to examples/xopera-pruning-default/enriched.yaml
diff --git a/tests/pruning-modes/02-consistent-strict/stats.sh b/examples/xopera-pruning-default/stats.sh
similarity index 100%
rename from tests/pruning-modes/02-consistent-strict/stats.sh
rename to examples/xopera-pruning-default/stats.sh
diff --git a/examples/xopera-pruning-default/tests/elastic/test.yaml b/examples/xopera-pruning-default/tests/elastic/test.yaml
new file mode 100644
index 0000000000..7474f82f12
--- /dev/null
+++ b/examples/xopera-pruning-default/tests/elastic/test.yaml
@@ -0,0 +1,2 @@
+presets: elastic
+expected: ../../../xopera-pruning/tests/elastic/expected.yaml
diff --git a/examples/xopera-pruning-default/tests/static-large/test.yaml b/examples/xopera-pruning-default/tests/static-large/test.yaml
new file mode 100644
index 0000000000..7aeb4f5f50
--- /dev/null
+++ b/examples/xopera-pruning-default/tests/static-large/test.yaml
@@ -0,0 +1,2 @@
+presets: static-large
+expected: ../../../xopera-pruning/tests/static-large/expected.yaml
diff --git a/examples/xopera-pruning-default/tests/static/test.yaml b/examples/xopera-pruning-default/tests/static/test.yaml
new file mode 100644
index 0000000000..3f484e06da
--- /dev/null
+++ b/examples/xopera-pruning-default/tests/static/test.yaml
@@ -0,0 +1,2 @@
+presets: static
+expected: ../../../xopera-pruning/tests/static/expected.yaml
diff --git a/tests/pruning-modes/04-default/template.yaml b/examples/xopera-pruning-default/variable-service-template.yaml
similarity index 100%
rename from tests/pruning-modes/04-default/template.yaml
rename to examples/xopera-pruning-default/variable-service-template.yaml
diff --git a/examples/xopera-pruning-manual/.gitignore b/examples/xopera-pruning-manual/.gitignore
new file mode 100644
index 0000000000..7951405f85
--- /dev/null
+++ b/examples/xopera-pruning-manual/.gitignore
@@ -0,0 +1 @@
+lib
\ No newline at end of file
diff --git a/examples/xopera-pruning-manual/config.yaml b/examples/xopera-pruning-manual/config.yaml
new file mode 100644
index 0000000000..7f67d453c2
--- /dev/null
+++ b/examples/xopera-pruning-manual/config.yaml
@@ -0,0 +1,2 @@
+dependencies:
+    - source: ../xopera-pruning-consistent-loose/lib
diff --git a/tests/pruning-modes/01-manual/enrich.sh b/examples/xopera-pruning-manual/enrich.sh
similarity index 100%
rename from tests/pruning-modes/01-manual/enrich.sh
rename to examples/xopera-pruning-manual/enrich.sh
diff --git a/tests/pruning-modes/01-manual/enriched.yaml b/examples/xopera-pruning-manual/enriched.yaml
similarity index 100%
rename from tests/pruning-modes/01-manual/enriched.yaml
rename to examples/xopera-pruning-manual/enriched.yaml
diff --git a/tests/pruning-modes/04-default/stats.sh b/examples/xopera-pruning-manual/stats.sh
similarity index 100%
rename from tests/pruning-modes/04-default/stats.sh
rename to examples/xopera-pruning-manual/stats.sh
diff --git a/examples/xopera-pruning-manual/tests/elastic/test.yaml b/examples/xopera-pruning-manual/tests/elastic/test.yaml
new file mode 100644
index 0000000000..7474f82f12
--- /dev/null
+++ b/examples/xopera-pruning-manual/tests/elastic/test.yaml
@@ -0,0 +1,2 @@
+presets: elastic
+expected: ../../../xopera-pruning/tests/elastic/expected.yaml
diff --git a/examples/xopera-pruning-manual/tests/static-large/test.yaml b/examples/xopera-pruning-manual/tests/static-large/test.yaml
new file mode 100644
index 0000000000..7aeb4f5f50
--- /dev/null
+++ b/examples/xopera-pruning-manual/tests/static-large/test.yaml
@@ -0,0 +1,2 @@
+presets: static-large
+expected: ../../../xopera-pruning/tests/static-large/expected.yaml
diff --git a/examples/xopera-pruning-manual/tests/static/test.yaml b/examples/xopera-pruning-manual/tests/static/test.yaml
new file mode 100644
index 0000000000..3f484e06da
--- /dev/null
+++ b/examples/xopera-pruning-manual/tests/static/test.yaml
@@ -0,0 +1,2 @@
+presets: static
+expected: ../../../xopera-pruning/tests/static/expected.yaml
diff --git a/tests/pruning-modes/01-manual/template.yaml b/examples/xopera-pruning-manual/variable-service-template.yaml
similarity index 100%
rename from tests/pruning-modes/01-manual/template.yaml
rename to examples/xopera-pruning-manual/variable-service-template.yaml
diff --git a/examples/xopera-pruning-semantic-strict/.gitignore b/examples/xopera-pruning-semantic-strict/.gitignore
new file mode 100644
index 0000000000..7951405f85
--- /dev/null
+++ b/examples/xopera-pruning-semantic-strict/.gitignore
@@ -0,0 +1 @@
+lib
\ No newline at end of file
diff --git a/examples/xopera-pruning-semantic-strict/config.yaml b/examples/xopera-pruning-semantic-strict/config.yaml
new file mode 100644
index 0000000000..7f67d453c2
--- /dev/null
+++ b/examples/xopera-pruning-semantic-strict/config.yaml
@@ -0,0 +1,2 @@
+dependencies:
+    - source: ../xopera-pruning-consistent-loose/lib
diff --git a/tests/pruning-modes/05-semantic-strict/enrich.sh b/examples/xopera-pruning-semantic-strict/enrich.sh
similarity index 100%
rename from tests/pruning-modes/05-semantic-strict/enrich.sh
rename to examples/xopera-pruning-semantic-strict/enrich.sh
diff --git a/tests/pruning-modes/05-semantic-strict/enriched.yaml b/examples/xopera-pruning-semantic-strict/enriched.yaml
similarity index 100%
rename from tests/pruning-modes/05-semantic-strict/enriched.yaml
rename to examples/xopera-pruning-semantic-strict/enriched.yaml
diff --git a/tests/pruning-modes/05-semantic-strict/stats.sh b/examples/xopera-pruning-semantic-strict/stats.sh
similarity index 100%
rename from tests/pruning-modes/05-semantic-strict/stats.sh
rename to examples/xopera-pruning-semantic-strict/stats.sh
diff --git a/examples/xopera-pruning-semantic-strict/tests/elastic/test.yaml b/examples/xopera-pruning-semantic-strict/tests/elastic/test.yaml
new file mode 100644
index 0000000000..7474f82f12
--- /dev/null
+++ b/examples/xopera-pruning-semantic-strict/tests/elastic/test.yaml
@@ -0,0 +1,2 @@
+presets: elastic
+expected: ../../../xopera-pruning/tests/elastic/expected.yaml
diff --git a/examples/xopera-pruning-semantic-strict/tests/static-large/test.yaml b/examples/xopera-pruning-semantic-strict/tests/static-large/test.yaml
new file mode 100644
index 0000000000..7aeb4f5f50
--- /dev/null
+++ b/examples/xopera-pruning-semantic-strict/tests/static-large/test.yaml
@@ -0,0 +1,2 @@
+presets: static-large
+expected: ../../../xopera-pruning/tests/static-large/expected.yaml
diff --git a/examples/xopera-pruning-semantic-strict/tests/static/test.yaml b/examples/xopera-pruning-semantic-strict/tests/static/test.yaml
new file mode 100644
index 0000000000..3f484e06da
--- /dev/null
+++ b/examples/xopera-pruning-semantic-strict/tests/static/test.yaml
@@ -0,0 +1,2 @@
+presets: static
+expected: ../../../xopera-pruning/tests/static/expected.yaml
diff --git a/tests/pruning-modes/05-semantic-strict/template.yaml b/examples/xopera-pruning-semantic-strict/variable-service-template.yaml
similarity index 100%
rename from tests/pruning-modes/05-semantic-strict/template.yaml
rename to examples/xopera-pruning-semantic-strict/variable-service-template.yaml
diff --git a/src/controller/template/test.ts b/src/controller/template/test.ts
index f79e78cb71..8195d8b466 100644
--- a/src/controller/template/test.ts
+++ b/src/controller/template/test.ts
@@ -33,7 +33,7 @@ export type VariabilityTestConfig = {
     error?: string
     template?: string
     expected?: string
-    renames?: [string, string][]
+    replace?: [string, string][]
     merge?: any
 }
 
diff --git a/src/utils/files.ts b/src/utils/files.ts
index 5cd101f4e6..bcff04f76e 100644
--- a/src/utils/files.ts
+++ b/src/utils/files.ts
@@ -6,7 +6,6 @@ import * as ejs from 'ejs'
 import extract from 'extract-zip'
 import * as fss from 'fs'
 import * as fse from 'fs-extra'
-import Glob from 'glob'
 import * as yaml from 'js-yaml'
 import lnk from 'lnk'
 import _ from 'lodash'
@@ -281,19 +280,3 @@ export async function renderFile(source: string, data: ejs.Data, target?: string
 export function stat(file: string) {
     return fss.statSync(file)
 }
-
-export async function glob(pattern: string | string[], options?: Glob.GlobOptionsWithFileTypesUnset) {
-    return Glob.glob(pattern, options)
-}
-
-export function replace(file: string, find: string, replace: string) {
-    const data = loadFile(file)
-    const replaced = data.replaceAll(find, replace)
-    storeFile(file, replaced, {onlyIfChanged: true})
-}
-
-export function merge(file: string, merge: any) {
-    const data = loadYAML(file)
-    const merged = _.merge(data, merge)
-    storeFile(file, merged, {onlyIfChanged: true})
-}
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 71bf9f3408..d1b6712ace 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -187,3 +187,10 @@ export function filter(unfiltered: {[key: string]: boolean}, filter: RegExp) {
 export function sum(values: number[]) {
     return values.reduce((sum, value) => sum + value, 0)
 }
+
+export function replace(data: string, entries: [find: string, replace: string][]) {
+    for (const entry of entries) {
+        data = data.replaceAll(entry[0], entry[1])
+    }
+    return data
+}
diff --git a/tests/hosting-aware-pruning/01-manual/cloud/test.yaml b/tests/hosting-aware-pruning/01-manual/cloud/test.yaml
deleted file mode 100644
index 3cbbba6c4e..0000000000
--- a/tests/hosting-aware-pruning/01-manual/cloud/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-template: ../template.yaml
-expected: ../../cloud.expected.yaml
-presets: cloud
diff --git a/tests/hosting-aware-pruning/01-manual/local/test.yaml b/tests/hosting-aware-pruning/01-manual/local/test.yaml
deleted file mode 100644
index bd824f9e61..0000000000
--- a/tests/hosting-aware-pruning/01-manual/local/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-template: ../template.yaml
-expected: ../../local.expected.yaml
-presets: local
diff --git a/tests/hosting-aware-pruning/02-pruning/cloud/test.yaml b/tests/hosting-aware-pruning/02-pruning/cloud/test.yaml
deleted file mode 100644
index 98df5a6add..0000000000
--- a/tests/hosting-aware-pruning/02-pruning/cloud/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-template: ../../../../examples/unfurl-aware/variable-service-template.yaml
-expected: ../../cloud.expected.yaml
-presets: cloud
diff --git a/tests/hosting-aware-pruning/02-pruning/local/test.yaml b/tests/hosting-aware-pruning/02-pruning/local/test.yaml
deleted file mode 100644
index 4852e86af4..0000000000
--- a/tests/hosting-aware-pruning/02-pruning/local/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-template: ../../../../examples/unfurl-aware/variable-service-template.yaml
-expected: ../../local.expected.yaml
-presets: local
diff --git a/tests/hosting-aware-pruning/hosting-aware-pruning.test.ts b/tests/hosting-aware-pruning/hosting-aware-pruning.test.ts
deleted file mode 100644
index d6306c8872..0000000000
--- a/tests/hosting-aware-pruning/hosting-aware-pruning.test.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import {VariabilityTestGroups} from '../utils'
-
-describe('hosting-aware-pruning', async () => {
-    VariabilityTestGroups(__dirname)
-})
diff --git a/tests/pruning-modes/01-manual/elastic/test.yaml b/tests/pruning-modes/01-manual/elastic/test.yaml
deleted file mode 100644
index b6ac06053c..0000000000
--- a/tests/pruning-modes/01-manual/elastic/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: elastic
-expected: ../../../../examples/xopera-pruning/tests/elastic/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/01-manual/static-large/test.yaml b/tests/pruning-modes/01-manual/static-large/test.yaml
deleted file mode 100644
index 8abf28cd74..0000000000
--- a/tests/pruning-modes/01-manual/static-large/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static-large
-expected: ../../../../examples/xopera-pruning/tests/static-large/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/01-manual/static/test.yaml b/tests/pruning-modes/01-manual/static/test.yaml
deleted file mode 100644
index f46cc4286d..0000000000
--- a/tests/pruning-modes/01-manual/static/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static
-expected: ../../../../examples/xopera-pruning/tests/static/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/02-consistent-strict/elastic/test.yaml b/tests/pruning-modes/02-consistent-strict/elastic/test.yaml
deleted file mode 100644
index b6ac06053c..0000000000
--- a/tests/pruning-modes/02-consistent-strict/elastic/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: elastic
-expected: ../../../../examples/xopera-pruning/tests/elastic/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/02-consistent-strict/static-large/test.yaml b/tests/pruning-modes/02-consistent-strict/static-large/test.yaml
deleted file mode 100644
index 8abf28cd74..0000000000
--- a/tests/pruning-modes/02-consistent-strict/static-large/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static-large
-expected: ../../../../examples/xopera-pruning/tests/static-large/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/02-consistent-strict/static/test.yaml b/tests/pruning-modes/02-consistent-strict/static/test.yaml
deleted file mode 100644
index f46cc4286d..0000000000
--- a/tests/pruning-modes/02-consistent-strict/static/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static
-expected: ../../../../examples/xopera-pruning/tests/static/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/03-consistent-loose/elastic/test.yaml b/tests/pruning-modes/03-consistent-loose/elastic/test.yaml
deleted file mode 100644
index cfbefbfc32..0000000000
--- a/tests/pruning-modes/03-consistent-loose/elastic/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: elastic
-expected: ../../../../examples/xopera-pruning/tests/elastic/expected.yaml
-template: ../../../../examples/xopera-pruning-consistent-loose/variable-service-template.yaml
diff --git a/tests/pruning-modes/03-consistent-loose/static-large/test.yaml b/tests/pruning-modes/03-consistent-loose/static-large/test.yaml
deleted file mode 100644
index a66762af47..0000000000
--- a/tests/pruning-modes/03-consistent-loose/static-large/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static-large
-expected: ../../../../examples/xopera-pruning/tests/static-large/expected.yaml
-template: ../../../../examples/xopera-pruning-consistent-loose/variable-service-template.yaml
diff --git a/tests/pruning-modes/03-consistent-loose/static/test.yaml b/tests/pruning-modes/03-consistent-loose/static/test.yaml
deleted file mode 100644
index b34a4270f5..0000000000
--- a/tests/pruning-modes/03-consistent-loose/static/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static
-expected: ../../../../examples/xopera-pruning/tests/static/expected.yaml
-template: ../../../../examples/xopera-pruning-consistent-loose/variable-service-template.yaml
diff --git a/tests/pruning-modes/04-default/elastic/test.yaml b/tests/pruning-modes/04-default/elastic/test.yaml
deleted file mode 100644
index b6ac06053c..0000000000
--- a/tests/pruning-modes/04-default/elastic/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: elastic
-expected: ../../../../examples/xopera-pruning/tests/elastic/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/04-default/static-large/test.yaml b/tests/pruning-modes/04-default/static-large/test.yaml
deleted file mode 100644
index 8abf28cd74..0000000000
--- a/tests/pruning-modes/04-default/static-large/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static-large
-expected: ../../../../examples/xopera-pruning/tests/static-large/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/04-default/static/test.yaml b/tests/pruning-modes/04-default/static/test.yaml
deleted file mode 100644
index f46cc4286d..0000000000
--- a/tests/pruning-modes/04-default/static/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static
-expected: ../../../../examples/xopera-pruning/tests/static/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/05-semantic-strict/elastic/test.yaml b/tests/pruning-modes/05-semantic-strict/elastic/test.yaml
deleted file mode 100644
index b6ac06053c..0000000000
--- a/tests/pruning-modes/05-semantic-strict/elastic/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: elastic
-expected: ../../../../examples/xopera-pruning/tests/elastic/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/05-semantic-strict/static-large/test.yaml b/tests/pruning-modes/05-semantic-strict/static-large/test.yaml
deleted file mode 100644
index 8abf28cd74..0000000000
--- a/tests/pruning-modes/05-semantic-strict/static-large/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static-large
-expected: ../../../../examples/xopera-pruning/tests/static-large/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/05-semantic-strict/static/test.yaml b/tests/pruning-modes/05-semantic-strict/static/test.yaml
deleted file mode 100644
index f46cc4286d..0000000000
--- a/tests/pruning-modes/05-semantic-strict/static/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static
-expected: ../../../../examples/xopera-pruning/tests/static/expected.yaml
-template: ../template.yaml
diff --git a/tests/pruning-modes/06-semantic-loose/elastic/test.yaml b/tests/pruning-modes/06-semantic-loose/elastic/test.yaml
deleted file mode 100644
index 04cf53452f..0000000000
--- a/tests/pruning-modes/06-semantic-loose/elastic/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: elastic
-expected: ../../../../examples/xopera-pruning/tests/elastic/expected.yaml
-template: ../../../../examples/xopera-pruning/variable-service-template.yaml
diff --git a/tests/pruning-modes/06-semantic-loose/static-large/test.yaml b/tests/pruning-modes/06-semantic-loose/static-large/test.yaml
deleted file mode 100644
index 375681c848..0000000000
--- a/tests/pruning-modes/06-semantic-loose/static-large/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static-large
-expected: ../../../../examples/xopera-pruning/tests/static-large/expected.yaml
-template: ../../../../examples/xopera-pruning/variable-service-template.yaml
diff --git a/tests/pruning-modes/06-semantic-loose/static/test.yaml b/tests/pruning-modes/06-semantic-loose/static/test.yaml
deleted file mode 100644
index 47d6d330b1..0000000000
--- a/tests/pruning-modes/06-semantic-loose/static/test.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-presets: static
-expected: ../../../../examples/xopera-pruning/tests/static/expected.yaml
-template: ../../../../examples/xopera-pruning/variable-service-template.yaml
diff --git a/tests/pruning-modes/modes.test.ts b/tests/pruning-modes/modes.test.ts
deleted file mode 100644
index 67f7941ac4..0000000000
--- a/tests/pruning-modes/modes.test.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import {VariabilityTestGroups} from '../utils'
-
-describe('modes', async () => {
-    VariabilityTestGroups(__dirname)
-})
diff --git a/tests/utils.ts b/tests/utils.ts
index 111795a794..7139f985b8 100644
--- a/tests/utils.ts
+++ b/tests/utils.ts
@@ -8,9 +8,10 @@ import {
     loadExpected,
 } from '#controller/template/test'
 import * as files from '#files'
+import {loadFile, storeFile} from '#files'
 import Loader from '#graph/loader'
 import std from '#std'
-import {toList} from '#utils/utils'
+import * as utils from '#utils/utils'
 import {expect} from 'chai'
 import _ from 'lodash'
 import path from 'path'
@@ -72,7 +73,7 @@ export function getDefaultTest(dir: string, vstdir?: string) {
                 template: getVariableServiceTemplate({dir: vstdir ?? dir, file: config.template}),
                 inputs: getDefaultInputs(dir),
                 output,
-                presets: toList(config.presets),
+                presets: utils.toList(config.presets),
             })
         }
 
@@ -82,22 +83,20 @@ export function getDefaultTest(dir: string, vstdir?: string) {
             await fn()
 
             /**
-             * TODO: Hotfix
-             *  search and replace some strings in the result, e.g., to align node template names restricted in case studies
+             * Search and replace string in result, e.g., to align node template names restricted in case studies
              */
-            for (const rename of config.renames || []) {
-                files.replace(output, rename[0], rename[1])
+            if (check.isDefined(config.replace)) {
+                let data = loadFile(output)
+                data = utils.replace(data, config.replace)
+                storeFile(output, data, {onlyIfChanged: true})
             }
 
             const result = new Loader(output).raw()
             const expected = loadExpected({dir, file: config.expected})
 
             /**
-             * TODO: Hotfix
-             *  adapt output by merging with custom JSON, e.g., for adapting
+             * Adapt output by merging with custom JSON, e.g., for patching additional properties in case studies
              */
-            // TODO: support merge.yaml as default file
-            // TODO: adapt documentation generator
             if (check.isDefined(config.merge)) {
                 _.merge(expected, config.merge)
             }