diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index aa2c8bb7dd5c2a6c6b115aed3490f9d8c4b99696..df1d0c0865020ff1b4ef6dd6d70608c9575f3522 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -346,9 +346,9 @@ test-search-service:
   dependencies:
     - build-search-service
   before_script:
-    - "cp -r ./dbrepo-search-service/init/clients ./dbrepo-search-service/clients"
-    - "cp -r ./dbrepo-search-service/init/omlib ./dbrepo-search-service/omlib"
-    - "cp -r ./dbrepo-search-service/init/tests/rsa ./dbrepo-search-service/tests/rsa"
+    - "cp -r ./dbrepo-search-service/init/clients ./dbrepo-search-service"
+    - "cp -r ./dbrepo-search-service/init/omlib ./dbrepo-search-service"
+    - "cp -r ./dbrepo-search-service/init/tests/rsa ./dbrepo-search-service/tests"
     - "cp ./dbrepo-search-service/init/tests/test_keycloak_client.py ./dbrepo-search-service/tests"
     - "cp ./dbrepo-search-service/init/tests/test_opensearch_client.py ./dbrepo-search-service/tests"
     - "cp ./dbrepo-search-service/init/friendly_names_overrides.json ./dbrepo-search-service/friendly_names_overrides.json"
diff --git a/dbrepo-search-service/init/tests/rsa/rsa/rs256.key b/dbrepo-search-service/tests/rsa/rs256.key
similarity index 100%
rename from dbrepo-search-service/init/tests/rsa/rsa/rs256.key
rename to dbrepo-search-service/tests/rsa/rs256.key
diff --git a/dbrepo-search-service/tests/rsa/rsa/rs256.key b/dbrepo-search-service/tests/rsa/rsa/rs256.key
deleted file mode 100644
index 86b3eaf5c6c4c6b83071b6d1e9d69cb22bcd4085..0000000000000000000000000000000000000000
--- a/dbrepo-search-service/tests/rsa/rsa/rs256.key
+++ /dev/null
@@ -1,3 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQABAoIBADNcMt6hAHub4JTAYS6Mra0EPRBO2XhWmACBrv3+8ETClXd5475KPLDewgRVtlmtbwU8G8awUXESQgPS9lfiqvQhPreA3cHlm6oP2WMKOEtakr2s8I+frsTBLCo0Ini9RaSzjoVVgS0zofyhASKi+T970MafSj5P3XNb8YBFdXgoYDiA7FXLH6a/+m7LScL+wGcFMAAeYESxZbMQLfH3v8L+4EcTraiwjLG17ZdlF3dpybMyUSse6ZQ/PdlyvBuzzLXhN6Ce2gd9ATfS+YWTzo7Yf+GU+ex5bIpVOfHqtuM/hyq7YGKENClsXwNZIAoFnvGCbvECAfgyapVrD30IfykCgYEA0rgsSZ82pxT40NxwgBD1g9lbNVBKXphRB/3S078qusUzJjT7AldEj4imGPhAbI7bI8gAeWJsp1XJWkjM8ktaVrh+NQl7p8e9OPh0pQF/5Bdg8ajbjXESpjnaU66pVYRQy/d+jNli/YRAHX5RUfsBl+6W4+WSVMGmKBiqJsur+ecCgYEAz1YVXClcmUnyZem5B+2E9noIzjF6ROE+jIb6rawM85P3Xd0lXtECQavtxw+Qk7I32qOwrxl1UpK2foVel3pazi+4OpMfmqtYGenRP1Zk1cZwrDo0cIemTDGjj3kJ8tYn12CGolFQpJZgK6OHzvG0tOxI5VZgjIViWNPe1PGWXtUCgYEAxXGNDe8BZs1f11S2lUlOw5yGug3hoYFXbAWJ5p7Ziuf8ZXB/QlJDC7se54a11wKEk6Jzz0lKRgE8CjzszJuOqnN0zn10QGIIC7nCklo1W6QMUmPGVWH994N976tZP6gbjQL6sT+AYcvpx7j0ubxYYeRNvnz+ACzzY964kGGHY0ECgYEAumlwPPNnMN7+VEjGNm2D7UMdJZ3wi3tkjF5ThdA5uMohTsAk+FG80KSu3RmOaGyEsUwY7+VYyYvlDm4E9PZqLBVVczyR3rMNPAcwPd0EPfvzk7WlLkOX7ct3fehaXH3VRlyfz9KCSeh1wOZ/lT1VtpD2nVOC7PSDzs92+kfXZZ0CgYAnrD1y4skgXkdwolZ3unn3EFyGm2d+X5aMTHwQPdWxqoNIAl/9wdghlzihwnPhhsxq1WzlxuC3V2IMrNPtRx70Mi+FbSmR5m4Xx5RptgMtMlwno+L40PzNJgMjHGjt0wcx3Vel8wuohDtnqMyS7P5nG1/TQx0Cyzwn7QOXlNpgbQ==
------END RSA PRIVATE KEY-----
\ No newline at end of file
diff --git a/dbrepo-search-service/tests/rsa/rsa/rsa256.pkey b/dbrepo-search-service/tests/rsa/rsa/rsa256.pkey
deleted file mode 100644
index 857dfb22beeac202c2955d7cc4f782b787492beb..0000000000000000000000000000000000000000
--- a/dbrepo-search-service/tests/rsa/rsa/rsa256.pkey
+++ /dev/null
@@ -1,3 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
------END PUBLIC KEY-----
diff --git a/dbrepo-search-service/init/tests/rsa/rsa/rsa256.pkey b/dbrepo-search-service/tests/rsa/rsa256.pkey
similarity index 100%
rename from dbrepo-search-service/init/tests/rsa/rsa/rsa256.pkey
rename to dbrepo-search-service/tests/rsa/rsa256.pkey