diff --git a/modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerAPIAdapterTest.java b/modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerAPIAdapterTest.java
index d1c10ed04..e739fd542 100644
--- a/modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerAPIAdapterTest.java
+++ b/modules/apim-adapter/src/test/java/com/axway/apim/adapter/apis/APIManagerAPIAdapterTest.java
@@ -607,13 +607,13 @@ public void loadAPIIncludingClientApps() throws IOException {
 
     @Test
     public void pollCatalog() throws AppException {
-        boolean status = apiManagerAPIAdapter.pollCatalogForPublishedState("d90122a7-9f47-420c-85ca-926125ea7bf6", "Test-App-API2-4618", "published");
+        boolean status = apiManagerAPIAdapter.pollCatalogForPublishedState("e4ded8c8-0a40-4b50-bc13-552fb7209150", "Test-App-API2-4618", "published");
         Assert.assertTrue(status);
     }
 
     @Test
     public void pollCatalogUnpublished() throws AppException {
-        boolean status = apiManagerAPIAdapter.pollCatalogForPublishedState("d90122a7-9f47-420c-85ca-926125ea7bf6", "Test-App-API2-4618", "unpublished");
+        boolean status = apiManagerAPIAdapter.pollCatalogForPublishedState("e4ded8c8-0a40-4b50-bc13-552fb7209150", "Test-App-API2-4618", "unpublished");
         Assert.assertTrue(status);
     }
 
diff --git a/modules/apim-cli-tests/src/main/resources/wiremock_apim/__files/getCatalogById.json b/modules/apim-cli-tests/src/main/resources/wiremock_apim/__files/getCatalogById.json
index 0f2b0259f..ba5e97401 100644
--- a/modules/apim-cli-tests/src/main/resources/wiremock_apim/__files/getCatalogById.json
+++ b/modules/apim-cli-tests/src/main/resources/wiremock_apim/__files/getCatalogById.json
@@ -1,5 +1,5 @@
 {
-  "id": "d90122a7-9f47-420c-85ca-926125ea7bf6",
+  "id": "e4ded8c8-0a40-4b50-bc13-552fb7209150",
   "description": "This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.",
   "deprecated": false,
   "apiVersion": "1.0.0",
diff --git a/modules/apim-cli-tests/src/main/resources/wiremock_apim/mappings/getCatalogById.json b/modules/apim-cli-tests/src/main/resources/wiremock_apim/mappings/getCatalogById.json
index 6a19c8d31..39dfb3c81 100644
--- a/modules/apim-cli-tests/src/main/resources/wiremock_apim/mappings/getCatalogById.json
+++ b/modules/apim-cli-tests/src/main/resources/wiremock_apim/mappings/getCatalogById.json
@@ -1,7 +1,7 @@
 {
   "request": {
     "method": "GET",
-    "url": "/api/portal/v1.4/discovery/swagger/api/id/d90122a7-9f47-420c-85ca-926125ea7bf6"
+    "url": "/api/portal/v1.4/discovery/swagger/api/id/e4ded8c8-0a40-4b50-bc13-552fb7209150"
   },
   "response": {
     "status": 200,
diff --git a/modules/apis/src/main/java/com/axway/apim/apiimport/actions/CreateNewAPI.java b/modules/apis/src/main/java/com/axway/apim/apiimport/actions/CreateNewAPI.java
index 90ca2e694..5e4d3b2a7 100644
--- a/modules/apis/src/main/java/com/axway/apim/apiimport/actions/CreateNewAPI.java
+++ b/modules/apis/src/main/java/com/axway/apim/apiimport/actions/CreateNewAPI.java
@@ -89,7 +89,7 @@ public void execute(APIChangeState changes, boolean reCreation) throws AppExcept
                 // In case, the existing API is already in use (Published), we have to grant access to our new imported API
                 apiAdapter.upgradeAccessToNewerAPI(createdAPI, actualAPI);
             }
-            if(apiAdapter.pollCatalogForPublishedState(createdAPI.getApiId(), createdAPI.getName(), createdAPI.getState())) {
+            if(apiAdapter.pollCatalogForPublishedState(createdAPI.getId(), createdAPI.getName(), createdAPI.getState())) {
                 // Is a Quota is defined we must manage it
                 new APIQuotaManager(desiredAPI, actualAPI).execute(createdAPI);
                 // Grant access to the API