diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4a4332df06..b41810d054 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -7,13 +7,18 @@ on:
 
 jobs:
   compile:
-    name: Build Everything
+    name: Build and Test
     runs-on: ubuntu-latest
     steps:
       - name: checkout source
         uses: actions/checkout@v1
         with:
           fetch-depth: 15
+      - name: Setup JDK
+        uses: actions/setup-java@v2
+        with:
+          distribution: temurin
+          java-version: 11
       - name: get current time
         uses: josStorer/get-current-time@v2
         id: current-time
@@ -32,15 +37,24 @@ jobs:
           architecture: 'x64' # defaults to 'x64'
       - name: install requirements
         run: sudo apt-get install ca-certificates-java expect
-      - name: run build everything
-        run: bazel build //...
+      - name: Coursier cache
+        uses: coursier/cache-action@v6
+      - name: Build and Test
+        run: make test
+      - name: Cleanup before cache
+        shell: bash
+        run: |
+          rm -rf "$HOME/.ivy2/local" || true
+          find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
+          find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
+          find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
+          find $HOME/.sbt                              -name "*.lock"               -delete || true
 
 # ------------------------------------------
 # ------------------------------------------
 # Test client-test-data 
   client-test-data-tests:
-    name: Test client-test-data 
-    needs: compile
+    name: Test client-test-data
     runs-on: ubuntu-latest
     steps:
       - name: checkout source
@@ -64,114 +78,25 @@ jobs:
           java-version: '11' # The OpenJDK version to make available on the path
           architecture: 'x64' # defaults to 'x64'
       - name: install requirements
-        run: sudo apt-get install ca-certificates-java expect redis-tools unzip
+        run: sudo apt-get install ca-certificates-java expect unzip
+      - name: Coursier cache
+        uses: coursier/cache-action@v6
       - name: generate api-client-test-data
         run: make client-test-data
+      - name: Cleanup before cache
+        shell: bash
+        run: |
+          rm -rf "$HOME/.ivy2/local" || true
+          find $HOME/Library/Caches/Coursier/v1        -name "ivydata-*.properties" -delete || true
+          find $HOME/.ivy2/cache                       -name "ivydata-*.properties" -delete || true
+          find $HOME/.cache/coursier/v1                -name "ivydata-*.properties" -delete || true
+          find $HOME/.sbt                              -name "*.lock"               -delete || true
 
 # ------------------------------------------
 # ------------------------------------------
 
-  api-unit-tests:
-    name: API Unit Tests
-    needs: compile
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout source
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 15
-      - name: get current time
-        uses: josStorer/get-current-time@v2
-        id: current-time
-        with:
-          format: YYYY-MM-DD
-          utcOffset: "+02:00"
-      - name: use daily bazel disk cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.bazel_disk_cache
-          key: ${{ runner.OS }}-bazel_disk_cache-${{ steps.current-time.outputs.formattedTime }}
-      - name: setup java version
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: '11' # The OpenJDK version to make available on the path
-          architecture: 'x64' # defaults to 'x64'
-      - name: install requirements
-        run: sudo apt-get install ca-certificates-java expect
-      - name: use daily bazel disk cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.bazel_disk_cache
-          key: ${{ runner.OS }}-bazel_disk_cache-${{ steps.date.outputs.date }} }}
-      - name: run API unit tests
-        run: make test-unit
-
-  api-e2e-tests:
-    name: API E2E Tests
-    needs: compile
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout source
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 15
-      - name: get current time
-        uses: josStorer/get-current-time@v2
-        id: current-time
-        with:
-          format: YYYY-MM-DD
-          utcOffset: "+02:00"
-      - name: use daily bazel disk cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.bazel_disk_cache
-          key: ${{ runner.OS }}-bazel_disk_cache-${{ steps.current-time.outputs.formattedTime }}
-      - name: setup java version
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: '11' # The OpenJDK version to make available on the path
-          architecture: 'x64' # defaults to 'x64'
-      - name: install requirements
-        run: sudo apt-get install ca-certificates-java expect redis-tools unzip
-      - name: run API E2E tests
-        run: make test-e2e
-
-  api-integration-tests:
-    name: API Integration Tests
-    needs: compile
-    runs-on: ubuntu-latest
-    steps:
-      - name: checkout source
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 15
-      - name: get current time
-        uses: josStorer/get-current-time@v2
-        id: current-time
-        with:
-          format: YYYY-MM-DD
-          utcOffset: "+02:00"
-      - name: use daily bazel disk cache
-        uses: actions/cache@v2
-        with:
-          path: ~/.bazel_disk_cache
-          key: ${{ runner.OS }}-bazel_disk_cache-${{ steps.current-time.outputs.formattedTime }}
-      - name: setup java version
-        uses: joschi/setup-jdk@v2
-        with:
-          java-version: '11' # The OpenJDK version to make available on the path
-          architecture: 'x64' # defaults to 'x64'
-      - name: Install dependencies
-        run: |
-          sudo apt-get install ca-certificates-java expect
-      - name: run API integration tests
-        run: |
-          make test-docker
-          make test-it
-
   upgrade-integration-tests:
     name: Upgrade Integration Tests
-    needs: compile
     runs-on: ubuntu-latest
     steps:
       - name: checkout source
@@ -202,7 +127,6 @@ jobs:
 
   docs-build-test:
     name: Build Docs Testrun
-    needs: compile
     runs-on: ubuntu-latest
     steps:
       - name: checkout source
@@ -242,9 +166,7 @@ jobs:
   publish:
     name: Publish (on release only)
     needs: [
-      api-unit-tests,
-      api-e2e-tests,
-      api-integration-tests,
+      compile,
       client-test-data-tests,
       upgrade-integration-tests,
       docs-build-test
@@ -273,7 +195,7 @@ jobs:
           java-version: '11' # The OpenJDK version to make available on the path
           architecture: 'x64' # defaults to 'x64'
       - name: install requirements
-        run: sudo apt-get install ca-certificates-java expect redis-tools unzip
+        run: sudo apt-get install ca-certificates-java expect unzip
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.gitignore b/.gitignore
index 4e5cd26788..baa70495ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,37 +1,22 @@
 /.project
 .ijwb
 .vscode
+.bloop
+.bsp
 **/.idea
 **/*.iml
 **/*.ipr
 **/*.iws
-/logs/
 /bin/
-/info.aduna.logging.dir_IS_UNDEFINED/
-.cache
-.classpath
 .docker
-.ensime
-.ensime_cache
 .env
-/.tmp/
-native
 **/.DS_Store
-site/
-docs/env
-docs/_build
-docs/_format_docu
-docs/_format_docu_v2
-docs/project
 salsah1/project
 webapi/project
 webapi/_fuseki/run
 webapi-it
 webapi-test
 upgrade/project
-upgrade/target
-triplestores/graphdb-se-7
-idea.vmoptions
 sipi/test
 bazel-*
 
@@ -50,18 +35,14 @@ bazel-*
 *.bak
 .sbtrc
 
-**/venv
-**/__pycache__
-dump.rdb
-/site/
 dependencies.txt
 /client-test-data.zip
-/db_prod_dump.trig
-/db_staging_dump.trig
-/db_test_dump.trig
-/.vscode
-/cleandeps.sh
-/.metals
 /sipi/images/082E/*
 /sipi/images/originals/082E/*
 /dependencies.bzl
+
+.idea/
+.metals/
+metals.sbt
+
+.tmp/
diff --git a/Makefile b/Makefile
index b0d753dc05..e81bd435e3 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,6 @@ docs-clean: ## cleans the project directory
 
 .PHONY: build
 build: docker-build ## build all targets (excluding docs)
-	@bazel build //...
 
 .PHOBY: check-for-outdated-deps
 check-for-outdated-deps: ## check for outdated maven dependencies
@@ -55,7 +54,7 @@ buildifier: ## format Bazel WORKSPACE and BUILD.bazel files
 
 .PHONY: docker-build-knora-api-image
 docker-build-knora-api-image: # build and publish knora-api docker image locally
-	@bazel run //docker/knora-api:image
+	@sbt "webapi / Docker / publishLocal"
 
 .PHONY: docker-publish-knora-api-image
 docker-publish-knora-api-image: # publish knora-api image to Dockerhub
@@ -201,38 +200,15 @@ stack-db-only: env-file docker-build-knora-jena-fuseki-image  ## starts only fus
 test-docker: docker-build ## runs Docker image tests
 	bazel test //docker/...
 
-.PHONY: test-webapi
-test-webapi: docker-build ## runs all dsp-api tests.
-	bazel test //webapi/...
-
-.PHONY: test-unit
-test-unit: docker-build ## runs the dsp-api unit tests.
-	bazel test \
-	//webapi/src/test/scala/org/knora/webapi/http/... \
-	//webapi/src/test/scala/org/knora/webapi/messages/... \
-	//webapi/src/test/scala/org/knora/webapi/other/... \
-	//webapi/src/test/scala/org/knora/webapi/responders/... \
-	//webapi/src/test/scala/org/knora/webapi/routing/... \
-	//webapi/src/test/scala/org/knora/webapi/store/... \
-	//webapi/src/test/scala/org/knora/webapi/util/... \
-
-.PHONY: test-e2e
-test-e2e: docker-build ## runs the dsp-api e2e tests.
-	bazel test //webapi/src/test/scala/org/knora/webapi/e2e/...
-
 .PHONY: client-test-data
-client-test-data: docker-build ## runs the dsp-api e2e tests and generates client test data.
-	docker-compose -f docker-compose.yml up -d redis
-	$(CURRENT_DIR)/webapi/scripts/clear-client-test-data.sh
-	bazel test --cache_test_results=no //webapi/src/test/scala/org/knora/webapi/e2e/... --action_env=KNORA_WEBAPI_COLLECT_CLIENT_TEST_DATA=true
-	$(CURRENT_DIR)/webapi/scripts/dump-client-test-data.sh
-
-.PHONY: test-it
-test-it: docker-build ## runs the dsp-api integration tests.
-	bazel test //webapi/src/test/scala/org/knora/webapi/it/...
+client-test-data: export KNORA_WEBAPI_COLLECT_CLIENT_TEST_DATA := true
+client-test-data: build ## runs the dsp-api e2e tests and generates client test data.
+	$(CURRENT_DIR)/webapi/scripts/zap-client-test-data.sh
+	sbt -v "webapi/testOnly *E2ESpec *R2RSpec"
+	$(CURRENT_DIR)/webapi/scripts/zip-client-test-data.sh
 
 .PHONY: test-repository-upgrade
-test-repository-upgrade: init-db-test-minimal ## runs DB upgrade integration test
+test-repository-upgrade: build init-db-test-minimal ## runs DB upgrade integration test
 	@rm -rf $(CURRENT_DIR)/.tmp/knora-test-data/v7.0.0/
 	@mkdir -p $(CURRENT_DIR)/.tmp/knora-test-data/v7.0.0/
 	@unzip $(CURRENT_DIR)/test_data/v7.0.0/v7.0.0-knora-test.trig.zip -d $(CURRENT_DIR)/.tmp/knora-test-data/v7.0.0/
@@ -245,8 +221,8 @@ test-repository-upgrade: init-db-test-minimal ## runs DB upgrade integration tes
 	@$(MAKE) -f $(THIS_FILE) stack-up
 
 .PHONY: test
-test: docker-build ## runs all test targets.
-	bazel test //webapi/...
+test: build ## runs all tests
+	sbt -v +test
 
 #################################
 ## Database Management
diff --git a/README.md b/README.md
index 209f49decf..f130c521c9 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,7 @@ Each developer machine should have the following prerequisites installed:
 * Docker Desktop: https://www.docker.com/products/docker-desktop
 * Homebrew (on macOS): https://brew.sh
 * [OpenJDK](https://adoptopenjdk.net) 11
+* [sbt](https://www.scala-sbt.org/)
 * [Bazel](https://bazel.build)
 
 #### Java Adoptopenjdk 11
diff --git a/build.sbt b/build.sbt
new file mode 100644
index 0000000000..cbaf1f6150
--- /dev/null
+++ b/build.sbt
@@ -0,0 +1,192 @@
+import com.typesafe.sbt.SbtNativePackager.autoImport.NativePackagerHelper._
+import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport.{Docker, dockerRepository}
+import com.typesafe.sbt.packager.docker.{Cmd, ExecCmd}
+import org.knora.Dependencies
+import sbt.Keys.version
+
+import scala.language.postfixOps
+import scala.sys.process.Process
+
+//////////////////////////////////////
+// GLOBAL SETTINGS
+//////////////////////////////////////
+
+lazy val aggregatedProjects: Seq[ProjectReference] = Seq(webapi)
+
+lazy val buildSettings = Dependencies.Versions ++ Seq(
+  organization := "org.knora",
+  version := (ThisBuild / version).value
+)
+
+lazy val rootBaseDir = ThisBuild / baseDirectory
+
+lazy val root: Project = Project(id = "root", file("."))
+  .aggregate(aggregatedProjects: _*)
+  .enablePlugins(GitVersioning, GitBranchPrompt)
+  .settings(Dependencies.Versions)
+  .settings(
+    // values set for all sub-projects
+    // These are normal sbt settings to configure for release, skip if already defined
+    Global / onChangedBuildSource := ReloadOnSourceChanges,
+    ThisBuild / licenses := Seq("Apache License, Version 2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")),
+    ThisBuild / homepage := Some(url("https://github.com/dasch-swiss/dsp-api")),
+    ThisBuild / scmInfo := Some(
+      ScmInfo(url("https://github.com/dasch-swiss/dsp-api"), "scm:git:git@github.com:dasch-swiss/dsp-api.git")
+    ),
+    // use 'git describe' for deriving the version
+    git.useGitDescribe := true,
+    // override generated version string because docker hub rejects '+' in tags
+    ThisBuild / version ~= (_.replace('+', '-')),
+    // use Ctrl-c to stop current task but not quit SBT
+    Global / cancelable := true,
+    publish / skip := true
+    //   Dependencies.sysProps := sys.props.toString(),
+    //   Dependencies.sysEnvs := sys.env.toString(),
+    // dockerImageCreationTask := Seq(
+    //   (salsah1 / Docker / publishLocal).value,
+    //   (webapi / Docker / publishLocal).value
+    //   (knoraJenaFuseki / Docker / publishLocal).value,
+    //   (knoraSipi / Docker / publishLocal).value
+    //)
+  )
+
+//////////////////////////////////////
+// WEBAPI (./webapi)
+//////////////////////////////////////
+
+import com.typesafe.sbt.SbtNativePackager.autoImport.NativePackagerHelper._
+import sbt._
+import sbt.librarymanagement.Resolver
+
+run / connectInput := true
+
+lazy val webApiCommonSettings = Seq(
+  name := "webapi"
+)
+
+// GatlingPlugin - load testing
+// JavaAgent - adds AspectJ Weaver configuration
+// BuildInfoPlugin - allows generation of scala code with version information
+
+lazy val webapi: Project = Project(id = "webapi", base = file("webapi"))
+  .settings(buildSettings)
+  .enablePlugins(SbtTwirl, JavaAppPackaging, DockerPlugin, GatlingPlugin, JavaAgent, RevolverPlugin, BuildInfoPlugin)
+  .settings(
+    webApiCommonSettings,
+    resolvers ++= Seq(
+      Resolver.bintrayRepo("hseeberger", "maven")
+    ),
+    Dependencies.webapiLibraryDependencies
+  )
+  .settings(
+    inConfig(Test)(Defaults.testTasks ++ baseAssemblySettings)
+  )
+  .settings(
+    exportJars := true,
+    Compile / unmanagedResourceDirectories += (rootBaseDir.value / "knora-ontologies"),
+    // add needed files to jar
+    Compile / packageBin / mappings ++= Seq(
+      (rootBaseDir.value / "knora-ontologies" / "knora-admin.ttl") -> "knora-ontologies/knora-admin.ttl",
+      (rootBaseDir.value / "knora-ontologies" / "knora-base.ttl") -> "knora-ontologies/knora-base.ttl",
+      (rootBaseDir.value / "knora-ontologies" / "salsah-gui.ttl") -> "knora-ontologies/salsah-gui.ttl",
+      (rootBaseDir.value / "knora-ontologies" / "standoff-data.ttl") -> "knora-ontologies/standoff-data.ttl",
+      (rootBaseDir.value / "knora-ontologies" / "standoff-onto.ttl") -> "knora-ontologies/standoff-onto.ttl",
+      (rootBaseDir.value / "webapi" / "scripts" / "fuseki-knora-test-repository-config.ttl") -> "webapi/scripts/fuseki-knora-test-repository-config.ttl",
+      (rootBaseDir.value / "webapi" / "scripts" / "fuseki-knora-test-unit-repository-config.ttl") -> "webapi/scripts/fuseki-knora-test-unit-repository-config.ttl",
+      (rootBaseDir.value / "webapi" / "scripts" / "fuseki-repository-config.ttl.template") -> "webapi/scripts/fuseki-repository-config.ttl.template"
+    ),
+    // contentOf("salsah1/src/main/resources").toMap.mapValues("config/" + _)
+    // (rootBaseDir.value / "knora-ontologies") -> "knora-ontologies",
+
+    // put additional files into the jar when running tests which are needed by testcontainers
+    Test / packageBin / mappings ++= Seq(
+      (rootBaseDir.value / "sipi" / "config" / "sipi.init-knora.lua") -> "sipi/config/sipi.init-knora.lua",
+      (rootBaseDir.value / "sipi" / "config" / "sipi.knora-docker-config.lua") -> "sipi/config/sipi.knora-docker-config.lua",
+      (rootBaseDir.value / "sipi" / "config" / "sipi.knora-docker-config.lua") -> "sipi/config/sipi.knora-docker-config.lua"
+    )
+  )
+  .settings(
+    scalacOptions ++= Seq("-feature", "-unchecked", "-deprecation", "-Yresolve-term-conflict:package"),
+    logLevel := Level.Info,
+    run / javaOptions := webapiJavaRunOptions,
+    reStart / javaOptions ++= resolvedJavaAgents.value map { resolved =>
+      "-javaagent:" + resolved.artifact.absolutePath + resolved.agent.arguments
+    }, // allows sbt-javaagent to work with sbt-revolver
+    reStart / javaOptions ++= webapiJavaRunOptions,
+    javaAgents += Dependencies.Compile.aspectJWeaver,
+    fork := true, // run tests in a forked JVM
+    Test / testForkedParallel := false, // run forked tests in parallel
+    Test / parallelExecution := false, // run non-forked tests in parallel
+    // Global / concurrentRestrictions += Tags.limit(Tags.Test, 1), // restrict the number of concurrently executing tests in all projects
+    Test / javaOptions ++= Seq("-Dconfig.resource=fuseki.conf") ++ webapiJavaTestOptions,
+    // Test / javaOptions ++= Seq("-Dakka.log-config-on-start=on"), // prints out akka config
+    // Test / javaOptions ++= Seq("-Dconfig.trace=loads"), // prints out config locations
+    Test / testOptions += Tests.Argument("-oDF") // show full stack traces and test case durations
+
+    // enable publishing the jars for test and it
+    // Test / packageBin / publishArtifact := true,
+    // IntegrationTest / packageBin / publishArtifact := true,
+    // addArtifact(artifact in (IntegrationTest, packageBin), packageBin in IntegrationTest)
+  )
+  .settings(
+    // prepare for publishing
+
+    // Skip packageDoc and packageSrc task on stage
+    Compile / packageDoc / mappings := Seq(),
+    Compile / packageSrc / mappings := Seq(),
+    Universal / mappings ++= {
+      // copy the scripts folder
+      directory("webapi/scripts") ++
+        // add knora-ontologies
+        directory("knora-ontologies") ++
+        // copy configuration files to config directory
+        contentOf("webapi/src/main/resources").toMap.mapValues("config/" + _)
+    },
+    // add 'config' directory to the classpath of the start script,
+    Universal / scriptClasspath := Seq("webapi/scripts", "knora-ontologies", "../config/") ++ scriptClasspath.value,
+    // need this here, so that the Manifest inside the jars has the correct main class set.
+    Compile / mainClass := Some("org.knora.webapi.app.Main"),
+    // add dockerCommands used to create the image
+    // docker:stage, docker:publishLocal, docker:publish, docker:clean
+    Docker / dockerRepository := Some("dasch-swiss"),
+    Docker / packageName := "knora-api",
+    dockerUpdateLatest := true,
+    dockerBaseImage := "eclipse-temurin:11-jre-focal",
+    Docker / maintainer := "support@dasch.swiss",
+    Docker / dockerExposedPorts ++= Seq(3333),
+    Docker / defaultLinuxInstallLocation := "/opt/docker"
+  )
+  .settings(
+    buildInfoKeys ++= Seq[BuildInfoKey](
+      name,
+      version,
+      "akkaHttp" -> Dependencies.akkaHttpVersion.value,
+      "sipi" -> Dependencies.sipiImage.value,
+      "fuseki" -> Dependencies.fusekiImage.value
+    ),
+    buildInfoPackage := "org.knora.webapi.http.version"
+  )
+
+lazy val webapiJavaRunOptions = Seq(
+  // "-showversion",
+  "-Xms1G",
+  "-Xmx1G",
+  // "-verbose:gc",
+  //"-XX:+UseG1GC",
+  //"-XX:MaxGCPauseMillis=500"
+  "-Dcom.sun.management.jmxremote",
+  // "-Dcom.sun.management.jmxremote.port=1617",
+  "-Dcom.sun.management.jmxremote.authenticate=false",
+  "-Dcom.sun.management.jmxremote.ssl=false"
+  //"-agentpath:/Applications/YourKit-Java-Profiler-2018.04.app/Contents/Resources/bin/mac/libyjpagent.jnilib"
+)
+
+lazy val webapiJavaTestOptions = Seq(
+  // "-showversion",
+  "-Xms1G",
+  "-Xmx1G"
+  // "-verbose:gc",
+  //"-XX:+UseG1GC",
+  //"-XX:MaxGCPauseMillis=500",
+  //"-XX:MaxMetaspaceSize=4096m"
+)
diff --git a/docker-compose.yml b/docker-compose.yml
index b1e86ebc21..488c6f4bb7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -35,15 +35,8 @@ services:
       - SIPI_WEBAPI_PORT=3333
     command: --config=/sipi/config/sipi.knora-docker-config.lua
 
-  redis:
-    image: redis:5
-    ports:
-      - "6379:6379"
-    networks:
-      - knora-net
-
   api:
-    image: bazel/docker/knora-api:image
+    image: dasch-swiss/knora-api:latest
     ports:
       - "3333:3333"
     volumes:
diff --git a/docker/knora-api.dockerfile b/docker/knora-api.dockerfile
deleted file mode 100644
index c61e52f05c..0000000000
--- a/docker/knora-api.dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-FROM adoptopenjdk/openjdk11:alpine-jre
-
-#RUN \
-#    apt-get -qq update && \
-#    apt-get install -y --no-install-recommends wget && \
-#    rm -rf /var/lib/apt/lists/*
-#
-#RUN \
-#    wget https://www.yourkit.com/download/docker/YourKit-JavaProfiler-2018.04-docker.zip -P /tmp/ && \
-#    unzip /tmp/YourKit-JavaProfiler-2018.04-docker.zip -d /usr/local && rm /tmp/YourKit-JavaProfiler-2018.04-docker.zip
-
-RUN \
-    apk update && \
-    apk upgrade && \
-    apk add bash
-
-COPY stage /webapi
-
-WORKDIR /webapi
-
-# check every minute
-HEALTHCHECK --interval=1m --timeout=1s CMD curl -f http://localhost:3333/health || exit 1
-
-EXPOSE 3333
-#EXPOSE 10001
-
-#ENTRYPOINT ["bin/webapi", "-J-agentpath:/usr/local/YourKit-JavaProfiler-2018.04/bin/linux-x86-64/libyjpagent.so=port=10001,listen=all"]
-ENTRYPOINT ["bin/webapi"]
-
-LABEL MAINTAINER="400790+subotic@users.noreply.github.com"
diff --git a/docker/knora-api/BUILD.bazel b/docker/knora-api/BUILD.bazel
deleted file mode 100644
index 88b9c00c93..0000000000
--- a/docker/knora-api/BUILD.bazel
+++ /dev/null
@@ -1,45 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
-
-# builds the docker image
-container_image(
-    name = "image",
-    base = select({
-        "@platforms//cpu:arm64": "@openjdk11_arm64//image",
-        "//conditions:default": "@openjdk11_amd64//image",
-    }),
-    cmd = [
-        "java",
-        "-jar",
-        "app_cli_deploy.jar",
-    ],
-    # entrypoint = ["java", "-jar", "webapi_deploy.jar"],
-    files = [
-        "//webapi/src/main/scala/org/knora/webapi/app:app_cli_deploy.jar",
-    ],
-    labels = {
-        "MAINTAINER": "400790+subotic@users.noreply.github.com",
-    },
-    ports = [
-        "3333/tcp",
-    ],
-)
-
-# push to dockerhub
-container_push(
-    name = "push",
-    format = "Docker",
-    image = ":image",
-    registry = "index.docker.io",
-    repository = "daschswiss/knora-api",
-    tag = "{BUILD_SCM_TAG}",
-)
-
-# use in targets needing an up-to-date docker image locally
-#genrule(
-#  name = "build",
-#  srcs = [":image"],
-#  cmd = "docker load -i $(location //docker/knora-api:image) >$@",
-#  outs = ["build-output.txt"]
-#)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
new file mode 100644
index 0000000000..efb0f84d9b
--- /dev/null
+++ b/project/Dependencies.scala
@@ -0,0 +1,261 @@
+/*
+ * Copyright © 2021 - 2022 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.knora
+
+import sbt.Keys._
+import sbt.{Def, _}
+
+object Dependencies {
+
+    lazy val sysProps = settingKey[String]("all system properties")
+    lazy val sysEnvs = settingKey[String]("all system environment variables")
+
+    lazy val sipiImage = settingKey[String]("the SIPI docker image")
+    lazy val akkaVersion = settingKey[String]("the Akka version")
+    lazy val akkaHttpVersion = settingKey[String]("the AkkaHttp version")
+    lazy val jenaVersion = settingKey[String]("the Jena library version")
+    lazy val metricsVersion = settingKey[String]("the metrics library version")
+
+    lazy val fusekiImage = SettingKey[String]("the DSP specific Apache Jena Fuseki Image")
+    lazy val knoraSipiImage = SettingKey[String]("the DSP specific Sipi Image")
+    lazy val knoraWebapiImage = SettingKey[String]("the DSP-API Image")
+
+    val Versions = Seq(
+        scalaVersion := "2.13.7",
+        akkaVersion := "2.6.18",
+        akkaHttpVersion := "10.2.8",
+        jenaVersion := "4.4.0",
+        metricsVersion := "4.0.1",
+        sipiImage := "daschswiss/sipi:v3.3.1",
+        fusekiImage := "daschswiss/apache-jena-fuseki:2.0.8"
+    )
+
+    // the user can change the default 'graphdb-se' value by creating an environment variable containing 'graphdb-free'
+    // e.g., in '$ export KNORA_GDB_TYPE=graphdb-free' in the terminal before launching sbt.
+    lazy val gdbTypeString: String = sys.env.getOrElse("KNORA_GDB_TYPE", "graphdb-se")
+
+    object Compile {
+        // ZIO
+        val zio = "dev.zio" %% "zio" % "2.0.0-M3"
+        val zioJson = "dev.zio" %% "zio-json" % "0.1.5"
+        val zioTest = "dev.zio" %% "zio-test" % "2.0.0-M3"
+        val zioTestJunit = "dev.zio" %% "zio-test-junit" % "2.0.0-M3"
+        val zioPrelude = "dev.zio" %% "zio-prelude" % "1.0.0-RC6"
+
+        // akka
+        val akkaActor              = Def.setting {"com.typesafe.akka"          %% "akka-actor"               % akkaVersion.value}
+        val akkaStream             = Def.setting {"com.typesafe.akka"          %% "akka-stream"              % akkaVersion.value}
+        val akkaSlf4j              = Def.setting {"com.typesafe.akka"          %% "akka-slf4j"               % akkaVersion.value}
+        val akkaProtobufV3         = Def.setting {"com.typesafe.akka"          %% "akka-protobuf-v3"         % akkaVersion.value}
+
+        // akka http
+        val akkaHttp               = Def.setting {"com.typesafe.akka"          %% "akka-http"                % akkaHttpVersion.value}
+        val akkaHttpXml            = Def.setting {"com.typesafe.akka"          %% "akka-http-xml"            % akkaHttpVersion.value}
+        val akkaHttpSprayJson      = Def.setting {"com.typesafe.akka"          %% "akka-http-spray-json"     % akkaHttpVersion.value}
+        val akkaHttpJacksonJava    = Def.setting {"com.typesafe.akka"          %% "akka-http-jackson"        % akkaHttpVersion.value}
+
+        val typesafeConfig         = "com.typesafe"                             % "config"                   % "1.3.3"
+
+        //CORS support
+        val akkaHttpCors           = "ch.megard"                               %% "akka-http-cors"           % "1.0.0"
+
+        // jena
+        val jenaLibs               = Def.setting {"org.apache.jena"             % "apache-jena-libs"         % jenaVersion.value }
+        val jenaText               = Def.setting {"org.apache.jena"             % "jena-text"                % jenaVersion.value }
+
+        // logging
+        val scalaLogging           = "com.typesafe.scala-logging"              %% "scala-logging"            % "3.9.4"
+        val logbackClassic         = "ch.qos.logback"                           % "logback-classic"          % "1.2.9"
+
+        // Metrics
+        val kamonCore              = "io.kamon"                                %% "kamon-core"               % "2.1.5"
+        val kamonScalaFuture       = "io.kamon"                                %% "kamon-scala-future"       % "2.1.5"
+        val kamonAkkaHttpd         = "io.kamon"                                %% "kamon-akka-http"          % "2.1.5"
+        val kamonPrometheus        = "io.kamon"                                %% "kamon-prometheus"         % "2.1.5"
+        val kamonLogback           = "io.kamon"                                %% "kamon-logback"            % "2.1.5"
+        val aspectJWeaver          = "org.aspectj"                              % "aspectjweaver"            % "1.9.4"
+
+        // input validation
+        val commonsValidator       = "commons-validator"                        % "commons-validator"        % "1.6" exclude("commons-logging", "commons-logging")
+
+        // authentication
+        val bcprov                 = "org.bouncycastle"                         % "bcprov-jdk15on"           % "1.64"
+        val springSecurityCore     = "org.springframework.security"             % "spring-security-core"     % "5.1.5.RELEASE" exclude("commons-logging", "commons-logging") exclude("org.springframework", "spring-aop")
+        val jwtSprayJson           = "com.pauldijou"                           %% "jwt-spray-json"           % "5.0.0"
+
+        // caching
+        val ehcache                = "net.sf.ehcache"                           % "ehcache"                  % "2.10.9.2"
+        val jedis                  = "redis.clients"                            % "jedis"                    % "3.1.0-m4"
+        // serialization
+        val chill                  = "com.twitter"                             %% "chill"                    % "0.9.5"
+
+        // other
+        //"javax.transaction" % "transaction-api" % "1.1-rev-1",
+        val commonsText            = "org.apache.commons"                       % "commons-text"             % "1.6"
+        val commonsIo              = "commons-io"                               % "commons-io"               % "2.6"
+        val commonsBeanUtil        = "commons-beanutils"                        % "commons-beanutils"        % "1.9.3" exclude("commons-logging", "commons-logging") // not used by us, but need newest version to prevent this problem: http://stackoverflow.com/questions/14402745/duplicate-classes-in-commons-collections-and-commons-beanutils
+        val jodd                   = "org.jodd"                                 % "jodd"                     % "3.2.6"
+        val jodaTime               = "joda-time"                                % "joda-time"                % "2.9.1"
+        val jodaConvert            = "org.joda"                                 % "joda-convert"             % "1.8"
+        val diff                   = "com.sksamuel.diff"                        % "diff"                     % "1.1.11"
+        val xmlunitCore            = "org.xmlunit"                              % "xmlunit-core"             % "2.1.1"
+
+        // other
+        val rdf4jClient            = "org.eclipse.rdf4j"                        % "rdf4j-client"             % "3.4.4"
+        val rdf4jRuntime           = "org.eclipse.rdf4j"                        % "rdf4j-runtime"            % "3.4.4"
+        val rdf4jStorage           = "org.eclipse.rdf4j"                        % "rdf4j-storage"            % "3.4.4"
+        val scallop                = "org.rogach"                              %% "scallop"                  % "3.5.1"
+        val gwtServlet             = "com.google.gwt"                           % "gwt-servlet"              % "2.8.0"
+        val saxonHE                = "net.sf.saxon"                             % "Saxon-HE"                 % "9.9.0-2"
+
+        val scalaXml               = "org.scala-lang.modules"                  %% "scala-xml"                % "1.2.0"
+        val scalaJava8Compat       = "org.scala-lang.modules"                  %% "scala-java8-compat"       % "1.0.2"
+
+        // provides akka jackson (json) support
+        val akkaHttpCirce          = "de.heikoseeberger"                       %% "akka-http-circe"          % "1.36.0"
+        val jacksonScala           = "com.fasterxml.jackson.module"            %% "jackson-module-scala"     % "2.12.3"
+
+        // swagger (api documentation)
+        val swaggerAkkaHttp        = "com.github.swagger-akka-http"            %% "swagger-akka-http"        % "1.6.0"
+
+        // Java EE modules which are deprecated in Java SE 9, 10 and will be removed in Java SE 11
+        val jaxbApi                = "javax.xml.bind"                           % "jaxb-api"                 % "2.2.12"
+
+        val icu4j                  = "com.ibm.icu"                              % "icu4j"                    % "62.1"
+
+        val apacheHttpClient       = "org.apache.httpcomponents"                % "httpclient"               % "4.5.6" exclude("commons-logging", "commons-logging")
+
+        // Graph for Scala            "org.scala-graph:graph-core_2.13:1.13.1",
+        val scalaGraph = "org.scala-graph" %% "graph-core" % "1.13.1"
+
+        // missing from current BAZEL setup
+            // "ch.qos.logback:logback-core:1.2.9",
+        val logbackCore = "ch.qos.logback" % "logback-core" % "1.2.9"
+            // "org.slf4j:log4j-over-slf4j:1.7.32",
+        val log4jOverSlf4j = "org.slf4j" % "log4j-over-slf4j" % "1.7.32"
+            // "org.slf4j:jcl-over-slf4j:1.7.32",
+        val jclOverSlf4j = "org.slf4j" % "jcl-over-slf4j" % "1.7.32"
+            // "org.slf4j:slf4j-api:1.7.32",
+        val slf4jApi = "org.slf4j" % "slf4j-api" % "1.7.32"
+            // "com.apicatalog:titanium-json-ld:1.2.0",
+        val titaniumJSONLD = "com.apicatalog" % "titanium-json-ld" % "1.2.0"
+            // "org.glassfish:jakarta.json:2.0.1",
+        val jakartaJSON = "org.glassfish" % "jakarta.json" % "2.0.1"
+            // "com.typesafe.play:twirl-api_2.13:1.5.1",
+        val twirlApi = "com.typesafe.play" %% "twirl-api" % "1.5.1"
+            // "junit:junit:4.13.2",
+        val junit = "junit" % "junit" % "4.13.2"
+            // "org.seleniumhq.selenium:selenium-support:3.141.59",
+        val seleniumSupport = "org.seleniumhq.selenium" % "selenium-support" % "3.141.59"
+    }
+
+    object WebapiTest {
+        val akkaTestkit            = Def.setting {"com.typesafe.akka"            %% "akka-testkit"             % akkaVersion.value        % "test"}
+        val akkaStreamTestkit      = Def.setting {"com.typesafe.akka"            %% "akka-stream-testkit"      % akkaVersion.value        % "test"}
+        val akkaHttpTestkit        = Def.setting {"com.typesafe.akka"            %% "akka-http-testkit"        % akkaHttpVersion.value    % "test"}
+        val scalaTest              = "org.scalatest"                             %% "scalatest"                % "3.2.2"                  % "test"
+        val gatlingHighcharts      = "io.gatling.highcharts"                      % "gatling-charts-highcharts"% "3.7.5"                  % "test"
+        val gatlingTestFramework   = "io.gatling"                                 % "gatling-test-framework"   % "3.2.1"                  % "test"
+        val testcontainers         = "org.testcontainers"                         % "testcontainers"           % "1.16.0"                 % "test"
+    }
+
+    object TestBinaries {
+        val akkaTestkit            = Def.setting {"com.typesafe.akka"            %% "akka-testkit"             % akkaVersion.value}
+        val akkaStreamTestkit      = Def.setting {"com.typesafe.akka"            %% "akka-stream-testkit"      % akkaVersion.value}
+        val akkaHttpTestkit        = Def.setting {"com.typesafe.akka"            %% "akka-http-testkit"        % akkaHttpVersion.value}
+        val scalaTest              = "org.scalatest"                             %% "scalatest"                % "3.2.2"
+        val gatlingHighcharts      = "io.gatling.highcharts"                      % "gatling-charts-highcharts"% "3.7.5"
+        val gatlingTestFramework   = "io.gatling"                                 % "gatling-test-framework"   % "3.2.1"
+    }
+
+    import Compile._
+
+    val l = libraryDependencies
+
+    val webapiLibraryDependencies = l ++= Seq[sbt.ModuleID](
+        akkaActor.value,
+        akkaHttp.value,
+        akkaHttpCirce,
+        akkaHttpCors,
+        akkaHttpJacksonJava.value,
+        akkaHttpSprayJson.value,
+        akkaHttpXml.value,
+        akkaProtobufV3.value,
+        akkaSlf4j.value,
+        akkaStream.value,
+        apacheHttpClient,
+        bcprov,
+        chill,
+        commonsBeanUtil,
+        commonsIo,
+        commonsText,
+        commonsValidator,
+        diff,
+        ehcache,
+        gwtServlet,
+        icu4j,
+        jacksonScala,
+        jaxbApi,
+        jedis,
+        jenaLibs.value,
+        jenaText.value,
+        jodaConvert,
+        jodaTime,
+        jodd,
+        jwtSprayJson,
+        kamonCore,
+        kamonLogback,
+        kamonPrometheus,
+        kamonScalaFuture,
+        logbackClassic,
+        rdf4jClient,
+        rdf4jRuntime,
+        rdf4jStorage,
+        saxonHE,
+        scalaGraph,
+        scalaJava8Compat,
+        scalaLogging,
+        scalaXml,
+        scallop,
+        springSecurityCore,
+        swaggerAkkaHttp,
+        typesafeConfig,
+        WebapiTest.akkaHttpTestkit.value,
+        WebapiTest.akkaStreamTestkit.value,
+        WebapiTest.akkaTestkit.value,
+        WebapiTest.gatlingHighcharts,
+        WebapiTest.gatlingTestFramework,
+        WebapiTest.scalaTest,
+        WebapiTest.testcontainers,
+        xmlunitCore,
+        zio,
+        zioJson,
+        zioPrelude,
+        zioTest,
+        zioTestJunit,
+        // missing from current BAZEL setup
+        logbackCore,
+        log4jOverSlf4j,
+        jclOverSlf4j,
+        slf4jApi,
+        titaniumJSONLD,
+        jakartaJSON,
+        twirlApi,
+        junit,
+        seleniumSupport
+    )
+
+    val upgradeLibraryDependencies = l ++= Seq[sbt.ModuleID](
+        rdf4jRuntime,
+        scallop
+    )
+
+    val webapiTestAndITLibraryDependencies = l ++= Seq[sbt.ModuleID](
+        TestBinaries.gatlingHighcharts,
+        TestBinaries.gatlingTestFramework,
+        TestBinaries.scalaTest
+    )
+}
diff --git a/project/build.properties b/project/build.properties
new file mode 100644
index 0000000000..c8fcab543a
--- /dev/null
+++ b/project/build.properties
@@ -0,0 +1 @@
+sbt.version=1.6.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
new file mode 100644
index 0000000000..2235c5cbbd
--- /dev/null
+++ b/project/plugins.sbt
@@ -0,0 +1,23 @@
+resolvers ++= Seq(
+  Resolver.typesafeRepo("releases")
+)
+
+// Knora
+addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
+addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.4")
+addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.1")
+
+// webapi
+addSbtPlugin("io.spray" % "sbt-revolver" % "0.9.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10")
+
+addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.5")
+addSbtPlugin("io.gatling" % "gatling-sbt" % "2.2.2")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
+addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.15")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
+
+// addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.1")
+// addSbtPlugin("com.github.cb372" % "sbt-explicit-dependencies" % "0.2.16")
+// addDependencyTreePlugin
diff --git a/third_party/dependencies.bzl b/third_party/dependencies.bzl
index 514ec08a94..c599f89859 100644
--- a/third_party/dependencies.bzl
+++ b/third_party/dependencies.bzl
@@ -90,7 +90,7 @@ def dependencies():
             "org.rogach:scallop_2.13:3.5.1",
             "com.google.gwt:gwt-servlet:2.8.0",
             "net.sf.saxon:Saxon-HE:9.9.0-2",
-            "org.scala-lang.modules:scala-xml_2.13:1.1.1",
+            # "org.scala-lang.modules:scala-xml_2.13:1.1.1",
             "org.scala-lang.modules:scala-java8-compat_2.13:0.9.1",
 
             # provides akka jackson (json) support
diff --git a/webapi/BUILD.bazel b/webapi/BUILD.bazel
deleted file mode 100644
index 8c8821a737..0000000000
--- a/webapi/BUILD.bazel
+++ /dev/null
@@ -1,194 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library", "scala_repl", "scala_test")
-
-# alias added for convenience. To call, use: bazel run //webapi:GenerateContributorsFile
-alias(
-    name = "GenerateContributorsFile",
-    actual = "//webapi/src/main/scala/org/knora/webapi/contributors:GenerateContributorsFile",
-)
-
-# alias added for convenience. To call, use: bazel run //webapi:app_cli
-alias(
-    name = "app_cli",
-    actual = "//webapi/src/main/scala/org/knora/webapi/app:app_cli",
-)
-
-# alias added for convenience. To call, use: bazel run //webapi:app_repl
-alias(
-    name = "app_repl",
-    actual = "//webapi/src/main/scala/org/knora/webapi/app:app_repl",
-)
-
-# Should be removed, after each scala_test rule is refactored to use direct
-# dependencies to the needed packages.
-scala_library(
-    name = "main_library",
-    testonly = True,
-    resources = [
-        "//knora-ontologies",
-        "//webapi/scripts:fuseki_repository_config_ttl_template",
-        "//webapi/src/main/resources",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    runtime_deps = [
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_13",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/core",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/http/directives",
-        "//webapi/src/main/scala/org/knora/webapi/http/handler",
-        "//webapi/src/main/scala/org/knora/webapi/http/version",
-        "//webapi/src/main/scala/org/knora/webapi/http/version/versioninfo",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/responders",
-        "//webapi/src/main/scala/org/knora/webapi/routing",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/store",
-        "//webapi/src/main/scala/org/knora/webapi/util",
-        "//webapi/src/main/scala/org/knora/webapi/util/cache",
-        # Logging
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_slf4j_jcl_over_slf4j",
-        "@maven//:org_slf4j_slf4j_api",
-        #
-        "@maven//:ch_megard_akka_http_cors_2_13",
-        "@maven//:com_fasterxml_jackson_core_jackson_annotations",
-        "@maven//:com_fasterxml_jackson_core_jackson_databind",
-        "@maven//:com_github_andrewoma_dexx_collection",
-        "@maven//:com_apicatalog_titanium_json_ld",
-        "@maven//:org_glassfish_jakarta_json",
-        "@maven//:com_github_swagger_akka_http_swagger_akka_http_2_13",
-        "@maven//:com_google_gwt_gwt_servlet",
-        "@maven//:com_ibm_icu_icu4j",
-        "@maven//:com_pauldijou_jwt_core_2_13",
-        "@maven//:com_pauldijou_jwt_json_common_2_13",
-        "@maven//:com_pauldijou_jwt_spray_json_2_13",
-        "@maven//:com_sksamuel_diff_diff",
-        "@maven//:com_twitter_chill_2_13",
-        # Akka
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
-        "@maven//:com_typesafe_akka_akka_parsing_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-        "@maven//:com_typesafe_config",
-        # Templates
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-        "@maven//:commons_cli_commons_cli",
-        "@maven//:commons_codec_commons_codec",
-        "@maven//:commons_io_commons_io",
-        "@maven//:commons_validator_commons_validator",
-        # Telemetry
-        "@maven//:io_kamon_kamon_core_2_13",
-        "@maven//:io_kamon_kamon_instrumentation_common_2_13",
-        # "@maven//:io_kamon_kamon_logback_2_13",
-        # "@maven//:io_kamon_kamon_prometheus_2_13",
-        "@maven//:io_kamon_kamon_scala_future_2_13",
-        #
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:io_swagger_swagger_annotations",
-        "@maven//:io_swagger_swagger_jaxrs",
-        "@maven//:io_swagger_swagger_models",
-        "@maven//:javax_ws_rs_jsr311_api",
-        # "@maven//:joda_time_joda_time",
-        "@maven//:net_sf_ehcache_ehcache",
-        "@maven//:net_sf_saxon_Saxon_HE",
-        "@maven//:org_apache_commons_commons_csv",
-        "@maven//:org_apache_commons_commons_lang3",
-        "@maven//:org_apache_commons_commons_pool2",
-        "@maven//:org_apache_commons_commons_text",
-        "@maven//:org_apache_httpcomponents_httpclient",
-        "@maven//:org_apache_httpcomponents_httpclient_cache",
-        "@maven//:org_apache_httpcomponents_httpcore",
-        "@maven//:org_apache_jena_apache_jena_libs",
-        "@maven//:org_apache_jena_jena_arq",
-        "@maven//:org_apache_jena_jena_base",
-        "@maven//:org_apache_jena_jena_core",
-        "@maven//:org_apache_jena_jena_tdb",
-        "@maven//:org_apache_jena_jena_text",
-        "@maven//:org_apache_lucene_lucene_core",
-        "@maven//:org_eclipse_rdf4j_rdf4j_client",
-        "@maven//:org_jodd_jodd",
-        "@maven//:org_rogach_scallop_2_13",
-        "@maven//:org_scala_lang_modules_scala_java8_compat_2_13",
-        "@maven//:org_scala_lang_modules_scala_xml_2_13",
-        "@maven//:org_scala_lang_scala_library",
-        "@maven//:org_scala_lang_scala_reflect",
-        "@maven//:org_springframework_security_spring_security_core",
-        "@maven//:redis_clients_jedis",
-    ],
-)
-
-# Should be removed, after each scala_test rule is refactored to use direct
-# dependencies to the needed packages.
-scala_library(
-    name = "test_library",
-    testonly = True,
-    srcs = [
-        "//webapi/src/test/scala/org/knora/webapi:srcs",
-    ],
-    resources = [
-        "//sipi/config",
-        "//webapi/src/test/resources",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    runtime_deps = [
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_13",
-        "@maven//:org_bouncycastle_bcprov_jdk15on",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/app",
-        "//webapi/src/main/scala/org/knora/webapi/core",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/http/handler",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/feature",
-        "//webapi/src/main/scala/org/knora/webapi/responders",
-        "//webapi/src/main/scala/org/knora/webapi/routing",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/store",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/inmem",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings",
-        "//webapi/src/main/scala/org/knora/webapi/util",
-        # Logging
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_slf4j_slf4j_api",
-        # Test Libs
-        "@maven//:com_typesafe_akka_akka_testkit_2_13",
-        "@maven//:com_typesafe_akka_akka_http_testkit_2_13",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-        "@maven//:com_typesafe_config",
-        "@maven//:dev_zio_zio_2_13",
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:org_scalactic_scalactic_2_13",
-        "@maven//:org_scalatest_scalatest_core_2_13",
-        "@maven//:org_scalatest_scalatest_wordspec_2_13",
-        "@maven//:org_scalatest_scalatest_matchers_core_2_13",
-        "@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
-        "@maven//:org_scalatest_scalatest_compatible",
-        "@maven//:org_testcontainers_testcontainers",
-        "@maven//:junit_junit",
-        "@maven//:org_apache_commons_commons_pool2",
-        "@maven//:redis_clients_jedis",
-    ],
-)
diff --git a/webapi/scripts/BUILD.bazel b/webapi/scripts/BUILD.bazel
deleted file mode 100644
index c8c9c4d74a..0000000000
--- a/webapi/scripts/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
-
-filegroup(
-    name = "fuseki_repository_config_ttl_template",
-    srcs = [
-        "fuseki-repository-config.ttl.template",
-    ],
-)
-
-filegroup(
-    name = "graphdb-se",
-    srcs = [
-        "graphdb-dump-repository.sh",
-        "graphdb-empty-repository.sh",
-        "graphdb-upload-repository.sh",
-    ],
-)
-
-pkg_tar(
-    name = "tar",
-    srcs = [":graphdb-se"],
-    package_dir = "graphdb-se",
-)
diff --git a/webapi/scripts/expected-client-test-data.txt b/webapi/scripts/expected-client-test-data.txt
index 964cab24c1..1fb5baffb4 100644
--- a/webapi/scripts/expected-client-test-data.txt
+++ b/webapi/scripts/expected-client-test-data.txt
@@ -14,6 +14,8 @@ test-data/admin/groups/get-groups-response.json
 test-data/admin/groups/update-group-request.json
 test-data/admin/groups/update-group-response.json
 test-data/admin/lists/
+test-data/admin/lists/add-child-to-second-child-request.json
+test-data/admin/lists/add-child-to-second-child-response.json
 test-data/admin/lists/add-second-child-to-root-request.json
 test-data/admin/lists/add-second-child-to-root-response.json
 test-data/admin/lists/create-child-node-request.json
diff --git a/webapi/scripts/clear-client-test-data.sh b/webapi/scripts/zap-client-test-data.sh
similarity index 51%
rename from webapi/scripts/clear-client-test-data.sh
rename to webapi/scripts/zap-client-test-data.sh
index fb42973c49..c38aa15384 100755
--- a/webapi/scripts/clear-client-test-data.sh
+++ b/webapi/scripts/zap-client-test-data.sh
@@ -1,17 +1,14 @@
 #!/usr/bin/env bash
 
-# Removes client test data from Redis.
+# Removes client test data.
 
 set -e
 
-# The name of the Redis hash in which client test data is collected.
-hash_name=client-test-data
-
 # The name of the Zip file that contains client test data download from Redis.
 zip_file_name=client-test-data.zip
 
-# Remove the hash from Redis.
-redis-cli del $hash_name > /dev/null
-
 # Remove any existing client test data Zip file.
 rm -f $zip_file_name
+
+# Remove the temporary directory containing the generated test data.
+rm -rf /tmp/client_test_data/
diff --git a/webapi/scripts/dump-client-test-data.sh b/webapi/scripts/zip-client-test-data.sh
similarity index 63%
rename from webapi/scripts/dump-client-test-data.sh
rename to webapi/scripts/zip-client-test-data.sh
index ee82b89390..b01ad7662e 100755
--- a/webapi/scripts/dump-client-test-data.sh
+++ b/webapi/scripts/zip-client-test-data.sh
@@ -12,18 +12,14 @@ popd () {
     command popd "$@" > /dev/null
 }
 
-
-# The name of the Redis hash in which client test data has been collected.
-hash_name=client-test-data
-
-# The name of the Zip file that will contain client test data download from Redis.
+# The name of the Zip file that will contain the client test data.
 zip_file_name=client-test-data.zip
 
 # A file listing the expected contents of that Zip file.
 expected_contents_file=$(dirname "$0")/expected-client-test-data.txt
 
-# Make a temporary directory for downloading the data from Redis.
-temp_dir=$(mktemp -d)
+# The temporary directory containing the generated test data.
+temp_dir=/tmp/client_test_data
 
 # The name of the top-level directory inside the temporary directory.
 top_dir_name=test-data
@@ -35,23 +31,6 @@ mkdir -p $top_dir_path
 # Remove any existing client test data Zip file.
 rm -f $zip_file_name
 
-# Iterate over the keys in the Redis hash.
-redis-cli hkeys $hash_name | while read relative_file_path
-do
-  if [ -n "$relative_file_path" ]
-  then
-    # The absolute path of the file to be downloaded.
-    abs_file_path="$top_dir_path/$relative_file_path"
-
-    # Create the directory that will contain the downloaded fiile.
-    relative_dirs_to_create=$(dirname "$abs_file_path")
-    mkdir -p "$relative_dirs_to_create"
-
-    # Download the file from Redis.
-    redis-cli hget $hash_name "$relative_file_path" > "$abs_file_path"
-  fi
-done
-
 # Create the Zip file.
 pushd $temp_dir
 zip -rq $zip_file_name .
@@ -63,9 +42,6 @@ mv $temp_dir/$zip_file_name .
 # Delete the temporary directory.
 rm -rf $temp_dir
 
-# Remove the hash from Redis.
-redis-cli del $hash_name > /dev/null
-
 # Make a temporary file to hold the file paths in the Zip file.
 temp_contents=$(mktemp)
 
diff --git a/webapi/src/main/resources/BUILD.bazel b/webapi/src/main/resources/BUILD.bazel
deleted file mode 100644
index dd29eb4acc..0000000000
--- a/webapi/src/main/resources/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "resources",
-    srcs = [
-        "TEIMapping.xml",
-        "application.conf",
-        "knoraXmlImport.xsd",
-        "logback.xml",
-        "mappingXMLToStandoff.xsd",
-        "standoffToTEI.xsl",
-    ],
-)
diff --git a/webapi/src/main/resources/application.conf b/webapi/src/main/resources/application.conf
index f1c3e3d26d..c53690fe21 100644
--- a/webapi/src/main/resources/application.conf
+++ b/webapi/src/main/resources/application.conf
@@ -511,10 +511,7 @@ app {
 
     # Array containing route paths which should be rejected. This can be used to selectively disable routes
     # in the configuration.
-    routes-to-reject = [
-        "v1/test",
-        "v2/test"
-    ]
+    routes-to-reject = []
 
     triplestore {
         dbtype = "fuseki"
diff --git a/webapi/src/main/scala/org/knora/webapi/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/BUILD.bazel
deleted file mode 100644
index 49dfb676f3..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-# //webapi//src/main/scala/org/knora/webapi
-scala_library(
-    name = "webapi",
-    srcs = glob(["*.scala"]),
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/annotation/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/annotation/BUILD.bazel
deleted file mode 100644
index 39e8ecbebe..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/annotation/BUILD.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-# //webapi/src/main/scala/org/knora/webapi/annotation
-scala_library(
-    name = "annotation",
-    srcs = glob(["*.scala"]),
-    unused_dependency_checker_mode = "warn",
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/app/ApplicationActor.scala b/webapi/src/main/scala/org/knora/webapi/app/ApplicationActor.scala
index a3b0decd58..05c618e945 100644
--- a/webapi/src/main/scala/org/knora/webapi/app/ApplicationActor.scala
+++ b/webapi/src/main/scala/org/knora/webapi/app/ApplicationActor.scala
@@ -477,11 +477,6 @@ class ApplicationActor extends Actor with Stash with LazyLogging with AroundDire
         // Transition to ready state
         self ! AppReady()
 
-        if (knoraSettings.prometheusEndpoint) {
-          // Load Kamon monitoring
-          Kamon.loadModules()
-        }
-
         // Kick of startup procedure.
         self ! InitStartUp(ignoreRepository, requiresIIIFService)
 
@@ -521,15 +516,12 @@ class ApplicationActor extends Actor with Stash with LazyLogging with AroundDire
 
   override def postStop(): Unit = {
     super.postStop()
-    logger.info("ApplicationActor - shutdown in progress, initiating post stop cleanup. Bye!")
-
-    if (knoraSettings.prometheusEndpoint) {
-      // Stop Kamon monitoring
-      Kamon.stopModules()
-    }
+    logger.info("ApplicationActor - ... shutdown in progress, initiating post stop cleanup...")
 
     CacheUtil.removeAllCaches()
 
+    logger.info("ApplicationActor - ... Bye!")
+
     Http().shutdownAllConnectionPools() andThen { case _ => system.terminate() }
   }
 
diff --git a/webapi/src/main/scala/org/knora/webapi/app/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/app/BUILD.bazel
deleted file mode 100644
index 0fec62f73e..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/app/BUILD.bazel
+++ /dev/null
@@ -1,70 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library", "scala_repl")
-
-scala_library(
-    name = "app",
-    srcs = glob(["*.scala"]),
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/core",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/feature",
-        "//webapi/src/main/scala/org/knora/webapi/http/directives",
-        "//webapi/src/main/scala/org/knora/webapi/http/version",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/responders",
-        "//webapi/src/main/scala/org/knora/webapi/routing",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/store",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/inmem",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings",
-        "//webapi/src/main/scala/org/knora/webapi/util/cache",
-        "@maven//:ch_megard_akka_http_cors_2_13",
-        "@maven//:com_github_swagger_akka_http_swagger_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-        "@maven//:com_typesafe_config",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:io_kamon_kamon_core_2_13",
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:org_slf4j_slf4j_api",
-        "@maven//:redis_clients_jedis",
-    ],
-)
-
-scala_binary(
-    name = "app_cli",
-    jvm_flags = [
-        "-Dconfig.resource=application.conf",
-        "-Dlogging.config=logback.xml",
-    ],
-    main_class = "org.knora.webapi.app.Main",
-    resources = [
-        "//knora-ontologies",
-        "//webapi/scripts:fuseki_repository_config_ttl_template",
-        "//webapi/src/main/resources",
-    ],
-    runtime_deps = [
-        ":app",
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_13",
-        "@maven//:org_bouncycastle_bcprov_jdk15on",
-        "@maven//:org_glassfish_jakarta_json",
-        "@maven//:org_scala_lang_modules_scala_java8_compat_2_13",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-)
-
-scala_repl(
-    name = "app_repl",
-    deps = [":app"],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/contributors/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/contributors/BUILD.bazel
deleted file mode 100644
index eeaa8651a3..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/contributors/BUILD.bazel
+++ /dev/null
@@ -1,45 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_binary", "scala_library")
-
-scala_library(
-    name = "contributors",
-    srcs = glob(["**/*.scala"]),
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    runtime_deps = [
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_13",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/util",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:org_rogach_scallop_2_13",
-        "@maven//:org_scala_lang_scala_library",
-        "@maven//:org_scala_lang_scala_reflect",
-    ],
-)
-
-scala_binary(
-    name = "GenerateContributorsFile",
-    main_class = "org.knora.webapi.util.GenerateContributorsFile",
-    runtime_deps = [
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_13",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-    deps = [
-        ":contributors",
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_13",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/core/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/core/BUILD.bazel
deleted file mode 100644
index 0df2b6a7a0..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/core/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "core",
-    srcs = [
-        "ActorMaker.scala",
-        "Core.scala",
-        "LiveActorMaker.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/exceptions/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/exceptions/BUILD.bazel
deleted file mode 100644
index 8ca88ce50e..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/exceptions/BUILD.bazel
+++ /dev/null
@@ -1,17 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "exceptions",
-    srcs = [
-        "Exceptions.scala",
-        "package.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:org_apache_commons_commons_lang3",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/feature/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/feature/BUILD.bazel
deleted file mode 100644
index e16f18bdd8..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/feature/BUILD.bazel
+++ /dev/null
@@ -1,20 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "feature",
-    srcs = [
-        "FeatureFactory.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/http/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/http/BUILD.bazel
deleted file mode 100644
index 043e22de22..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/http/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "http",
-    srcs = glob(["*.scala"]),
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi/http/directives",
-        "//webapi/src/main/scala/org/knora/webapi/http/handler",
-        "//webapi/src/main/scala/org/knora/webapi/http/status",
-        "//webapi/src/main/scala/org/knora/webapi/http/version",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/http/directives/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/http/directives/BUILD.bazel
deleted file mode 100644
index 26a1dba755..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/http/directives/BUILD.bazel
+++ /dev/null
@@ -1,18 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "directives",
-    srcs = ["DSPApiDirectives.scala"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/http/handler",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "@maven//:ch_megard_akka_http_cors_2_13",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/http/handler/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/http/handler/BUILD.bazel
deleted file mode 100644
index 724c3233d6..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/http/handler/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "handler",
-    srcs = glob(["*.scala"]),
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/http/status",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:org_scala_lang_modules_scala_xml_2_13",
-        "@maven//:org_slf4j_slf4j_api",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/http/status/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/http/status/BUILD.bazel
deleted file mode 100644
index f6c57e7881..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/http/status/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "status",
-    srcs = glob(["*.scala"]),
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/http/version/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/http/version/BUILD.bazel
deleted file mode 100644
index 68865b896a..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/http/version/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "version",
-    srcs = glob(["*.scala"]),
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi/http/version/versioninfo",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/http/version/ServerVersion.scala b/webapi/src/main/scala/org/knora/webapi/http/version/ServerVersion.scala
index 3ecab202d2..2e2b2951c8 100644
--- a/webapi/src/main/scala/org/knora/webapi/http/version/ServerVersion.scala
+++ b/webapi/src/main/scala/org/knora/webapi/http/version/ServerVersion.scala
@@ -8,7 +8,6 @@ package org.knora.webapi.http.version
 import akka.http.scaladsl.model.headers.Server
 import akka.http.scaladsl.server.Directives.respondWithHeader
 import akka.http.scaladsl.server.Route
-import org.knora.webapi.http.version.versioninfo.VersionInfo
 
 /**
  * This object provides methods that can be used to add the [[Server]] header
@@ -16,8 +15,9 @@ import org.knora.webapi.http.version.versioninfo.VersionInfo
  */
 object ServerVersion {
 
-  private val ApiNameAndVersion = s"${VersionInfo.name}/${VersionInfo.webapiVersion}"
-  private val AkkaNameAndVersion = s"akka-http/${VersionInfo.akkaHttpVersion}"
+  // FIXME: Revert as soon as we remove Bazel (not before)
+  private val ApiNameAndVersion = s"${BuildInfo.name}/${BuildInfo.version}"
+  private val AkkaNameAndVersion = s"akka-http/${BuildInfo.akkaHttp}"
   private val AllProducts = ApiNameAndVersion + " " + AkkaNameAndVersion
 
   def serverVersionHeader: Server = Server(products = AllProducts)
diff --git a/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/BUILD.bazel
deleted file mode 100644
index 7ed0fad432..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/BUILD.bazel
+++ /dev/null
@@ -1,50 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-# bring our version constants in
-load("//third_party:versions.bzl", "AKKA_HTTP_VERSION", "AKKA_VERSION", "FUSEKI_VERSION", "SCALA_VERSION", "SIPI_VERSION")
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-load("@ecosia_rules_stamp//:defs.bzl", "stamp")
-
-filegroup(
-    name = "srcs",
-    srcs = glob(["**"]),
-)
-
-# the stamp rule extracts the stamped values (from //tools/buildstamp)
-# into a separate file (see 'bazel-out/darwin-fastbuild/bin/tools/version_info/STAMP_BUILD_SCM_TAG'),
-# onto which other rules can then depend
-stamp(
-    name = "build_scm_tag_stamp",
-    stamp_keys = ["BUILD_SCM_TAG"],
-)
-
-# Generates a scala source file that includes version information
-# The generated intermediate file is missing the BUILD_TAG, which is
-# added by the 'version_info_with_build_tag' genrule
-load("//webapi/src/main/scala/org/knora/webapi/http/version/versioninfo:gen_version_info.bzl", "gen_version_info")
-
-gen_version_info(
-    name = "version_info_without_build_tag",
-    akka_http_version = AKKA_HTTP_VERSION,
-    akka_version = AKKA_VERSION,
-    fuseki_version = FUSEKI_VERSION,
-    scala_version = SCALA_VERSION,
-    sipi_version = SIPI_VERSION,
-)
-
-# Adds the missing build tag and emits the final scala object
-genrule(
-    name = "version_info_with_build_tag",
-    srcs = [
-        ":build_scm_tag_stamp",
-        ":version_info_without_build_tag",
-    ],
-    outs = ["version_info.scala"],
-    cmd = '$(location add_build_tag.sh) $(location build_scm_tag_stamp) $(location version_info_without_build_tag) > "$@"',
-    tools = [":add_build_tag.sh"],
-)
-
-scala_library(
-    name = "versioninfo",
-    srcs = [":version_info_with_build_tag"],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/VersionInfoTemplate.scala b/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/VersionInfoTemplate.scala
deleted file mode 100644
index 3dca871317..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/VersionInfoTemplate.scala
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright © 2021 - 2022 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.knora.webapi.http.version.versioninfo
-
-/** This object was generated by //tools/version_info. */
-case object VersionInfo {
-
-  val name: String = "webapi"
-
-  val webapiVersion: String = "{BUILD_TAG}"
-
-  val scalaVersion: String = "{SCALA_VERSION}"
-
-  val akkaHttpVersion: String = "{AKKA_HTTP_VERSION}"
-
-  val sipiVersion: String = "{SIPI_VERSION}"
-
-  val jenaFusekiVersion = "{FUSEKI_VERSION}"
-
-  override val toString: String = {
-    "name: %s, version: %s, scalaVersion: %s, akkaHttpVersion: %s, sipiVersion: %s, jenaFusekiVersion: %s".format(
-      name,
-      webapiVersion,
-      scalaVersion,
-      akkaHttpVersion,
-      sipiVersion,
-      jenaFusekiVersion
-    )
-  }
-}
diff --git a/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/add_build_tag.sh b/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/add_build_tag.sh
deleted file mode 100755
index 59803cc4e0..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/add_build_tag.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# get the tag from volatile-status.txt
-EXTRACTED_TAG=$(cat "$1")
-
-# exchange the placeholder 'BUILD_TAG' with the 'EXTRACTED_TAG' extracted in the previous step
-sed "s/{BUILD_TAG}/$EXTRACTED_TAG/" "$2"
diff --git a/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/gen_version_info.bzl b/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/gen_version_info.bzl
deleted file mode 100644
index 3511943a5a..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/http/version/versioninfo/gen_version_info.bzl
+++ /dev/null
@@ -1,36 +0,0 @@
-"""Generate a file using a template.
-It is much more memory-efficient to use a template file than creating the whole
-content during the analysis phase.
-"""
-
-# Label of the template file to use.
-_TEMPLATE = "//webapi/src/main/scala/org/knora/webapi/http/version/versioninfo:VersionInfoTemplate.scala"
-
-def _gen_version_info_impl(ctx):
-    ctx.actions.expand_template(
-        template = ctx.file._template,
-        output = ctx.outputs.source_file,
-        substitutions = {
-            "{SCALA_VERSION}": ctx.attr.scala_version,
-            "{AKKA_VERSION}": ctx.attr.akka_version,
-            "{AKKA_HTTP_VERSION}": ctx.attr.akka_http_version,
-            "{SIPI_VERSION}": ctx.attr.sipi_version,
-            "{FUSEKI_VERSION}": ctx.attr.fuseki_version,
-        },
-    )
-
-gen_version_info = rule(
-    implementation = _gen_version_info_impl,
-    attrs = {
-        "scala_version": attr.string(mandatory = True),
-        "akka_version": attr.string(mandatory = True),
-        "akka_http_version": attr.string(mandatory = True),
-        "sipi_version": attr.string(mandatory = True),
-        "fuseki_version": attr.string(mandatory = True),
-        "_template": attr.label(
-            default = Label(_TEMPLATE),
-            allow_single_file = True,
-        ),
-    },
-    outputs = {"source_file": "%{name}.scala"},
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/instrumentation/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/instrumentation/BUILD.bazel
deleted file mode 100644
index b6d8ece2c8..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/instrumentation/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "instrumentation",
-    srcs = [
-        "InstrumentationSupport.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_slf4j_slf4j_api",
-        "@maven//:org_scala_lang_scala_library",
-        "@maven//:org_scala_lang_scala_reflect",
-        "@maven//:io_kamon_kamon_core_2_13",
-        "@maven//:io_kamon_kamon_instrumentation_common_2_13",
-        # "@maven//:io_kamon_kamon_logback_2_13",
-        # "@maven//:io_kamon_kamon_prometheus_2_13",
-        "@maven//:io_kamon_kamon_scala_future_2_13",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/messages/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/messages/BUILD.bazel
deleted file mode 100644
index 0b1deee8cb..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/messages/BUILD.bazel
+++ /dev/null
@@ -1,53 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "messages",
-    srcs = glob(["**/*.scala"]) + ["//webapi/src/main/twirl:twirl_sources"],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/annotation",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/feature",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings",
-        "//webapi/src/main/scala/org/knora/webapi/util",
-        "//webapi/src/main/scala/org/knora/webapi/util/cache",
-        "@maven//:com_apicatalog_titanium_json_ld",
-        "@maven//:com_google_gwt_gwt_servlet",
-        "@maven//:com_ibm_icu_icu4j",
-        "@maven//:com_sksamuel_diff_diff",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:commons_io_commons_io",
-        "@maven//:commons_validator_commons_validator",
-        "@maven//:dev_zio_zio_2_13",
-        "@maven//:dev_zio_zio_prelude_2_13",
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:org_glassfish_jakarta_json",
-        "@maven//:net_sf_saxon_Saxon_HE",
-        "@maven//:org_apache_commons_commons_lang3",
-        "@maven//:org_apache_commons_commons_text",
-        "@maven//:org_apache_jena_apache_jena_libs",
-        "@maven//:org_eclipse_rdf4j_rdf4j_client",
-        "@maven//:org_eclipse_rdf4j_rdf4j_repository_sail",
-        "@maven//:org_eclipse_rdf4j_rdf4j_sail_api",
-        "@maven//:org_eclipse_rdf4j_rdf4j_sail_memory",
-        "@maven//:org_eclipse_rdf4j_rdf4j_shacl",
-        "@maven//:org_jodd_jodd",
-        "@maven//:org_scala_graph_graph_core_2_13",
-        "@maven//:org_scala_lang_modules_scala_xml_2_13",
-        "@maven//:org_scala_lang_scala_library",
-        "@maven//:org_scala_lang_scala_reflect",
-        "@maven//:org_slf4j_slf4j_api",
-        "@maven//:org_springframework_security_spring_security_core",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/responders/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/responders/BUILD.bazel
deleted file mode 100644
index 526f95aabf..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/responders/BUILD.bazel
+++ /dev/null
@@ -1,38 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "responders",
-    srcs = glob(["**/*.scala"]),
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/annotation",
-        "//webapi/src/main/scala/org/knora/webapi/core",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/feature",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/responders/v2/ontology",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings",
-        "//webapi/src/main/scala/org/knora/webapi/util",
-        "//webapi/src/main/scala/org/knora/webapi/util/cache",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:dev_zio_zio_2_13",
-        "@maven//:dev_zio_zio_prelude_2_13",
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:org_glassfish_jakarta_json",
-        "@maven//:org_scala_lang_modules_scala_xml_2_13",
-        "@maven//:org_slf4j_slf4j_api",
-        "@maven//:org_springframework_security_spring_security_core",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/BUILD.bazel
deleted file mode 100644
index 459bc2c432..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/responders/v2/ontology/BUILD.bazel
+++ /dev/null
@@ -1,27 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "ontology",
-    srcs = [
-        "Cache.scala",
-        "Cardinalities.scala",
-        "OntologyHelpers.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/feature",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/util/cache",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_slf4j_slf4j_api",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/routing/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/routing/BUILD.bazel
deleted file mode 100644
index 96f85d798c..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/routing/BUILD.bazel
+++ /dev/null
@@ -1,45 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "routing",
-    srcs = glob(["**/*.scala"]),
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/annotation",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/feature",
-        "//webapi/src/main/scala/org/knora/webapi/http/status",
-        "//webapi/src/main/scala/org/knora/webapi/http/version/versioninfo",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/util",
-        "//webapi/src/main/scala/org/knora/webapi/util/cache",
-        "@maven//:com_github_swagger_akka_http_swagger_akka_http_2_13",
-        "@maven//:com_pauldijou_jwt_core_2_13",
-        "@maven//:com_pauldijou_jwt_json_common_2_13",
-        "@maven//:com_pauldijou_jwt_spray_json_2_13",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
-        "@maven//:com_typesafe_akka_akka_parsing_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-        "@maven//:com_typesafe_config",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:commons_validator_commons_validator",
-        "@maven//:dev_zio_zio_2_13",
-        "@maven//:dev_zio_zio_prelude_2_13",
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:io_swagger_swagger_annotations",
-        "@maven//:io_swagger_swagger_jaxrs",
-        "@maven//:io_swagger_swagger_models",
-        "@maven//:javax_ws_rs_jsr311_api",
-        "@maven//:org_scala_lang_modules_scala_xml_2_13",
-        "@maven//:org_slf4j_slf4j_api",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/routing/RejectingRoute.scala b/webapi/src/main/scala/org/knora/webapi/routing/RejectingRoute.scala
index 4760355673..555baa167c 100644
--- a/webapi/src/main/scala/org/knora/webapi/routing/RejectingRoute.scala
+++ b/webapi/src/main/scala/org/knora/webapi/routing/RejectingRoute.scala
@@ -61,16 +61,14 @@ class RejectingRoute(routeData: KnoraRouteData) extends KnoraRoute(routeData) wi
 
         case Success(appState) =>
           appState match {
+            case AppStates.Running if rejectSeq.flatten.isEmpty =>
+              // route is allowed. by rejecting, I'm letting it through so that some other route can match
+              reject()
             case AppStates.Running if rejectSeq.flatten.nonEmpty =>
               // route not allowed. will complete request.
               val msg = s"Request to $wholePath not allowed as per configuration for routes to reject."
               log.info(msg)
               complete(StatusCodes.NotFound, "The requested path is deactivated.")
-
-            case AppStates.Running if rejectSeq.flatten.isEmpty =>
-              // route is allowed. by rejecting, I'm letting it through so that some other route can match
-              reject()
-
             case other =>
               // if any state other then 'Running', then return ServiceUnavailable
               val msg =
diff --git a/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala b/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala
index dc788ced01..fed3dce5b0 100644
--- a/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala
+++ b/webapi/src/main/scala/org/knora/webapi/routing/VersionRoute.scala
@@ -10,7 +10,7 @@ import akka.http.scaladsl.server.Directives.{get, path}
 import akka.http.scaladsl.server.Route
 import akka.util.Timeout
 import org.knora.webapi.feature.FeatureFactoryConfig
-import org.knora.webapi.http.version.versioninfo.VersionInfo
+import org.knora.webapi.http.version.BuildInfo
 import spray.json.{JsObject, JsString}
 
 import scala.concurrent.duration._
@@ -32,9 +32,6 @@ trait VersionCheck {
 
   override implicit val timeout: Timeout = 1.second
 
-  protected def versionCheck: HttpResponse =
-    createResponse(getVersion)
-
   protected def createResponse(result: VersionCheckResult): HttpResponse =
     HttpResponse(
       status = StatusCodes.OK,
@@ -51,20 +48,20 @@ trait VersionCheck {
       )
     )
 
-  private def getVersion: VersionCheckResult = {
-    var sipiVersion = VersionInfo.sipiVersion
+  protected def getVersion: VersionCheckResult = {
+    var sipiVersion = BuildInfo.sipi
     val sipiIndex = sipiVersion.indexOf(':')
     sipiVersion = if (sipiIndex > 0) sipiVersion.substring(sipiIndex + 1) else sipiVersion
 
-    var fusekiVersion = VersionInfo.jenaFusekiVersion
+    var fusekiVersion = BuildInfo.fuseki
     val fusekiIndex = fusekiVersion.indexOf(':')
     fusekiVersion = if (fusekiIndex > 0) fusekiVersion.substring(fusekiIndex + 1) else fusekiVersion
 
     VersionCheckResult(
       name = "version",
-      webapi = VersionInfo.webapiVersion,
-      scala = VersionInfo.scalaVersion,
-      akkaHttp = VersionInfo.akkaHttpVersion,
+      webapi = BuildInfo.version,
+      scala = BuildInfo.version,
+      akkaHttp = BuildInfo.akkaHttp,
       sipi = sipiVersion,
       fuseki = fusekiVersion
     )
@@ -82,7 +79,7 @@ class VersionRoute(routeData: KnoraRouteData) extends KnoraRoute(routeData) with
   override def makeRoute(featureFactoryConfig: FeatureFactoryConfig): Route =
     path("version") {
       get { requestContext =>
-        requestContext.complete(versionCheck)
+        requestContext.complete(createResponse(getVersion))
       }
     }
 }
diff --git a/webapi/src/main/scala/org/knora/webapi/settings/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/settings/BUILD.bazel
deleted file mode 100644
index 995c612376..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/settings/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "settings",
-    srcs = glob(["*.scala"]),
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/util/cache",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_config",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala
index af843f89ee..035cafe402 100644
--- a/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala
+++ b/webapi/src/main/scala/org/knora/webapi/settings/KnoraSettings.scala
@@ -273,18 +273,6 @@ class KnoraSettingsImpl(config: Config, log: LoggingAdapter) extends Extension {
     false
   }
 
-  val clientTestDataRedisHost: Option[String] = if (config.hasPath("app.client-test-data-service.redis.host")) {
-    Some(config.getString("app.client-test-data-service.redis.host"))
-  } else {
-    None
-  }
-
-  val clientTestDataRedisPort: Option[Int] = if (config.hasPath("app.client-test-data-service.redis.port")) {
-    Some(config.getInt("app.client-test-data-service.redis.port"))
-  } else {
-    None
-  }
-
   private def getFiniteDuration(path: String, underlying: Config): FiniteDuration =
     Duration(underlying.getString(path)) match {
       case x: FiniteDuration => x
diff --git a/webapi/src/main/scala/org/knora/webapi/store/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/store/BUILD.bazel
deleted file mode 100644
index 5b0300f4f4..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/store/BUILD.bazel
+++ /dev/null
@@ -1,46 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "store",
-    srcs = glob(["**/*.scala"]),
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/core",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/feature",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/routing",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
-        "//webapi/src/main/scala/org/knora/webapi/util",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_akka_akka_http_spray_json_2_13",
-        "@maven//:com_typesafe_akka_akka_stream_2_13",
-        "@maven//:com_typesafe_config",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:commons_cli_commons_cli",
-        "@maven//:commons_codec_commons_codec",
-        "@maven//:commons_io_commons_io",
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:org_apache_commons_commons_csv",
-        "@maven//:org_apache_commons_commons_lang3",
-        "@maven//:org_apache_httpcomponents_httpclient",
-        "@maven//:org_apache_httpcomponents_httpclient_cache",
-        "@maven//:org_apache_httpcomponents_httpcore",
-        "@maven//:org_apache_jena_apache_jena_libs",
-        "@maven//:org_apache_jena_jena_arq",
-        "@maven//:org_apache_jena_jena_base",
-        "@maven//:org_apache_jena_jena_core",
-        "@maven//:org_apache_jena_jena_tdb",
-        "@maven//:org_apache_jena_jena_text",
-        "@maven//:org_apache_lucene_lucene_core",
-        "@maven//:org_slf4j_slf4j_api",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/BUILD.bazel
deleted file mode 100644
index f3f0614225..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "cacheservice",
-    srcs = [
-        "CacheService.scala",
-        "CacheServiceExceptions.scala",
-        "CacheServiceManager.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/util",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/inmem/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/inmem/BUILD.bazel
deleted file mode 100644
index 3a5ec6922c..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/inmem/BUILD.bazel
+++ /dev/null
@@ -1,21 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "inmem",
-    srcs = [
-        "CacheServiceInMemImpl.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_slf4j_slf4j_api",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/redis/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/redis/BUILD.bazel
deleted file mode 100644
index 8afafbabb8..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/redis/BUILD.bazel
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "redis",
-    srcs = [
-        "CacheServiceRedisImpl.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_apache_commons_commons_pool2",
-        "@maven//:org_slf4j_slf4j_api",
-        "@maven//:redis_clients_jedis",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization/BUILD.bazel
deleted file mode 100644
index 97b71d2994..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization/BUILD.bazel
+++ /dev/null
@@ -1,19 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "serialization",
-    srcs = [
-        "CacheSerialization.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "@maven//:com_twitter_chill_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings/BUILD.bazel
deleted file mode 100644
index 23044ebd20..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "settings",
-    srcs = [
-        "CacheServiceSettings.scala",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "@maven//:com_typesafe_config",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala b/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala
index 02c2718877..21a5a4c147 100644
--- a/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala
+++ b/webapi/src/main/scala/org/knora/webapi/store/triplestore/http/HttpTriplestoreConnector.scala
@@ -550,10 +550,11 @@ class HttpTriplestoreConnector extends Actor with ActorLogging with Instrumentat
         val httpPost: HttpPost = new HttpPost(uriBuilder.build())
 
         // Add the input file to the body of the request.
-        val inputFile = Paths.get(elem.path)
-
+        // here we need to tweak the base directory path from "webapi"
+        // to the parent folder where the files can be found
+        val inputFile = Paths.get("..", elem.path)
         if (!Files.exists(inputFile)) {
-          throw BadRequestException(s"File ${inputFile.toAbsolutePath} does not exist")
+          throw BadRequestException(s"File ${inputFile} does not exist")
         }
 
         val fileEntity = new FileEntity(inputFile.toFile, ContentType.create(mimeTypeTextTurtle, "UTF-8"))
diff --git a/webapi/src/main/scala/org/knora/webapi/util/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/util/BUILD.bazel
deleted file mode 100644
index 637db2dffa..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/util/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "util",
-    srcs = glob(["**/*.scala"]),
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_akka_akka_http_core_2_13",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:commons_validator_commons_validator",
-        "@maven//:io_spray_spray_json_2_13",
-        "@maven//:org_scala_lang_scala_library",
-        "@maven//:org_scala_lang_scala_reflect",
-        "@maven//:org_slf4j_slf4j_api",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/util/cache/BUILD.bazel b/webapi/src/main/scala/org/knora/webapi/util/cache/BUILD.bazel
deleted file mode 100644
index bcaffe5e0f..0000000000
--- a/webapi/src/main/scala/org/knora/webapi/util/cache/BUILD.bazel
+++ /dev/null
@@ -1,16 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-scala_library(
-    name = "cache",
-    srcs = ["CacheUtil.scala"],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi/exceptions",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:net_sf_ehcache_ehcache",
-        "@maven//:org_slf4j_slf4j_api",
-    ],
-)
diff --git a/webapi/src/main/scala/org/knora/webapi/util/cache/CacheUtil.scala b/webapi/src/main/scala/org/knora/webapi/util/cache/CacheUtil.scala
index 5d5671ed11..cbb3dfd995 100644
--- a/webapi/src/main/scala/org/knora/webapi/util/cache/CacheUtil.scala
+++ b/webapi/src/main/scala/org/knora/webapi/util/cache/CacheUtil.scala
@@ -143,7 +143,7 @@ object CacheUtil {
    * @param cacheName the name of the cache.
    * @param key       the cache key as a [[String]]
    */
-  def remove(cacheName: String, key: String): () = {
+  def remove(cacheName: String, key: String): Unit = {
     val cacheManager = CacheManager.getInstance()
     val cacheOption = Option(cacheManager.getCache(cacheName))
 
@@ -176,6 +176,8 @@ class LoggingCacheEventListener(log: Logger) extends CacheEventListener {
   def notifyRemoveAll(cache: Ehcache): Unit =
     log.debug("notifyRemoveAll " + cache.getName)
 
+  override def clone(): Unit = log.debug("CloneNotSupportedException")
+
   def dispose(): Unit = {}
 
 }
diff --git a/webapi/src/main/twirl/BUILD.bazel b/webapi/src/main/twirl/BUILD.bazel
deleted file mode 100644
index a5679313be..0000000000
--- a/webapi/src/main/twirl/BUILD.bazel
+++ /dev/null
@@ -1,62 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_twirl//twirl:twirl.bzl", "twirl_templates")
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library")
-
-twirl_templates(
-    name = "twirl_sources",
-    srcs = glob(["**/*.scala.txt"]) + glob([
-        "**/*.scala.html",
-    ]) + glob([
-        "**/*.scala.xml",
-    ]),
-    additional_imports = [
-        "play.twirl.api.TwirlFeatureImports._",
-        "play.twirl.api.TwirlHelperImports._",
-        "play.twirl.api.Html",
-        "play.twirl.api.JavaScript",
-        "play.twirl.api.Txt",
-        "play.twirl.api.Xml",
-    ],
-    source_directory = ".",
-)
-
-genrule(
-    name = "twirl",
-    srcs = [
-        ":twirl_sources",
-    ],
-    outs = [
-        "twirl.srcjar",
-    ],
-    cmd = "jar -cf \"$@\" $(locations :twirl_sources)",
-    # tools = ["jar"],
-)
-
-twirl_templates(
-    name = "twirl_new_sources",
-    srcs = [
-        "org/knora/webapi/queries/sparql/v2/isPropertyUsed.scala.txt"
-    ],
-    additional_imports = [
-        "play.twirl.api.TwirlFeatureImports._",
-        "play.twirl.api.TwirlHelperImports._",
-        "play.twirl.api.Html",
-        "play.twirl.api.JavaScript",
-        "play.twirl.api.Txt",
-        "play.twirl.api.Xml",
-    ],
-    source_directory = ".",
-)
-
-scala_library(
-    name = "library",
-    srcs = [":twirl_new_sources"],
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-        "@maven//:org_scala_lang_modules_scala_xml_2_13",
-        "@maven//:org_slf4j_slf4j_api",
-    ],
-)
diff --git a/webapi/src/test/resources/BUILD.bazel b/webapi/src/test/resources/BUILD.bazel
deleted file mode 100644
index 7b42d50af7..0000000000
--- a/webapi/src/test/resources/BUILD.bazel
+++ /dev/null
@@ -1,13 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "resources",
-    srcs = [
-        "fuseki.conf",
-        "graphdb-free.conf",
-        "graphdb-se.conf",
-        "jenatdb.conf",
-        "logback-test.xml",
-        "test.conf",
-    ],
-)
diff --git a/webapi/src/test/resources/graphdb-free.conf b/webapi/src/test/resources/graphdb-free.conf
deleted file mode 100644
index 40dfe3fb3e..0000000000
--- a/webapi/src/test/resources/graphdb-free.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-include "test"
-
-app {
-    triplestore {
-        dbtype = "graphdb-free"
-
-        graphdb {
-            port = 7200
-            repository-name = "knora-test-unit"
-            username = "admin"
-            password = "root"
-        }
-
-        reload-on-start = false
-    }
-}
\ No newline at end of file
diff --git a/webapi/src/test/resources/graphdb-se.conf b/webapi/src/test/resources/graphdb-se.conf
deleted file mode 100644
index e568e8ac07..0000000000
--- a/webapi/src/test/resources/graphdb-se.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-include "test"
-
-app {
-    triplestore {
-        dbtype = "graphdb-se"
-
-        graphdb {
-            port = 7200
-            repository-name = "knora-test-unit"
-            username = "admin"
-            password = "root"
-        }
-
-        reload-on-start = false
-    }
-}
\ No newline at end of file
diff --git a/webapi/src/test/resources/jenatdb.conf b/webapi/src/test/resources/jenatdb.conf
deleted file mode 100644
index e539f3a80d..0000000000
--- a/webapi/src/test/resources/jenatdb.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-include "test"
-
-app {
-    triplestore {
-        dbtype = "embedded-jena-tdb"
-        //dbtype = "fuseki"
-
-        embedded-jena-tdb {
-            persisted = true // "true" -> disk, "false" -> in-memory
-            storage-path = "_TMP" // ignored if "in-memory"
-        }
-
-        reload-on-start = false
-    }
-}
\ No newline at end of file
diff --git a/webapi/src/test/resources/logback-test.xml b/webapi/src/test/resources/logback-test.xml
index e4afb62b7c..decde01e8b 100644
--- a/webapi/src/test/resources/logback-test.xml
+++ b/webapi/src/test/resources/logback-test.xml
@@ -102,6 +102,7 @@
 
     <!-- E2E -->
     <logger name="org.knora.webapi.e2e.InstanceCheckerSpec" level="INFO"/>
+    <logger name="org.knora.webapi.e2e.ClientTestDataCollector" level="INFO"/>
 
     <!-- http -->
     <logger name="org.knora.webapi.e2e.CORSSupportE2ESpec" level="DEBUG"/>
diff --git a/webapi/src/test/resources/test.conf b/webapi/src/test/resources/test.conf
index 101bd348c0..eb1bd0d49d 100644
--- a/webapi/src/test/resources/test.conf
+++ b/webapi/src/test/resources/test.conf
@@ -31,14 +31,6 @@ app {
     client-test-data-service {
         # If true, collect client test data from E2E tests.
         collect-client-test-data = false
-
         collect-client-test-data = ${?KNORA_WEBAPI_COLLECT_CLIENT_TEST_DATA}
-
-        redis {
-            host = "localhost"
-            host = ${?KNORA_WEBAPI_CLIENT_TEST_DATA_SERVICE_REDIS_HOST}
-            port = 6379
-            port = ${?KNORA_WEBAPI_CLIENT_TEST_DATA_SERVICE_REDIS_PORT}
-        }
     }
 }
diff --git a/webapi/src/test/scala/org/knora/webapi/AsyncCoreSpec.scala b/webapi/src/test/scala/org/knora/webapi/AsyncCoreSpec.scala
index 14765b3abc..1fb4932471 100644
--- a/webapi/src/test/scala/org/knora/webapi/AsyncCoreSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/AsyncCoreSpec.scala
@@ -104,7 +104,7 @@ abstract class AsyncCoreSpec(_system: ActorSystem)
     parent = new KnoraSettingsFeatureFactoryConfig(settings)
   )
 
-  final override def beforeAll(): () = {
+  final override def beforeAll(): Unit = {
     // set allow reload over http
     appActor ! SetAllowReloadOverHTTPState(true)
 
@@ -119,7 +119,7 @@ abstract class AsyncCoreSpec(_system: ActorSystem)
     // memusage()
   }
 
-  final override def afterAll(): () =
+  final override def afterAll(): Unit =
     appActor ! AppStop()
 
   protected def loadTestData(rdfDataObjects: Seq[RdfDataObject]): Unit = {
diff --git a/webapi/src/test/scala/org/knora/webapi/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/BUILD.bazel
deleted file mode 100644
index 6952d4e3a2..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/BUILD.bazel
+++ /dev/null
@@ -1,30 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "AsyncCoreSpec.scala",
-        "CoreSpec.scala",
-        "E2ESimSpec.scala",
-        "E2ESpec.scala",
-        "ITKnoraFakeSpec.scala",
-        "ITKnoraLiveSpec.scala",
-        "IntegrationSpec.scala",
-        "KnoraFakeCore.scala",
-        "ManagersWithMockedSipi.scala",
-        "R2RSpec.scala",
-        "TestContainerFuseki.scala",
-        "TestContainerRedis.scala",
-        "TestContainersAll.scala",
-        "TestProbeMaker.scala",
-        "UnitSpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/e2e:srcs",
-        "//webapi/src/test/scala/org/knora/webapi/responders:srcs",
-        "//webapi/src/test/scala/org/knora/webapi/sharedtestdata:srcs",
-        "//webapi/src/test/scala/org/knora/webapi/store:srcs",
-        "//webapi/src/test/scala/org/knora/webapi/util:srcs",
-        "//webapi/src/test/scala/org/knora/webapi/models:srcs",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/CoreSpec.scala b/webapi/src/test/scala/org/knora/webapi/CoreSpec.scala
index 36516ccf46..1652dfbdd6 100644
--- a/webapi/src/test/scala/org/knora/webapi/CoreSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/CoreSpec.scala
@@ -126,7 +126,7 @@ abstract class CoreSpec(_system: ActorSystem)
     parent = new KnoraSettingsFeatureFactoryConfig(settings)
   )
 
-  final override def beforeAll(): () = {
+  final override def beforeAll(): Unit = {
     // set allow reload over http
     appActor ! SetAllowReloadOverHTTPState(true)
 
@@ -141,8 +141,8 @@ abstract class CoreSpec(_system: ActorSystem)
     // memusage()
   }
 
-  final override def afterAll(): () =
-    appActor ! AppStop()
+  final override def afterAll(): Unit =
+    TestKit.shutdownActorSystem(system)
 
   protected def loadTestData(rdfDataObjects: Seq[RdfDataObject]): Unit = {
     logger.info("Loading test data started ...")
diff --git a/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala
index 42ddf802e9..91e7dd38b6 100644
--- a/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala
@@ -21,6 +21,7 @@ import akka.http.scaladsl.Http
 import akka.http.scaladsl.client.RequestBuilding
 import akka.http.scaladsl.model._
 import akka.stream.Materializer
+import akka.testkit.{ImplicitSender, TestKit}
 import com.typesafe.config.{Config, ConfigFactory}
 import com.typesafe.scalalogging.LazyLogging
 import org.scalatest.concurrent.ScalaFutures
@@ -34,6 +35,7 @@ import scala.concurrent.duration._
 import scala.concurrent.{Await, ExecutionContext, Future}
 import scala.languageFeature.postfixOps
 import scala.util.{Failure, Success, Try}
+import org.knora.webapi.exceptions.FileWriteException
 
 object E2ESpec {
   val defaultConfig: Config = ConfigFactory.load()
@@ -44,7 +46,8 @@ object E2ESpec {
  * and provides access to settings and logging.
  */
 class E2ESpec(_system: ActorSystem)
-    extends Core
+    extends TestKit(_system)
+    with Core
     with StartupUtils
     with TriplestoreJsonProtocol
     with Suite
@@ -67,8 +70,6 @@ class E2ESpec(_system: ActorSystem)
   def this() = this(ActorSystem("E2ETest", TestContainersAll.PortConfig.withFallback(E2ESpec.defaultConfig)))
 
   /* needed by the core trait */
-
-  implicit lazy val system: ActorSystem = _system
   implicit lazy val settings: KnoraSettingsImpl = KnoraSettings(system)
   implicit val materializer: Materializer = Materializer.matFromSystem(system)
   implicit val executionContext: ExecutionContext = system.dispatchers.lookup(KnoraDispatchers.KnoraActorDispatcher)
@@ -94,6 +95,9 @@ class E2ESpec(_system: ActorSystem)
 
   override def beforeAll(): Unit = {
 
+    // create temp data dir if not present
+    createTmpFileDir()
+
     // set allow reload over http
     appActor ! SetAllowReloadOverHTTPState(true)
 
@@ -110,7 +114,7 @@ class E2ESpec(_system: ActorSystem)
 
   override def afterAll(): Unit =
     /* Stop the server when everything else has finished */
-    appActor ! AppStop()
+    TestKit.shutdownActorSystem(system)
 
   protected def loadTestData(rdfDataObjects: Seq[RdfDataObject]): Unit = {
     logger.info("Loading test data started ...")
@@ -194,4 +198,18 @@ class E2ESpec(_system: ActorSystem)
     } else {
       FileUtil.readTextFile(file).replaceAll("IIIF_BASE_URL", settings.externalSipiIIIFGetUrl)
     }
+  
+  private def createTmpFileDir(): Unit = {
+      // check if tmp datadir exists and create it if not
+      val tmpFileDir = Path.of(settings.tmpDataDir)
+
+      if (!Files.exists(tmpFileDir)) {
+        try {
+          Files.createDirectories(tmpFileDir)
+        } catch {
+          case e: Throwable =>
+            throw FileWriteException(s"Tmp data directory ${settings.tmpDataDir} could not be created: ${e.getMessage}")
+        }
+      }
+    }
 }
diff --git a/webapi/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala b/webapi/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala
index c4e7b92fd1..601cf1a8a3 100644
--- a/webapi/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala
@@ -14,6 +14,7 @@ import akka.http.scaladsl.client.RequestBuilding
 import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport
 import akka.http.scaladsl.model._
 import akka.stream.Materializer
+import akka.testkit.{ImplicitSender, TestKit}
 import com.typesafe.config.{Config, ConfigFactory}
 import com.typesafe.scalalogging.LazyLogging
 import org.knora.webapi.app.{ApplicationActor, LiveManagers}
@@ -43,7 +44,8 @@ object ITKnoraLiveSpec {
  * provides access to settings and logging.
  */
 class ITKnoraLiveSpec(_system: ActorSystem)
-    extends Core
+    extends TestKit(_system)
+    with Core
     with StartupUtils
     with Suite
     with AnyWordSpecLike
@@ -71,7 +73,6 @@ class ITKnoraLiveSpec(_system: ActorSystem)
     this(ActorSystem("IntegrationTests", TestContainersAll.PortConfig.withFallback(ITKnoraLiveSpec.defaultConfig)))
 
   /* needed by the core trait (represents the KnoraTestCore trait)*/
-  implicit lazy val system: ActorSystem = _system
   implicit lazy val settings: KnoraSettingsImpl = KnoraSettings(system)
   implicit val materializer: Materializer = Materializer.matFromSystem(system)
   implicit val executionContext: ExecutionContext = system.dispatchers.lookup(KnoraDispatchers.KnoraActorDispatcher)
@@ -112,7 +113,7 @@ class ITKnoraLiveSpec(_system: ActorSystem)
 
   override def afterAll(): Unit =
     /* Stop the server when everything else has finished */
-    appActor ! AppStop()
+    TestKit.shutdownActorSystem(system)
 
   protected def checkIfSipiIsRunning(): Unit = {
     // This requires that (1) fileserver.docroot is set in Sipi's config file and (2) it contains a file test.html.
@@ -169,7 +170,7 @@ class ITKnoraLiveSpec(_system: ActorSystem)
    * @param path     the path of the file.
    * @param mimeType the MIME type of the file.
    */
-  protected case class FileToUpload(path: String, mimeType: ContentType)
+  protected case class FileToUpload(path: Path, mimeType: ContentType)
 
   /**
    * Represents an image file to be uploaded to Sipi.
@@ -222,13 +223,12 @@ class ITKnoraLiveSpec(_system: ActorSystem)
     // Make a multipart/form-data request containing the files.
 
     val formDataParts: Seq[Multipart.FormData.BodyPart] = filesToUpload.map { fileToUpload =>
-      val fileToSend: Path = Paths.get(fileToUpload.path)
-      assert(Files.exists(fileToSend), s"File ${fileToUpload.path} does not exist")
+      assert(Files.exists(fileToUpload.path), s"File ${fileToUpload} does not exist")
 
       Multipart.FormData.BodyPart(
         "file",
-        HttpEntity.fromPath(fileToUpload.mimeType, fileToSend),
-        Map("filename" -> fileToSend.getFileName.toString)
+        HttpEntity.fromPath(fileToUpload.mimeType, fileToUpload.path),
+        Map("filename" -> fileToUpload.path.getFileName.toString)
       )
     }
 
diff --git a/webapi/src/test/scala/org/knora/webapi/IntegrationSpec.scala b/webapi/src/test/scala/org/knora/webapi/IntegrationSpec.scala
index 7fd7223cfd..e8d7da8284 100644
--- a/webapi/src/test/scala/org/knora/webapi/IntegrationSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/IntegrationSpec.scala
@@ -47,6 +47,10 @@ object IntegrationSpec {
   }
 }
 
+/**
+  * Defines a base class used in tests where only a running Fuseki Container is needed.
+  * Does not start the DSP-API server.
+  */
 abstract class IntegrationSpec(_config: Config)
     extends AsyncWordSpecLike
     with Matchers
@@ -58,7 +62,7 @@ abstract class IntegrationSpec(_config: Config)
 
   implicit val system: ActorSystem =
     ActorSystem(
-      CoreSpec.getCallerName(classOf[IntegrationSpec]),
+      IntegrationSpec.getCallerName(classOf[IntegrationSpec]),
       TestContainerFuseki.PortConfig.withFallback(IntegrationSpec.defaultConfig)
     )
 
diff --git a/webapi/src/test/scala/org/knora/webapi/R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/R2RSpec.scala
index 54dbde0387..dff30ad708 100644
--- a/webapi/src/test/scala/org/knora/webapi/R2RSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/R2RSpec.scala
@@ -97,7 +97,7 @@ class R2RSpec
 
   val log: LoggingAdapter = akka.event.Logging(system, this.getClass)
 
-  override def beforeAll(): () = {
+  override def beforeAll(): Unit = {
     // set allow reload over http
     appActor ! SetAllowReloadOverHTTPState(true)
 
@@ -110,7 +110,7 @@ class R2RSpec
     loadTestData(rdfDataObjects)
   }
 
-  override def afterAll(): () =
+  override def afterAll(): Unit =
     /* Stop the server when everything else has finished */
     appActor ! AppStop()
 
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/BUILD.bazel
deleted file mode 100644
index c2ce85d7b4..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/e2e/BUILD.bazel
+++ /dev/null
@@ -1,122 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "ClientTestDataCollector.scala",
-        "InstanceChecker.scala",
-        "//webapi/src/test/scala/org/knora/webapi/e2e/v2:srcs",
-    ],
-)
-
-scala_test(
-    name = "CORSSupportE2ESpec",
-    size = "small",
-    srcs = [
-        "CORSSupportE2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ExceptionHandlerR2RSpec",
-    size = "small",  # 60s
-    srcs = [
-        "ExceptionHandlerR2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "HealthRouteE2ESpec",
-    size = "small",  # 60s
-    srcs = [
-        "HealthRouteE2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "InstanceCheckerSpec",
-    size = "small",
-    srcs = [
-        "InstanceChecker.scala",
-        "InstanceCheckerSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "RejectingRouteE2ESpec",
-    size = "small",
-    srcs = [
-        "RejectingRouteE2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "FeatureToggleR2RSpec",
-    size = "small",  # 60s
-    srcs = [
-        "FeatureToggleR2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/ClientTestDataCollector.scala b/webapi/src/test/scala/org/knora/webapi/e2e/ClientTestDataCollector.scala
index 717a6846df..ee0e30e7ee 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/ClientTestDataCollector.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/ClientTestDataCollector.scala
@@ -7,30 +7,28 @@ package org.knora.webapi.e2e
 
 import org.knora.webapi.exceptions.TestConfigurationException
 import org.knora.webapi.settings.KnoraSettingsImpl
-import redis.clients.jedis.{Jedis, JedisPool, JedisPoolConfig}
+import java.io.File
+import java.io.BufferedWriter
+import java.io.FileWriter
+import java.nio.file.Paths
+import java.nio.file.Path
+import com.typesafe.scalalogging.LazyLogging
+import java.nio.charset.StandardCharsets
+import java.nio.file.Files
 
 /**
  * Collects E2E test requests and responses for use as client test data.
  *
  * @param settings the application settings.
  */
-class ClientTestDataCollector(settings: KnoraSettingsImpl) {
-  private val redisHashName: String = "client-test-data"
+class ClientTestDataCollector(settings: KnoraSettingsImpl) extends LazyLogging {
 
-  // Are we configured to collect client test data?
-  private val maybeJedisPool: Option[JedisPool] = if (settings.collectClientTestData) {
-    // Yes. Make a connection pool for connecting to Redis.
+  // write the client test data into this folder
+  private val tempClientTestDataFolder: Path = Path.of("/tmp/client_test_data", "test-data")
 
-    val redisHost: String = settings.clientTestDataRedisHost.getOrElse(
-      throw TestConfigurationException(s"No Redis host configured for client test data")
-    )
-    val redisPort: Int = settings.clientTestDataRedisPort.getOrElse(
-      throw TestConfigurationException(s"No Redis port configured for client test data")
-    )
-    Some(new JedisPool(new JedisPoolConfig(), redisHost, redisPort, 30999))
-  } else {
-    None
-  }
+  // Are we configured to collect client test data?
+  private val collectClientTestData = settings.collectClientTestData
+  logger.debug(s"collectClientTestData: $collectClientTestData")
 
   /**
    * Stores a client test data file.
@@ -38,23 +36,22 @@ class ClientTestDataCollector(settings: KnoraSettingsImpl) {
    * @param fileContent the content of the file to be stored.
    */
   def addFile(fileContent: TestDataFileContent): Unit =
-    // Are we configured to collect client test data?
-    maybeJedisPool match {
-      case Some(jedisPool) =>
-        // Yes. Store the file.
-
-        val jedis: Jedis = jedisPool.getResource
-
-        try {
-          jedis.hset(redisHashName, fileContent.filePath.toString, fileContent.text)
-        } finally {
-          jedis.close()
-        }
-
-      case None =>
-        // No. Do nothing.
-        ()
+    if (collectClientTestData) {
+      // If configured to write client test data, then write to folder
+      writeFile(fileContent.filePath.toString, fileContent.text)
     }
+
+  /**
+   * write a `String` to the `filename`.
+   */
+  private def writeFile(filename: String, s: String): Unit = {
+    logger.debug(s"writeFile: filename: $filename")
+    val fullPath = tempClientTestDataFolder.resolve(filename)
+    logger.debug(s"writeFile: fullPath: $fullPath")
+    Files.createDirectories(fullPath.getParent())
+    Files.createFile(fullPath)
+    Files.write(fullPath, s.getBytes(StandardCharsets.UTF_8))
+  }
 }
 
 /**
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala
index 11af5b2ffe..745499d0f6 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala
@@ -32,7 +32,7 @@ class InstanceCheckerSpec extends E2ESpec(InstanceCheckerSpec.config) {
 
   "The InstanceChecker" should {
     "accept a JSON-LD instance of anything:Thing" in {
-      val testDing = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/Testding.jsonld"))
+      val testDing = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/Testding.jsonld"))
 
       jsonLDInstanceChecker.check(
         instanceResponse = testDing,
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala
index afbc7346cd..19a424f5d2 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala
@@ -15,7 +15,7 @@ object RejectingRouteE2ESpec {
   val config = ConfigFactory.parseString("""
           akka.loglevel = "DEBUG"
           akka.stdout-loglevel = "DEBUG"
-          app.routes-to-reject = ["v1/test", "v2/test", "v1/groups", "v1/users"]
+          app.routes-to-reject = ["v1/testRouteToReject", "v2/testRouteToReject"]
         """.stripMargin)
 }
 
@@ -24,40 +24,31 @@ object RejectingRouteE2ESpec {
  */
 class RejectingRouteE2ESpec extends E2ESpec(RejectingRouteE2ESpec.config) {
 
-  implicit def default(implicit system: ActorSystem) = RouteTestTimeout(settings.defaultTimeout)
-
   "The Rejecting Route" should {
 
     "reject the 'v1/test' path" in {
-      val request = Get(baseApiUrl + s"/v1/test")
+      val request = Get(baseApiUrl + s"/v1/testRouteToReject")
       val response: HttpResponse = singleAwaitingRequest(request)
 
       response.status should be(StatusCodes.NotFound)
     }
 
     "reject the 'v2/test' path" in {
-      val request = Get(baseApiUrl + s"/v2/test")
-      val response: HttpResponse = singleAwaitingRequest(request)
-
-      response.status should be(StatusCodes.NotFound)
-    }
-
-    "reject the 'v1/groups' path" in {
-      val request = Get(baseApiUrl + s"/v1/groups")
+      val request = Get(baseApiUrl + s"/v2/testRouteToReject")
       val response: HttpResponse = singleAwaitingRequest(request)
 
       response.status should be(StatusCodes.NotFound)
     }
 
-    "reject the 'v1/users' path" in {
-      val request = Get(baseApiUrl + s"/v1/users")
+    "not reject the 'admin/groups' path" in {
+      val request = Get(baseApiUrl + s"/admin/groups")
       val response: HttpResponse = singleAwaitingRequest(request)
 
-      response.status should be(StatusCodes.NotFound)
+      response.status should be(StatusCodes.OK)
     }
 
-    "not reject the 'v1/projects' path, as it is not listed" in {
-      val request = Get(baseApiUrl + s"/v1/projects")
+    "not reject the 'admin/projects' path, as it is not listed" in {
+      val request = Get(baseApiUrl + s"/admin/projects")
       val response: HttpResponse = singleAwaitingRequest(request)
 
       response.status should be(StatusCodes.OK)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/admin/BUILD.bazel
deleted file mode 100644
index ce65f52cd8..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/e2e/admin/BUILD.bazel
+++ /dev/null
@@ -1,117 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "GroupsADME2ESpec",
-    size = "small",  # 60s
-    srcs = [
-        "GroupsADME2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "PermissionsADME2ESpec",
-    size = "small",
-    srcs = [
-        "PermissionsADME2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ProjectsADME2ESpec",
-    size = "small",
-    srcs = [
-        "ProjectsADME2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_eclipse_rdf4j_rdf4j_client",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "SipiADME2ESpec",
-    size = "small",
-    srcs = [
-        "SipiADME2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "StoreADME2ESpec",
-    size = "small",
-    srcs = [
-        "StoreADME2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "UsersADME2ESpec",
-    size = "medium",
-    srcs = [
-        "UsersADME2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/BUILD.bazel
deleted file mode 100644
index 23c8278cdc..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/BUILD.bazel
+++ /dev/null
@@ -1,61 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "OldListsRouteADMFeatureE2ESpec",
-    size = "small",
-    srcs = [
-        "OldListsRouteADMFeatureE2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "DeleteListItemsRouteADME2ESpec",
-    size = "small",
-    srcs = [
-        "DeleteListItemsRouteADME2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "UpdateListItemsRouteADME2ESpec",
-    size = "small",
-    srcs = [
-        "UpdateListItemsRouteADME2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/OldListsRouteADMFeatureE2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/OldListsRouteADMFeatureE2ESpec.scala
index 2be095cd46..bfad70b522 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/OldListsRouteADMFeatureE2ESpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/OldListsRouteADMFeatureE2ESpec.scala
@@ -1038,7 +1038,7 @@ class OldListsRouteADMFeatureE2ESpec
           TestDataFileContent(
             filePath = TestDataFilePath(
               directoryPath = clientTestDataPath,
-              filename = "add-second-child-to-root-request",
+              filename = "add-child-to-second-child-request",
               fileExtension = "json"
             ),
             text = addChildToSecondChild
@@ -1085,7 +1085,7 @@ class OldListsRouteADMFeatureE2ESpec
           TestDataFileContent(
             filePath = TestDataFilePath(
               directoryPath = clientTestDataPath,
-              filename = "add-second-child-to-root-response",
+              filename = "add-child-to-second-child-response",
               fileExtension = "json"
             ),
             text = responseToString(response)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/http/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/http/BUILD.bazel
deleted file mode 100644
index 740dc92545..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/e2e/http/BUILD.bazel
+++ /dev/null
@@ -1,29 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "ServerVersionE2ESpec",
-    size = "small",  # 60s
-    srcs = [
-        "ServerVersionE2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    runtime_deps = [
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_13",
-        "@maven//:org_bouncycastle_bcprov_jdk15on",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala
index 263e26c340..670652d58c 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala
@@ -23,11 +23,9 @@ object ServerVersionE2ESpec {
  * End-to-End (E2E) test specification for testing the server response.
  */
 class ServerVersionE2ESpec extends E2ESpec(ServerVersionE2ESpec.config) {
-
   implicit def default(implicit system: ActorSystem): RouteTestTimeout = RouteTestTimeout(settings.defaultTimeout)
 
   "The Server" should {
-
     "return the custom 'Server' header with every response" in {
       val request = Get(baseApiUrl + s"/admin/projects")
       val response: HttpResponse = singleAwaitingRequest(request)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/v1/BUILD.bazel
deleted file mode 100644
index 20b4bbf883..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v1/BUILD.bazel
+++ /dev/null
@@ -1,220 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "AuthenticationV1E2ESpec",
-    size = "small",  # 60s
-    srcs = [
-        "AuthenticationV1E2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ErrorV1E2ESpec",
-    size = "small",  # 60s
-    srcs = [
-        "ErrorV1E2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ListsV1E2ESpec",
-    size = "small",  # 60s
-    srcs = [
-        "ListsV1E2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "PermissionsHandlingV1E2ESpec",
-    size = "medium",
-    srcs = [
-        "PermissionsHandlingV1E2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ProjectsV1E2ESpec",
-    size = "small",
-    srcs = [
-        "ProjectsV1E2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ResourcesV1R2RSpec",
-    size = "medium",  # 900s
-    srcs = [
-        "ResourcesV1R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_scala_lang_modules_scala_xml_2_13",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "SearchV1R2RSpec",
-    size = "medium",  # 900s
-    srcs = [
-        "SearchV1R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "SipiV1R2RSpec",
-    size = "medium",  # 900s
-    srcs = [
-        "SipiV1R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "StandoffV1R2RSpec",
-    size = "medium",
-    srcs = [
-        "StandoffV1R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "UsersV1E2ESpec",
-    size = "small",  # 60s
-    srcs = [
-        "UsersV1E2ESpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages:SessionMessagesV1",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ValuesV1R2RSpec",
-    size = "small",  # 60s
-    srcs = [
-        "ValuesV1R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala
index 5c774817a6..cbc75e7f09 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala
@@ -639,7 +639,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "create a mapping resource for standoff conversion for letters" in {
 
-      val mappingFileToSend = Paths.get(RequestParams.pathToLetterMapping)
+      val mappingFileToSend = Paths.get("..", RequestParams.pathToLetterMapping)
 
       val formDataMapping = Multipart.FormData(
         Multipart.FormData.BodyPart(
@@ -674,7 +674,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "create a TextValue from an XML representing a letter" in {
 
-      val xmlFileToSend = FileUtil.readTextFile(Paths.get(RequestParams.pathToLetterXML))
+      val xmlFileToSend = FileUtil.readTextFile(Paths.get("..", RequestParams.pathToLetterXML))
 
       val newValueParams =
         s"""
@@ -707,7 +707,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "read the XML TextValue back to XML and compare it to the XML that was originally sent" in {
 
-      val xmlFile = Paths.get(RequestParams.pathToLetterXML)
+      val xmlFile = Paths.get("..", RequestParams.pathToLetterXML)
       val xmlStr = FileUtil.readTextFile(xmlFile)
 
       Get("/v1/values/" + URLEncoder.encode(firstTextValueIri.get, "UTF-8")) ~> addCredentials(
@@ -736,7 +736,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "change a text value from XML representing a letter" in {
 
-      val xmlFileToSend = Paths.get(RequestParams.pathToLetter2XML)
+      val xmlFileToSend = Paths.get("..", RequestParams.pathToLetter2XML)
       val xmlStrToSend = FileUtil.readTextFile(xmlFileToSend)
 
       val newValueParams =
@@ -769,7 +769,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "read the changed TextValue back to XML and compare it to the XML that was originally sent" in {
 
-      val xmlFile = Paths.get(RequestParams.pathToLetter2XML)
+      val xmlFile = Paths.get("..", RequestParams.pathToLetter2XML)
       val xmlStr = FileUtil.readTextFile(xmlFile)
 
       Get("/v1/values/" + URLEncoder.encode(firstTextValueIri.get, "UTF-8")) ~> addCredentials(
@@ -798,7 +798,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "create a TextValue from complex XML representing a letter" in {
 
-      val xmlFileToSend = Paths.get(RequestParams.pathToLetter3XML)
+      val xmlFileToSend = Paths.get("..", RequestParams.pathToLetter3XML)
       val xmlStrToSend = FileUtil.readTextFile(xmlFileToSend)
 
       val newValueParams =
@@ -832,7 +832,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "read the complex TextValue back to XML and compare it to the XML that was originally sent" in {
 
-      val xmlFile = Paths.get(RequestParams.pathToLetter3XML)
+      val xmlFile = Paths.get("..", RequestParams.pathToLetter3XML)
       val xmlStr = FileUtil.readTextFile(xmlFile)
 
       Get("/v1/values/" + URLEncoder.encode(secondTextValueIri.get, "UTF-8")) ~> addCredentials(
@@ -861,7 +861,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "create a mapping resource for standoff conversion for HTML" in {
 
-      val mappingFileToSend = Paths.get(RequestParams.pathToHTMLMapping)
+      val mappingFileToSend = Paths.get("..", RequestParams.pathToHTMLMapping)
 
       val formDataMapping = Multipart.FormData(
         Multipart.FormData.BodyPart(
@@ -896,7 +896,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "create a TextValue from StandardXML representing HTML (in strict XML notation)" in {
 
-      val xmlFileToSend = Paths.get(RequestParams.pathToStandardHTML)
+      val xmlFileToSend = Paths.get("..", RequestParams.pathToStandardHTML)
       val xmlStrToSend = FileUtil.readTextFile(xmlFileToSend)
 
       val newValueParams =
@@ -930,7 +930,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "read the TextValue back to XML and compare it to the (Standard) HTML that was originally sent" in {
 
-      val htmlFile = Paths.get(RequestParams.pathToStandardHTML)
+      val htmlFile = Paths.get("..", RequestParams.pathToStandardHTML)
       val htmlStr = FileUtil.readTextFile(htmlFile)
 
       Get("/v1/values/" + URLEncoder.encode(thirdTextValueIri.get, "UTF-8")) ~> addCredentials(
@@ -959,7 +959,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "create a TextValue from StandardXML representing HTML with internal anchor link" in {
 
-      val xmlFileToSend = Paths.get(RequestParams.pathToStandardHTMLInternalLink)
+      val xmlFileToSend = Paths.get("..", RequestParams.pathToStandardHTMLInternalLink)
       val xmlStrToSend = FileUtil.readTextFile(xmlFileToSend)
 
       val newValueParams =
@@ -993,7 +993,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "read the TextValue back to XML and compare it to the (Standard) HTML with internal anchor link that was originally sent" in {
 
-      val htmlFile = Paths.get(RequestParams.pathToStandardHTMLInternalLink)
+      val htmlFile = Paths.get("..", RequestParams.pathToStandardHTMLInternalLink)
       val htmlStr = FileUtil.readTextFile(htmlFile)
 
       Get("/v1/values/" + URLEncoder.encode(fourthTextValueIri.get, "UTF-8")) ~> addCredentials(
@@ -1022,7 +1022,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "create a TextValue from XML representing HTML (in strict XML notation)" in {
 
-      val xmlFileToSend = Paths.get(RequestParams.pathToHTML)
+      val xmlFileToSend = Paths.get("..", RequestParams.pathToHTML)
       val xmlStrToSend = FileUtil.readTextFile(xmlFileToSend)
 
       val newValueParams =
@@ -1056,7 +1056,7 @@ class StandoffV1R2RSpec extends R2RSpec {
 
     "read the TextValue back to XML and compare it to the HTML that was originally sent" in {
 
-      val htmlFile = Paths.get(RequestParams.pathToHTML)
+      val htmlFile = Paths.get("..", RequestParams.pathToHTML)
       val htmlStr = FileUtil.readTextFile(htmlFile)
 
       Get("/v1/values/" + URLEncoder.encode(thirdTextValueIri.get, "UTF-8")) ~> addCredentials(
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/e2e/v2/BUILD.bazel
deleted file mode 100644
index decd35b489..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/BUILD.bazel
+++ /dev/null
@@ -1,210 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "MarkupHeader.scala",
-        "ProjectHeader.scala",
-        "ResponseCheckerV2.scala",
-        "SchemaHeader.scala",
-    ],
-)
-
-scala_test(
-    name = "AuthenticationV2E2ESpec",
-    size = "small",  # 60s
-    srcs = [
-        "AuthenticationV2E2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "JSONLDHandlingV2R2RSpec",
-    size = "medium",
-    srcs = [
-        "JSONLDHandlingV2R2RSpec.scala",
-        "ResponseCheckerV2.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON_LD,
-)
-
-scala_test(
-    name = "ListsRouteV2R2RSpec",
-    size = "medium",
-    srcs = [
-        "ListsRouteV2R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_eclipse_rdf4j_rdf4j_client",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "OntologyV2R2RSpec",
-    size = "medium",  # 300s
-    srcs = [
-        "OntologyV2R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_eclipse_rdf4j_rdf4j_client",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-##
-## //webapi/src/test/scala/org/knora/webapi/e2e/v2:ResourcesRouteV2E2ESpec
-scala_test(
-    name = "ResourcesRouteV2E2ESpec",
-    size = "medium",
-    srcs = [
-        "ResourcesRouteV2E2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_eclipse_rdf4j_rdf4j_client",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ResponseCheckerV2R2RSpec",
-    size = "small",  # 60s
-    srcs = [
-        "ResponseCheckerV2.scala",
-        "ResponseCheckerV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "SearchRouteV2R2RSpec",
-    size = "medium",  # 300s
-    srcs = [
-        "ResponseCheckerV2.scala",
-        "SchemaHeader.scala",
-        "SearchRouteV2R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "StandoffRouteV2R2RSpec",
-    size = "medium",  # 300s
-    srcs = [
-        "ResponseCheckerV2.scala",
-        "StandoffRouteV2R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "ValuesRouteV2E2ESpec",
-    size = "medium",
-    srcs = [
-        "ValuesRouteV2E2ESpec.scala",
-    ],
-    data = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-        "@maven//:org_scala_lang_modules_scala_xml_2_13",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ValuesV2R2RSpec",
-    size = "small",  # 60s
-    srcs = [
-        "ValuesV2R2RSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala
index 5ce30e3a45..9d29a190d0 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala
@@ -24,7 +24,6 @@ import scala.concurrent.ExecutionContextExecutor
  * End-to-end specification for the handling of JSONLD documents.
  */
 class JSONLDHandlingV2R2RSpec extends R2RSpec {
-
   override def testConfigSource: String =
     """
       |# akka.loglevel = "DEBUG"
@@ -44,12 +43,14 @@ class JSONLDHandlingV2R2RSpec extends R2RSpec {
   )
 
   "The JSON-LD processor" should {
-
     "expand prefixes (on the client side)" in {
-
       // JSON-LD with prefixes and context object
       val jsonldWithPrefixes =
-        readOrWriteTextFile("", Paths.get("test_data/resourcesR2RV2/NarrenschiffFirstPage.jsonld"), writeFile = false)
+        readOrWriteTextFile(
+          "",
+          Paths.get("..", "test_data/resourcesR2RV2/NarrenschiffFirstPage.jsonld"),
+          writeFile = false
+        )
 
       // expand JSON-LD with JSON-LD processor
       val jsonldParsedExpanded = JsonLDUtil.parseJsonLD(jsonldWithPrefixes)
@@ -58,7 +59,7 @@ class JSONLDHandlingV2R2RSpec extends R2RSpec {
       val expectedJsonldExpandedParsed = JsonLDUtil.parseJsonLD(
         readOrWriteTextFile(
           "",
-          Paths.get("test_data/resourcesR2RV2/NarrenschiffFirstPageExpanded.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/NarrenschiffFirstPageExpanded.jsonld"),
           writeFile = false
         )
       )
@@ -71,7 +72,6 @@ class JSONLDHandlingV2R2RSpec extends R2RSpec {
     }
 
     "produce the expected JSON-LD context object (on the server side)" in {
-
       Get("/v2/resources/" + URLEncoder.encode("http://rdfh.ch/0803/7bbb8e59b703", "UTF-8")) ~> resourcesPath ~> check {
 
         assert(status == StatusCodes.OK, response.toString)
@@ -82,17 +82,13 @@ class JSONLDHandlingV2R2RSpec extends R2RSpec {
           JsonParser(
             readOrWriteTextFile(
               "",
-              Paths.get("test_data/resourcesR2RV2/NarrenschiffFirstPage.jsonld"),
+              Paths.get("..", "test_data/resourcesR2RV2/NarrenschiffFirstPage.jsonld"),
               writeFile = false
             )
           ).asJsObject
 
         assert(receivedJson.fields("@context") == expectedJson.fields("@context"), "@context incorrect")
-
       }
-
     }
-
   }
-
 }
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala
index 45315fa28f..753d33d5ad 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala
@@ -58,7 +58,7 @@ class ListsRouteV2R2RSpec extends R2RSpec {
       Get(s"/v2/lists/${URLEncoder.encode("http://rdfh.ch/lists/00FF/73d0ec0302", "UTF-8")}") ~> listsPath ~> check {
         assert(status == StatusCodes.OK, response.toString)
         val expectedAnswerJSONLD: JsValue =
-          JsonParser(FileUtil.readTextFile(Paths.get("test_data/listsR2RV2/imagesList.jsonld")))
+          JsonParser(FileUtil.readTextFile(Paths.get("..", "test_data/listsR2RV2/imagesList.jsonld")))
         val responseJson: JsValue = JsonParser(responseAs[String])
         assert(responseJson == expectedAnswerJSONLD)
       }
@@ -69,7 +69,7 @@ class ListsRouteV2R2RSpec extends R2RSpec {
         val responseStr = responseAs[String]
         assert(status == StatusCodes.OK, responseStr)
         val expectedAnswerJSONLD: JsValue =
-          JsonParser(FileUtil.readTextFile(Paths.get("test_data/listsR2RV2/treelist.jsonld")))
+          JsonParser(FileUtil.readTextFile(Paths.get("..", "test_data/listsR2RV2/treelist.jsonld")))
         val responseJson: JsValue = JsonParser(responseStr)
         assert(responseJson == expectedAnswerJSONLD)
 
@@ -91,7 +91,7 @@ class ListsRouteV2R2RSpec extends R2RSpec {
         val responseStr = responseAs[String]
         assert(status == StatusCodes.OK, responseStr)
         val expectedAnswerJSONLD: JsValue =
-          JsonParser(FileUtil.readTextFile(Paths.get("test_data/listsR2RV2/othertreelist.jsonld")))
+          JsonParser(FileUtil.readTextFile(Paths.get("..", "test_data/listsR2RV2/othertreelist.jsonld")))
         val responseJson: JsValue = JsonParser(responseStr)
         assert(responseJson == expectedAnswerJSONLD)
 
@@ -113,7 +113,7 @@ class ListsRouteV2R2RSpec extends R2RSpec {
         .addHeader(Accept(RdfMediaTypes.`text/turtle`)) ~> listsPath ~> check {
         assert(status == StatusCodes.OK, response.toString)
         val expectedAnswerTurtle: RdfModel =
-          parseTurtle(FileUtil.readTextFile(Paths.get("test_data/listsR2RV2/imagesList.ttl")))
+          parseTurtle(FileUtil.readTextFile(Paths.get("..", "test_data/listsR2RV2/imagesList.ttl")))
         val responseTurtle: RdfModel = parseTurtle(responseAs[String])
         assert(responseTurtle == expectedAnswerTurtle)
       }
@@ -124,7 +124,7 @@ class ListsRouteV2R2RSpec extends R2RSpec {
         .addHeader(Accept(RdfMediaTypes.`application/rdf+xml`)) ~> listsPath ~> check {
         assert(status == StatusCodes.OK, response.toString)
         val expectedAnswerRdfXml: RdfModel =
-          parseRdfXml(FileUtil.readTextFile(Paths.get("test_data/listsR2RV2/imagesList.rdf")))
+          parseRdfXml(FileUtil.readTextFile(Paths.get("..", "test_data/listsR2RV2/imagesList.rdf")))
         val responseRdfXml: RdfModel = parseRdfXml(responseAs[String])
         assert(responseRdfXml == expectedAnswerRdfXml)
       }
@@ -134,7 +134,7 @@ class ListsRouteV2R2RSpec extends R2RSpec {
       Get(s"/v2/node/${URLEncoder.encode("http://rdfh.ch/lists/00FF/4348fb82f2", "UTF-8")}") ~> listsPath ~> check {
         assert(status == StatusCodes.OK, response.toString)
         val expectedAnswerJSONLD: JsValue =
-          JsonParser(FileUtil.readTextFile(Paths.get("test_data/listsR2RV2/imagesListNode.jsonld")))
+          JsonParser(FileUtil.readTextFile(Paths.get("..", "test_data/listsR2RV2/imagesListNode.jsonld")))
         val responseJson: JsValue = JsonParser(responseAs[String])
         assert(responseJson == expectedAnswerJSONLD)
       }
@@ -145,7 +145,7 @@ class ListsRouteV2R2RSpec extends R2RSpec {
         val responseStr = responseAs[String]
         assert(status == StatusCodes.OK, responseStr)
         val expectedAnswerJSONLD: JsValue =
-          JsonParser(FileUtil.readTextFile(Paths.get("test_data/listsR2RV2/treelistnode.jsonld")))
+          JsonParser(FileUtil.readTextFile(Paths.get("..", "test_data/listsR2RV2/treelistnode.jsonld")))
         val responseJson: JsValue = JsonParser(responseStr)
         assert(responseJson == expectedAnswerJSONLD)
 
@@ -167,7 +167,7 @@ class ListsRouteV2R2RSpec extends R2RSpec {
         .addHeader(Accept(RdfMediaTypes.`text/turtle`)) ~> listsPath ~> check {
         assert(status == StatusCodes.OK, response.toString)
         val expectedAnswerTurtle: RdfModel =
-          parseTurtle(FileUtil.readTextFile(Paths.get("test_data/listsR2RV2/imagesListNode.ttl")))
+          parseTurtle(FileUtil.readTextFile(Paths.get("..", "test_data/listsR2RV2/imagesListNode.ttl")))
         val responseTurtle: RdfModel = parseTurtle(responseAs[String])
         assert(responseTurtle == expectedAnswerTurtle)
       }
@@ -178,7 +178,7 @@ class ListsRouteV2R2RSpec extends R2RSpec {
         .addHeader(Accept(RdfMediaTypes.`application/rdf+xml`)) ~> listsPath ~> check {
         assert(status == StatusCodes.OK, response.toString)
         val expectedAnswerRdfXml: RdfModel =
-          parseRdfXml(FileUtil.readTextFile(Paths.get("test_data/listsR2RV2/imagesListNode.rdf")))
+          parseRdfXml(FileUtil.readTextFile(Paths.get("..", "test_data/listsR2RV2/imagesListNode.rdf")))
         val responseRdfXml: RdfModel = parseRdfXml(responseAs[String])
         assert(responseRdfXml == expectedAnswerRdfXml)
       }
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala
index 338e5541b6..5f51ea37cc 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala
@@ -118,7 +118,7 @@ class OntologyV2R2RSpec extends R2RSpec {
   ) {
     def makeFile(mediaType: MediaType.NonBinary): Path = {
       val fileSuffix = mediaType.fileExtensions.head
-      Paths.get(s"test_data/ontologyR2RV2/$fileBasename.$fileSuffix")
+      Paths.get("..", s"test_data/ontologyR2RV2/$fileBasename.$fileSuffix")
     }
 
     /**
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala
index 97b24ab237..8c3b49b9b5 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala
@@ -113,7 +113,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -141,7 +141,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerTurtle = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"),
+        Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"),
         writeTestDataFiles
       )
       assert(parseTurtle(responseAsString) == parseTurtle(expectedAnswerTurtle))
@@ -155,7 +155,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerRdfXml = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.rdf"),
+        Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.rdf"),
         writeTestDataFiles
       )
       assert(parseRdfXml(responseAsString) == parseRdfXml(expectedAnswerRdfXml))
@@ -169,7 +169,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLandPreview.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLandPreview.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -181,7 +181,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val responseAsString = responseToString(response)
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD =
-        readOrWriteTextFile(responseAsString, Paths.get("test_data/resourcesR2RV2/AThing.jsonld"), writeTestDataFiles)
+        readOrWriteTextFile(responseAsString, Paths.get("..", "test_data/resourcesR2RV2/AThing.jsonld"), writeTestDataFiles)
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
 
       clientTestDataCollector.addFile(
@@ -205,7 +205,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -228,7 +228,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerTurtle =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.ttl"),
+          Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.ttl"),
           writeTestDataFiles
         )
       assert(parseTurtle(responseAsString) == parseTurtle(expectedAnswerTurtle))
@@ -244,7 +244,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerRdfXml =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.rdf"),
+          Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.rdf"),
           writeTestDataFiles
         )
       assert(parseRdfXml(responseAsString) == parseRdfXml(expectedAnswerRdfXml))
@@ -259,7 +259,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimplePreview.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimplePreview.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -275,7 +275,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -289,7 +289,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/NarrenschiffFirstPage.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/NarrenschiffFirstPage.jsonld"),
         writeTestDataFiles
       )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -303,7 +303,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/ThingWithBCEDate.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/ThingWithBCEDate.jsonld"),
         writeTestDataFiles
       )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -324,7 +324,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/ThingWithBCEDate2.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/ThingWithBCEDate2.jsonld"),
         writeTestDataFiles
       )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -345,7 +345,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/ThingWithListValue.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/ThingWithListValue.jsonld"),
         writeTestDataFiles
       )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -368,7 +368,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/ThingWithListValueSimple.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/ThingWithListValueSimple.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -389,7 +389,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/ThingWithLinkComplex.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/ThingWithLinkComplex.jsonld"),
         writeTestDataFiles
       )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -411,7 +411,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/ThingWithLinkSimple.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/ThingWithLinkSimple.jsonld"),
         writeTestDataFiles
       )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -433,7 +433,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/ThingWithTextLangComplex.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/ThingWithTextLangComplex.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -456,7 +456,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/ThingWithTextLangSimple.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/ThingWithTextLangSimple.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -476,7 +476,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val responseAsString = responseToString(response)
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD =
-        readOrWriteTextFile(responseAsString, Paths.get("test_data/resourcesR2RV2/Testding.jsonld"), writeTestDataFiles)
+        readOrWriteTextFile(responseAsString, Paths.get("..", "test_data/resourcesR2RV2/Testding.jsonld"), writeTestDataFiles)
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
 
       clientTestDataCollector.addFile(
@@ -506,7 +506,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/ThingWithPicture.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/ThingWithPicture.jsonld"),
         writeTestDataFiles
       )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -539,7 +539,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/ThingWithOneHiddenResource.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/ThingWithOneHiddenResource.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -561,7 +561,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/ThingWithOneDeletedResource.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/ThingWithOneDeletedResource.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -583,7 +583,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/ThingWithVersionHistory.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/ThingWithVersionHistory.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -598,7 +598,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/ThingWithVersionHistory.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/ThingWithVersionHistory.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -612,7 +612,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/CompleteVersionHistory.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/CompleteVersionHistory.jsonld"),
           writeTestDataFiles
         )
       compareJSONLDForResourceHistoryResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -628,7 +628,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/PartialVersionHistory.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/PartialVersionHistory.jsonld"),
         writeTestDataFiles
       )
       compareJSONLDForResourceHistoryResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -659,7 +659,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
             val expectedAnswerJSONLD =
               readOrWriteTextFile(
                 versionResponseAsString,
-                Paths.get(s"test_data/resourcesR2RV2/ThingWithVersionHistory$arkTimestamp.jsonld"),
+                Paths.get("..", s"test_data/resourcesR2RV2/ThingWithVersionHistory$arkTimestamp.jsonld"),
                 writeTestDataFiles
               )
             compareJSONLDForResourcesResponse(
@@ -712,7 +712,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
 
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/ThingGraphBoth.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/ThingGraphBoth.jsonld"),
         writeTestDataFiles
       )
       val parsedExpectedJsonLD = JsonLDUtil.parseJsonLD(expectedAnswerJSONLD)
@@ -730,7 +730,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
 
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/ThingGraphOutbound.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/ThingGraphOutbound.jsonld"),
         writeTestDataFiles
       )
       val parsedExpectedJsonLD = JsonLDUtil.parseJsonLD(expectedAnswerJSONLD)
@@ -748,7 +748,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
 
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/ThingGraphInbound.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/ThingGraphInbound.jsonld"),
         writeTestDataFiles
       )
       val parsedExpectedJsonLD = JsonLDUtil.parseJsonLD(expectedAnswerJSONLD)
@@ -769,7 +769,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/ThingGraphBothWithExcludedProp.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/ThingGraphBothWithExcludedProp.jsonld"),
           writeTestDataFiles
         )
       val parsedExpectedJsonLD = JsonLDUtil.parseJsonLD(expectedAnswerJSONLD)
@@ -788,7 +788,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val expectedAnswerJSONLD =
         readOrWriteTextFile(
           responseAsString,
-          Paths.get("test_data/resourcesR2RV2/ThingGraphBothWithDepth.jsonld"),
+          Paths.get("..", "test_data/resourcesR2RV2/ThingGraphBothWithDepth.jsonld"),
           writeTestDataFiles
         )
       val parsedExpectedJsonLD = JsonLDUtil.parseJsonLD(expectedAnswerJSONLD)
@@ -841,7 +841,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       assert(response.status == StatusCodes.OK, responseAsString)
       val expectedAnswerJSONLD = readOrWriteTextFile(
         responseAsString,
-        Paths.get("test_data/resourcesR2RV2/BooksFromIncunabula.jsonld"),
+        Paths.get("..", "test_data/resourcesR2RV2/BooksFromIncunabula.jsonld"),
         writeTestDataFiles
       )
       compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAsString)
@@ -1010,7 +1010,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
 
     "create a resource whose label contains a Unicode escape and quotation marks" in {
       val jsonLDEntity: String =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/ThingWithUnicodeEscape.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/ThingWithUnicodeEscape.jsonld"))
       val request = Post(
         s"$baseApiUrl/v2/resources",
         HttpEntity(RdfMediaTypes.`application/ld+json`, jsonLDEntity)
@@ -1566,7 +1566,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
     }
 
     "create a resource containing escaped text" in {
-      val jsonLDEntity = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/CreateResourceWithEscape.jsonld"))
+      val jsonLDEntity = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/CreateResourceWithEscape.jsonld"))
       val request = Post(
         s"$baseApiUrl/v2/resources",
         HttpEntity(RdfMediaTypes.`application/ld+json`, jsonLDEntity)
@@ -1899,7 +1899,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
     "create a resource with a large text containing a lot of markup (32849 words, 6738 standoff tags)" ignore { // uses too much memory for GitHub CI
       // Create a resource containing the text of Hamlet.
 
-      val hamletXml = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/hamlet.xml"))
+      val hamletXml = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/hamlet.xml"))
 
       val jsonLDEntity =
         s"""{
@@ -1943,7 +1943,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
     }
 
     "read the large text and its markup as XML, and check that it matches the original XML" ignore { // depends on previous test
-      val hamletXml = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/hamlet.xml"))
+      val hamletXml = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/hamlet.xml"))
 
       // Request the newly created resource.
       val resourceGetRequest = Get(
@@ -2205,7 +2205,7 @@ class ResourcesRouteV2E2ESpec extends E2ESpec(ResourcesRouteV2E2ESpec.config) {
       val responseJson: JsValue = JsonParser(responseStr)
 
       val expectedJson: JsValue = JsonParser(
-        readOrWriteTextFile(responseStr, Paths.get("test_data/resourcesR2RV2/IIIFManifest.jsonld"), writeTestDataFiles)
+        readOrWriteTextFile(responseStr, Paths.get("..", "test_data/resourcesR2RV2/IIIFManifest.jsonld"), writeTestDataFiles)
       )
 
       assert(responseJson == expectedJson)
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2Spec.scala
index 42529ec483..46e07f2f4e 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2Spec.scala
@@ -18,7 +18,7 @@ class ResponseCheckerV2Spec extends CoreSpec() {
   "ResponseCheckerV2" should {
     "not throw an exception if received and expected resource responses are the same" in {
       val expectedAnswerJSONLD =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/ThingWithLinkComplex.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/ThingWithLinkComplex.jsonld"))
 
       ResponseCheckerV2.compareJSONLDForResourcesResponse(
         expectedJSONLD = expectedAnswerJSONLD,
@@ -28,7 +28,7 @@ class ResponseCheckerV2Spec extends CoreSpec() {
 
     "not throw an exception if received and expected mapping responses are the same" in {
       val expectedAnswerJSONLD =
-        FileUtil.readTextFile(Paths.get("test_data/standoffR2RV2/mappingCreationResponse.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/standoffR2RV2/mappingCreationResponse.jsonld"))
 
       ResponseCheckerV2.compareJSONLDForMappingCreationResponse(
         expectedJSONLD = expectedAnswerJSONLD,
@@ -38,8 +38,8 @@ class ResponseCheckerV2Spec extends CoreSpec() {
 
     "throw an exception if received and expected resource responses are different" in {
       val expectedAnswerJSONLD =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/ThingWithLinkComplex.jsonld"))
-      val receivedAnswerJSONLD = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/ThingWithListValue.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/ThingWithLinkComplex.jsonld"))
+      val receivedAnswerJSONLD = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/ThingWithListValue.jsonld"))
 
       assertThrows[AssertionError] {
         ResponseCheckerV2.compareJSONLDForResourcesResponse(
@@ -51,9 +51,9 @@ class ResponseCheckerV2Spec extends CoreSpec() {
 
     "throw an exception if the values of the received and expected resource responses are different" in {
       val expectedAnswerJSONLD =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
       val receivedAnswerJSONLD =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLandPreview.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLandPreview.jsonld"))
 
       assertThrows[AssertionError] {
         ResponseCheckerV2.compareJSONLDForResourcesResponse(
@@ -65,10 +65,10 @@ class ResponseCheckerV2Spec extends CoreSpec() {
 
     "throw an exception if the number of values of the received and expected resource responses are different" in {
       val expectedAnswerJSONLD =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/NarrenschiffFirstPage.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/NarrenschiffFirstPage.jsonld"))
       // number of StillImageFileValue is wrong
       val receivedAnswerJSONLD =
-        FileUtil.readTextFile(Paths.get("test_data/responseCheckerR2RV2/NarrenschiffFirstPageWrong.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/responseCheckerR2RV2/NarrenschiffFirstPageWrong.jsonld"))
 
       assertThrows[AssertionError] {
         ResponseCheckerV2.compareJSONLDForResourcesResponse(
@@ -80,9 +80,9 @@ class ResponseCheckerV2Spec extends CoreSpec() {
 
     "throw an exception if received and expected mapping responses are different" in {
       val expectedAnswerJSONLD =
-        FileUtil.readTextFile(Paths.get("test_data/standoffR2RV2/mappingCreationResponse.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/standoffR2RV2/mappingCreationResponse.jsonld"))
       val receivedAnswerJSONLD =
-        FileUtil.readTextFile(Paths.get("test_data/standoffR2RV2/mappingCreationResponseWithDifferentLabel.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/standoffR2RV2/mappingCreationResponseWithDifferentLabel.jsonld"))
 
       assertThrows[AssertionError] {
         ResponseCheckerV2.compareJSONLDForMappingCreationResponse(
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala
index 8f5b6494c4..db02973a28 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala
@@ -104,7 +104,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/NarrFulltextSearch.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/NarrFulltextSearch.jsonld"),
           writeTestDataFiles
         )
 
@@ -135,7 +135,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/searchResponseWithHiddenResource.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/searchResponseWithHiddenResource.jsonld"),
             writeTestDataFiles
           )
 
@@ -153,7 +153,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get(s"test_data/searchR2RV2/DingeFulltextSearch.jsonld"),
+          Paths.get("..", s"test_data/searchR2RV2/DingeFulltextSearch.jsonld"),
           writeTestDataFiles
         )
 
@@ -172,7 +172,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get(s"test_data/searchR2RV2/DingeFulltextSearchSimple.jsonld"),
+            Paths.get("..", s"test_data/searchR2RV2/DingeFulltextSearchSimple.jsonld"),
             writeTestDataFiles
           )
 
@@ -202,7 +202,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingUniform.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingUniform.jsonld"),
           writeTestDataFiles
         )
 
@@ -220,7 +220,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingUniform.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingUniform.jsonld"),
           writeTestDataFiles
         )
 
@@ -238,7 +238,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/FulltextSearchWithImage.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/FulltextSearchWithImage.jsonld"),
             writeTestDataFiles
           )
 
@@ -303,7 +303,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseStr,
-            Paths.get("test_data/searchR2RV2/thingWithOptionalDateSortedDesc.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/thingWithOptionalDateSortedDesc.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -389,7 +389,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -435,7 +435,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -477,7 +477,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswerSimple.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswerSimple.jsonld"),
           writeTestDataFiles
         )
 
@@ -520,7 +520,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswerSimple.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswerSimple.jsonld"),
           writeTestDataFiles
         )
 
@@ -601,7 +601,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchNoTitleInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchNoTitleInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -646,7 +646,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/NotZeitgloeckleinExtendedSearch.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/NotZeitgloeckleinExtendedSearch.jsonld"),
             writeTestDataFiles
           )
 
@@ -741,7 +741,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PageWithSeqnum10WithSeqnumAndLinkValueInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PageWithSeqnum10WithSeqnumAndLinkValueInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -791,7 +791,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PageWithSeqnum10OnlySeqnuminAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PageWithSeqnum10OnlySeqnuminAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -843,7 +843,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/pagesOfLatinNarrenschiffWithSeqnumLowerEquals10.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/pagesOfLatinNarrenschiffWithSeqnumLowerEquals10.jsonld"),
             writeTestDataFiles
           )
 
@@ -893,7 +893,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnum.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnum.jsonld"),
             writeTestDataFiles
           )
 
@@ -944,7 +944,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnumNextOffset.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnumNextOffset.jsonld"),
             writeTestDataFiles
           )
 
@@ -1034,7 +1034,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/BooksPublishedOnDate.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/BooksPublishedOnDate.jsonld"),
           writeTestDataFiles
         )
 
@@ -1085,7 +1085,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -1139,7 +1139,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -1192,7 +1192,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedBeforeDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedBeforeDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -1245,7 +1245,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedAfterOrOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedAfterOrOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -1298,7 +1298,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedAfterDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedAfterDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -1351,7 +1351,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedBeforeOrOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedBeforeOrOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -1405,7 +1405,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedBetweenDates.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedBetweenDates.jsonld"),
             writeTestDataFiles
           )
 
@@ -1469,7 +1469,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/RegionsForPage.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/RegionsForPage.jsonld"),
           writeTestDataFiles
         )
 
@@ -1537,7 +1537,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/bookWithIncomingPagesWithAllRequestedProps.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/bookWithIncomingPagesWithAllRequestedProps.jsonld"),
             writeTestDataFiles
           )
 
@@ -1599,7 +1599,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/bookWithIncomingPagesOnlyLink.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/bookWithIncomingPagesOnlyLink.jsonld"),
             writeTestDataFiles
           )
 
@@ -1653,7 +1653,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/IncomingLinksForBook.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/IncomingLinksForBook.jsonld"),
           writeTestDataFiles
         )
 
@@ -1732,7 +1732,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingEqualsDecimal.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingEqualsDecimal.jsonld"),
           writeTestDataFiles
         )
 
@@ -1778,7 +1778,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingBiggerThanDecimal.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingBiggerThanDecimal.jsonld"),
           writeTestDataFiles
         )
 
@@ -1825,7 +1825,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingSmallerThanDecimal.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingSmallerThanDecimal.jsonld"),
             writeTestDataFiles
           )
 
@@ -1868,7 +1868,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/thingWithURI.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/thingWithURI.jsonld"),
           writeTestDataFiles
         )
 
@@ -1950,7 +1950,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingWithBoolean.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingWithBoolean.jsonld"),
           writeTestDataFiles
         )
 
@@ -2004,7 +2004,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithBooleanOptionalOffset0.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithBooleanOptionalOffset0.jsonld"),
             writeTestDataFiles
           )
 
@@ -2061,7 +2061,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithBooleanOptionalOffset1.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithBooleanOptionalOffset1.jsonld"),
             writeTestDataFiles
           )
 
@@ -2121,7 +2121,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithBooleanOrDecimal.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithBooleanOrDecimal.jsonld"),
             writeTestDataFiles
           )
 
@@ -2170,7 +2170,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeit.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeit.jsonld"),
             writeTestDataFiles
           )
 
@@ -2218,7 +2218,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
 
@@ -2266,7 +2266,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
 
@@ -2314,7 +2314,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
 
@@ -2359,7 +2359,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingWithListValue.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingWithListValue.jsonld"),
           writeTestDataFiles
         )
 
@@ -2406,7 +2406,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -2450,7 +2450,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -2467,7 +2467,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, response.toString)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -2487,7 +2487,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithRichtextWithTermTextInParagraph.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithRichtextWithTermTextInParagraph.jsonld"),
             writeTestDataFiles
           )
 
@@ -2524,7 +2524,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithRichtextWithTermTextInParagraph.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithRichtextWithTermTextInParagraph.jsonld"),
             writeTestDataFiles
           )
 
@@ -2560,7 +2560,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithRichtextWithTermTextInParagraph.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithRichtextWithTermTextInParagraph.jsonld"),
             writeTestDataFiles
           )
 
@@ -2650,7 +2650,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LinkObjectsToBooks.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LinkObjectsToBooks.jsonld"),
           writeTestDataFiles
         )
 
@@ -2709,7 +2709,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/letterWithAuthor.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/letterWithAuthor.jsonld"),
           writeTestDataFiles
         )
 
@@ -2827,7 +2827,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName.jsonld"),
             writeTestDataFiles
           )
 
@@ -2954,7 +2954,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
             writeTestDataFiles
           )
 
@@ -3008,7 +3008,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/foafPerson.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/foafPerson.jsonld"),
           writeTestDataFiles
         )
 
@@ -3055,7 +3055,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingByIriWithRequestedValues.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingByIriWithRequestedValues.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -3118,7 +3118,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithAuthorWithInformation.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithAuthorWithInformation.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -3171,7 +3171,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/incomingPagesForBook.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/incomingPagesForBook.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -3279,7 +3279,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/regionsOfZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/regionsOfZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -3319,7 +3319,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ProjectsWithOptionalPersonOrBiblio.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ProjectsWithOptionalPersonOrBiblio.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -3368,7 +3368,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
             writeTestDataFiles
           )
 
@@ -3415,7 +3415,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
             writeTestDataFiles
           )
 
@@ -3460,7 +3460,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
             writeTestDataFiles
           )
 
@@ -3504,7 +3504,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
             writeTestDataFiles
           )
 
@@ -3548,7 +3548,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
             writeTestDataFiles
           )
 
@@ -3589,7 +3589,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithoutName.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithoutName.jsonld"),
             writeTestDataFiles
           )
 
@@ -3632,7 +3632,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/booksWithPage100.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/booksWithPage100.jsonld"),
           writeTestDataFiles
         )
 
@@ -3677,7 +3677,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/lettersByMeier.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/lettersByMeier.jsonld"),
           writeTestDataFiles
         )
 
@@ -3716,7 +3716,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -3758,7 +3758,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -3796,7 +3796,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswerSimple.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswerSimple.jsonld"),
           writeTestDataFiles
         )
 
@@ -3835,7 +3835,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswerSimple.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswerSimple.jsonld"),
           writeTestDataFiles
         )
 
@@ -3908,7 +3908,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchNoTitleInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchNoTitleInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -3949,7 +3949,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/NotZeitgloeckleinExtendedSearch.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/NotZeitgloeckleinExtendedSearch.jsonld"),
             writeTestDataFiles
           )
 
@@ -4033,7 +4033,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PageWithSeqnum10WithSeqnumAndLinkValueInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PageWithSeqnum10WithSeqnumAndLinkValueInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -4114,7 +4114,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PageWithSeqnum10OnlySeqnuminAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PageWithSeqnum10OnlySeqnuminAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -4159,7 +4159,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/pagesOfLatinNarrenschiffWithSeqnumLowerEquals10.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/pagesOfLatinNarrenschiffWithSeqnumLowerEquals10.jsonld"),
             writeTestDataFiles
           )
 
@@ -4202,7 +4202,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnum.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnum.jsonld"),
             writeTestDataFiles
           )
 
@@ -4246,7 +4246,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnumNextOffset.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnumNextOffset.jsonld"),
             writeTestDataFiles
           )
 
@@ -4324,7 +4324,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/BooksPublishedOnDate.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/BooksPublishedOnDate.jsonld"),
           writeTestDataFiles
         )
 
@@ -4368,7 +4368,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -4415,7 +4415,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -4462,7 +4462,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedBeforeDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedBeforeDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -4509,7 +4509,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedAfterOrOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedAfterOrOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -4556,7 +4556,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedAfterDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedAfterDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -4603,7 +4603,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedBeforeOrOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedBeforeOrOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -4650,7 +4650,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedBetweenDates.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedBetweenDates.jsonld"),
             writeTestDataFiles
           )
 
@@ -4701,7 +4701,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/RegionsForPage.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/RegionsForPage.jsonld"),
           writeFile = false
         )
 
@@ -4756,7 +4756,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/bookWithIncomingPagesWithAllRequestedProps.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/bookWithIncomingPagesWithAllRequestedProps.jsonld"),
             writeTestDataFiles
           )
 
@@ -4805,7 +4805,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/bookWithIncomingPagesOnlyLink.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/bookWithIncomingPagesOnlyLink.jsonld"),
             writeTestDataFiles
           )
 
@@ -4850,7 +4850,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/IncomingLinksForBook.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/IncomingLinksForBook.jsonld"),
           writeTestDataFiles
         )
 
@@ -4923,7 +4923,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingEqualsDecimal.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingEqualsDecimal.jsonld"),
           writeTestDataFiles
         )
 
@@ -4965,7 +4965,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingBiggerThanDecimal.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingBiggerThanDecimal.jsonld"),
           writeTestDataFiles
         )
 
@@ -5008,7 +5008,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingSmallerThanDecimal.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingSmallerThanDecimal.jsonld"),
             writeFile = false
           )
 
@@ -5084,7 +5084,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingWithBoolean.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingWithBoolean.jsonld"),
           writeTestDataFiles
         )
 
@@ -5131,7 +5131,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithBooleanOptionalOffset1.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithBooleanOptionalOffset1.jsonld"),
             writeTestDataFiles
           )
 
@@ -5185,7 +5185,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithBooleanOrDecimal.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithBooleanOrDecimal.jsonld"),
             writeTestDataFiles
           )
 
@@ -5231,7 +5231,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeit.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeit.jsonld"),
             writeTestDataFiles
           )
 
@@ -5277,7 +5277,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
 
@@ -5323,7 +5323,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
 
@@ -5367,7 +5367,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
 
@@ -5408,7 +5408,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingWithListValue.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingWithListValue.jsonld"),
           writeTestDataFiles
         )
 
@@ -5449,7 +5449,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -5487,7 +5487,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -5529,7 +5529,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LinkObjectsToBooks.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LinkObjectsToBooks.jsonld"),
           writeTestDataFiles
         )
 
@@ -5579,7 +5579,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/letterWithAuthor.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/letterWithAuthor.jsonld"),
           writeTestDataFiles
         )
 
@@ -5634,7 +5634,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName.jsonld"),
             writeTestDataFiles
           )
 
@@ -5689,7 +5689,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
             writeTestDataFiles
           )
 
@@ -5741,7 +5741,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/foafPerson.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/foafPerson.jsonld"),
           writeTestDataFiles
         )
 
@@ -5783,7 +5783,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingByIriWithRequestedValues.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingByIriWithRequestedValues.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -5832,7 +5832,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithAuthorWithInformation.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithAuthorWithInformation.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -5878,7 +5878,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/incomingPagesForBook.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/incomingPagesForBook.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -5967,7 +5967,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/regionsOfZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/regionsOfZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -6004,7 +6004,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ProjectsWithOptionalPersonOrBiblio.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ProjectsWithOptionalPersonOrBiblio.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -6044,7 +6044,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingWithListNodeLabel.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingWithListNodeLabel.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -6131,7 +6131,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/thingWithOptionalDateSortedDesc.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/thingWithOptionalDateSortedDesc.jsonld"),
             writeFile = false
           )
 
@@ -6229,7 +6229,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingsWithOptionalDecimalGreaterThan1.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingsWithOptionalDecimalGreaterThan1.jsonld"),
             writeTestDataFiles
           )
 
@@ -6271,7 +6271,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/booksWithPage100.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/booksWithPage100.jsonld"),
           writeTestDataFiles
         )
 
@@ -6316,7 +6316,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/lettersByMeier.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/lettersByMeier.jsonld"),
           writeTestDataFiles
         )
 
@@ -6355,7 +6355,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchWithTitleInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -6428,7 +6428,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ZeitgloeckleinExtendedSearchNoTitleInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinExtendedSearchNoTitleInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -6471,7 +6471,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/NotZeitgloeckleinExtendedSearch.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/NotZeitgloeckleinExtendedSearch.jsonld"),
             writeTestDataFiles
           )
 
@@ -6557,7 +6557,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PageWithSeqnum10WithSeqnumAndLinkValueInAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PageWithSeqnum10WithSeqnumAndLinkValueInAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -6637,7 +6637,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PageWithSeqnum10OnlySeqnuminAnswer.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PageWithSeqnum10OnlySeqnuminAnswer.jsonld"),
             writeTestDataFiles
           )
 
@@ -6684,7 +6684,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/pagesOfLatinNarrenschiffWithSeqnumLowerEquals10.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/pagesOfLatinNarrenschiffWithSeqnumLowerEquals10.jsonld"),
             writeTestDataFiles
           )
 
@@ -6727,7 +6727,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnum.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnum.jsonld"),
             writeTestDataFiles
           )
 
@@ -6771,7 +6771,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnumNextOffset.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/PagesOfNarrenschiffOrderedBySeqnumNextOffset.jsonld"),
             writeTestDataFiles
           )
 
@@ -6815,7 +6815,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/BooksPublishedOnDate.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/BooksPublishedOnDate.jsonld"),
           writeTestDataFiles
         )
 
@@ -6860,7 +6860,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -6908,7 +6908,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksNotPublishedOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -6956,7 +6956,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedBeforeDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedBeforeDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -7004,7 +7004,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedAfterOrOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedAfterOrOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -7052,7 +7052,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedAfterDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedAfterDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -7100,7 +7100,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedBeforeOrOnDate.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedBeforeOrOnDate.jsonld"),
             writeTestDataFiles
           )
 
@@ -7148,7 +7148,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksPublishedBetweenDates.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksPublishedBetweenDates.jsonld"),
             writeTestDataFiles
           )
 
@@ -7188,7 +7188,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/RegionsForPage.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/RegionsForPage.jsonld"),
           writeFile = false
         )
 
@@ -7243,7 +7243,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/bookWithIncomingPagesWithAllRequestedProps.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/bookWithIncomingPagesWithAllRequestedProps.jsonld"),
             writeTestDataFiles
           )
 
@@ -7292,7 +7292,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/bookWithIncomingPagesOnlyLink.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/bookWithIncomingPagesOnlyLink.jsonld"),
             writeTestDataFiles
           )
 
@@ -7336,7 +7336,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/IncomingLinksForBook.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/IncomingLinksForBook.jsonld"),
           writeTestDataFiles
         )
 
@@ -7376,7 +7376,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingEqualsDecimal.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingEqualsDecimal.jsonld"),
           writeTestDataFiles
         )
 
@@ -7410,7 +7410,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, response.toString)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingEqualsDecimal.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingEqualsDecimal.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -7450,7 +7450,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingBiggerThanDecimal.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingBiggerThanDecimal.jsonld"),
           writeTestDataFiles
         )
 
@@ -7487,7 +7487,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD: String =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingSmallerThanDecimal.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingSmallerThanDecimal.jsonld"),
             writeTestDataFiles
           )
 
@@ -7532,7 +7532,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD: String =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithLinkToStart.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithLinkToStart.jsonld"),
             writeTestDataFiles
           )
 
@@ -7573,7 +7573,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD: String = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/PageOfThings.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/PageOfThings.jsonld"),
           writeTestDataFiles
         )
 
@@ -7623,7 +7623,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingWithBoolean.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingWithBoolean.jsonld"),
           writeTestDataFiles
         )
 
@@ -7676,7 +7676,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithBooleanOptionalOffset1.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithBooleanOptionalOffset1.jsonld"),
             writeTestDataFiles
           )
 
@@ -7731,7 +7731,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithBooleanOrDecimal.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithBooleanOrDecimal.jsonld"),
             writeTestDataFiles
           )
 
@@ -7779,7 +7779,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeit.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeit.jsonld"),
             writeTestDataFiles
           )
 
@@ -7825,7 +7825,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
 
@@ -7871,7 +7871,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/BooksWithTitleContainingZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
 
@@ -7912,7 +7912,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/ThingWithListValue.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingWithListValue.jsonld"),
           writeTestDataFiles
         )
 
@@ -7953,7 +7953,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -7993,7 +7993,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LanguageFulltextSearch.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8035,7 +8035,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/LinkObjectsToBooks.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LinkObjectsToBooks.jsonld"),
           writeTestDataFiles
         )
 
@@ -8085,7 +8085,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/letterWithAuthor.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/letterWithAuthor.jsonld"),
           writeTestDataFiles
         )
 
@@ -8139,7 +8139,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName.jsonld"),
             writeTestDataFiles
           )
 
@@ -8193,7 +8193,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithPersonWithName2.jsonld"),
             writeTestDataFiles
           )
 
@@ -8234,7 +8234,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingByIriWithRequestedValues.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingByIriWithRequestedValues.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8283,7 +8283,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/letterWithAuthorWithInformation.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/letterWithAuthorWithInformation.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8331,7 +8331,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/incomingPagesForBook.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/incomingPagesForBook.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8422,7 +8422,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/regionsOfZeitgloecklein.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/regionsOfZeitgloecklein.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8618,7 +8618,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/thingReferringToSpecificListNode.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/thingReferringToSpecificListNode.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8658,7 +8658,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/thingNotReferringToSpecificListNode.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/thingNotReferringToSpecificListNode.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8728,7 +8728,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/thingReferringToSpecificListNodeWithSubnodes.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/thingReferringToSpecificListNodeWithSubnodes.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8765,7 +8765,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
         val expectedAnswerJSONLD = readOrWriteTextFile(
           responseAs[String],
-          Paths.get("test_data/searchR2RV2/letterWithSubject.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/letterWithSubject.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8802,7 +8802,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/thingsWithStandoffLinks.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/thingsWithStandoffLinks.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8840,7 +8840,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/thingsWithStandoffLinks.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/thingsWithStandoffLinks.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8877,7 +8877,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/thingsWithStandoffLinksToSpecificThing.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/thingsWithStandoffLinksToSpecificThing.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8915,7 +8915,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/thingsWithStandoffLinksToSpecificThing.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/thingsWithStandoffLinksToSpecificThing.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = responseAs[String])
@@ -8951,7 +8951,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             responseAs[String],
-            Paths.get("test_data/searchR2RV2/ThingWithRichtextWithTermTextInParagraph.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingWithRichtextWithTermTextInParagraph.jsonld"),
             writeTestDataFiles
           )
 
@@ -8963,7 +8963,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
     "search for a standoff date tag indicating a date in a particular range (submitting the complex schema)" in {
       // First, create a standoff-to-XML mapping that can handle standoff date tags.
 
-      val mappingFileToSend = Paths.get("test_data/test_route/texts/mappingForHTML.xml")
+      val mappingFileToSend = Paths.get("..", "test_data/test_route/texts/mappingForHTML.xml")
 
       val paramsCreateHTMLMappingFromXML =
         s"""
@@ -9003,7 +9003,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
 
       // Next, create a resource with a text value containing a standoff date tag. TODO: Use API v2.
 
-      val xmlFileToSend = Paths.get("test_data/test_route/texts/HTML.xml")
+      val xmlFileToSend = Paths.get("..", "test_data/test_route/texts/HTML.xml")
 
       val newValueParams =
         s"""
@@ -9128,7 +9128,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
     "create a resource with a large text containing a lot of markup (32849 words, 6738 standoff tags)" ignore { // uses too much memory for GitHub CI
       // Create a resource containing the text of Hamlet.
 
-      val hamletXml = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/hamlet.xml"))
+      val hamletXml = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/hamlet.xml"))
 
       val jsonLDEntity =
         s"""{
@@ -9170,7 +9170,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
     }
 
     "search for the large text and its markup and receive it as XML, and check that it matches the original XML" ignore { // depends on previous test
-      val hamletXml = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/hamlet.xml"))
+      val hamletXml = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/hamlet.xml"))
 
       val gravsearchQuery =
         s"""PREFIX knora-api: <http://api.knora.org/ontology/knora-api/v2#>
@@ -9358,7 +9358,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ThingWithTimeStamp.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingWithTimeStamp.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9394,7 +9394,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ThingWithHiddenThing.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ThingWithHiddenThing.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9450,7 +9450,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val expectedAnswerJSONLD =
           readOrWriteTextFile(
             searchResponseStr,
-            Paths.get("test_data/searchR2RV2/ThingFromQueryWithUnion.jsonld"),
+            Paths.get("..", "test_data/searchR2RV2/ThingFromQueryWithUnion.jsonld"),
             writeTestDataFiles
           )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9656,7 +9656,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9685,7 +9685,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
           writeFile = false
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9715,7 +9715,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
           writeFile = false
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9745,7 +9745,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
           writeFile = false
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9774,7 +9774,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
           writeFile = false
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9803,7 +9803,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
           writeFile = false
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9832,7 +9832,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
           writeFile = false
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9861,7 +9861,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/ZeitgloeckleinViaLabel.jsonld"),
           writeFile = false
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9895,7 +9895,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD = readOrWriteTextFile(
           searchResponseStr,
-          Paths.get("test_data/searchR2RV2/LetterNotToSelf.jsonld"),
+          Paths.get("..", "test_data/searchR2RV2/LetterNotToSelf.jsonld"),
           writeTestDataFiles
         )
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
@@ -9928,7 +9928,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val searchResponseStr = responseAs[String]
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD =
-          readOrWriteTextFile(searchResponseStr, Paths.get("test_data/searchR2RV2/LetterNotToSelf.jsonld"))
+          readOrWriteTextFile(searchResponseStr, Paths.get("..", "test_data/searchR2RV2/LetterNotToSelf.jsonld"))
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
       }
     }
@@ -9959,7 +9959,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val searchResponseStr = responseAs[String]
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD =
-          readOrWriteTextFile(searchResponseStr, Paths.get("test_data/searchR2RV2/LetterNotToSelf.jsonld"))
+          readOrWriteTextFile(searchResponseStr, Paths.get("..", "test_data/searchR2RV2/LetterNotToSelf.jsonld"))
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
       }
     }
@@ -9990,7 +9990,7 @@ class SearchRouteV2R2RSpec extends R2RSpec {
         val searchResponseStr = responseAs[String]
         assert(status == StatusCodes.OK, searchResponseStr)
         val expectedAnswerJSONLD =
-          readOrWriteTextFile(searchResponseStr, Paths.get("test_data/searchR2RV2/LetterNotToSelf.jsonld"))
+          readOrWriteTextFile(searchResponseStr, Paths.get("..", "test_data/searchR2RV2/LetterNotToSelf.jsonld"))
         compareJSONLDForResourcesResponse(expectedJSONLD = expectedAnswerJSONLD, receivedJSONLD = searchResponseStr)
       }
     }
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/StandoffRouteV2R2RSpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/StandoffRouteV2R2RSpec.scala
index a14e5be45d..1c84141bf6 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/StandoffRouteV2R2RSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/StandoffRouteV2R2RSpec.scala
@@ -28,7 +28,6 @@ import scala.concurrent.ExecutionContextExecutor
  * here: http://spray.io/documentation/1.2.2/spray-testkit/
  */
 class StandoffRouteV2R2RSpec extends R2RSpec {
-
   override def testConfigSource: String =
     """
       |# akka.loglevel = "DEBUG"
@@ -47,7 +46,6 @@ class StandoffRouteV2R2RSpec extends R2RSpec {
   private val password = SharedTestDataADM.testPass
 
   object RequestParams {
-
     val pathToLetterMapping = "test_data/test_route/texts/mappingForLetter.xml"
 
     val pathToLetterXML = "test_data/test_route/texts/letter.xml"
@@ -72,10 +70,8 @@ class StandoffRouteV2R2RSpec extends R2RSpec {
   )
 
   "The Standoff v2 Endpoint" should {
-
     "create a mapping from a XML" in {
-
-      val xmlFileToSend = Paths.get(RequestParams.pathToLetterMapping)
+      val xmlFileToSend = Paths.get("..", RequestParams.pathToLetterMapping)
 
       val mappingParams =
         s"""
@@ -115,7 +111,7 @@ class StandoffRouteV2R2RSpec extends R2RSpec {
         )
 
         val expectedAnswerJSONLD =
-          FileUtil.readTextFile(Paths.get("test_data/standoffR2RV2/mappingCreationResponse.jsonld"))
+          FileUtil.readTextFile(Paths.get("..", "test_data/standoffR2RV2/mappingCreationResponse.jsonld"))
 
         compareJSONLDForMappingCreationResponse(
           expectedJSONLD = expectedAnswerJSONLD,
diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala
index adeae97d3b..8953361643 100644
--- a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala
@@ -675,7 +675,7 @@ class ValuesRouteV2E2ESpec extends E2ESpec {
     val responseStr = responseToString(response)
     assert(response.status == StatusCodes.OK, responseStr)
     val expectedResponseStr =
-      readOrWriteTextFile(responseStr, Paths.get(s"test_data/valuesE2EV2/$fileBasename.jsonld"), writeTestDataFiles)
+      readOrWriteTextFile(responseStr, Paths.get("..", s"test_data/valuesE2EV2/$fileBasename.jsonld"), writeTestDataFiles)
     compareJSONLDForResourcesResponse(expectedJSONLD = expectedResponseStr, receivedJSONLD = responseStr)
 
     clientTestDataCollector.addFile(
@@ -968,17 +968,6 @@ class ValuesRouteV2E2ESpec extends E2ESpec {
            |  }
            |}""".stripMargin
 
-      clientTestDataCollector.addFile(
-        TestDataFileContent(
-          filePath = TestDataFilePath(
-            directoryPath = clientTestDataPath,
-            filename = "create-int-value-with-custom-UUID-request",
-            fileExtension = "json"
-          ),
-          text = jsonLDEntity
-        )
-      )
-
       val request = Post(
         baseApiUrl + "/v2/values",
         HttpEntity(RdfMediaTypes.`application/ld+json`, jsonLDEntity)
@@ -2073,7 +2062,7 @@ class ValuesRouteV2E2ESpec extends E2ESpec {
     "create a text value with standoff containing escaped text" in {
       val resourceIri = AThing.iri
       val maybeResourceLastModDate: Option[Instant] = getResourceLastModificationDate(resourceIri, anythingUserEmail)
-      val jsonLDEntity = FileUtil.readTextFile(Paths.get("test_data/valuesE2EV2/CreateValueWithEscape.jsonld"))
+      val jsonLDEntity = FileUtil.readTextFile(Paths.get("..", "test_data/valuesE2EV2/CreateValueWithEscape.jsonld"))
       val request = Post(
         baseApiUrl + "/v2/values",
         HttpEntity(RdfMediaTypes.`application/ld+json`, jsonLDEntity)
@@ -2107,7 +2096,7 @@ class ValuesRouteV2E2ESpec extends E2ESpec {
     "create a TextValue from XML representing HTML with an attribute containing escaped quotes" in {
       // Create the mapping.
 
-      val xmlFileToSend = Paths.get("test_data/test_route/texts/mappingForHTML.xml")
+      val xmlFileToSend = Paths.get("..", "test_data/test_route/texts/mappingForHTML.xml")
 
       val mappingParams =
         s"""{
@@ -4001,7 +3990,7 @@ class ValuesRouteV2E2ESpec extends E2ESpec {
     "update a text value with standoff containing escaped text" in {
       val resourceIri = AThing.iri
       val maybeResourceLastModDate: Option[Instant] = getResourceLastModificationDate(resourceIri, anythingUserEmail)
-      val jsonLDEntity = FileUtil.readTextFile(Paths.get("test_data/valuesE2EV2/UpdateValueWithEscape.jsonld"))
+      val jsonLDEntity = FileUtil.readTextFile(Paths.get("..","test_data/valuesE2EV2/UpdateValueWithEscape.jsonld"))
       val jsonLDEntityWithResourceValueIri = jsonLDEntity.replace("VALUE_IRI", textValueWithEscapeIri.get)
       val request = Put(
         baseApiUrl + "/v2/values",
diff --git a/webapi/src/test/scala/org/knora/webapi/http/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/http/BUILD.bazel
deleted file mode 100644
index ffd0fb0cdc..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/http/BUILD.bazel
+++ /dev/null
@@ -1 +0,0 @@
-package(default_visibility = ["//visibility:public"])
diff --git a/webapi/src/test/scala/org/knora/webapi/http/version/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/http/version/BUILD.bazel
deleted file mode 100644
index 9564b0b0d8..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/http/version/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "ServerVersionSpec",
-    size = "small",  # 60s
-    srcs = [
-        "ServerVersionSpec.scala",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    runtime_deps = [
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_13",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/http/version/BuildInfoSpec.scala b/webapi/src/test/scala/org/knora/webapi/http/version/BuildInfoSpec.scala
new file mode 100644
index 0000000000..6e1382f928
--- /dev/null
+++ b/webapi/src/test/scala/org/knora/webapi/http/version/BuildInfoSpec.scala
@@ -0,0 +1,21 @@
+/*
+ * Copyright © 2021 - 2022 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package org.knora.webapi.http.version
+
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.wordspec.AnyWordSpecLike
+
+/**
+ * This spec is used to test 'BuildInfo'.
+ */
+class BuildInfoSpec extends AnyWordSpecLike with Matchers {
+  "The version info" should {
+    "contain all the necessary information" in {
+      BuildInfo.name should be("webapi")
+      BuildInfo.version should not be empty
+    }
+  }
+}
diff --git a/webapi/src/test/scala/org/knora/webapi/http/version/ServerVersionSpec.scala b/webapi/src/test/scala/org/knora/webapi/http/version/ServerVersionSpec.scala
index 7e570df86a..944a5ed4dd 100644
--- a/webapi/src/test/scala/org/knora/webapi/http/version/ServerVersionSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/http/version/ServerVersionSpec.scala
@@ -10,12 +10,10 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.wordspec.AnyWordSpecLike
 
 /**
- * This spec is used to test 'ListAdminMessages'.
+ * This spec is used to test 'ServerVersion'.
  */
 class ServerVersionSpec extends AnyWordSpecLike with Matchers {
-
   "The server version header" should {
-
     "contain the necessary information" in {
       val header: Server = ServerVersion.serverVersionHeader
       header.toString() should include("webapi/")
diff --git a/webapi/src/test/scala/org/knora/webapi/http/version/versioninfo/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/http/version/versioninfo/BUILD.bazel
deleted file mode 100644
index e4513125ba..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/http/version/versioninfo/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "VersionInfoSpec",
-    size = "small",  # 60s
-    srcs = [
-        "VersionInfoSpec.scala",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    runtime_deps = [
-        "@maven//:ch_qos_logback_logback_classic",
-        "@maven//:ch_qos_logback_logback_core",
-        "@maven//:com_typesafe_akka_akka_slf4j_2_13",
-        "@maven//:org_slf4j_log4j_over_slf4j",
-    ],
-    deps = [
-        "//webapi/src/main/scala/org/knora/webapi/http/version/versioninfo",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/http/version/versioninfo/VersionInfoSpec.scala b/webapi/src/test/scala/org/knora/webapi/http/version/versioninfo/VersionInfoSpec.scala
deleted file mode 100644
index 089174978f..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/http/version/versioninfo/VersionInfoSpec.scala
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright © 2021 - 2022 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package org.knora.webapi.http.version.versioninfo
-
-import org.scalatest.matchers.should.Matchers
-import org.scalatest.wordspec.AnyWordSpecLike
-
-/**
- * This spec is used to test 'ListAdminMessages'.
- */
-class VersionInfoSpec extends AnyWordSpecLike with Matchers {
-
-  "The version info" should {
-
-    "contain all the necessary information" in {
-      VersionInfo.name should be("webapi")
-
-      // all regex match semver: https://gist.github.com/jhorsman/62eeea161a13b80e39f5249281e17c39
-      VersionInfo.webapiVersion should fullyMatch regex """^(v[0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$"""
-      VersionInfo.scalaVersion should fullyMatch regex """^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$"""
-      VersionInfo.akkaHttpVersion should fullyMatch regex """^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$"""
-      VersionInfo.sipiVersion should fullyMatch regex """^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$"""
-      VersionInfo.jenaFusekiVersion should fullyMatch regex """^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?(?:\+[0-9A-Za-z-]+)?$"""
-    }
-  }
-}
diff --git a/webapi/src/test/scala/org/knora/webapi/it/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/it/BUILD.bazel
deleted file mode 100644
index 1a5c4fab63..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/it/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "VersionRouteITSpec",
-    size = "small",
-    srcs = [
-        "VersionRouteITSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    runtime_deps = [
-        "@maven//:org_bouncycastle_bcprov_jdk15on",
-    ],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:test_library",
-        "//webapi:main_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/it/v1/BUILD.bazel
deleted file mode 100644
index df23b17466..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/it/v1/BUILD.bazel
+++ /dev/null
@@ -1,78 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "DrawingsGodsV1ITSpec",
-    size = "small",
-    srcs = [
-        "DrawingsGodsV1ITSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:test_library",
-        "//webapi:main_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ErrorV1ITSpec",
-    size = "small",
-    srcs = [
-        "ErrorV1ITSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:test_library",
-        "//webapi:main_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "KnoraSipiIntegrationV1ITSpec",
-    size = "medium",  # On Github CI it takes more than 60s!
-    srcs = [
-        "KnoraSipiIntegrationV1ITSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:test_library",
-        "//webapi:main_library",
-        "@maven//:org_scala_lang_modules_scala_xml_2_13",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "KnoraSipiPermissionsV1ITSpec",
-    size = "small",
-    srcs = [
-        "KnoraSipiPermissionsV1ITSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:test_library",
-        "//webapi:main_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala b/webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala
index 03a93cc63c..4c7321aeca 100644
--- a/webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala
@@ -19,6 +19,7 @@ import spray.json._
 
 import scala.concurrent.Await
 import scala.concurrent.duration._
+import java.nio.file.Paths
 
 object DrawingsGodsV1ITSpec {
   val config: Config = ConfigFactory.parseString("""
@@ -58,7 +59,7 @@ class DrawingsGodsV1ITSpec
 
     val drawingsOfGodsUserEmail = "ddd1@unil.ch"
     val testPass = "test"
-    val pathToChlaus = "test_data/test_route/images/Chlaus.jpg"
+    val pathToChlaus = Paths.get("..", "test_data/test_route/images/Chlaus.jpg")
     var loginToken: String = ""
 
     "log in as a Knora user" in {
diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala b/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala
index ce2c84ee1c..0f638c6915 100644
--- a/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala
@@ -26,6 +26,7 @@ import scala.concurrent.duration._
 import scala.concurrent.{Await, Future}
 import scala.xml._
 import scala.xml.transform.{RewriteRule, RuleTransformer}
+import java.nio.file.Path
 
 object KnoraSipiIntegrationV1ITSpec {
   val config: Config = ConfigFactory.parseString("""
@@ -49,18 +50,19 @@ class KnoraSipiIntegrationV1ITSpec
 
   private val userEmail = SharedTestDataADM.rootUser.email
   private val password = SharedTestDataADM.testPass
-  private val pathToChlaus = "test_data/test_route/images/Chlaus.jpg"
-  private val pathToMarbles = "test_data/test_route/images/marbles.tif"
-  private val pathToXSLTransformation = "test_data/test_route/texts/letterToHtml.xsl"
-  private val pathToMappingWithXSLT = "test_data/test_route/texts/mappingForLetterWithXSLTransformation.xml"
+  private val pathToChlaus = Paths.get("..", "test_data/test_route/images/Chlaus.jpg")
+  private val pathToMarbles = Paths.get("..", "test_data/test_route/images/marbles.tif")
+  private val pathToXSLTransformation = Paths.get("..", "test_data/test_route/texts/letterToHtml.xsl")
+  private val pathToMappingWithXSLT =
+    Paths.get("..", "test_data/test_route/texts/mappingForLetterWithXSLTransformation.xml")
   private val secondPageIri = new MutableTestIri
 
-  private val pathToBEOLBodyXSLTransformation = "test_data/test_route/texts/beol/standoffToTEI.xsl"
-  private val pathToBEOLStandoffTEIMapping = "test_data/test_route/texts/beol/BEOLTEIMapping.xml"
-  private val pathToBEOLHeaderXSLTransformation = "test_data/test_route/texts/beol/header.xsl"
-  private val pathToBEOLGravsearchTemplate = "test_data/test_route/texts/beol/gravsearch.txt"
-  private val pathToBEOLLetterMapping = "test_data/test_route/texts/beol/testLetter/beolMapping.xml"
-  private val pathToBEOLBulkXML = "test_data/test_route/texts/beol/testLetter/bulk.xml"
+  private val pathToBEOLBodyXSLTransformation = Paths.get("..", "test_data/test_route/texts/beol/standoffToTEI.xsl")
+  private val pathToBEOLStandoffTEIMapping = Paths.get("..", "test_data/test_route/texts/beol/BEOLTEIMapping.xml")
+  private val pathToBEOLHeaderXSLTransformation = Paths.get("..", "test_data/test_route/texts/beol/header.xsl")
+  private val pathToBEOLGravsearchTemplate = Paths.get("..", "test_data/test_route/texts/beol/gravsearch.txt")
+  private val pathToBEOLLetterMapping = Paths.get("..", "test_data/test_route/texts/beol/testLetter/beolMapping.xml")
+  private val pathToBEOLBulkXML = Paths.get("..", "test_data/test_route/texts/beol/testLetter/bulk.xml")
   private val letterIri = new MutableTestIri
   private val gravsearchTemplateIri = new MutableTestIri
 
@@ -70,32 +72,32 @@ class KnoraSipiIntegrationV1ITSpec
   private val videoResourceIri = new MutableTestIri
 
   private val minimalPdfOriginalFilename = "minimal.pdf"
-  private val pathToMinimalPdf = s"test_data/test_route/files/$minimalPdfOriginalFilename"
+  private val pathToMinimalPdf = Paths.get("..", s"test_data/test_route/files/$minimalPdfOriginalFilename")
   private val minimalPdfWidth = 1250
   private val minimalPdfHeight = 600
 
   private val testPdfOriginalFilename = "test.pdf"
-  private val pathToTestPdf = s"test_data/test_route/files/$testPdfOriginalFilename"
+  private val pathToTestPdf = Paths.get("..", s"test_data/test_route/files/$testPdfOriginalFilename")
   private val testPdfWidth = 2480
   private val testPdfHeight = 3508
 
   private val minimalZipOriginalFilename = "minimal.zip"
-  private val pathToMinimalZip = s"test_data/test_route/files/$minimalZipOriginalFilename"
+  private val pathToMinimalZip = Paths.get("..", s"test_data/test_route/files/$minimalZipOriginalFilename")
 
   private val testZipOriginalFilename = "test.zip"
-  private val pathToTestZip = s"test_data/test_route/files/$testZipOriginalFilename"
+  private val pathToTestZip = Paths.get("..", s"test_data/test_route/files/$testZipOriginalFilename")
 
   private val minimalWavOriginalFilename = "minimal.wav"
-  private val pathToMinimalWav = s"test_data/test_route/files/$minimalWavOriginalFilename"
+  private val pathToMinimalWav = Paths.get("..", s"test_data/test_route/files/$minimalWavOriginalFilename")
 
   private val testWavOriginalFilename = "test.wav"
-  private val pathToTestWav = s"test_data/test_route/files/$testWavOriginalFilename"
+  private val pathToTestWav = Paths.get("..", s"test_data/test_route/files/$testWavOriginalFilename")
 
   private val testVideoOriginalFilename = "testVideo.mp4"
-  private val pathToTestVideo = s"test_data/test_route/files/$testVideoOriginalFilename"
+  private val pathToTestVideo = Paths.get("..", s"test_data/test_route/files/$testVideoOriginalFilename")
 
   private val testVideo2OriginalFilename = "testVideo2.mp4"
-  private val pathToTestVideo2 = s"test_data/test_route/files/$testVideoOriginalFilename"
+  private val pathToTestVideo2 = Paths.get("..", s"test_data/test_route/files/$testVideoOriginalFilename")
 
   /**
    * Adds the IRI of a XSL transformation to the given mapping.
@@ -316,17 +318,15 @@ class KnoraSipiIntegrationV1ITSpec
     }
 
     "create an 'p0803-incunabula:book' and an 'p0803-incunabula:page' with file parameters via XML import" in {
-      val fileToUpload = Paths.get(pathToChlaus)
-
       // To be able to run packaged tests inside Docker, we need to copy
       // the file first to a place which is shared with sipi
-      val dest = FileUtil.createTempFile(settings, Some("jpg"))
-      Files.copy(fileToUpload, dest, StandardCopyOption.REPLACE_EXISTING)
+      val dest: Path = FileUtil.createTempFile(settings, Some("jpg"))
+      Files.copy(pathToChlaus, dest, StandardCopyOption.REPLACE_EXISTING)
 
       // Upload the image to Sipi.
       val sipiUploadResponse: SipiUploadResponse = uploadToSipi(
         loginToken = loginToken,
-        filesToUpload = Seq(FileToUpload(path = dest.toAbsolutePath.toString, mimeType = MediaTypes.`image/tiff`))
+        filesToUpload = Seq(FileToUpload(path = dest, mimeType = MediaTypes.`image/tiff`))
       )
 
       val uploadedFile: SipiUploadResponseEntry = sipiUploadResponse.uploadedFiles.head
@@ -431,7 +431,7 @@ class KnoraSipiIntegrationV1ITSpec
 
       // add a mapping referring to the XSLT as the default XSL transformation
 
-      val mapping = FileUtil.readTextFile(Paths.get(pathToMappingWithXSLT))
+      val mapping = FileUtil.readTextFile(pathToMappingWithXSLT)
 
       val updatedMapping = addXSLTIriToMapping(mapping, resId)
 
@@ -466,7 +466,7 @@ class KnoraSipiIntegrationV1ITSpec
     }
 
     "create a sample BEOL letter" in {
-      val mapping = FileUtil.readTextFile(Paths.get(pathToBEOLLetterMapping))
+      val mapping = FileUtil.readTextFile(pathToBEOLLetterMapping)
 
       val paramsForMapping =
         s"""
@@ -498,7 +498,7 @@ class KnoraSipiIntegrationV1ITSpec
 
       // create a letter via bulk import
 
-      val bulkXML = FileUtil.readTextFile(Paths.get(pathToBEOLBulkXML))
+      val bulkXML = FileUtil.readTextFile(pathToBEOLBulkXML)
 
       val bulkRequest = Post(
         baseApiUrl + "/v1/resources/xmlimport/" + URLEncoder
@@ -552,7 +552,7 @@ class KnoraSipiIntegrationV1ITSpec
 
       // add a mapping referring to the XSLT as the default XSL transformation
 
-      val mapping = FileUtil.readTextFile(Paths.get(pathToBEOLStandoffTEIMapping))
+      val mapping = FileUtil.readTextFile(pathToBEOLStandoffTEIMapping)
 
       val updatedMapping = addXSLTIriToMapping(mapping, resId)
 
diff --git a/webapi/src/test/scala/org/knora/webapi/it/v2/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/it/v2/BUILD.bazel
deleted file mode 100644
index 09a2c32ba6..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/it/v2/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "KnoraSipiIntegrationV2ITSpec",
-    size = "medium",
-    srcs = [
-        "KnoraSipiIntegrationV2ITSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:test_library",
-        "//webapi:main_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala b/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala
index cb44236903..1cb9a9ba1f 100644
--- a/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala
@@ -62,60 +62,60 @@ class KnoraSipiIntegrationV2ITSpec
   private val videoValueIri = new MutableTestIri
 
   private val marblesOriginalFilename = "marbles.tif"
-  private val pathToMarbles = s"test_data/test_route/images/$marblesOriginalFilename"
+  private val pathToMarbles = Paths.get("..", s"test_data/test_route/images/$marblesOriginalFilename")
   private val marblesWidth = 1419
   private val marblesHeight = 1001
 
-  private val pathToMarblesWithWrongExtension = "test_data/test_route/images/marbles_with_wrong_extension.jpg"
+  private val pathToMarblesWithWrongExtension = Paths.get("..", "test_data/test_route/images/marbles_with_wrong_extension.jpg")
 
   private val trp88OriginalFilename = "Trp88.tiff"
-  private val pathToTrp88 = s"test_data/test_route/images/$trp88OriginalFilename"
+  private val pathToTrp88 = Paths.get("..", s"test_data/test_route/images/$trp88OriginalFilename")
   private val trp88Width = 499
   private val trp88Height = 630
 
   private val minimalPdfOriginalFilename = "minimal.pdf"
-  private val pathToMinimalPdf = s"test_data/test_route/files/$minimalPdfOriginalFilename"
+  private val pathToMinimalPdf = Paths.get("..", s"test_data/test_route/files/$minimalPdfOriginalFilename")
   private val minimalPdfWidth = 1250
   private val minimalPdfHeight = 600
 
   private val testPdfOriginalFilename = "test.pdf"
-  private val pathToTestPdf = s"test_data/test_route/files/$testPdfOriginalFilename"
+  private val pathToTestPdf = Paths.get("..", s"test_data/test_route/files/$testPdfOriginalFilename")
   private val testPdfWidth = 2480
   private val testPdfHeight = 3508
 
   private val csv1OriginalFilename = "eggs.csv"
-  private val pathToCsv1 = s"test_data/test_route/files/$csv1OriginalFilename"
+  private val pathToCsv1 = Paths.get("..", s"test_data/test_route/files/$csv1OriginalFilename")
 
   private val csv2OriginalFilename = "spam.csv"
-  private val pathToCsv2 = s"test_data/test_route/files/$csv2OriginalFilename"
+  private val pathToCsv2 = Paths.get("..", s"test_data/test_route/files/$csv2OriginalFilename")
 
   private val xml1OriginalFilename = "test1.xml"
-  private val pathToXml1 = s"test_data/test_route/files/$xml1OriginalFilename"
+  private val pathToXml1 = Paths.get("..", s"test_data/test_route/files/$xml1OriginalFilename")
 
   private val xml2OriginalFilename = "test2.xml"
-  private val pathToXml2 = s"test_data/test_route/files/$xml2OriginalFilename"
+  private val pathToXml2 = Paths.get("..", s"test_data/test_route/files/$xml2OriginalFilename")
 
   private val minimalZipOriginalFilename = "minimal.zip"
-  private val pathToMinimalZip = s"test_data/test_route/files/$minimalZipOriginalFilename"
+  private val pathToMinimalZip = Paths.get("..", s"test_data/test_route/files/$minimalZipOriginalFilename")
 
   private val testZipOriginalFilename = "test.zip"
-  private val pathToTestZip = s"test_data/test_route/files/$testZipOriginalFilename"
+  private val pathToTestZip = Paths.get("..", s"test_data/test_route/files/$testZipOriginalFilename")
 
   private val test7zOriginalFilename = "test.7z"
-  private val pathToTest7z = s"test_data/test_route/files/$test7zOriginalFilename"
+  private val pathToTest7z = Paths.get("..", s"test_data/test_route/files/$test7zOriginalFilename")
 
   private val minimalWavOriginalFilename = "minimal.wav"
-  private val pathToMinimalWav = s"test_data/test_route/files/$minimalWavOriginalFilename"
+  private val pathToMinimalWav = Paths.get("..", s"test_data/test_route/files/$minimalWavOriginalFilename")
   private val minimalWavDuration = BigDecimal("0.0")
 
   private val testWavOriginalFilename = "test.wav"
-  private val pathToTestWav = s"test_data/test_route/files/$testWavOriginalFilename"
+  private val pathToTestWav = Paths.get("..", s"test_data/test_route/files/$testWavOriginalFilename")
 
   private val testVideoOriginalFilename = "testVideo.mp4"
-  private val pathToTestVideo = s"test_data/test_route/files/$testVideoOriginalFilename"
+  private val pathToTestVideo = Paths.get("..", s"test_data/test_route/files/$testVideoOriginalFilename")
 
   private val testVideo2OriginalFilename = "test.wav"
-  private val pathToTestVideo2 = s"test_data/test_route/files/$testVideo2OriginalFilename"
+  private val pathToTestVideo2 = Paths.get("..", s"test_data/test_route/files/$testVideo2OriginalFilename")
 
   private val thingDocumentIRI = "http://0.0.0.0:3333/ontology/0001/anything/v2#ThingDocument"
 
@@ -386,15 +386,14 @@ class KnoraSipiIntegrationV2ITSpec
         "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJLbm9yYSIsInN1YiI6Imh0dHA6Ly9yZGZoLmNoL3VzZXJzLzlYQkNyRFYzU1JhN2tTMVd3eW5CNFEiLCJhdWQiOlsiS25vcmEiLCJTaXBpIl0sImV4cCI6NDY5NDM1MTEyMiwiaWF0IjoxNTQxNzU5MTIyLCJqdGkiOiJ4bnlYeklFb1QxNmM2dkpDbHhSQllnIn0.P2Aq37G6XMLLBVMdnpDVVhWjenbVw0HTb1BpEuTWGRo"
 
       // The image to be uploaded.
-      val fileToSend = Paths.get(pathToMarbles)
-      assert(Files.exists(fileToSend), s"File $pathToMarbles does not exist")
+      assert(Files.exists(pathToMarbles), s"File $pathToMarbles does not exist")
 
       // A multipart/form-data request containing the image.
       val sipiFormData = Multipart.FormData(
         Multipart.FormData.BodyPart(
           "file",
-          HttpEntity.fromPath(MediaTypes.`image/tiff`, fileToSend),
-          Map("filename" -> fileToSend.getFileName.toString)
+          HttpEntity.fromPath(MediaTypes.`image/tiff`, pathToMarbles),
+          Map("filename" -> pathToMarbles.getFileName.toString)
         )
       )
 
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/BUILD.bazel
deleted file mode 100644
index 4933be6fc8..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/BUILD.bazel
+++ /dev/null
@@ -1,29 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-filegroup(
-    name = "SessionMessagesV1",
-    srcs = [
-        "v1/responder/sessionmessages/SessionMessagesV1.scala",
-    ],
-)
-
-scala_test(
-    name = "StringFormatterSpec",
-    size = "small",
-    srcs = [
-        "StringFormatterSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/BUILD.bazel
deleted file mode 100644
index 23f5d33f7a..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "ListsMessagesADMSpec",
-    size = "small",  # 60s
-    srcs = [
-        "ListsMessagesADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/BUILD.bazel
deleted file mode 100644
index 367e7d5fe2..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "PermissionsMessagesADMSpec",
-    size = "small",  # 60s
-    srcs = [
-        "PermissionsMessagesADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/BUILD.bazel
deleted file mode 100644
index eed09d9af1..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "ProjectsMessagesADMSpec",
-    size = "small",  # 60s
-    srcs = [
-        "ProjectsMessagesADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/BUILD.bazel
deleted file mode 100644
index 599f93fb7d..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/BUILD.bazel
+++ /dev/null
@@ -1,25 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "UsersMessagesADMSpec",
-    size = "small",  # 60s
-    srcs = [
-        "UsersMessagesADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_springframework_security_spring_security_core",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/valueObjects/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/valueObjects/BUILD.bazel
deleted file mode 100644
index 2e85007fb2..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/valueObjects/BUILD.bazel
+++ /dev/null
@@ -1,27 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "ValueObjectsADMSpec",
-    size = "small",  # 60s
-    srcs = [
-        "GroupsValueObjectsADMSpec.scala",
-        "ProjectsValueObjectsADMSpec.scala",
-        "ListsValueObjectsADMSpec.scala",
-        "UsersValueObjectsADMSpec.scala",
-        "ValueObjectsADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_springframework_security_spring_security_core",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/BUILD.bazel
deleted file mode 100644
index 0deaea2e61..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/BUILD.bazel
+++ /dev/null
@@ -1,21 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "TriplestoreMessagesSpec",
-    size = "small",  # 60s
-    srcs = [
-        "TriplestoreMessagesSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/util/BUILD.bazel
deleted file mode 100644
index 9c08e5b5fd..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/BUILD.bazel
+++ /dev/null
@@ -1,77 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "CalendarDateUtilV2Spec",
-    size = "small",
-    srcs = [
-        "CalendarDateUtilV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "ConstructResponseUtilV2Spec",
-    size = "small",
-    srcs = [
-        "ConstructResponseUtilV2Spec.scala",
-        "ConstructResponseUtilV2SpecFullData.scala",
-        "//webapi/src/test/scala/org/knora/webapi/responders/v2:ResourcesResponderV2SpecFullData.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "DateUtilV1Spec",
-    size = "small",
-    srcs = [
-        "DateUtilV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "PermissionUtilADMSpec",
-    size = "small",
-    srcs = [
-        "PermissionUtilADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala
index 0358a2b001..60bbaec38f 100644
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala
@@ -38,7 +38,7 @@ class ConstructResponseUtilV2Spec extends CoreSpec() with ImplicitSender {
 
     "convert a resource Turtle response into a resource" in {
       val resourceIri: IRI = "http://rdfh.ch/0803/c5058f3a"
-      val turtleStr: String = FileUtil.readTextFile(Paths.get("test_data/constructResponseUtilV2/Zeitglocklein.ttl"))
+      val turtleStr: String = FileUtil.readTextFile(Paths.get("..", "test_data/constructResponseUtilV2/Zeitglocklein.ttl"))
       val resourceRequestResponse: SparqlExtendedConstructResponse =
         SparqlExtendedConstructResponse.parseTurtleResponse(turtleStr, rdfFormatUtil, log).get
       val mainResourcesAndValueRdfData: ConstructResponseUtilV2.MainResourcesAndValueRdfData =
@@ -73,7 +73,7 @@ class ConstructResponseUtilV2Spec extends CoreSpec() with ImplicitSender {
     "convert a resource Turtle response with hidden values into a resource with the anything admin user" in {
       val resourceIri: IRI = "http://rdfh.ch/0001/F8L7zPp7TI-4MGJQlCO4Zg"
       val turtleStr: String =
-        FileUtil.readTextFile(Paths.get("test_data/constructResponseUtilV2/visibleThingWithHiddenIntValues.ttl"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/constructResponseUtilV2/visibleThingWithHiddenIntValues.ttl"))
       val resourceRequestResponse: SparqlExtendedConstructResponse =
         SparqlExtendedConstructResponse.parseTurtleResponse(turtleStr, rdfFormatUtil, log).get
       val mainResourcesAndValueRdfData: ConstructResponseUtilV2.MainResourcesAndValueRdfData =
@@ -109,7 +109,7 @@ class ConstructResponseUtilV2Spec extends CoreSpec() with ImplicitSender {
     "convert a resource Turtle response with hidden values into a resource with the incunabula user" in {
       val resourceIri: IRI = "http://rdfh.ch/0001/F8L7zPp7TI-4MGJQlCO4Zg"
       val turtleStr: String =
-        FileUtil.readTextFile(Paths.get("test_data/constructResponseUtilV2/visibleThingWithHiddenIntValues.ttl"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/constructResponseUtilV2/visibleThingWithHiddenIntValues.ttl"))
       val resourceRequestResponse: SparqlExtendedConstructResponse =
         SparqlExtendedConstructResponse.parseTurtleResponse(turtleStr, rdfFormatUtil, log).get
       val mainResourcesAndValueRdfData: ConstructResponseUtilV2.MainResourcesAndValueRdfData =
@@ -145,7 +145,7 @@ class ConstructResponseUtilV2Spec extends CoreSpec() with ImplicitSender {
     "convert a resource Turtle response with a hidden thing into a resource with the anything admin user" in {
       val resourceIri: IRI = "http://rdfh.ch/0001/0JhgKcqoRIeRRG6ownArSw"
       val turtleStr: String =
-        FileUtil.readTextFile(Paths.get("test_data/constructResponseUtilV2/thingWithOneHiddenThing.ttl"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/constructResponseUtilV2/thingWithOneHiddenThing.ttl"))
       val resourceRequestResponse: SparqlExtendedConstructResponse =
         SparqlExtendedConstructResponse.parseTurtleResponse(turtleStr, rdfFormatUtil, log).get
       val mainResourcesAndValueRdfData: ConstructResponseUtilV2.MainResourcesAndValueRdfData =
@@ -181,7 +181,7 @@ class ConstructResponseUtilV2Spec extends CoreSpec() with ImplicitSender {
     "convert a resource Turtle response with a hidden thing into a resource with an unknown user" in {
       val resourceIri: IRI = "http://rdfh.ch/0001/0JhgKcqoRIeRRG6ownArSw"
       val turtleStr: String =
-        FileUtil.readTextFile(Paths.get("test_data/constructResponseUtilV2/thingWithOneHiddenThing.ttl"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/constructResponseUtilV2/thingWithOneHiddenThing.ttl"))
       val resourceRequestResponse: SparqlExtendedConstructResponse =
         SparqlExtendedConstructResponse.parseTurtleResponse(turtleStr, rdfFormatUtil, log).get
       val mainResourcesAndValueRdfData: ConstructResponseUtilV2.MainResourcesAndValueRdfData =
@@ -217,7 +217,7 @@ class ConstructResponseUtilV2Spec extends CoreSpec() with ImplicitSender {
     "convert a resource Turtle response with standoff into a resource with anything admin user" in {
       val resourceIri: IRI = "http://rdfh.ch/0001/a-thing-with-text-values"
       val turtleStr: String =
-        FileUtil.readTextFile(Paths.get("test_data/constructResponseUtilV2/thingWithStandoff.ttl"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/constructResponseUtilV2/thingWithStandoff.ttl"))
       val resourceRequestResponse: SparqlExtendedConstructResponse =
         SparqlExtendedConstructResponse.parseTurtleResponse(turtleStr, rdfFormatUtil, log).get
       val mainResourcesAndValueRdfData: ConstructResponseUtilV2.MainResourcesAndValueRdfData =
@@ -283,7 +283,7 @@ class ConstructResponseUtilV2Spec extends CoreSpec() with ImplicitSender {
        */
 
       val resourceIris: Seq[IRI] = Seq("http://rdfh.ch/0803/76570a749901", "http://rdfh.ch/0803/773f258402")
-      val turtleStr: String = FileUtil.readTextFile(Paths.get("test_data/constructResponseUtilV2/mainQuery1.ttl"))
+      val turtleStr: String = FileUtil.readTextFile(Paths.get("..", "test_data/constructResponseUtilV2/mainQuery1.ttl"))
       val resourceRequestResponse: SparqlExtendedConstructResponse =
         SparqlExtendedConstructResponse.parseTurtleResponse(turtleStr, rdfFormatUtil, log).get
       val mainResourcesAndValueRdfData: ConstructResponseUtilV2.MainResourcesAndValueRdfData =
@@ -350,7 +350,7 @@ class ConstructResponseUtilV2Spec extends CoreSpec() with ImplicitSender {
        */
 
       val resourceIris: Seq[IRI] = Seq("http://rdfh.ch/0803/c5058f3a", "http://rdfh.ch/0803/ff17e5ef9601")
-      val turtleStr: String = FileUtil.readTextFile(Paths.get("test_data/constructResponseUtilV2/mainQuery2.ttl"))
+      val turtleStr: String = FileUtil.readTextFile(Paths.get("..", "test_data/constructResponseUtilV2/mainQuery2.ttl"))
       val resourceRequestResponse: SparqlExtendedConstructResponse =
         SparqlExtendedConstructResponse.parseTurtleResponse(turtleStr, rdfFormatUtil, log).get
       val mainResourcesAndValueRdfData: ConstructResponseUtilV2.MainResourcesAndValueRdfData =
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/BUILD.bazel
deleted file mode 100644
index 3168626a69..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/BUILD.bazel
+++ /dev/null
@@ -1,15 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "JsonLDUtilSpec.scala",
-        "KnoraResponseV2Spec.scala",
-        "RdfFormatUtilSpec.scala",
-        "RdfModelSpec.scala",
-        "ShaclValidatorSpec.scala",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala
index dacb8dcc77..0962e74a59 100644
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala
@@ -113,7 +113,7 @@ abstract class JsonLDUtilSpec(featureToggle: FeatureToggle) extends CoreSpec {
     "convert JSON-LD representing an ontology to an RDF4J Model" in {
       // Read a JSON-LD file.
       val inputJsonLD: String =
-        FileUtil.readTextFile(Paths.get("test_data/ontologyR2RV2/anythingOntologyWithValueObjects.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/ontologyR2RV2/anythingOntologyWithValueObjects.jsonld"))
 
       // Parse it to a JsonLDDocument.
       val jsonLDDocument: JsonLDDocument = JsonLDUtil.parseJsonLD(inputJsonLD)
@@ -123,7 +123,7 @@ abstract class JsonLDUtilSpec(featureToggle: FeatureToggle) extends CoreSpec {
 
       // Read an isomorphic Turtle file.
       val expectedTurtle: String =
-        FileUtil.readTextFile(Paths.get("test_data/ontologyR2RV2/anythingOntologyWithValueObjects.ttl"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/ontologyR2RV2/anythingOntologyWithValueObjects.ttl"))
 
       // Parse the Turtle to an RDF4J Model.
       val expectedModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = expectedTurtle, rdfFormat = Turtle)
@@ -134,7 +134,7 @@ abstract class JsonLDUtilSpec(featureToggle: FeatureToggle) extends CoreSpec {
 
     "convert an RDF4J Model representing an ontology to JSON-LD" in {
       // Read a Turtle file.
-      val turtle = FileUtil.readTextFile(Paths.get("test_data/ontologyR2RV2/anythingOntologyWithValueObjects.ttl"))
+      val turtle = FileUtil.readTextFile(Paths.get("..", "test_data/ontologyR2RV2/anythingOntologyWithValueObjects.ttl"))
 
       // Parse it to an RDF4J Model.
       val inputModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = turtle, rdfFormat = Turtle)
@@ -150,7 +150,7 @@ abstract class JsonLDUtilSpec(featureToggle: FeatureToggle) extends CoreSpec {
 
       // Read an isomorphic JSON-LD file.
       val expectedJsonLD =
-        FileUtil.readTextFile(Paths.get("test_data/ontologyR2RV2/anythingOntologyWithValueObjects.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/ontologyR2RV2/anythingOntologyWithValueObjects.jsonld"))
 
       // Parse it to an RDF4J Model.
       val jsonLDExpectedModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = expectedJsonLD, rdfFormat = JsonLD)
@@ -162,7 +162,7 @@ abstract class JsonLDUtilSpec(featureToggle: FeatureToggle) extends CoreSpec {
     "convert JSON-LD representing a resource to an RDF4J Model" in {
       // Read a JSON-LD file.
       val inputJsonLD: String =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
 
       // Parse it to a JsonLDDocument.
       val jsonLDDocument: JsonLDDocument = JsonLDUtil.parseJsonLD(inputJsonLD)
@@ -177,7 +177,7 @@ abstract class JsonLDUtilSpec(featureToggle: FeatureToggle) extends CoreSpec {
       outputModelAsJsonLDDocument should ===(jsonLDDocument)
 
       // Read an isomorphic Turtle file.
-      val expectedTurtle = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
+      val expectedTurtle = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
 
       // Parse it to an RDF4J Model.
       val expectedModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = expectedTurtle, rdfFormat = Turtle)
@@ -188,7 +188,7 @@ abstract class JsonLDUtilSpec(featureToggle: FeatureToggle) extends CoreSpec {
 
     "convert an RDF4J Model representing a resource to JSON-LD" in {
       // Read a Turtle file.
-      val turtle = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
+      val turtle = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
 
       // Parse it to an RDF4J Model.
       val inputModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = turtle, rdfFormat = Turtle)
@@ -203,7 +203,7 @@ abstract class JsonLDUtilSpec(featureToggle: FeatureToggle) extends CoreSpec {
       jsonLDOutputModel should ===(inputModel)
 
       // Read an isomorphic JSON-LD file.
-      val expectedJsonLD = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
+      val expectedJsonLD = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
 
       // Parse it to a JsonLDDocument and compare it with the generated one.
       val expectedJsonLDDocument: JsonLDDocument = JsonLDUtil.parseJsonLD(expectedJsonLD)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala
index c19f472186..0665d29282 100644
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala
@@ -131,7 +131,7 @@ abstract class KnoraResponseV2Spec(featureToggle: FeatureToggle) extends CoreSpe
   "KnoraResponseV2" should {
     "convert Turtle to JSON-LD" in {
       // Read a Turtle file representing a resource. TODO: Use sample project metadata for this test.
-      val turtle: String = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
+      val turtle: String = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
 
       // Wrap it in a KnoraTurtleResponseV2.
       val turtleTestResponse = TurtleTestResponse(turtle)
@@ -150,7 +150,7 @@ abstract class KnoraResponseV2Spec(featureToggle: FeatureToggle) extends CoreSpe
 
       // Read an isomorphic JSON-LD file and parse it to a JsonLDDocument.
       val expectedJsonLD: String =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
       val parsedExpectedJsonLD: JsonLDDocument = JsonLDUtil.parseJsonLD(expectedJsonLD)
 
       // Compare the two documents.
@@ -159,7 +159,7 @@ abstract class KnoraResponseV2Spec(featureToggle: FeatureToggle) extends CoreSpe
 
     "convert JSON-LD to Turtle" in {
       // Read a JSON-LD file representing a resource.
-      val jsonLD: String = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
+      val jsonLD: String = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
 
       // Wrap it in a KnoraJsonLDResponseV2.
       val jsonLDTestResponse = JsonLDTestResponse(JsonLDUtil.parseJsonLD(jsonLD))
@@ -178,7 +178,7 @@ abstract class KnoraResponseV2Spec(featureToggle: FeatureToggle) extends CoreSpe
 
       // Read an isomorphic Turtle file and parse it to an RDF4J Model.
       val expectedTurtle: String =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
       val parsedExpectedTurtle: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = expectedTurtle, rdfFormat = Turtle)
 
       // Compare the two models.
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala
index 5d5572d7cd..5e69f588bc 100644
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala
@@ -85,7 +85,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
 
   "RdfFormatUtil" should {
     "parse RDF in Turtle format, producing an RdfModel, then format it as Turtle again" in {
-      val inputTurtle: String = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
+      val inputTurtle: String = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
       val inputModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = inputTurtle, rdfFormat = Turtle)
       checkModelForRdfTypeBook(inputModel)
 
@@ -97,7 +97,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
 
     "parse RDF in JSON-LD format, producing an RdfModel, then format it as JSON-LD again" in {
       val inputTurtle: String =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
       val inputModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = inputTurtle, rdfFormat = JsonLD)
       checkModelForRdfTypeBook(inputModel)
 
@@ -108,7 +108,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
     }
 
     "parse RDF in Turtle format, producing a JsonLDDocument, then format it as Turtle again" in {
-      val inputTurtle: String = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
+      val inputTurtle: String = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl"))
       val inputModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = inputTurtle, rdfFormat = Turtle)
       val inputJsonLDDocument: JsonLDDocument =
         rdfFormatUtil.parseToJsonLDDocument(rdfStr = inputTurtle, rdfFormat = Turtle)
@@ -125,7 +125,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
     }
 
     "parse RDF in RDF/XML format, producing a JsonLDDocument, then format it as RDF/XML again" in {
-      val inputRdfXml: String = FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.rdf"))
+      val inputRdfXml: String = FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.rdf"))
       val inputModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = inputRdfXml, rdfFormat = RdfXml)
       val inputJsonLDDocument: JsonLDDocument =
         rdfFormatUtil.parseToJsonLDDocument(rdfStr = inputRdfXml, rdfFormat = RdfXml)
@@ -143,14 +143,14 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
 
     "parse RDF in TriG format" in {
       val graphIri = "http://example.org/data#"
-      val inputTrig = FileUtil.readTextFile(Paths.get("test_data/rdfFormatUtil/BookReiseInsHeiligeLand.trig"))
+      val inputTrig = FileUtil.readTextFile(Paths.get("..", "test_data/rdfFormatUtil/BookReiseInsHeiligeLand.trig"))
       val inputModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = inputTrig, rdfFormat = TriG)
       checkModelForRdfTypeBook(rdfModel = inputModel, context = Some(graphIri))
     }
 
     "parse RDF in N-Quads format" in {
       val graphIri = "http://example.org/data#"
-      val inputTrig = FileUtil.readTextFile(Paths.get("test_data/rdfFormatUtil/BookReiseInsHeiligeLand.nq"))
+      val inputTrig = FileUtil.readTextFile(Paths.get("..", "test_data/rdfFormatUtil/BookReiseInsHeiligeLand.nq"))
       val inputModel: RdfModel = rdfFormatUtil.parseToRdfModel(rdfStr = inputTrig, rdfFormat = NQuads)
       checkModelForRdfTypeBook(rdfModel = inputModel, context = Some(graphIri))
     }
@@ -158,7 +158,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
     "read Turtle, add a graph IRI to it, write it to a TriG file, and read back the TriG file" in {
       val graphIri = "http://example.org/data#"
       val rdfSource = RdfInputStreamSource(
-        new BufferedInputStream(Files.newInputStream(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl")))
+        new BufferedInputStream(Files.newInputStream(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl")))
       )
       val outputFile: Path = Files.createTempFile("test", ".trig")
 
@@ -176,7 +176,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
     "read Turtle, add a graph IRI to it, write it to an N-Quads file, and read back the N-Quads file" in {
       val graphIri = "http://example.org/data#"
       val rdfSource = RdfInputStreamSource(
-        new BufferedInputStream(Files.newInputStream(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl")))
+        new BufferedInputStream(Files.newInputStream(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.ttl")))
       )
       val outputFile: Path = Files.createTempFile("test", ".trig")
 
@@ -193,7 +193,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
 
     "parse RDF in JSON-LD format, producing a JsonLDDocument, then format it as JSON-LD again" in {
       val inputTurtle: String =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLand.jsonld"))
       val inputJsonLDDocument: JsonLDDocument =
         rdfFormatUtil.parseToJsonLDDocument(rdfStr = inputTurtle, rdfFormat = JsonLD)
       checkJsonLDDocumentForRdfTypeBook(inputJsonLDDocument)
@@ -207,7 +207,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
 
     "use prefixes and custom datatypes" in {
       val inputJsonLD: String =
-        FileUtil.readTextFile(Paths.get("test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.jsonld"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/resourcesR2RV2/BookReiseInsHeiligeLandSimple.jsonld"))
       val inputJsonLDDocument: JsonLDDocument = JsonLDUtil.parseJsonLD(inputJsonLD)
       val outputModel: RdfModel = inputJsonLDDocument.toRdfModel(rdfModelFactory)
 
@@ -231,7 +231,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
 
     "parse RDF from a stream and process it using an RdfStreamProcessor" in {
       val inputStream =
-        new BufferedInputStream(Files.newInputStream(Paths.get("test_data/ontologies/anything-onto.ttl")))
+        new BufferedInputStream(Files.newInputStream(Paths.get("..", "test_data/ontologies/anything-onto.ttl")))
       val testStreamProcessor = new TestStreamProcessor
 
       rdfFormatUtil.parseWithStreamProcessor(
@@ -248,7 +248,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
       // to a ByteArrayOutputStream.
 
       val fileInputStream =
-        new BufferedInputStream(Files.newInputStream(Paths.get("test_data/ontologies/anything-onto.ttl")))
+        new BufferedInputStream(Files.newInputStream(Paths.get("..", "test_data/ontologies/anything-onto.ttl")))
       val byteArrayOutputStream = new ByteArrayOutputStream()
 
       val formattingStreamProcessor = rdfFormatUtil.makeFormattingStreamProcessor(
@@ -280,7 +280,7 @@ abstract class RdfFormatUtilSpec(featureToggle: FeatureToggle) extends CoreSpec
 
     "stream RDF data from an InputStream into an RdfModel, then into an OutputStream, then back into an RdfModel" in {
       val fileInputStream =
-        new BufferedInputStream(Files.newInputStream(Paths.get("test_data/ontologies/anything-onto.ttl")))
+        new BufferedInputStream(Files.newInputStream(Paths.get("..", "test_data/ontologies/anything-onto.ttl")))
       val rdfModel: RdfModel = rdfFormatUtil.inputStreamToRdfModel(inputStream = fileInputStream, rdfFormat = Turtle)
       fileInputStream.close()
       assert(rdfModel.contains(expectedThingLabelStatement))
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala
index ac4dd187cf..6b6e9575d9 100644
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala
@@ -302,7 +302,7 @@ abstract class RdfModelSpec(featureToggle: FeatureToggle) extends CoreSpec {
     }
 
     "do a SPARQL SELECT query" in {
-      val fileInputStream = new BufferedInputStream(new FileInputStream("test_data/all_data/anything-data.ttl"))
+      val fileInputStream = new BufferedInputStream(new FileInputStream("../test_data/all_data/anything-data.ttl"))
       val anythingModel: RdfModel =
         rdfFormatUtil.inputStreamToRdfModel(inputStream = fileInputStream, rdfFormat = Turtle)
       fileInputStream.close()
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala
index a191f3e2dc..f922e3a985 100644
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala
@@ -16,13 +16,13 @@ import org.knora.webapi.messages.util.rdf._
 
 object ShaclValidatorSpec {
   val config: String =
-    """
-      |app {
-      |    shacl {
-      |        shapes-dir = "test_data/shacl"
-      |    }
-      |}
-      |""".stripMargin
+    s"""
+       |app {
+       |    shacl {
+       |        shapes-dir = "../test_data/shacl"
+       |    }
+       |}
+       |""".stripMargin
 }
 
 /**
@@ -68,9 +68,11 @@ abstract class ShaclValidatorSpec(featureToggle: FeatureToggle)
         rdfFormat = Turtle
       )
 
+      val shaclPath = Paths.get("test/person.ttl")
+      println(shaclPath)
       val validationResult: ShaclValidationResult = shaclValidator.validate(
         rdfModel = validRdfModel,
-        shaclPath = Paths.get("test/person.ttl")
+        shaclPath = shaclPath
       )
 
       validationResult match {
@@ -95,9 +97,11 @@ abstract class ShaclValidatorSpec(featureToggle: FeatureToggle)
         rdfFormat = Turtle
       )
 
+      val shaclPath = Paths.get("test/person.ttl")
+      println(shaclPath)
       val validationResult: ShaclValidationResult = shaclValidator.validate(
         rdfModel = invalidRdfModel,
-        shaclPath = Paths.get("test/person.ttl")
+        shaclPath = shaclPath
       )
 
       validationResult match {
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/jenaimpl/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/jenaimpl/BUILD.bazel
deleted file mode 100644
index fe6dfd1c00..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/jenaimpl/BUILD.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "JenaModelSpec",
-    size = "small",
-    srcs = [
-        "JenaModelSpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:RdfModelSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "JenaFormatUtilSpec",
-    size = "small",
-    srcs = [
-        "JenaFormatUtilSpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:RdfFormatUtilSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_apache_jena_apache_jena_libs",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON_LD,
-)
-
-scala_test(
-    name = "JenaJsonLDUtilSpec",
-    size = "small",
-    srcs = [
-        "JenaJsonLDUtilSpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:JsonLDUtilSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_apache_jena_apache_jena_libs",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON_LD,
-)
-
-scala_test(
-    name = "JenaKnoraResponseV2Spec",
-    size = "small",
-    srcs = [
-        "JenaKnoraResponseV2Spec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:KnoraResponseV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_apache_jena_apache_jena_libs",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON_LD,
-)
-
-scala_test(
-    name = "JenaShaclValidatorSpec",
-    size = "small",
-    srcs = [
-        "JenaShaclValidatorSpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:ShaclValidatorSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_apache_jena_apache_jena_libs",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON_LD,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/rdf4jimpl/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/rdf4jimpl/BUILD.bazel
deleted file mode 100644
index cb3e101eec..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/rdf4jimpl/BUILD.bazel
+++ /dev/null
@@ -1,103 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "RDF4JModelSpec",
-    size = "small",
-    srcs = [
-        "RDF4JModelSpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:RdfModelSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "RDF4JFormatUtilSpec",
-    size = "small",
-    srcs = [
-        "RDF4JFormatUtilSpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:RdfFormatUtilSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_apache_jena_apache_jena_libs",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON_LD,
-)
-
-scala_test(
-    name = "RDF4JJsonLDUtilSpec",
-    size = "small",
-    srcs = [
-        "RDF4JJsonLDUtilSpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:JsonLDUtilSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_apache_jena_apache_jena_libs",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON_LD,
-)
-
-scala_test(
-    name = "RDF4JKnoraResponseV2Spec",
-    size = "small",
-    srcs = [
-        "RDF4JKnoraResponseV2Spec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:KnoraResponseV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_apache_jena_apache_jena_libs",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON_LD,
-)
-
-scala_test(
-    name = "RDF4JShaclValidatorSpec",
-    size = "small",
-    srcs = [
-        "RDF4JShaclValidatorSpec.scala",
-        "//webapi/src/test/scala/org/knora/webapi/messages/util/rdf:ShaclValidatorSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_apache_jena_apache_jena_libs",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON_LD,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/util/search/BUILD.bazel
deleted file mode 100644
index f0d968721f..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/search/BUILD.bazel
+++ /dev/null
@@ -1,124 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES")
-
-test_suite(
-    name = "all_tests",
-    tests = [
-        ":GravsearchParserSpec",
-        ":GravsearchTypeInspectorSpec",
-        ":NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec",
-        ":NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec",
-        ":SparqlTransformerSpec",
-    ],
-)
-
-scala_test(
-    name = "SparqlTransformerSpec",
-    size = "small",  # 60s
-    srcs = [
-        "SparqlTransformerSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "TopologicalSortUtilSpec",
-    size = "small",  # 60s
-    srcs = [
-        "gravsearch/prequery/TopologicalSortUtilSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec",
-    size = "small",  # 60s
-    srcs = [
-        "gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec",
-    size = "small",
-    srcs = [
-        "gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "GravsearchTypeInspectorSpec",
-    size = "small",  # 60s
-    srcs = [
-        "gravsearch/GravsearchParserSpec.scala",
-        "gravsearch/types/GravsearchTypeInspectorSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "GravsearchParserSpec",
-    size = "small",  # 60s
-    srcs = [
-        "gravsearch/GravsearchParserSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/BUILD.bazel
deleted file mode 100644
index af0fedb26c..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/BUILD.bazel
+++ /dev/null
@@ -1,60 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "StandoffTagUtilV2Spec",
-    size = "small",
-    srcs = [
-        "StandoffTagUtilV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "XMLToStandoffUtilSpec",
-    size = "small",
-    srcs = [
-        "XMLToStandoffUtilSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "XMLUtilSpec",
-    size = "small",
-    srcs = [
-        "XMLUtilSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala
index 9021684209..c481e0e46b 100644
--- a/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala
@@ -84,10 +84,10 @@ class XMLUtilSpec extends CoreSpec {
 
     "demonstrate how to handle resources that may or may not be embedded" in {
       val xmlWithNestedResource =
-        FileUtil.readTextFile(Paths.get("test_data/test_route/texts/beol/xml-with-nested-resources.xml"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/test_route/texts/beol/xml-with-nested-resources.xml"))
       val xmlWithNonNestedResource =
-        FileUtil.readTextFile(Paths.get("test_data/test_route/texts/beol/xml-with-non-nested-resources.xml"))
-      val xslt = FileUtil.readTextFile(Paths.get("test_data/test_route/texts/beol/header.xsl"))
+        FileUtil.readTextFile(Paths.get("..", "test_data/test_route/texts/beol/xml-with-non-nested-resources.xml"))
+      val xslt = FileUtil.readTextFile(Paths.get("..", "test_data/test_route/texts/beol/header.xsl"))
 
       val transformedXmlWithNestedResource: String = XMLUtil.applyXSLTransformation(xmlWithNestedResource, xslt)
       val transformedXmlWithNonNestedResource: String = XMLUtil.applyXSLTransformation(xmlWithNonNestedResource, xslt)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/permissionmessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/permissionmessages/BUILD.bazel
deleted file mode 100644
index daa5d1fdaa..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/permissionmessages/BUILD.bazel
+++ /dev/null
@@ -1,23 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES")
-load("//third_party:dependencies.bzl", "BASE_TEST_DEPENDENCIES")
-
-scala_test(
-    name = "PermissionMessagesV1Spec",
-    size = "small",  # 60s
-    srcs = [
-        "PermissionMessagesV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/BUILD.bazel
deleted file mode 100644
index d13a306f7e..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/BUILD.bazel
+++ /dev/null
@@ -1,24 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES")
-load("//third_party:dependencies.bzl", "BASE_TEST_DEPENDENCIES")
-
-scala_test(
-    name = "UserMessagesV1Spec",
-    size = "small",  # 60s
-    srcs = [
-        "UserMessagesV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:org_springframework_security_spring_security_core",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/BUILD.bazel
deleted file mode 100644
index ea6a140887..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/BUILD.bazel
+++ /dev/null
@@ -1,40 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES")
-
-scala_test(
-    name = "InputOntologyV2Spec",
-    size = "small",  # 60s
-    srcs = [
-        "InputOntologyV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "ChangePropertyGuiElementRequestV2Spec",
-    size = "small",  # 60s
-    srcs = [
-        "ChangePropertyGuiElementRequestV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/BUILD.bazel
deleted file mode 100644
index 57866c6fe7..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES")
-
-scala_test(
-    name = "ResourcesMessagesV2Spec",
-    size = "small",  # 60s
-    srcs = [
-        "ResourcesMessagesV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/models/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/models/BUILD.bazel
deleted file mode 100644
index 3e469bb4d6..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/models/BUILD.bazel
+++ /dev/null
@@ -1,10 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "OntologyModels.scala",
-        "//webapi/src/test/scala/org/knora/webapi/models/filemodels:srcs",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/models/filemodels/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/models/filemodels/BUILD.bazel
deleted file mode 100644
index 90c3c84aee..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/models/filemodels/BUILD.bazel
+++ /dev/null
@@ -1,26 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "FileModels.scala",
-        "FileModelUtil.scala"
-    ],
-)
-
-scala_test(
-    name = "FileModelsSpec",
-    size = "small",
-    srcs = [
-       "FileModelsSpec.scala",
-    ],
-    data = [],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-       "//webapi:test_library",
-       "//webapi:main_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/other/v1/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/other/v1/BUILD.bazel
deleted file mode 100644
index 39c3178617..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/other/v1/BUILD.bazel
+++ /dev/null
@@ -1,40 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "DrawingsGodsV1E2ESpec",
-    size = "small",
-    srcs = [
-        "DrawingsGodsV1E2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "DrawingsGodsV1Spec",
-    size = "small",  # 60s
-    srcs = [
-        "DrawingsGodsV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/other/v2/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/other/v2/BUILD.bazel
deleted file mode 100644
index 4d4147fd4e..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/other/v2/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "LumieresLausanneV2E2ESpec",
-    size = "small",
-    srcs = [
-        "LumieresLausanneV2E2ESpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/responders/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/responders/BUILD.bazel
deleted file mode 100644
index c07fe63d9e..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/responders/BUILD.bazel
+++ /dev/null
@@ -1,30 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES")
-load("//third_party:dependencies.bzl", "BASE_TEST_DEPENDENCIES")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "MockableResponderManager.scala",
-        "//webapi/src/test/scala/org/knora/webapi/responders/v2:srcs",
-    ],
-)
-
-scala_test(
-    name = "IriLockerSpec",
-    size = "small",  # 60s
-    srcs = [
-        "IriLockerSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/responders/admin/BUILD.bazel
deleted file mode 100644
index 1fc1ef107b..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/responders/admin/BUILD.bazel
+++ /dev/null
@@ -1,113 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "GroupsResponderADMSpec",
-    size = "small",  # 60s
-    srcs = [
-        "GroupsResponderADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ListsResponderADMSpec",
-    size = "small",  # 60s
-    srcs = [
-        "ListsResponderADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "PermissionsResponderADMSpec",
-    size = "medium",  # 300s
-    srcs = [
-        "PermissionsResponderADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ProjectsResponderADMSpec",
-    size = "small",  # 60s
-    srcs = [
-        "ProjectsResponderADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "SipiResponderADMSpec",
-    size = "medium",  # 300s
-    srcs = [
-        "SipiResponderADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "UsersResponderADMSpec",
-    size = "small",  # 60s
-    srcs = [
-        "UsersResponderADMSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/responders/v1/BUILD.bazel
deleted file mode 100644
index 7b0309c6f3..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/responders/v1/BUILD.bazel
+++ /dev/null
@@ -1,136 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "ListsResponderV1Spec",
-    size = "small",  # 60s
-    srcs = [
-        "ListsResponderV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "OntologyResponderV1Spec",
-    size = "small",  # 60s
-    srcs = [
-        "OntologyResponderV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "ProjectsResponderV1Spec",
-    size = "small",
-    srcs = [
-        "ProjectsResponderV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "ResourcesResponderV1Spec",
-    size = "medium",
-    srcs = [
-        "ResourcesResponderV1Spec.scala",
-        "ResourcesResponderV1SpecContextData.scala",
-        "ResourcesResponderV1SpecFullData.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "SearchResponderV1Spec",
-    size = "medium",  # 300s
-    srcs = [
-        "SearchResponderV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "UsersResponderV1Spec",
-    size = "small",  # 60s
-    srcs = [
-        "UsersResponderV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "ValuesResponderV1Spec",
-    size = "medium",  # 300s
-    srcs = [
-        "ResourcesResponderV1SpecFullData.scala",
-        "ValuesResponderV1Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecContextData.scala b/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecContextData.scala
index 62382f37ad..6dc44cb2d4 100644
--- a/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecContextData.scala
+++ b/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecContextData.scala
@@ -28,7 +28,7 @@ object ResourcesResponderV1SpecContextData {
    */
   private val expectedBookResourceContextResponseStr = FileUtil
     .readTextFile(
-      Paths.get("test_data/v1/expectedBookContextResponse.json")
+      Paths.get("..", "test_data/v1/expectedBookContextResponse.json")
     )
     .replaceAll("IIIF_BASE_URL", settings.externalSipiIIIFGetUrl)
 
diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/responders/v2/BUILD.bazel
deleted file mode 100644
index 08c902f17e..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/responders/v2/BUILD.bazel
+++ /dev/null
@@ -1,128 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "ResourcesResponseCheckerV2.scala",
-    ],
-)
-
-scala_test(
-    name = "ListsResponderV2Spec",
-    size = "medium",
-    srcs = [
-        "ListsResponderV2Spec.scala",
-        "ListsResponderV2SpecFullData.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "OntologyResponderV2Spec",
-    size = "large",
-    srcs = [
-        "OntologyResponderV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "ResourcesResponderV2Spec",
-    size = "large",
-    srcs = [
-        "ResourcesResponderV2Spec.scala",
-        "ResourcesResponderV2SpecFullData.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-        "@maven//:org_xmlunit_xmlunit_core",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "ResourcesResponseCheckerV2Spec",
-    size = "small",
-    srcs = [
-        "ResourcesResponderV2SpecFullData.scala",
-        "ResourcesResponseCheckerV2Spec.scala",
-        "ResourcesResponseCheckerV2SpecFullData.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "SearchResponderV2Spec",
-    size = "medium",
-    srcs = [
-        "SearchResponderV2Spec.scala",
-        "SearchResponderV2SpecFullData.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "ValuesResponderV2Spec",
-    size = "medium",
-    srcs = [
-        "ValuesResponderV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        # Templates
-        "@maven//:com_typesafe_play_twirl_api_2_13",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/BUILD.bazel
deleted file mode 100644
index 263d340e59..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/BUILD.bazel
+++ /dev/null
@@ -1,83 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-
-scala_test(
-    name = "CacheSpec",
-    size = "small",  # 60s
-    srcs = [
-        "CacheSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    resources = [
-        "//webapi/scripts:fuseki_repository_config_ttl_template",
-        "//webapi/src/main/resources",
-        "//webapi/src/test/resources",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi:test_library",
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/feature",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/responders/v2/ontology",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/store",
-        "//webapi/src/main/scala/org/knora/webapi/util/cache",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_config",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_scalactic_scalactic_2_13",
-        "@maven//:org_scalatest_scalatest_compatible",
-        "@maven//:org_scalatest_scalatest_core_2_13",
-        "@maven//:org_scalatest_scalatest_matchers_core_2_13",
-        "@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
-        "@maven//:org_scalatest_scalatest_wordspec_2_13",
-    ],
-)
-
-scala_test(
-    name = "DeleteCardinalitiesFromClassSpec",
-    size = "small",  # 60s
-    srcs = [
-        "DeleteCardinalitiesFromClassSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    resources = [
-        "//webapi/scripts:fuseki_repository_config_ttl_template",
-        "//webapi/src/main/resources",
-        "//webapi/src/test/resources",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi:test_library",
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/responders/v2/ontology",
-        "//webapi/src/main/scala/org/knora/webapi/settings",
-        "//webapi/src/main/scala/org/knora/webapi/store",
-        "@maven//:com_typesafe_akka_akka_actor_2_13",
-        "@maven//:com_typesafe_config",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_scalactic_scalactic_2_13",
-        "@maven//:org_scalatest_scalatest_compatible",
-        "@maven//:org_scalatest_scalatest_core_2_13",
-        "@maven//:org_scalatest_scalatest_matchers_core_2_13",
-        "@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
-        "@maven//:org_scalatest_scalatest_wordspec_2_13",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/CacheSpec.scala b/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/CacheSpec.scala
index 704fddff38..ce9ce056e6 100644
--- a/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/CacheSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/CacheSpec.scala
@@ -58,6 +58,9 @@ class CacheSpec extends IntegrationSpec(TestContainerFuseki.PortConfig) {
     loadTestData(fusekiActor, additionalTestData)
   }
 
+  override protected def afterAll(): Unit =
+    CacheUtil.removeAllCaches()
+
   "The basic functionality of the ontology cache" should {
 
     "successfully load all ontologies" in {
diff --git a/webapi/src/test/scala/org/knora/webapi/routing/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/routing/BUILD.bazel
deleted file mode 100644
index 59d683cbfe..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/routing/BUILD.bazel
+++ /dev/null
@@ -1,41 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "AuthenticatorSpec",
-    size = "small",
-    srcs = [
-        "AuthenticatorSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    scalacopts = ["-deprecation"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
-
-scala_test(
-    name = "JWTHelperSpec",
-    size = "small",
-    srcs = [
-        "JWTHelperSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES_WITH_JSON,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/sharedtestdata/BUILD.bazel
deleted file mode 100644
index a6f636ba49..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/BUILD.bazel
+++ /dev/null
@@ -1,14 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "SharedListsTestDataADM.scala",
-        "SharedOntologyTestDataADM.scala",
-        "SharedPermissionsTestData.scala",
-        "SharedTestDataADM.scala",
-        "SharedTestDataV1.scala",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/store/BUILD.bazel
deleted file mode 100644
index 1034b1c03d..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/store/BUILD.bazel
+++ /dev/null
@@ -1,11 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "MockableStoreManager.scala",
-        "//webapi/src/test/scala/org/knora/webapi/store/iiif:srcs",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/cacheservice/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/store/cacheservice/BUILD.bazel
deleted file mode 100644
index edcb77f463..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/store/cacheservice/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "CacheServiceManagerSpec",
-    size = "small",  # 60s
-    srcs = [
-        "CacheServiceManagerSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/cacheservice/inmem/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/store/cacheservice/inmem/BUILD.bazel
deleted file mode 100644
index 23767f367b..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/store/cacheservice/inmem/BUILD.bazel
+++ /dev/null
@@ -1,34 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "CacheServiceInMemImplSpec",
-    size = "small",  # 60s
-    srcs = [
-        "CacheServiceInMemImplSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi:test_library",
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/inmem",
-        "@maven//:com_typesafe_config",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_scalactic_scalactic_2_13",
-        "@maven//:org_scalatest_scalatest_compatible",
-        "@maven//:org_scalatest_scalatest_core_2_13",
-        "@maven//:org_scalatest_scalatest_matchers_core_2_13",
-        "@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
-        "@maven//:org_scalatest_scalatest_wordspec_2_13",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/cacheservice/redis/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/store/cacheservice/redis/BUILD.bazel
deleted file mode 100644
index 32eea7a97c..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/store/cacheservice/redis/BUILD.bazel
+++ /dev/null
@@ -1,39 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "CacheServiceRedisImplSpec",
-    size = "small",  # 60s
-    srcs = [
-        "CacheServiceRedisImplSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    resources = [
-        "//webapi/src/main/resources",
-        "//webapi/src/test/resources",
-    ],
-    scalacopts = ["-deprecation"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi:test_library",
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/redis",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/settings",
-        "@maven//:com_typesafe_config",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_scalactic_scalactic_2_13",
-        "@maven//:org_scalatest_scalatest_compatible",
-        "@maven//:org_scalatest_scalatest_core_2_13",
-        "@maven//:org_scalatest_scalatest_matchers_core_2_13",
-        "@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
-        "@maven//:org_scalatest_scalatest_wordspec_2_13",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/cacheservice/serialization/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/store/cacheservice/serialization/BUILD.bazel
deleted file mode 100644
index 2a87201970..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/store/cacheservice/serialization/BUILD.bazel
+++ /dev/null
@@ -1,32 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-
-scala_test(
-    name = "CacheSerializationSpec",
-    size = "small",  # 60s
-    srcs = [
-        "CacheSerializationSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    unused_dependency_checker_mode = "warn",
-    deps = [
-        "//webapi:test_library",
-        "//webapi/src/main/scala/org/knora/webapi",
-        "//webapi/src/main/scala/org/knora/webapi/instrumentation",
-        "//webapi/src/main/scala/org/knora/webapi/messages",
-        "//webapi/src/main/scala/org/knora/webapi/store/cacheservice/serialization",
-        "@maven//:com_typesafe_config",
-        "@maven//:com_typesafe_scala_logging_scala_logging_2_13",
-        "@maven//:org_scalactic_scalactic_2_13",
-        "@maven//:org_scalatest_scalatest_compatible",
-        "@maven//:org_scalatest_scalatest_core_2_13",
-        "@maven//:org_scalatest_scalatest_matchers_core_2_13",
-        "@maven//:org_scalatest_scalatest_shouldmatchers_2_13",
-        "@maven//:org_scalatest_scalatest_wordspec_2_13",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/iiif/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/store/iiif/BUILD.bazel
deleted file mode 100644
index 71c6614e02..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/store/iiif/BUILD.bazel
+++ /dev/null
@@ -1,9 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "MockSipiConnector.scala",
-        "MockableIIIFManager.scala",
-    ],
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/store/triplestore/BUILD.bazel
deleted file mode 100644
index 95d6eb243d..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/BUILD.bazel
+++ /dev/null
@@ -1,58 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON")
-
-scala_test(
-    name = "AllTriplestoreSpec",
-    size = "medium",
-    srcs = [
-        "AllTriplestoreSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "HttpTriplestoreConnectorSpec",
-    size = "small",
-    srcs = [
-        "HttpTriplestoreConnectorSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "GraphDBConsistencyCheckingSpec",
-    size = "small",  # 60s
-    srcs = [
-        "GraphDBConsistencyCheckingSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/BUILD.bazel
deleted file mode 100644
index 3389f28eb1..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/BUILD.bazel
+++ /dev/null
@@ -1,143 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES")
-
-scala_test(
-    name = "UpgradePluginPR1307Spec",
-    size = "small",
-    srcs = [
-        "UpgradePluginPR1307Spec.scala",
-        "UpgradePluginSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-        "//test_data/upgrade",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "UpgradePluginPR1322Spec",
-    size = "small",
-    srcs = [
-        "UpgradePluginPR1322Spec.scala",
-        "UpgradePluginSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-        "//test_data/upgrade",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "UpgradePluginPR1367Spec",
-    size = "small",
-    srcs = [
-        "UpgradePluginPR1367Spec.scala",
-        "UpgradePluginSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-        "//test_data/upgrade",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "UpgradePluginPR1372Spec",
-    size = "small",
-    srcs = [
-        "UpgradePluginPR1372Spec.scala",
-        "UpgradePluginSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-        "//test_data/upgrade",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "UpgradePluginPR1615Spec",
-    size = "small",
-    srcs = [
-        "UpgradePluginPR1615Spec.scala",
-        "UpgradePluginSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-        "//test_data/upgrade",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "UpgradePluginPR1746Spec",
-    size = "small",
-    srcs = [
-        "UpgradePluginPR1746Spec.scala",
-        "UpgradePluginSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-        "//test_data/upgrade",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "UpgradePluginPR1921Spec",
-    size = "small",
-    srcs = [
-        "UpgradePluginPR1921Spec.scala",
-        "UpgradePluginSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-        "//test_data/upgrade",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala
index dc7f463b61..efaa281fb5 100644
--- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala
@@ -11,7 +11,7 @@ class UpgradePluginPR1307Spec extends UpgradePluginSpec {
   "Upgrade plugin PR1307" should {
     "update text values with standoff" in {
       // Parse the input file.
-      val model: RdfModel = trigFileToModel("test_data/upgrade/pr1307.trig")
+      val model: RdfModel = trigFileToModel("../test_data/upgrade/pr1307.trig")
 
       // Use the plugin to transform the input.
       val plugin = new UpgradePluginPR1307(defaultFeatureFactoryConfig)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala
index b0cd136555..6e109fa05a 100644
--- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala
@@ -11,7 +11,7 @@ class UpgradePluginPR1322Spec extends UpgradePluginSpec {
   "Upgrade plugin PR1322" should {
     "add UUIDs to values" in {
       // Parse the input file.
-      val model: RdfModel = trigFileToModel("test_data/upgrade/pr1322.trig")
+      val model: RdfModel = trigFileToModel("../test_data/upgrade/pr1322.trig")
 
       // Use the plugin to transform the input.
       val plugin = new UpgradePluginPR1322(defaultFeatureFactoryConfig)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala
index 5bd42f20fa..28f4e12a32 100644
--- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala
@@ -15,7 +15,7 @@ class UpgradePluginPR1367Spec extends UpgradePluginSpec {
   "Upgrade plugin PR1367" should {
     "fix the datatypes of decimal literals" in {
       // Parse the input file.
-      val model: RdfModel = trigFileToModel("test_data/upgrade/pr1367.trig")
+      val model: RdfModel = trigFileToModel("../test_data/upgrade/pr1367.trig")
 
       // Use the plugin to transform the input.
       val plugin = new UpgradePluginPR1367(defaultFeatureFactoryConfig)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala
index 537eea9d25..28ffb8e215 100644
--- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala
@@ -11,7 +11,7 @@ class UpgradePluginPR1372Spec extends UpgradePluginSpec {
   "Upgrade plugin PR1372" should {
     "remove permissions from past versions of values" in {
       // Parse the input file.
-      val model: RdfModel = trigFileToModel("test_data/upgrade/pr1372.trig")
+      val model: RdfModel = trigFileToModel("../test_data/upgrade/pr1372.trig")
 
       // Use the plugin to transform the input.
       val plugin = new UpgradePluginPR1372(defaultFeatureFactoryConfig)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala
index 7c8374262b..2011844012 100644
--- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala
@@ -11,7 +11,7 @@ class UpgradePluginPR1615Spec extends UpgradePluginSpec {
   "Upgrade plugin PR1615" should {
     "remove the instance of ForbiddenResource" in {
       // Parse the input file.
-      val model: RdfModel = trigFileToModel("test_data/upgrade/pr1615.trig")
+      val model: RdfModel = trigFileToModel("../test_data/upgrade/pr1615.trig")
 
       // Use the plugin to transform the input.
       val plugin = new UpgradePluginPR1615(defaultFeatureFactoryConfig)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala
index bef5cd5e32..a0e50b04ec 100644
--- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala
@@ -34,7 +34,7 @@ class UpgradePluginPR1746Spec extends UpgradePluginSpec with LazyLogging {
   "Upgrade plugin PR1746" should {
     "replace empty string with FIXME" in {
       // Parse the input file.
-      val model: RdfModel = trigFileToModel("test_data/upgrade/pr1746.trig")
+      val model: RdfModel = trigFileToModel("../test_data/upgrade/pr1746.trig")
 
       // Use the plugin to transform the input.
       val plugin = new UpgradePluginPR1746(defaultFeatureFactoryConfig, logger)
diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala
index 34304befed..3a9037ee7c 100644
--- a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala
@@ -32,7 +32,7 @@ class UpgradePluginPR1921Spec extends UpgradePluginSpec with LazyLogging {
 
   "Upgrade plugin PR921" should {
     // Parse the input file.
-    val model: RdfModel = trigFileToModel("test_data/upgrade/pr1921.trig")
+    val model: RdfModel = trigFileToModel("../test_data/upgrade/pr1921.trig")
     // Use the plugin to transform the input.
     val plugin = new UpgradePluginPR1921(defaultFeatureFactoryConfig, logger)
     plugin.transform(model)
diff --git a/webapi/src/test/scala/org/knora/webapi/util/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/util/BUILD.bazel
deleted file mode 100644
index 8a984904dd..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/util/BUILD.bazel
+++ /dev/null
@@ -1,71 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-filegroup(
-    name = "srcs",
-    srcs = [
-        "AkkaHttpUtils.scala",
-        "MutableTestIri.scala",
-        "MutableTestString.scala",
-        "MutableUserADM.scala",
-        "StartupUtils.scala",
-        "TestExtractorMethods.scala",
-    ],
-)
-
-scala_test(
-    name = "ApacheLuceneSupportSpec",
-    size = "small",
-    srcs = [
-        "ApacheLuceneSupportSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "Base64UrlCheckDigitSpec",
-    size = "small",
-    srcs = [
-        "Base64UrlCheckDigitSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-        "@maven//:commons_validator_commons_validator",
-    ] + BASE_TEST_DEPENDENCIES,
-)
-
-scala_test(
-    name = "StringLiteralSequenceV2Spec",
-    size = "small",
-    srcs = [
-        "StringLiteralSequenceV2Spec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/util/cache/BUILD.bazel b/webapi/src/test/scala/org/knora/webapi/util/cache/BUILD.bazel
deleted file mode 100644
index 0b020efefb..0000000000
--- a/webapi/src/test/scala/org/knora/webapi/util/cache/BUILD.bazel
+++ /dev/null
@@ -1,22 +0,0 @@
-package(default_visibility = ["//visibility:public"])
-
-load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test")
-load("//third_party:dependencies.bzl", "ALL_WEBAPI_MAIN_DEPENDENCIES", "BASE_TEST_DEPENDENCIES", "BASE_TEST_DEPENDENCIES_WITH_JSON", "BASE_TEST_DEPENDENCIES_WITH_JSON_LD")
-
-scala_test(
-    name = "CacheUtilSpec",
-    size = "small",
-    srcs = [
-        "CacheUtilSpec.scala",
-    ],
-    data = [
-        "//knora-ontologies",
-        "//test_data",
-    ],
-    jvm_flags = ["-Dconfig.resource=fuseki.conf"],
-    # unused_dependency_checker_mode = "warn",
-    deps = ALL_WEBAPI_MAIN_DEPENDENCIES + [
-        "//webapi:main_library",
-        "//webapi:test_library",
-    ] + BASE_TEST_DEPENDENCIES,
-)
diff --git a/webapi/src/test/scala/org/knora/webapi/util/cache/CacheUtilSpec.scala b/webapi/src/test/scala/org/knora/webapi/util/cache/CacheUtilSpec.scala
index 24b70ebf14..7f06c6b99f 100644
--- a/webapi/src/test/scala/org/knora/webapi/util/cache/CacheUtilSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/util/cache/CacheUtilSpec.scala
@@ -7,9 +7,18 @@ package org.knora.webapi.util.cache
 
 import akka.testkit.ImplicitSender
 import com.typesafe.config.{Config, ConfigFactory}
-import org.knora.webapi.CoreSpec
+import org.knora.webapi.UnitSpec
 import org.knora.webapi.routing.Authenticator
 import org.knora.webapi.sharedtestdata.SharedTestDataV1
+import akka.testkit.TestKit
+import org.scalatest.wordspec.AnyWordSpecLike
+import akka.actor.ActorSystem
+import org.scalatest.matchers.should.Matchers
+import org.scalatest.BeforeAndAfterAll
+import com.typesafe.scalalogging.LazyLogging
+import org.knora.webapi.settings.KnoraSettings
+import org.knora.webapi.settings.KnoraSettingsImpl
+import org.knora.webapi.messages.StringFormatter
 
 object CacheUtilSpec {
   val config: Config = ConfigFactory.parseString("""
@@ -19,11 +28,28 @@ object CacheUtilSpec {
         """.stripMargin)
 }
 
-class CacheUtilSpec extends CoreSpec("CachingTestSystem") with ImplicitSender with Authenticator {
+class CacheUtilSpec
+    extends TestKit(ActorSystem("CacheUtilSpec"))
+    with AnyWordSpecLike
+    with Matchers
+    with BeforeAndAfterAll
+    with LazyLogging
+    with Authenticator {
+
+  StringFormatter.initForTest()
+  val settings: KnoraSettingsImpl = KnoraSettings(system)
 
   private val cacheName = Authenticator.AUTHENTICATION_INVALIDATION_CACHE_NAME
   private val sessionId = System.currentTimeMillis().toString
 
+  override protected def beforeAll(): Unit =
+    CacheUtil.createCaches(settings.caches)
+
+  override def afterAll(): Unit = {
+    CacheUtil.removeAllCaches()
+    TestKit.shutdownActorSystem(system)
+  }
+
   "Caching" should {
 
     "allow to set and get the value " in {