diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e12acda8..607b3319 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,6 @@ permissions:
 jobs:
   lint:
     name: PyLint
-    needs: test
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
@@ -26,7 +25,7 @@ jobs:
           make lint
   test:
     name: TestSuite
-    if: success()
+    needs: lint
     strategy:
       matrix:
         os: [ubuntu-24.04, windows-2022, macos-13, macos-14]
@@ -65,3 +64,49 @@ jobs:
         if: always()
         run: |
           util/check_local_modifications.sh
+  integration-tests:
+    name: Integration tests
+    needs: test
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install python version
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - name: Install dependencies
+        run: |
+          python3 -m pip install --upgrade pip
+          python3 -m pip install -r requirements_dev.txt
+          sudo apt install cmake ninja-build graphviz
+      - name: Cache clang-tidy
+        id: cache-clang-tidy
+        uses: actions/cache@v4
+        with:
+          path: ~/work/lobster/llvm-project/build/bin/clang-tidy
+          key: cache-clang-tidy
+      - if: ${{ steps.cache-clang-tidy.outputs.cache-hit != 'true' }}
+        name: Build clang-tidy
+        run: |
+          make clang-tidy
+      - if: ${{ steps.cache-clang-tidy.outputs.cache-hit != 'true' }}
+        name: Save cache
+        uses: actions/cache/save@v4
+        with:
+          path: ~/work/lobster/llvm-project/build/bin/clang-tidy
+          key: cache-clang-tidy
+      - name: Run integration tests
+        run: |
+          make integration-tests
+      - name: Check output files
+        if: always()
+        run: |
+          util/check_local_modifications.sh
+  failure:
+    name: Check all jobs
+    needs: integration-tests
+    if: ${{ failure() || cancelled() }}
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Failure
+        run: exit 1
diff --git a/Makefile b/Makefile
index 116549e9..e20706ce 100644
--- a/Makefile
+++ b/Makefile
@@ -41,22 +41,28 @@ packages:
 	diff -Naur test_install/lib/python*/site-packages/lobster test_install_monolithic/lib/python*/site-packages/lobster -x "*.pyc"
 	diff -Naur test_install/bin test_install_monolithic/bin
 
+clang-tidy:
+	cd .. && \
+	git clone https://github.com/bmw-software-engineering/llvm-project && \
+	cd llvm-project && \
+	cmake -S llvm -B build -G Ninja -DLLVM_ENABLE_PROJECTS='clang;clang-tools-extra' -DCMAKE_BUILD_TYPE=Release && \
+	cmake --build build --target clang-tidy
+
 integration-tests: packages
-	(cd integration-tests/projects/basic; make)
-	(cd integration-tests/projects/filter; make)
+	(cd tests-integration/projects/basic; make)
+	(cd tests-integration/projects/filter; make)
+	rm -f MODULE.bazel MODULE.bazel.lock
 
 system-tests:
 	mkdir -p docs
-	make -B -C test-system/lobster-json
-	make -B -C test-system/lobster-python
+	make -B -C tests-system/lobster-json
+	make -B -C tests-system/lobster-python
 
 unit-tests:
 	coverage run -p \
 			--branch --rcfile=coverage.cfg \
 			--data-file .coverage \
-			-m unittest discover -s test-unit -v
-
-test: integration-tests system-tests unit-tests
+			-m unittest discover -s tests-unit -v
 
 upload-main: packages
 	python3 -m twine upload --repository pypi packages/*/dist/*
@@ -82,9 +88,14 @@ full-release:
 coverage:
 	coverage combine -q
 	coverage html --rcfile=coverage.cfg
-	coverage report --rcfile=coverage.cfg --fail-under=57
+	coverage report --rcfile=coverage.cfg --fail-under=72
+
+test: system-tests unit-tests
+	make coverage
+	util/check_local_modifications.sh
 
-test-ci: system-tests unit-tests coverage
+test-all: integration-tests system-tests unit-tests
+	make coverage
 	util/check_local_modifications.sh
 
 docs:
@@ -117,10 +128,10 @@ requirements.lobster: lobster/tools/trlc/requirements.trlc \
 code.lobster: $(wildcard lobster/tools/trlc/*.py)
 	lobster-python --out code.lobster lobster/tools/trlc
 
-unit-tests.lobster: $(wildcard test-unit/lobster-trlc/*.py)
-	lobster-python --activity --out unit-tests.lobster test-unit/lobster-trlc
+unit-tests.lobster: $(wildcard tests-unit/lobster-trlc/*.py)
+	lobster-python --activity --out unit-tests.lobster tests-unit/lobster-trlc
 
-system-tests.lobster: $(wildcard test-system/*/*.rsl) \
-                      $(wildcard test-system/*/*.trlc) \
-                      $(wildcard test-system/*/tracing)
-	python3 test-system/lobster-trlc/lobster-trlc-system-test.py
+system-tests.lobster: $(wildcard tests-system/*/*.rsl) \
+                      $(wildcard tests-system/*/*.trlc) \
+                      $(wildcard tests-system/*/tracing)
+	python3 tests-system/lobster-trlc/lobster-trlc-system-test.py
diff --git a/coverage.cfg b/coverage.cfg
index 85c4728c..b6872154 100644
--- a/coverage.cfg
+++ b/coverage.cfg
@@ -13,4 +13,4 @@ exclude_lines =
 omit =
     /usr/*
     */site-packages/*
-    test-unit/*
+    tests-unit/*
diff --git a/documentation/example_report.html b/documentation/example_report.html
index c8238ccd..b030fda9 100644
--- a/documentation/example_report.html
+++ b/documentation/example_report.html
@@ -260,17 +260,17 @@ <h3>Coverage</h3>
 </div>
 <div class="column">
 <h3>Tracing policy</h3>
-<svg width="278pt" height="188pt"
- viewBox="0.00 0.00 278.06 188.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="248pt" height="188pt"
+ viewBox="0.00 0.00 247.53 188.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 184)">
 <title>LOBSTER Tracing Policy</title>
-<polygon fill="white" stroke="transparent" points="-4,4 -4,-184 274.06,-184 274.06,4 -4,4"/>
+<polygon fill="white" stroke="none" points="-4,4 -4,-184 243.53,-184 243.53,4 -4,4"/>
 <!-- n_419cfc02b324dc7d8faefa90ed608fb0 -->
 <g id="node1" class="node">
 <title>n_419cfc02b324dc7d8faefa90ed608fb0</title>
 <g id="a_node1"><a xlink:href="#sec-419cfc02b324dc7d8faefa90ed608fb0" xlink:title="System Requirements">
-<path fill="none" stroke="black" d="M174.5,-180C174.5,-180 23.5,-180 23.5,-180 17.5,-180 11.5,-174 11.5,-168 11.5,-168 11.5,-156 11.5,-156 11.5,-150 17.5,-144 23.5,-144 23.5,-144 174.5,-144 174.5,-144 180.5,-144 186.5,-150 186.5,-156 186.5,-156 186.5,-168 186.5,-168 186.5,-174 180.5,-180 174.5,-180"/>
-<text text-anchor="middle" x="99" y="-158.3" font-family="Times,serif" font-size="14.00">System Requirements</text>
+<path fill="none" stroke="black" d="M147,-180C147,-180 35,-180 35,-180 29,-180 23,-174 23,-168 23,-168 23,-156 23,-156 23,-150 29,-144 35,-144 35,-144 147,-144 147,-144 153,-144 159,-150 159,-156 159,-156 159,-168 159,-168 159,-174 153,-180 147,-180"/>
+<text text-anchor="middle" x="91" y="-156.95" font-family="Times,serif" font-size="14.00">System Requirements</text>
 </a>
 </g>
 </g>
@@ -278,46 +278,46 @@ <h3>Tracing policy</h3>
 <g id="node2" class="node">
 <title>n_9d273bd32c1fceb91b7d6a4d40e98bdd</title>
 <g id="a_node2"><a xlink:href="#sec-9d273bd32c1fceb91b7d6a4d40e98bdd" xlink:title="Software Requirements">
-<path fill="none" stroke="black" d="M180,-108C180,-108 18,-108 18,-108 12,-108 6,-102 6,-96 6,-96 6,-84 6,-84 6,-78 12,-72 18,-72 18,-72 180,-72 180,-72 186,-72 192,-78 192,-84 192,-84 192,-96 192,-96 192,-102 186,-108 180,-108"/>
-<text text-anchor="middle" x="99" y="-86.3" font-family="Times,serif" font-size="14.00">Software Requirements</text>
+<path fill="none" stroke="black" d="M151.12,-108C151.12,-108 30.87,-108 30.87,-108 24.87,-108 18.88,-102 18.88,-96 18.88,-96 18.88,-84 18.88,-84 18.88,-78 24.88,-72 30.88,-72 30.88,-72 151.12,-72 151.12,-72 157.12,-72 163.12,-78 163.12,-84 163.12,-84 163.12,-96 163.12,-96 163.12,-102 157.12,-108 151.12,-108"/>
+<text text-anchor="middle" x="91" y="-84.95" font-family="Times,serif" font-size="14.00">Software Requirements</text>
 </a>
 </g>
 </g>
 <!-- n_419cfc02b324dc7d8faefa90ed608fb0&#45;&gt;n_9d273bd32c1fceb91b7d6a4d40e98bdd -->
 <g id="edge1" class="edge">
 <title>n_419cfc02b324dc7d8faefa90ed608fb0&#45;&gt;n_9d273bd32c1fceb91b7d6a4d40e98bdd</title>
-<path fill="none" stroke="black" d="M99,-143.7C99,-135.98 99,-126.71 99,-118.11"/>
-<polygon fill="black" stroke="black" points="102.5,-118.1 99,-108.1 95.5,-118.1 102.5,-118.1"/>
+<path fill="none" stroke="black" d="M91,-143.7C91,-136.41 91,-127.73 91,-119.54"/>
+<polygon fill="black" stroke="black" points="94.5,-119.62 91,-109.62 87.5,-119.62 94.5,-119.62"/>
 </g>
 <!-- n_ca0dbad92a874b2f69b549293387925e -->
 <g id="node3" class="node">
 <title>n_ca0dbad92a874b2f69b549293387925e</title>
 <g id="a_node3"><a xlink:href="#sec-ca0dbad92a874b2f69b549293387925e" xlink:title="Code">
 <polygon fill="none" stroke="black" points="54,-36 0,-36 0,0 54,0 54,-36"/>
-<text text-anchor="middle" x="27" y="-14.3" font-family="Times,serif" font-size="14.00">Code</text>
+<text text-anchor="middle" x="27" y="-12.95" font-family="Times,serif" font-size="14.00">Code</text>
 </a>
 </g>
 </g>
 <!-- n_9d273bd32c1fceb91b7d6a4d40e98bdd&#45;&gt;n_ca0dbad92a874b2f69b549293387925e -->
 <g id="edge2" class="edge">
 <title>n_9d273bd32c1fceb91b7d6a4d40e98bdd&#45;&gt;n_ca0dbad92a874b2f69b549293387925e</title>
-<path fill="none" stroke="black" d="M81.2,-71.7C72.4,-63.14 61.62,-52.66 52,-43.3"/>
-<polygon fill="black" stroke="black" points="54.2,-40.57 44.59,-36.1 49.32,-45.58 54.2,-40.57"/>
+<path fill="none" stroke="black" d="M75.18,-71.7C67.66,-63.47 58.53,-53.48 50.24,-44.42"/>
+<polygon fill="black" stroke="black" points="52.99,-42.24 43.66,-37.22 47.82,-46.96 52.99,-42.24"/>
 </g>
 <!-- n_840c3e13412933b0e3f7394f4c7fecb0 -->
 <g id="node4" class="node">
 <title>n_840c3e13412933b0e3f7394f4c7fecb0</title>
 <g id="a_node4"><a xlink:href="#sec-840c3e13412933b0e3f7394f4c7fecb0" xlink:title="Verification Test">
-<polygon fill="none" stroke="black" points="270.13,-18 220.56,-36 121.44,-36 71.87,-18 121.44,0 220.56,0 270.13,-18"/>
-<text text-anchor="middle" x="171" y="-14.3" font-family="Times,serif" font-size="14.00">Verification Test</text>
+<polygon fill="none" stroke="black" points="239.53,-18 197.76,-36 114.24,-36 72.47,-18 114.24,0 197.76,0 239.53,-18"/>
+<text text-anchor="middle" x="156" y="-12.95" font-family="Times,serif" font-size="14.00">Verification Test</text>
 </a>
 </g>
 </g>
 <!-- n_9d273bd32c1fceb91b7d6a4d40e98bdd&#45;&gt;n_840c3e13412933b0e3f7394f4c7fecb0 -->
 <g id="edge3" class="edge">
 <title>n_9d273bd32c1fceb91b7d6a4d40e98bdd&#45;&gt;n_840c3e13412933b0e3f7394f4c7fecb0</title>
-<path fill="none" stroke="black" d="M116.8,-71.7C125.6,-63.14 136.38,-52.66 146,-43.3"/>
-<polygon fill="black" stroke="black" points="148.68,-45.58 153.41,-36.1 143.8,-40.57 148.68,-45.58"/>
+<path fill="none" stroke="black" d="M107.07,-71.7C114.7,-63.47 123.98,-53.48 132.4,-44.42"/>
+<polygon fill="black" stroke="black" points="134.85,-46.92 139.09,-37.21 129.72,-42.16 134.85,-46.92"/>
 </g>
 </g>
 </svg>
@@ -347,7 +347,7 @@ <h4 id="sec-419cfc02b324dc7d8faefa90ed608fb0">System Requirements</h4>
 <h5>Codebeamer https://potato.kitten, tracker 12345</h5>
 <!-- begin item req 12345 -->
 <div class="item-missing" id="item-d499f1e2ff6c8662012d4c4bfe35060a5eda7b6c">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-triangle"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></line></svg> codebeamer Functional requirement LOBSTER demo</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 520 516" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-137 -85)"><path d="M162 506 397 113 632 506Z" stroke="#000000" stroke-width="27.5" stroke-miterlimit="8" fill="#FF9900" fill-rule="evenodd"/><text font-family="Aptos,Aptos_MSFontService,sans-serif" font-weight="700" font-size="202" transform="matrix(1 0 0 1 367.145 423)">!</text></g></svg> codebeamer Functional requirement LOBSTER demo</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
 <a href="https://potato.kitten/cb/issue/666" target="_blank">cb item 666 'LOBSTER demo'</a>
@@ -375,13 +375,13 @@ <h5>Codebeamer https://potato.kitten, tracker 12345</h5>
 </div>
 <!-- end item -->
 <h4 id="sec-9d273bd32c1fceb91b7d6a4d40e98bdd">Software Requirements</h4>
-<h5>integration-tests/projects/basic/potato.trlc</h5>
+<h5>tests-integration/projects/basic/potato.trlc</h5>
 <!-- begin item req example.req_implication -->
 <div class="item-ok" id="item-1bb1a5e571e24eebc94d2572ab385ee34e338995">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> TRLC Tagged_requirement example.req_implication</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> TRLC Tagged_requirement example.req_implication</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/potato.trlc#L3" target="_blank">integration-tests/projects/basic/potato.trlc:3</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/potato.trlc#L3" target="_blank">tests-integration/projects/basic/potato.trlc:3</a>
 </div>
 <div class="attribute">
 <blockquote>text: provide a utility function for logical implication</blockquote>
@@ -403,10 +403,10 @@ <h5>integration-tests/projects/basic/potato.trlc</h5>
 <!-- end item -->
 <!-- begin item req example.req_xor -->
 <div class="item-missing" id="item-5c0948f96e743a0c3ab3c14ecac0f5d10609f324">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-triangle"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></line></svg> TRLC Tagged_requirement example.req_xor</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 520 516" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-137 -85)"><path d="M162 506 397 113 632 506Z" stroke="#000000" stroke-width="27.5" stroke-miterlimit="8" fill="#FF9900" fill-rule="evenodd"/><text font-family="Aptos,Aptos_MSFontService,sans-serif" font-weight="700" font-size="202" transform="matrix(1 0 0 1 367.145 423)">!</text></g></svg> TRLC Tagged_requirement example.req_xor</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/potato.trlc#L9" target="_blank">integration-tests/projects/basic/potato.trlc:9</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/potato.trlc#L9" target="_blank">tests-integration/projects/basic/potato.trlc:9</a>
 </div>
 <div class="attribute">
 <blockquote>text: provide a utility function for logical exclusive or</blockquote>
@@ -415,8 +415,8 @@ <h5>integration-tests/projects/basic/potato.trlc</h5>
 <div>Traces to:
 <ul>
 <li>Simulink Block <a href='#item-d330ebddaa1ec4c761ec0c070c6f6c71fd4cbb4e'>exclusive_or/My Exclusive Or</a></li>
-<li>JSON Test vector <a href='#item-6fd933a1dce6a253d02839e2e301e42603b420e6'>XOR Test 1</a></li>
-<li>JSON Test vector <a href='#item-de185e274597c7c2aeb3dde37797a29da19f6f2c'>XOR Test 2</a></li>
+<li>JSON Test vector <a href='#item-2def120304660abe06791056ae3475223a985c2b'>example.json:XOR Test 1</a></li>
+<li>JSON Test vector <a href='#item-12cafbcbb11d67c7c95f6dd4fedbb1b79620379c'>example.json:XOR Test 2</a></li>
 </ul>
 </div>
 <div>Derived from:
@@ -434,10 +434,10 @@ <h5>integration-tests/projects/basic/potato.trlc</h5>
 <!-- end item -->
 <!-- begin item req example.req_nand -->
 <div class="item-ok" id="item-3e885dd2f9f061dedab93f44634897ace7f770c8">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> TRLC Tagged_requirement example.req_nand</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> TRLC Tagged_requirement example.req_nand</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/potato.trlc#L15" target="_blank">integration-tests/projects/basic/potato.trlc:15</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/potato.trlc#L15" target="_blank">tests-integration/projects/basic/potato.trlc:15</a>
 </div>
 <div class="attribute">
 <blockquote>text: provide a utility function for logical negated and<br><br>extra_text: potato</blockquote>
@@ -460,10 +460,10 @@ <h5>integration-tests/projects/basic/potato.trlc</h5>
 <!-- end item -->
 <!-- begin item req example.req_nor -->
 <div class="item-missing" id="item-714c0c22dee57a69c9425cff0c0bd4ca9ebe5d1f">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-triangle"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></line></svg> TRLC Requirement example.req_nor</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 520 516" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-137 -85)"><path d="M162 506 397 113 632 506Z" stroke="#000000" stroke-width="27.5" stroke-miterlimit="8" fill="#FF9900" fill-rule="evenodd"/><text font-family="Aptos,Aptos_MSFontService,sans-serif" font-weight="700" font-size="202" transform="matrix(1 0 0 1 367.145 423)">!</text></g></svg> TRLC Requirement example.req_nor</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/potato.trlc#L22" target="_blank">integration-tests/projects/basic/potato.trlc:22</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/potato.trlc#L22" target="_blank">tests-integration/projects/basic/potato.trlc:22</a>
 </div>
 <div class="attribute">
 <blockquote>provide a utility function for logical negated or</blockquote>
@@ -487,10 +487,10 @@ <h5>integration-tests/projects/basic/potato.trlc</h5>
 <!-- end item -->
 <!-- begin item req example.req_implies -->
 <div class="item-justified" id="item-21cffb8e9b92e4133844f4752a7c8100cf3166c4">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> TRLC Requirement example.req_implies</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> TRLC Requirement example.req_implies</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/potato.trlc#L27" target="_blank">integration-tests/projects/basic/potato.trlc:27</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/potato.trlc#L27" target="_blank">tests-integration/projects/basic/potato.trlc:27</a>
 </div>
 <div class="attribute">
 <blockquote>provide a utility function for logical implication</blockquote>
@@ -507,10 +507,10 @@ <h5>integration-tests/projects/basic/potato.trlc</h5>
 <!-- end item -->
 <!-- begin item req example.req_important -->
 <div class="item-partial" id="item-fbfa01aa359da14836c3fe53cd7363bfb1ffb782">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-triangle"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></line></svg> TRLC Linked_requirement example.req_important</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 520 516" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-137 -85)"><path d="M162 506 397 113 632 506Z" stroke="#000000" stroke-width="27.5" stroke-miterlimit="8" fill="#FF9900" fill-rule="evenodd"/><text font-family="Aptos,Aptos_MSFontService,sans-serif" font-weight="700" font-size="202" transform="matrix(1 0 0 1 367.145 423)">!</text></g></svg> TRLC Linked_requirement example.req_important</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/potato.trlc#L39" target="_blank">integration-tests/projects/basic/potato.trlc:39</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/potato.trlc#L39" target="_blank">tests-integration/projects/basic/potato.trlc:39</a>
 </div>
 <div class="attribute">
 <blockquote>this is important</blockquote>
@@ -533,13 +533,13 @@ <h5>integration-tests/projects/basic/potato.trlc</h5>
 <!-- end item -->
 <h3>Implementation</h3>
 <h4 id="sec-ca0dbad92a874b2f69b549293387925e">Code</h4>
-<h5>integration-tests/projects/basic/exclusive_or.slx</h5>
+<h5>tests-integration/projects/basic/exclusive_or.slx</h5>
 <!-- begin item simulink exclusive_or -->
 <div class="item-missing" id="item-f44a5e4c051c43e14dc1c71d4a3818a0b038597e">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-triangle"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></line></svg> Simulink Block exclusive_or</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 520 516" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-137 -85)"><path d="M162 506 397 113 632 506Z" stroke="#000000" stroke-width="27.5" stroke-miterlimit="8" fill="#FF9900" fill-rule="evenodd"/><text font-family="Aptos,Aptos_MSFontService,sans-serif" font-weight="700" font-size="202" transform="matrix(1 0 0 1 367.145 423)">!</text></g></svg> Simulink Block exclusive_or</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/exclusive_or.slx" target="_blank">integration-tests/projects/basic/exclusive_or.slx</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/exclusive_or.slx" target="_blank">tests-integration/projects/basic/exclusive_or.slx</a>
 </div>
 <div class="attribute">
 <div>Issues:
@@ -552,10 +552,10 @@ <h5>integration-tests/projects/basic/exclusive_or.slx</h5>
 <!-- end item -->
 <!-- begin item simulink exclusive_or/My_Exclusive_Or -->
 <div class="item-ok" id="item-d330ebddaa1ec4c761ec0c070c6f6c71fd4cbb4e">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> Simulink Block exclusive_or/My Exclusive Or</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> Simulink Block exclusive_or/My Exclusive Or</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/exclusive_or.slx" target="_blank">integration-tests/projects/basic/exclusive_or.slx</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/exclusive_or.slx" target="_blank">tests-integration/projects/basic/exclusive_or.slx</a>
 </div>
 <div class="attribute">
 <div>Derived from:
@@ -568,10 +568,10 @@ <h5>integration-tests/projects/basic/exclusive_or.slx</h5>
 <!-- end item -->
 <!-- begin item matlab exclusive_or/MATLAB Function -->
 <div class="item-missing" id="item-abac171105982dd5a053572a6f4d88ef30fbfc42">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-triangle"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></line></svg> MATLAB Function exclusive_or/MATLAB Function</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 520 516" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-137 -85)"><path d="M162 506 397 113 632 506Z" stroke="#000000" stroke-width="27.5" stroke-miterlimit="8" fill="#FF9900" fill-rule="evenodd"/><text font-family="Aptos,Aptos_MSFontService,sans-serif" font-weight="700" font-size="202" transform="matrix(1 0 0 1 367.145 423)">!</text></g></svg> MATLAB Function exclusive_or/MATLAB Function</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/exclusive_or.slx#L1" target="_blank">integration-tests/projects/basic/exclusive_or.slx:1</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/exclusive_or.slx#L1" target="_blank">tests-integration/projects/basic/exclusive_or.slx:1</a>
 </div>
 <div class="attribute">
 <div>Issues:
@@ -582,13 +582,13 @@ <h5>integration-tests/projects/basic/exclusive_or.slx</h5>
 </div>
 </div>
 <!-- end item -->
-<h5>integration-tests/projects/basic/foo.cpp</h5>
+<h5>tests-integration/projects/basic/foo.cpp</h5>
 <!-- begin item cpp foo.cpp:implication:3 -->
 <div class="item-ok" id="item-306ea2c9ccbbbc7157c8ff00b3e0381919969d52">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> C/C++ Function implication</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> C/C++ Function implication</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/foo.cpp#L3" target="_blank">integration-tests/projects/basic/foo.cpp:3</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/foo.cpp#L3" target="_blank">tests-integration/projects/basic/foo.cpp:3</a>
 </div>
 <div class="attribute">
 <div>Derived from:
@@ -601,10 +601,10 @@ <h5>integration-tests/projects/basic/foo.cpp</h5>
 <!-- end item -->
 <!-- begin item cpp foo.cpp:exclusive_or:9 -->
 <div class="item-missing" id="item-a59e5952bd9a2f7bb8592b7645968e08f73a9037">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-triangle"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></line></svg> C/C++ Function exclusive_or</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 520 516" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-137 -85)"><path d="M162 506 397 113 632 506Z" stroke="#000000" stroke-width="27.5" stroke-miterlimit="8" fill="#FF9900" fill-rule="evenodd"/><text font-family="Aptos,Aptos_MSFontService,sans-serif" font-weight="700" font-size="202" transform="matrix(1 0 0 1 367.145 423)">!</text></g></svg> C/C++ Function exclusive_or</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/foo.cpp#L9" target="_blank">integration-tests/projects/basic/foo.cpp:9</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/foo.cpp#L9" target="_blank">tests-integration/projects/basic/foo.cpp:9</a>
 </div>
 <div class="attribute">
 <div>Issues:
@@ -617,10 +617,10 @@ <h5>integration-tests/projects/basic/foo.cpp</h5>
 <!-- end item -->
 <!-- begin item cpp foo.cpp:potato:14 -->
 <div class="item-missing" id="item-1fcf699056a4c10fafba408751855a62d76a2fc2">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-alert-triangle"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"></path><line x1="12" y1="9" x2="12" y2="13"></line><line x1="12" y1="17" x2="12.01" y2="17"></line></svg> C/C++ Function potato</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 520 516" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-137 -85)"><path d="M162 506 397 113 632 506Z" stroke="#000000" stroke-width="27.5" stroke-miterlimit="8" fill="#FF9900" fill-rule="evenodd"/><text font-family="Aptos,Aptos_MSFontService,sans-serif" font-weight="700" font-size="202" transform="matrix(1 0 0 1 367.145 423)">!</text></g></svg> C/C++ Function potato</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/foo.cpp#L14" target="_blank">integration-tests/projects/basic/foo.cpp:14</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/foo.cpp#L14" target="_blank">tests-integration/projects/basic/foo.cpp:14</a>
 </div>
 <div class="attribute">
 <div>Issues:
@@ -632,13 +632,13 @@ <h5>integration-tests/projects/basic/foo.cpp</h5>
 </div>
 </div>
 <!-- end item -->
-<h5>integration-tests/projects/basic/nand.m</h5>
+<h5>tests-integration/projects/basic/nand.m</h5>
 <!-- begin item matlab nand -->
 <div class="item-ok" id="item-05717df9b8ee784715376855d7afeabeaa6cd1f5">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> MATLAB Function nand</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> MATLAB Function nand</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/nand.m#L1" target="_blank">integration-tests/projects/basic/nand.m:1</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/nand.m#L1" target="_blank">tests-integration/projects/basic/nand.m:1</a>
 </div>
 <div class="attribute">
 <div>Derived from:
@@ -649,13 +649,13 @@ <h5>integration-tests/projects/basic/nand.m</h5>
 </div>
 </div>
 <!-- end item -->
-<h5>integration-tests/projects/basic/nor.py</h5>
+<h5>tests-integration/projects/basic/nor.py</h5>
 <!-- begin item python nor.trlc_reference -->
 <div class="item-justified" id="item-716e7482019e79473ec2b20555b90c6183ef62a2">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> Python Function nor.trlc_reference</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> Python Function nor.trlc_reference</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/nor.py#L5" target="_blank">integration-tests/projects/basic/nor.py:5</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/nor.py#L5" target="_blank">tests-integration/projects/basic/nor.py:5</a>
 </div>
 <div class="attribute">
 <div>Justifications:
@@ -668,10 +668,10 @@ <h5>integration-tests/projects/basic/nor.py</h5>
 <!-- end item -->
 <!-- begin item python nor.Example.helper_function -->
 <div class="item-ok" id="item-44aca84976176f453e178bdd3323e7e9813dcebe">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> Python Method nor.Example.helper_function</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> Python Method nor.Example.helper_function</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/nor.py#L13" target="_blank">integration-tests/projects/basic/nor.py:13</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/nor.py#L13" target="_blank">tests-integration/projects/basic/nor.py:13</a>
 </div>
 <div class="attribute">
 <div>Derived from:
@@ -684,10 +684,10 @@ <h5>integration-tests/projects/basic/nor.py</h5>
 <!-- end item -->
 <!-- begin item python nor.Example.nor -->
 <div class="item-ok" id="item-4fe151cfc168f08ff6bc308291ecbee34309b652">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> Python Method nor.Example.nor</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> Python Method nor.Example.nor</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/nor.py#L17" target="_blank">integration-tests/projects/basic/nor.py:17</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/nor.py#L17" target="_blank">tests-integration/projects/basic/nor.py:17</a>
 </div>
 <div class="attribute">
 <div>Derived from:
@@ -700,13 +700,13 @@ <h5>integration-tests/projects/basic/nor.py</h5>
 <!-- end item -->
 <h3>Verification and Validation</h3>
 <h4 id="sec-840c3e13412933b0e3f7394f4c7fecb0">Verification Test</h4>
-<h5>integration-tests/projects/basic/example.json</h5>
-<!-- begin item json XOR Test 1 -->
-<div class="item-ok" id="item-6fd933a1dce6a253d02839e2e301e42603b420e6">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> JSON Test vector XOR Test 1</div>
+<h5>tests-integration/projects/basic/example.json</h5>
+<!-- begin item json example.json:XOR Test 1 -->
+<div class="item-ok" id="item-2def120304660abe06791056ae3475223a985c2b">
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> JSON Test vector example.json:XOR Test 1</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/example.json" target="_blank">integration-tests/projects/basic/example.json</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/example.json" target="_blank">tests-integration/projects/basic/example.json</a>
 </div>
 <div class="attribute">
 <div>Derived from:
@@ -717,12 +717,12 @@ <h5>integration-tests/projects/basic/example.json</h5>
 </div>
 </div>
 <!-- end item -->
-<!-- begin item json XOR Test 2 -->
-<div class="item-ok" id="item-de185e274597c7c2aeb3dde37797a29da19f6f2c">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> JSON Test vector XOR Test 2</div>
+<!-- begin item json example.json:XOR Test 2 -->
+<div class="item-ok" id="item-12cafbcbb11d67c7c95f6dd4fedbb1b79620379c">
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> JSON Test vector example.json:XOR Test 2</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/example.json" target="_blank">integration-tests/projects/basic/example.json</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/example.json" target="_blank">tests-integration/projects/basic/example.json</a>
 </div>
 <div class="attribute">
 <div>Derived from:
@@ -733,12 +733,12 @@ <h5>integration-tests/projects/basic/example.json</h5>
 </div>
 </div>
 <!-- end item -->
-<!-- begin item json Potato Test 1 -->
-<div class="item-justified" id="item-72c8c59855ab63fa99370a23ceca7132f2e8c7c1">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> JSON Test vector Potato Test 1</div>
+<!-- begin item json example.json:Potato Test 1 -->
+<div class="item-justified" id="item-6521c759f3012c6e12859502ce3a27dc8b6a2e14">
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> JSON Test vector example.json:Potato Test 1</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/example.json" target="_blank">integration-tests/projects/basic/example.json</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/example.json" target="_blank">tests-integration/projects/basic/example.json</a>
 </div>
 <div class="attribute">
 <div>Justifications:
@@ -749,13 +749,13 @@ <h5>integration-tests/projects/basic/example.json</h5>
 </div>
 </div>
 <!-- end item -->
-<h5>integration-tests/projects/basic/nand_test.m</h5>
+<h5>tests-integration/projects/basic/nand_test.m</h5>
 <!-- begin item matlab nand_test::test_1 -->
 <div class="item-ok" id="item-39288653f9b39978deae407a61549f53151857b7">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> MATLAB Test nand_test::test_1</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> MATLAB Test nand_test::test_1</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/nand_test.m#L3" target="_blank">integration-tests/projects/basic/nand_test.m:3</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/nand_test.m#L3" target="_blank">tests-integration/projects/basic/nand_test.m:3</a>
 </div>
 <div class="attribute">
 <div>Derived from:
@@ -766,13 +766,13 @@ <h5>integration-tests/projects/basic/nand_test.m</h5>
 </div>
 </div>
 <!-- end item -->
-<h5>integration-tests/projects/basic/test.cpp</h5>
+<h5>tests-integration/projects/basic/test.cpp</h5>
 <!-- begin item gtest ImplicationTest:BasicTest -->
 <div class="item-ok" id="item-0c9dd74b464f7be6456f3d14e144ba8b116dc9b3">
-<div class="item-name"><svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-check-square"><polyline points="9 11 12 14 22 4"></polyline><path d="M21 12v7a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11"></path></svg> GoogleTest Test ImplicationTest:BasicTest</div>
+<div class="item-name"><svg width="24" height="24" viewBox="0 0 456 461" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" overflow="hidden"><g transform="translate(-825 -84)"><path d="M839 310.5C839 193.139 934.811 98 1053 98 1171.19 98 1267 193.139 1267 310.5 1267 427.86 1171.19 523 1053 523 934.811 523 839 427.86 839 310.5Z" stroke="#008000" stroke-width="27.5" stroke-miterlimit="8" fill="#4EA72E" fill-rule="evenodd"/><text font-family="Segoe UI Symbol,Segoe UI Symbol_MSFontService,sans-serif" font-weight="400" font-size="202" transform="matrix(1 0 0 1 972.144 378)">✔</text></g></svg> GoogleTest Test ImplicationTest:BasicTest</div>
 <div class="attribute">Source: 
 <svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>
-<a href="https://github.com/bmw-software-engineering/lobster/blob/main/integration-tests/projects/basic/test.cpp#L7" target="_blank">integration-tests/projects/basic/test.cpp:7</a>
+<a href="https://github.com/bmw-software-engineering/lobster/blob/main/tests-integration/projects/basic/test.cpp#L7" target="_blank">tests-integration/projects/basic/test.cpp:7</a>
 </div>
 <div class="attribute">
 <div>Derived from:
diff --git a/integration-tests/projects/basic/ci_report.reference_output b/integration-tests/projects/basic/ci_report.reference_output
deleted file mode 100644
index 8d692f03..00000000
--- a/integration-tests/projects/basic/ci_report.reference_output
+++ /dev/null
@@ -1,11 +0,0 @@
-integration-tests/projects/basic/foo.cpp:9: lobster error: missing up reference
-integration-tests/projects/basic/foo.cpp:14: lobster error: unknown tracing target req example.doesnt_exist
-integration-tests/projects/basic/foo.cpp:14: lobster error: missing up reference
-integration-tests/projects/basic/exclusive_or.slx:1: lobster error: missing up reference
-cb item 666 'LOBSTER demo': lobster error: status is Potato, expected Valid
-integration-tests/projects/basic/potato.trlc:39: lobster error: missing reference to Code
-integration-tests/projects/basic/potato.trlc:39: lobster error: missing reference to Verification Test
-integration-tests/projects/basic/potato.trlc:22: lobster error: missing up reference
-integration-tests/projects/basic/potato.trlc:22: lobster error: missing reference to Verification Test
-integration-tests/projects/basic/potato.trlc:9: lobster error: tracing destination req 12345 has version 42 (expected 5)
-integration-tests/projects/basic/exclusive_or.slx: lobster error: missing up reference
diff --git a/integration-tests/projects/basic/potato.check b/integration-tests/projects/basic/potato.check
deleted file mode 100644
index 7266b00d..00000000
--- a/integration-tests/projects/basic/potato.check
+++ /dev/null
@@ -1,5 +0,0 @@
-package example
-
-checks Requirement {
-   trlc:len(text) >= 10, warning "this is a bit short", text
-}
\ No newline at end of file
diff --git a/integration-tests/projects/filter/BUILD b/integration-tests/projects/filter/BUILD
deleted file mode 100644
index d8663c9b..00000000
--- a/integration-tests/projects/filter/BUILD
+++ /dev/null
@@ -1,12 +0,0 @@
-cc_library(
-    name = "foofunc",
-    srcs = ["foo.h", "foo.cpp"]
-)
-
-cc_test(
-    name = "foo_test",
-    srcs = ["test.cpp"],
-    deps = ["@com_google_googletest//:gtest_main",
-            "foofunc",
-	    "//support/gtest/include:lobster_gtest"]
-)
diff --git a/lobster/report.py b/lobster/report.py
index c4140492..ad20689d 100644
--- a/lobster/report.py
+++ b/lobster/report.py
@@ -118,6 +118,7 @@ def write_report(self, filename):
 
         with open(filename, "w", encoding="UTF-8") as fd:
             json.dump(report, fd, indent=2)
+            fd.write("\n")
 
     def load_report(self, filename):
         assert isinstance(filename, str)
diff --git a/integration-tests/projects/basic/.gitignore b/tests-integration/projects/basic/.gitignore
similarity index 100%
rename from integration-tests/projects/basic/.gitignore
rename to tests-integration/projects/basic/.gitignore
diff --git a/integration-tests/projects/basic/BUILD b/tests-integration/projects/basic/BUILD
similarity index 100%
rename from integration-tests/projects/basic/BUILD
rename to tests-integration/projects/basic/BUILD
diff --git a/integration-tests/projects/basic/Makefile b/tests-integration/projects/basic/Makefile
similarity index 89%
rename from integration-tests/projects/basic/Makefile
rename to tests-integration/projects/basic/Makefile
index 908cfb6f..e15f644e 100644
--- a/integration-tests/projects/basic/Makefile
+++ b/tests-integration/projects/basic/Makefile
@@ -14,7 +14,6 @@ html_report.html: cppcode.lobster gtests.lobster mcode.lobster system-requiremen
 	@lobster-online-report
 	@cp report.lobster report.reference_output
 	@lobster-html-report
-	@cp lobster_report.html ../../../documentation/example_report.html
 	@lobster-ci-report | tee ci_report.reference_output
 
 cppcode.lobster: foo.h foo.cpp
@@ -37,8 +36,8 @@ pycode.lobster: nor.py
 		--out="pycode.lobster" \
 		--parse-decorator trlc_reference requirement
 
-software-requirements.lobster: potato.rsl potato.check potato.trlc
-	@lobster-trlc *.rsl *.check *.trlc \
+software-requirements.lobster: potato.rsl potato.trlc
+	@lobster-trlc *.rsl *.trlc \
 		--out="software-requirements.lobster"
 
 json.lobster: example.json
diff --git a/integration-tests/projects/basic/ci_report b/tests-integration/projects/basic/ci_report
similarity index 100%
rename from integration-tests/projects/basic/ci_report
rename to tests-integration/projects/basic/ci_report
diff --git a/tests-integration/projects/basic/ci_report.reference_output b/tests-integration/projects/basic/ci_report.reference_output
new file mode 100644
index 00000000..3c41be1e
--- /dev/null
+++ b/tests-integration/projects/basic/ci_report.reference_output
@@ -0,0 +1,11 @@
+tests-integration/projects/basic/foo.cpp:9: lobster error: missing up reference
+tests-integration/projects/basic/foo.cpp:14: lobster error: unknown tracing target req example.doesnt_exist
+tests-integration/projects/basic/foo.cpp:14: lobster error: missing up reference
+tests-integration/projects/basic/exclusive_or.slx:1: lobster error: missing up reference
+cb item 666 'LOBSTER demo': lobster error: status is Potato, expected Valid
+tests-integration/projects/basic/potato.trlc:39: lobster error: missing reference to Code
+tests-integration/projects/basic/potato.trlc:39: lobster error: missing reference to Verification Test
+tests-integration/projects/basic/potato.trlc:22: lobster error: missing up reference
+tests-integration/projects/basic/potato.trlc:22: lobster error: missing reference to Verification Test
+tests-integration/projects/basic/potato.trlc:9: lobster error: tracing destination req 12345 has version 42 (expected 5)
+tests-integration/projects/basic/exclusive_or.slx: lobster error: missing up reference
diff --git a/integration-tests/projects/basic/example.json b/tests-integration/projects/basic/example.json
similarity index 100%
rename from integration-tests/projects/basic/example.json
rename to tests-integration/projects/basic/example.json
diff --git a/integration-tests/projects/basic/exclusive_or.slx b/tests-integration/projects/basic/exclusive_or.slx
similarity index 100%
rename from integration-tests/projects/basic/exclusive_or.slx
rename to tests-integration/projects/basic/exclusive_or.slx
diff --git a/integration-tests/projects/basic/foo.cpp b/tests-integration/projects/basic/foo.cpp
similarity index 100%
rename from integration-tests/projects/basic/foo.cpp
rename to tests-integration/projects/basic/foo.cpp
diff --git a/integration-tests/projects/basic/foo.h b/tests-integration/projects/basic/foo.h
similarity index 100%
rename from integration-tests/projects/basic/foo.h
rename to tests-integration/projects/basic/foo.h
diff --git a/integration-tests/projects/basic/lobster-trlc.conf b/tests-integration/projects/basic/lobster-trlc.conf
similarity index 100%
rename from integration-tests/projects/basic/lobster-trlc.conf
rename to tests-integration/projects/basic/lobster-trlc.conf
diff --git a/integration-tests/projects/basic/lobster.conf b/tests-integration/projects/basic/lobster.conf
similarity index 100%
rename from integration-tests/projects/basic/lobster.conf
rename to tests-integration/projects/basic/lobster.conf
diff --git a/integration-tests/projects/basic/lobster.h b/tests-integration/projects/basic/lobster.h
similarity index 100%
rename from integration-tests/projects/basic/lobster.h
rename to tests-integration/projects/basic/lobster.h
diff --git a/integration-tests/projects/basic/nand.m b/tests-integration/projects/basic/nand.m
similarity index 100%
rename from integration-tests/projects/basic/nand.m
rename to tests-integration/projects/basic/nand.m
diff --git a/integration-tests/projects/basic/nand_test.m b/tests-integration/projects/basic/nand_test.m
similarity index 100%
rename from integration-tests/projects/basic/nand_test.m
rename to tests-integration/projects/basic/nand_test.m
diff --git a/integration-tests/projects/basic/nor.py b/tests-integration/projects/basic/nor.py
similarity index 100%
rename from integration-tests/projects/basic/nor.py
rename to tests-integration/projects/basic/nor.py
diff --git a/integration-tests/projects/basic/potato.rsl b/tests-integration/projects/basic/potato.rsl
similarity index 84%
rename from integration-tests/projects/basic/potato.rsl
rename to tests-integration/projects/basic/potato.rsl
index ad0a58a9..9896cb0b 100644
--- a/integration-tests/projects/basic/potato.rsl
+++ b/tests-integration/projects/basic/potato.rsl
@@ -28,3 +28,7 @@ type Linked_Requirement extends Requirement
 {
   trace_trlc optional Requirement [1 .. *]
 }
+
+checks Requirement {
+   len(text) >= 10, warning "this is a bit short", text
+}
diff --git a/integration-tests/projects/basic/potato.trlc b/tests-integration/projects/basic/potato.trlc
similarity index 100%
rename from integration-tests/projects/basic/potato.trlc
rename to tests-integration/projects/basic/potato.trlc
diff --git a/integration-tests/projects/basic/report.reference_output b/tests-integration/projects/basic/report.reference_output
similarity index 92%
rename from integration-tests/projects/basic/report.reference_output
rename to tests-integration/projects/basic/report.reference_output
index f728f25d..e8121159 100644
--- a/integration-tests/projects/basic/report.reference_output
+++ b/tests-integration/projects/basic/report.reference_output
@@ -49,7 +49,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/potato.trlc",
+            "file": "tests-integration/projects/basic/potato.trlc",
             "line": 3
           },
           "name": "example.req_implication",
@@ -76,7 +76,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/potato.trlc",
+            "file": "tests-integration/projects/basic/potato.trlc",
             "line": 9
           },
           "name": "example.req_xor",
@@ -106,7 +106,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/potato.trlc",
+            "file": "tests-integration/projects/basic/potato.trlc",
             "line": 15
           },
           "name": "example.req_nand",
@@ -134,7 +134,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/potato.trlc",
+            "file": "tests-integration/projects/basic/potato.trlc",
             "line": 22
           },
           "name": "example.req_nor",
@@ -163,7 +163,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/potato.trlc",
+            "file": "tests-integration/projects/basic/potato.trlc",
             "line": 27
           },
           "name": "example.req_implies",
@@ -187,7 +187,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/potato.trlc",
+            "file": "tests-integration/projects/basic/potato.trlc",
             "line": 39
           },
           "name": "example.req_important",
@@ -222,7 +222,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/foo.cpp",
+            "file": "tests-integration/projects/basic/foo.cpp",
             "line": 3
           },
           "name": "implication",
@@ -244,7 +244,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/foo.cpp",
+            "file": "tests-integration/projects/basic/foo.cpp",
             "line": 9
           },
           "name": "exclusive_or",
@@ -264,7 +264,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/foo.cpp",
+            "file": "tests-integration/projects/basic/foo.cpp",
             "line": 14
           },
           "name": "potato",
@@ -285,7 +285,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/nand.m",
+            "file": "tests-integration/projects/basic/nand.m",
             "line": 1
           },
           "name": "nand",
@@ -307,7 +307,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/exclusive_or.slx",
+            "file": "tests-integration/projects/basic/exclusive_or.slx",
             "line": 1
           },
           "name": "exclusive_or/MATLAB Function",
@@ -327,7 +327,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/exclusive_or.slx",
+            "file": "tests-integration/projects/basic/exclusive_or.slx",
             "line": null
           },
           "name": "exclusive_or",
@@ -347,7 +347,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/exclusive_or.slx",
+            "file": "tests-integration/projects/basic/exclusive_or.slx",
             "line": null
           },
           "name": "exclusive_or/My Exclusive Or",
@@ -369,7 +369,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/nor.py",
+            "file": "tests-integration/projects/basic/nor.py",
             "line": 5
           },
           "name": "nor.trlc_reference",
@@ -389,7 +389,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/nor.py",
+            "file": "tests-integration/projects/basic/nor.py",
             "line": 13
           },
           "name": "nor.Example.helper_function",
@@ -411,7 +411,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/nor.py",
+            "file": "tests-integration/projects/basic/nor.py",
             "line": 17
           },
           "name": "nor.Example.nor",
@@ -440,7 +440,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/test.cpp",
+            "file": "tests-integration/projects/basic/test.cpp",
             "line": 7
           },
           "name": "ImplicationTest:BasicTest",
@@ -463,7 +463,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/nand_test.m",
+            "file": "tests-integration/projects/basic/nand_test.m",
             "line": 3
           },
           "name": "nand_test::test_1",
@@ -486,7 +486,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/example.json",
+            "file": "tests-integration/projects/basic/example.json",
             "line": null
           },
           "name": "example.json:XOR Test 1",
@@ -509,7 +509,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/example.json",
+            "file": "tests-integration/projects/basic/example.json",
             "line": null
           },
           "name": "example.json:XOR Test 2",
@@ -532,7 +532,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/basic/example.json",
+            "file": "tests-integration/projects/basic/example.json",
             "line": null
           },
           "name": "example.json:Potato Test 1",
@@ -647,4 +647,4 @@
     }
   },
   "matrix": []
-}
\ No newline at end of file
+}
diff --git a/integration-tests/projects/basic/system-requirements.lobster b/tests-integration/projects/basic/system-requirements.lobster
similarity index 100%
rename from integration-tests/projects/basic/system-requirements.lobster
rename to tests-integration/projects/basic/system-requirements.lobster
diff --git a/integration-tests/projects/basic/test.cpp b/tests-integration/projects/basic/test.cpp
similarity index 100%
rename from integration-tests/projects/basic/test.cpp
rename to tests-integration/projects/basic/test.cpp
diff --git a/integration-tests/projects/filter/.gitignore b/tests-integration/projects/filter/.gitignore
similarity index 100%
rename from integration-tests/projects/filter/.gitignore
rename to tests-integration/projects/filter/.gitignore
diff --git a/integration-tests/projects/filter/Makefile b/tests-integration/projects/filter/Makefile
similarity index 100%
rename from integration-tests/projects/filter/Makefile
rename to tests-integration/projects/filter/Makefile
diff --git a/integration-tests/projects/filter/example.rsl b/tests-integration/projects/filter/example.rsl
similarity index 100%
rename from integration-tests/projects/filter/example.rsl
rename to tests-integration/projects/filter/example.rsl
diff --git a/integration-tests/projects/filter/foo.cpp b/tests-integration/projects/filter/foo.cpp
similarity index 100%
rename from integration-tests/projects/filter/foo.cpp
rename to tests-integration/projects/filter/foo.cpp
diff --git a/integration-tests/projects/filter/foo.h b/tests-integration/projects/filter/foo.h
similarity index 100%
rename from integration-tests/projects/filter/foo.h
rename to tests-integration/projects/filter/foo.h
diff --git a/integration-tests/projects/filter/lobster-trlc.conf b/tests-integration/projects/filter/lobster-trlc.conf
similarity index 100%
rename from integration-tests/projects/filter/lobster-trlc.conf
rename to tests-integration/projects/filter/lobster-trlc.conf
diff --git a/integration-tests/projects/filter/lobster.conf b/tests-integration/projects/filter/lobster.conf
similarity index 100%
rename from integration-tests/projects/filter/lobster.conf
rename to tests-integration/projects/filter/lobster.conf
diff --git a/integration-tests/projects/filter/report.reference_output b/tests-integration/projects/filter/report.reference_output
similarity index 93%
rename from integration-tests/projects/filter/report.reference_output
rename to tests-integration/projects/filter/report.reference_output
index 0085a7bd..49f0b68b 100644
--- a/integration-tests/projects/filter/report.reference_output
+++ b/tests-integration/projects/filter/report.reference_output
@@ -13,7 +13,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/sysreq_example.trlc",
+            "file": "tests-integration/projects/filter/sysreq_example.trlc",
             "line": 4
           },
           "name": "sysreq_example.lobster_example",
@@ -38,7 +38,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/sysreq_example.trlc",
+            "file": "tests-integration/projects/filter/sysreq_example.trlc",
             "line": 11
           },
           "name": "sysreq_example.req_implication",
@@ -62,7 +62,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/sysreq_example.trlc",
+            "file": "tests-integration/projects/filter/sysreq_example.trlc",
             "line": 19
           },
           "name": "sysreq_example.req_xor",
@@ -93,7 +93,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/softreq_example.trlc",
+            "file": "tests-integration/projects/filter/softreq_example.trlc",
             "line": 5
           },
           "name": "softreq_example.req_implication",
@@ -122,7 +122,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/softreq_example.trlc",
+            "file": "tests-integration/projects/filter/softreq_example.trlc",
             "line": 17
           },
           "name": "softreq_example.req_xor",
@@ -160,7 +160,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/foo.cpp",
+            "file": "tests-integration/projects/filter/foo.cpp",
             "line": 3
           },
           "name": "implication",
@@ -182,7 +182,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/foo.cpp",
+            "file": "tests-integration/projects/filter/foo.cpp",
             "line": 9
           },
           "name": "exclusive_or",
@@ -211,7 +211,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/test_example.json",
+            "file": "tests-integration/projects/filter/test_example.json",
             "line": null
           },
           "name": "test_example.json:Implication Test 1",
@@ -234,7 +234,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/test_example.json",
+            "file": "tests-integration/projects/filter/test_example.json",
             "line": null
           },
           "name": "test_example.json:Implication Test 2",
@@ -257,7 +257,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/test_example.json",
+            "file": "tests-integration/projects/filter/test_example.json",
             "line": null
           },
           "name": "test_example.json:XOR Test 1",
@@ -280,7 +280,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/test_example.json",
+            "file": "tests-integration/projects/filter/test_example.json",
             "line": null
           },
           "name": "test_example.json:XOR Test 2",
@@ -303,7 +303,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/test_example.json",
+            "file": "tests-integration/projects/filter/test_example.json",
             "line": null
           },
           "name": "test_example.json:XOR Test 3",
@@ -326,7 +326,7 @@
             "kind": "github",
             "gh_root": "https://github.com/bmw-software-engineering/lobster",
             "commit": "main",
-            "file": "integration-tests/projects/filter/test_example.json",
+            "file": "tests-integration/projects/filter/test_example.json",
             "line": null
           },
           "name": "test_example.json:XOR Test 4",
@@ -435,4 +435,4 @@
     }
   },
   "matrix": []
-}
\ No newline at end of file
+}
diff --git a/integration-tests/projects/filter/softreq_example.trlc b/tests-integration/projects/filter/softreq_example.trlc
similarity index 100%
rename from integration-tests/projects/filter/softreq_example.trlc
rename to tests-integration/projects/filter/softreq_example.trlc
diff --git a/integration-tests/projects/filter/sysreq_example.trlc b/tests-integration/projects/filter/sysreq_example.trlc
similarity index 100%
rename from integration-tests/projects/filter/sysreq_example.trlc
rename to tests-integration/projects/filter/sysreq_example.trlc
diff --git a/integration-tests/projects/filter/test_example.json b/tests-integration/projects/filter/test_example.json
similarity index 100%
rename from integration-tests/projects/filter/test_example.json
rename to tests-integration/projects/filter/test_example.json
diff --git a/test-system/lobster-json/Makefile b/tests-system/lobster-json/Makefile
similarity index 93%
rename from test-system/lobster-json/Makefile
rename to tests-system/lobster-json/Makefile
index 3f3f880a..340c21f7 100644
--- a/test-system/lobster-json/Makefile
+++ b/tests-system/lobster-json/Makefile
@@ -5,7 +5,7 @@ TARGETS=$(addsuffix .output, $(basename $(wildcard *.input)))
 all: $(TARGETS)
 
 %.output: %.input
-	@tail +2 $< > $*.json
+	@tail -n +2 $< > $*.json
 	@touch $*.lobster
 	-@coverage run -p --rcfile=../../coverage.cfg --branch \
 		--data-file ../../.coverage \
diff --git a/test-system/lobster-json/basic.input b/tests-system/lobster-json/basic.input
similarity index 100%
rename from test-system/lobster-json/basic.input
rename to tests-system/lobster-json/basic.input
diff --git a/test-system/lobster-json/basic.output b/tests-system/lobster-json/basic.output
similarity index 100%
rename from test-system/lobster-json/basic.output
rename to tests-system/lobster-json/basic.output
diff --git a/test-system/lobster-json/basic2.input b/tests-system/lobster-json/basic2.input
similarity index 100%
rename from test-system/lobster-json/basic2.input
rename to tests-system/lobster-json/basic2.input
diff --git a/test-system/lobster-json/basic2.output b/tests-system/lobster-json/basic2.output
similarity index 100%
rename from test-system/lobster-json/basic2.output
rename to tests-system/lobster-json/basic2.output
diff --git a/test-system/lobster-json/nested.input b/tests-system/lobster-json/nested.input
similarity index 100%
rename from test-system/lobster-json/nested.input
rename to tests-system/lobster-json/nested.input
diff --git a/test-system/lobster-json/nested.output b/tests-system/lobster-json/nested.output
similarity index 100%
rename from test-system/lobster-json/nested.output
rename to tests-system/lobster-json/nested.output
diff --git a/test-system/lobster-json/single1.input b/tests-system/lobster-json/single1.input
similarity index 100%
rename from test-system/lobster-json/single1.input
rename to tests-system/lobster-json/single1.input
diff --git a/test-system/lobster-json/single1.output b/tests-system/lobster-json/single1.output
similarity index 100%
rename from test-system/lobster-json/single1.output
rename to tests-system/lobster-json/single1.output
diff --git a/test-system/lobster-json/single2.input b/tests-system/lobster-json/single2.input
similarity index 100%
rename from test-system/lobster-json/single2.input
rename to tests-system/lobster-json/single2.input
diff --git a/test-system/lobster-json/single2.output b/tests-system/lobster-json/single2.output
similarity index 100%
rename from test-system/lobster-json/single2.output
rename to tests-system/lobster-json/single2.output
diff --git a/test-system/lobster-json/single3.input b/tests-system/lobster-json/single3.input
similarity index 100%
rename from test-system/lobster-json/single3.input
rename to tests-system/lobster-json/single3.input
diff --git a/test-system/lobster-json/single3.output b/tests-system/lobster-json/single3.output
similarity index 100%
rename from test-system/lobster-json/single3.output
rename to tests-system/lobster-json/single3.output
diff --git a/test-system/lobster-json/single4.input b/tests-system/lobster-json/single4.input
similarity index 100%
rename from test-system/lobster-json/single4.input
rename to tests-system/lobster-json/single4.input
diff --git a/test-system/lobster-json/single4.output b/tests-system/lobster-json/single4.output
similarity index 100%
rename from test-system/lobster-json/single4.output
rename to tests-system/lobster-json/single4.output
diff --git a/test-system/lobster-python/Makefile b/tests-system/lobster-python/Makefile
similarity index 100%
rename from test-system/lobster-python/Makefile
rename to tests-system/lobster-python/Makefile
diff --git a/test-system/lobster-python/basic.output b/tests-system/lobster-python/basic.output
similarity index 100%
rename from test-system/lobster-python/basic.output
rename to tests-system/lobster-python/basic.output
diff --git a/test-system/lobster-python/basic.py b/tests-system/lobster-python/basic.py
similarity index 100%
rename from test-system/lobster-python/basic.py
rename to tests-system/lobster-python/basic.py
diff --git a/test-system/lobster-python/multiple_identical_function_names.output b/tests-system/lobster-python/multiple_identical_function_names.output
similarity index 100%
rename from test-system/lobster-python/multiple_identical_function_names.output
rename to tests-system/lobster-python/multiple_identical_function_names.output
diff --git a/test-system/lobster-python/multiple_identical_function_names.py b/tests-system/lobster-python/multiple_identical_function_names.py
similarity index 100%
rename from test-system/lobster-python/multiple_identical_function_names.py
rename to tests-system/lobster-python/multiple_identical_function_names.py
diff --git a/test-system/lobster-python/pytest_mark.output b/tests-system/lobster-python/pytest_mark.output
similarity index 100%
rename from test-system/lobster-python/pytest_mark.output
rename to tests-system/lobster-python/pytest_mark.output
diff --git a/test-system/lobster-python/pytest_mark.py b/tests-system/lobster-python/pytest_mark.py
similarity index 100%
rename from test-system/lobster-python/pytest_mark.py
rename to tests-system/lobster-python/pytest_mark.py
diff --git a/test-system/lobster-trlc/lobster-trlc-system-test.py b/tests-system/lobster-trlc/lobster-trlc-system-test.py
similarity index 100%
rename from test-system/lobster-trlc/lobster-trlc-system-test.py
rename to tests-system/lobster-trlc/lobster-trlc-system-test.py
diff --git a/test-system/lobster-trlc/rbt-output-file/.gitkeep b/tests-system/lobster-trlc/rbt-output-file/.gitkeep
similarity index 100%
rename from test-system/lobster-trlc/rbt-output-file/.gitkeep
rename to tests-system/lobster-trlc/rbt-output-file/.gitkeep
diff --git a/test-unit/lobster-codebeamer/__init__.py b/tests-unit/lobster-codebeamer/__init__.py
similarity index 100%
rename from test-unit/lobster-codebeamer/__init__.py
rename to tests-unit/lobster-codebeamer/__init__.py
diff --git a/test-unit/lobster-codebeamer/test_codebeamer.py b/tests-unit/lobster-codebeamer/test_codebeamer.py
similarity index 100%
rename from test-unit/lobster-codebeamer/test_codebeamer.py
rename to tests-unit/lobster-codebeamer/test_codebeamer.py
diff --git a/test-unit/lobster-codebeamer/test_codebeamer_schema.py b/tests-unit/lobster-codebeamer/test_codebeamer_schema.py
similarity index 100%
rename from test-unit/lobster-codebeamer/test_codebeamer_schema.py
rename to tests-unit/lobster-codebeamer/test_codebeamer_schema.py
diff --git a/test-unit/lobster-cpptest/__init__.py b/tests-unit/lobster-cpptest/__init__.py
similarity index 100%
rename from test-unit/lobster-cpptest/__init__.py
rename to tests-unit/lobster-cpptest/__init__.py
diff --git a/test-unit/lobster-cpptest/data/test_1.config b/tests-unit/lobster-cpptest/data/test_1.config
similarity index 100%
rename from test-unit/lobster-cpptest/data/test_1.config
rename to tests-unit/lobster-cpptest/data/test_1.config
diff --git a/test-unit/lobster-cpptest/data/test_2.config b/tests-unit/lobster-cpptest/data/test_2.config
similarity index 100%
rename from test-unit/lobster-cpptest/data/test_2.config
rename to tests-unit/lobster-cpptest/data/test_2.config
diff --git a/test-unit/lobster-cpptest/data/test_case.cpp b/tests-unit/lobster-cpptest/data/test_case.cpp
similarity index 100%
rename from test-unit/lobster-cpptest/data/test_case.cpp
rename to tests-unit/lobster-cpptest/data/test_case.cpp
diff --git a/test-unit/lobster-cpptest/test_cpptest.py b/tests-unit/lobster-cpptest/test_cpptest.py
similarity index 100%
rename from test-unit/lobster-cpptest/test_cpptest.py
rename to tests-unit/lobster-cpptest/test_cpptest.py
diff --git a/test-unit/lobster-trlc/.gitkeep b/tests-unit/lobster-trlc/.gitkeep
similarity index 100%
rename from test-unit/lobster-trlc/.gitkeep
rename to tests-unit/lobster-trlc/.gitkeep
diff --git a/test-unit/test_io.py b/tests-unit/test_io.py
similarity index 100%
rename from test-unit/test_io.py
rename to tests-unit/test_io.py
diff --git a/test-unit/test_items.py b/tests-unit/test_items.py
similarity index 100%
rename from test-unit/test_items.py
rename to tests-unit/test_items.py
diff --git a/test-unit/test_json.py b/tests-unit/test_json.py
similarity index 100%
rename from test-unit/test_json.py
rename to tests-unit/test_json.py