diff --git a/ayanova/src/views/adm-global-select-templates.vue b/ayanova/src/views/adm-global-select-templates.vue
index 3532a603..4ae7b198 100644
--- a/ayanova/src/views/adm-global-select-templates.vue
+++ b/ayanova/src/views/adm-global-select-templates.vue
@@ -19,7 +19,7 @@
               item-value="id"
               :label="$ay.t('PickListTemplates')"
               @input="templateSelected"
-              :data-cy="!!$ay.dev ? 'SelectTemplate' : false"
+              :data-cy="!!$ay.dev ? 'selectTemplate' : false"
               :disabled="formState.dirty"
             >
             </v-select>
diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 4d1c69f4..70cd3fc5 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -14,7 +14,7 @@
         <v-list-item
           link
           to="adm-global-select-templates"
-          :data-cy="!!$ay.dev ? 'picklisttemplates' : false"
+          :data-cy="!!$ay.dev ? 'pickListTemplates' : false"
         >
           <v-list-item-title>{{
             $ay.t("PickListTemplates")
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index 8f92a0a6..44021941 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -10,6 +10,7 @@
       hide-default-footer
       @click:row="rowClick"
       :header-props="{ sortByText: $ay.t('Sort') }"
+      :data-cy="!!$ay.dev ? 'subsTable' : false"
     >
     </v-data-table>
   </div>
diff --git a/ayanova/src/views/home-password.vue b/ayanova/src/views/home-password.vue
index fc276665..487fc989 100644
--- a/ayanova/src/views/home-password.vue
+++ b/ayanova/src/views/home-password.vue
@@ -22,6 +22,7 @@
               :error-messages="form().serverErrors(this, 'loginName')"
               ref="loginName"
               @input="fieldValueChanged('loginName')"
+              :data-cy="!!$ay.dev ? 'loginName' : false"
             ></v-text-field>
           </v-col>
 
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index 59fbe70d..30b70797 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -28,6 +28,7 @@
               :error-messages="form().serverErrors(this, 'emailAddress')"
               ref="emailAddress"
               @input="fieldValueChanged('emailAddress')"
+              :data-cy="!!$ay.dev ? 'emailAddress' : false"
             ></v-text-field>
           </v-col>
 
diff --git a/ayanova/tests/e2e/specs/smoke.js b/ayanova/tests/e2e/specs/smoke.js
index 10f4eaba..29e90ed6 100644
--- a/ayanova/tests/e2e/specs/smoke.js
+++ b/ayanova/tests/e2e/specs/smoke.js
@@ -37,15 +37,15 @@ describe("SMOKE", () => {
 
     cy.visit("/home-user-settings");
     cy.url().should("include", "/home-user-settings");
-
-    // cy.visit("/home-translation");
-    // cy.url().should("include", "/home-translation");
-    // cy.get("[data-cy=underconstruction]");
+    cy.get("[data-cy=emailAddress]");
 
     cy.visit("/home-password");
     cy.url().should("include", "/home-password");
+    cy.get("[data-cy=loginName]");
+
     cy.visit("/home-notify-subscriptions");
     cy.url().should("include", "/home-notify-subscriptions");
+    cy.get("[data-cy=subsTable]");
 
     cy.visit("/cust-customers");
     cy.url().should("include", "/cust-customers");
@@ -137,61 +137,101 @@ describe("SMOKE", () => {
 
     cy.visit("/adm-global-settings");
     cy.url().should("include", "/adm-global-settings");
+    cy.get("[data-cy=pickListTemplates]");
 
     cy.visit("/adm-global-select-templates");
     cy.url().should("include", "/adm-global-select-templates");
+    cy.get("[data-cy=selectTemplate]");
+
     cy.visit("/adm-license");
     cy.url().should("include", "/adm-license");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/adm-users");
     cy.url().should("include", "/adm-users");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/adm-translation");
     cy.url().should("include", "/adm-translation");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/adm-report-templates");
     cy.url().should("include", "/adm-report-templates");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/adm-attachments");
     cy.url().should("include", "/adm-attachments");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/adm-history");
     cy.url().should("include", "/adm-history");
+    cy.get("[data-cy=underconstruction]");
 
     cy.visit("/ops-backup");
     cy.url().should("include", "/ops-backup");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/ops-server-state");
     cy.url().should("include", "/ops-server-state");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/ops-jobs");
     cy.url().should("include", "/ops-jobs");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/ops-log");
     cy.url().should("include", "/ops-log");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/ops-metrics");
     cy.url().should("include", "/ops-metrics");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/ops-profile");
     cy.url().should("include", "/ops-profile");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/ops-notification-settings");
     cy.url().should("include", "/ops-notification-settings");
+    cy.get("[data-cy=underconstruction]");
 
     cy.visit("/about");
     cy.url().should("include", "/about");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/applog");
     cy.url().should("include", "/applog");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/customize/Widget");
     cy.url().should("include", "/customize/Widget");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/data-list-view/TestWidgetDataList/widget-list/0");
     cy.url().should(
       "include",
       "/data-list-view/TestWidgetDataList/widget-list"
     );
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/review/2/1");
     cy.url().should("include", "/review/2/1");
     cy.get("[data-cy=underconstruction]");
 
     cy.visit("/history/3/1");
     cy.url().should("include", "/history/3/1");
+    cy.get("[data-cy=underconstruction]");
 
     //TODO: REPORT
 
     cy.visit("/widgets");
     cy.url().should("include", "/widgets");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/widgets/0");
     cy.url().should("include", "/widgets/0");
+    cy.get("[data-cy=underconstruction]");
+
     cy.visit("/NOTFOUND");
     cy.contains("404");