diff --git a/.github/workflows/tests-docker.yml b/.github/workflows/tests-docker.yml
index db6ab74a..0b04ca0d 100644
--- a/.github/workflows/tests-docker.yml
+++ b/.github/workflows/tests-docker.yml
@@ -184,11 +184,11 @@ jobs:
         curl -s http://localhost/data/metadata/$DISCOVERY_METADATA_ID.json --output /tmp/$DISCOVERY_METADATA_ID
         pywcmp ets validate /tmp/$DISCOVERY_METADATA_ID
         python3 wis2box-ctl.py execute wis2box data ingest -mdi $DISCOVERY_METADATA_ID -p $TEST_DATA
-    - name: add int-daycli-test data (csv2bufr)
+    - name: add org-daycli-test data (csv2bufr)
       env:
-        TOPIC_HIERARCHY: origin/a/wis2/int-daycli-test/data/core/climate/surface-based-observations/daily
-        DISCOVERY_METADATA: /data/wis2box/metadata/discovery/int-daycli-test.yml
-        DISCOVERY_METADATA_ID: urn:wmo:md:int-daycli-test:surface-climate-observations:daily
+        TOPIC_HIERARCHY: origin/a/wis2/org-daycli-test/data/core/climate/surface-based-observations/daily
+        DISCOVERY_METADATA: /data/wis2box/metadata/discovery/org-daycli-test.yml
+        DISCOVERY_METADATA_ID: urn:wmo:md:org-daycli-test:surface-climate-observations:daily
         STATION_METADATA: /data/wis2box/metadata/station/daycli-test.csv
         TEST_DATA: /data/wis2box/observations/daycli-test
       run: |
diff --git a/tests/data/metadata/discovery/int-daycli-test.yml b/tests/data/metadata/discovery/org-daycli-test.yml
similarity index 92%
rename from tests/data/metadata/discovery/int-daycli-test.yml
rename to tests/data/metadata/discovery/org-daycli-test.yml
index 7414bd96..9ba6c21d 100644
--- a/tests/data/metadata/discovery/int-daycli-test.yml
+++ b/tests/data/metadata/discovery/org-daycli-test.yml
@@ -1,8 +1,8 @@
 wis2box:
     retention: P30D
-    topic_hierarchy: int-daycli-test/data/core/climate/surface-based-observations/daily
+    topic_hierarchy: org-daycli-test/data/core/climate/surface-based-observations/daily
     country: int
-    centre_id: int-daycli-test
+    centre_id: org-daycli-test
     data_mappings:
         plugins:
             csv:
@@ -18,7 +18,7 @@ mcf:
     version: 1.0
 
 metadata:
-    identifier: urn:wmo:md:int-daycli-test:surface-climate-observations:daily
+    identifier: urn:wmo:md:org-daycli-test:surface-climate-observations:daily
     hierarchylevel: dataset
 
 identification:
diff --git a/tests/integration/test_workflow.py b/tests/integration/test_workflow.py
index 74fc6050..b09c43ad 100644
--- a/tests/integration/test_workflow.py
+++ b/tests/integration/test_workflow.py
@@ -59,7 +59,7 @@ def test_wis2downloader():
         'origin/a/wis2/int-wmo-test/data/core/weather/surface-based-observations/ship': 5, # noqa
         'origin/a/wis2/it-meteoam/data/core/weather/surface-based-observations/synop': 31, # noqa
         'origin/a/wis2/int-wmo-test/data/core/weather/advisories-warnings': 1, # noqa
-        'int-daycli-test/data/core/climate/surface-based-observations/daily': 30 # noqa
+        'origin/a/wis2/org-daycli-test/data/core/climate/surface-based-observations/daily': 30 # noqa
     }
 
     topic_nfiles_dict_found = {}
@@ -172,7 +172,7 @@ def test_metadata_discovery_publish():
         'ro-rnimh-test',
         'cg-met',
         'int-wmo-test',
-        'int-daycli-test'
+        'org-daycli-test'
     ]
 
     for centre_id in centre_ids:
@@ -307,10 +307,10 @@ def test_message_api():
         'cg-met': 15,
         'int-wmo': 13,
         'cn-cma': 11,
-        'int-daycli-test': 30
+        'org-daycli-test': 30
     }
     for key, value in counts.items():
-        url = f'{API_URL}/collections/messages/items?sortby=-datetime&data_id={key}&limit=1'  # noqa
+        url = f'{API_URL}/collections/messages/items?sortby=-datetime&q={key}&limit=1'  # noqa
         r = SESSION.get(url).json()
         assert r['numberMatched'] == value