diff --git a/lib/cli/scripts/init-aae-env.ts b/lib/cli/scripts/init-aae-env.ts
index f964183def..41d8f7cf0b 100644
--- a/lib/cli/scripts/init-aae-env.ts
+++ b/lib/cli/scripts/init-aae-env.ts
@@ -80,7 +80,7 @@ async function getApplicationByStatus(status: string) {
         await alfrescoJsApiDevops.login(args.devopsUsername, args.devopsPassword);
 
         return alfrescoJsApiDevops.oauth2Auth.callCustomApi(url, 'GET', pathParams, queryParams, headerParams, formParams, bodyParam,
-            contentTypes, accepts).on('error',(error)=>{
+            contentTypes, accepts).on('error', (error) => {
             logger.error(`Get application by status ${error} `);
         });
 
@@ -138,7 +138,7 @@ function getProjectRelease(projectId: string) {
     }
 }
 
-function releaseProject(projectId: string) {
+async function releaseProject(projectId: string) {
     const url = `${args.host}/modeling-service/v1/projects/${projectId}/releases`;
 
     const pathParams = {}, queryParams = {},
@@ -149,11 +149,28 @@ function releaseProject(projectId: string) {
             contentTypes, accepts);
 
     } catch (error) {
+        await deleteProject(projectId);
         logger.error('Post Projects Release' + error.status);
         isValid = false;
     }
 }
 
+function deleteProject(projectId: string) {
+    const url = `${args.host}/modeling-service/v1/projects/${projectId}`;
+
+    const pathParams = {}, queryParams = {},
+        headerParams = {}, formParams = {}, bodyParam = {},
+        contentTypes = ['application/json'], accepts = ['application/json'];
+    try {
+        return alfrescoJsApiModeler.oauth2Auth.callCustomApi(url, 'DELETE', pathParams, queryParams, headerParams, formParams, bodyParam,
+            contentTypes, accepts);
+
+    } catch (error) {
+        logger.error('Delete project error' + error.status);
+        isValid = false;
+    }
+}
+
 async function importAndReleaseProject(absoluteFilePath: string) {
     const fileContent = await fs.createReadStream(absoluteFilePath);
 
diff --git a/lib/testing/src/lib/core/pages/viewer.page.ts b/lib/testing/src/lib/core/pages/viewer.page.ts
index 94c8356d62..bb7ef8b520 100644
--- a/lib/testing/src/lib/core/pages/viewer.page.ts
+++ b/lib/testing/src/lib/core/pages/viewer.page.ts
@@ -24,6 +24,8 @@ import { Logger } from '../utils/logger';
 
 export class ViewerPage {
 
+    MAX_LOADING_TIME = 120000;
+
     tabsPage = new TabsPage();
     togglePage = new TogglePage();
 
@@ -117,13 +119,14 @@ export class ViewerPage {
     async waitTillContentLoaded(): Promise<void> {
         await browser.sleep(500);
 
-        if (this.isSpinnerPresent()) {
+        if (await this.isSpinnerPresent()) {
             Logger.log('wait spinner disappear');
-            await BrowserVisibility.waitUntilElementIsNotPresent(element(by.tagName('mat-progress-spinner')));
+            await BrowserVisibility.waitUntilElementIsNotVisible(element(by.tagName('mat-progress-spinner')), this.MAX_LOADING_TIME);
         } else {
             try {
                 Logger.log('wait spinner is present');
-                await BrowserVisibility.waitUntilElementIsPresent(element(by.tagName('mat-progress-spinner')));
+                await BrowserVisibility.waitUntilElementIsVisible(element(by.tagName('mat-progress-spinner')));
+                await BrowserVisibility.waitUntilElementIsNotVisible(element(by.tagName('mat-progress-spinner')), this.MAX_LOADING_TIME);
             } catch (error) {
             }
         }