diff --git a/ayanova/src/App.vue b/ayanova/src/App.vue
index 3c9d855a..603c91bb 100644
--- a/ayanova/src/App.vue
+++ b/ayanova/src/App.vue
@@ -35,7 +35,7 @@
               :prepend-icon="item.icon"
               :value="false"
               :key="item.key"
-              :data-cy="!!$ay.dev ? item.testid : false"
+              :data-cy="item.testid"
             >
               <template v-slot:activator>
                 <!--group activator -->
@@ -87,7 +87,7 @@
                   <div class="pl-3" :key="subitem.key">
                     <v-list-item
                       :to="subitem.route"
-                      :data-cy="!!$ay.dev ? 'nav' + subitem.route : false"
+                      :data-cy="'nav' + subitem.route"
                     >
                       <v-list-item-action>
                         <v-icon
@@ -112,10 +112,7 @@
           <!-- TOP LEVEL ACTION -->
           <template v-else>
             <div :key="item.key">
-              <v-list-item
-                :to="item.route"
-                :data-cy="!!$ay.dev ? item.testid : false"
-              >
+              <v-list-item :to="item.route" :data-cy="item.testid">
                 <v-list-item-action v-if="item.icon">
                   <v-icon :color="item.color ? item.color : ''">{{
                     item.icon
@@ -133,12 +130,7 @@
       </v-list>
       <template v-slot:append>
         <div>
-          <v-btn
-            x-large
-            block
-            to="/login"
-            :data-cy="!!$ay.dev ? 'logout' : false"
-          >
+          <v-btn x-large block to="/login" data-cy="logout">
             <v-icon large left>$ayiSignOut</v-icon>
             <span class="ml-2 text-h6">{{ $ay.t("Logout") }}</span></v-btn
           >
@@ -154,7 +146,7 @@
     >
       <v-app-bar-nav-icon
         @click.stop="drawer = !drawer"
-        :data-cy="!!$ay.dev ? 'navicon' : false"
+        data-cy="navicon"
       ></v-app-bar-nav-icon>
       <v-toolbar-title style="width: 300px" class="ml-0 pl-4">
         <v-icon>{{ appBar.icon }}</v-icon
@@ -162,12 +154,7 @@
         <span v-if="appBar.title">{{ $ay.t(appBar.title) }}</span>
       </v-toolbar-title>
       <v-spacer></v-spacer>
-      <v-btn
-        text
-        icon
-        to="/home-notifications"
-        :data-cy="!!$ay.dev ? 'notification' : false"
-      >
+      <v-btn text icon to="/home-notifications" data-cy="notification">
         <v-badge color="deep-purple" :value="newNotificationCount() > 0">
           <template v-slot:badge>
             {{ newNotificationCount() }}
@@ -185,7 +172,7 @@
             v-if="item.surface"
             :disabled="item.disabled"
             @click="clickMenuItem(item)"
-            :data-cy="!!$ay.dev ? item.key : false"
+            :data-cy="item.key"
           >
             <v-icon :color="item.color ? item.color : ''">
               {{ item.icon }}
@@ -196,12 +183,7 @@
         <v-spacer></v-spacer>
         <v-menu bottom float-left>
           <template v-slot:activator="{ on }">
-            <v-btn
-              text
-              icon
-              v-on="on"
-              :data-cy="!!$ay.dev ? 'contextmenu' : false"
-            >
+            <v-btn text icon v-on="on" data-cy="contextmenu">
               <v-icon>$ayiEllipsisV</v-icon>
             </v-btn>
           </template>
@@ -223,7 +205,7 @@
                 :target="item.target"
                 @click="clickMenuItem(item)"
                 v-bind:class="{ 'hidden-sm-and-up': item.surface }"
-                :data-cy="!!$ay.dev ? item.key : false"
+                :data-cy="item.key"
               >
                 <v-list-item-action>
                   <v-icon
diff --git a/ayanova/src/components/custom-fields-control.vue b/ayanova/src/components/custom-fields-control.vue
index b33ba94b..407f9b55 100644
--- a/ayanova/src/components/custom-fields-control.vue
+++ b/ayanova/src/components/custom-fields-control.vue
@@ -23,7 +23,7 @@
                 :disabled="disabled"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
-                :data-cy="!!$ay.dev ? item.fld : false"
+                :data-cy="item.fld"
                 :error-messages="form().serverErrors(parentVM, item.fld)"
                 :rules="[
                   form().customFieldsCheck(
@@ -44,7 +44,7 @@
                 :disabled="disabled"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
-                :data-cy="!!$ay.dev ? item.fld : false"
+                :data-cy="item.fld"
                 :error-messages="form().serverErrors(parentVM, item.fld)"
                 :rules="[
                   form().customFieldsCheck(
@@ -64,7 +64,7 @@
                 :disabled="disabled"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
-                :data-cy="!!$ay.dev ? item.fld : false"
+                :data-cy="item.fld"
                 :error-messages="form().serverErrors(parentVM, item.fld)"
                 :rules="[
                   form().customFieldsCheck(
@@ -84,7 +84,7 @@
                 :disabled="disabled"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
-                :data-cy="!!$ay.dev ? item.fld : false"
+                :data-cy="item.fld"
                 :error-messages="form().serverErrors(parentVM, item.fld)"
                 :rules="[
                   form().customFieldsCheck(
@@ -106,7 +106,7 @@
                 :disabled="disabled"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
-                :data-cy="!!$ay.dev ? item.fld : false"
+                :data-cy="item.fld"
                 :error-messages="form().serverErrors(parentVM, item.fld)"
                 :rules="[
                   form().customFieldsCheck(
@@ -130,7 +130,7 @@
                 :disabled="disabled"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
-                :data-cy="!!$ay.dev ? item.fld : false"
+                :data-cy="item.fld"
                 :error-messages="form().serverErrors(parentVM, item.fld)"
                 :rules="[
                   form().customFieldsCheck(
@@ -150,7 +150,7 @@
                 :disabled="disabled"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
-                :data-cy="!!$ay.dev ? item.fld : false"
+                :data-cy="item.fld"
                 :error-messages="form().serverErrors(parentVM, item.fld)"
                 :rules="[
                   form().customFieldsCheck(
@@ -170,7 +170,7 @@
                 :disabled="disabled"
                 :label="$ay.t(item.fld)"
                 :ref="item.fld"
-                :data-cy="!!$ay.dev ? item.fld : false"
+                :data-cy="item.fld"
                 :error-messages="form().serverErrors(parentVM, item.fld)"
                 :rules="[
                   form().customFieldsCheck(
diff --git a/ayanova/src/components/date-control.vue b/ayanova/src/components/date-control.vue
index a3707ac0..e450bd62 100644
--- a/ayanova/src/components/date-control.vue
+++ b/ayanova/src/components/date-control.vue
@@ -11,7 +11,7 @@
         :rules="rules"
         type="date"
         :error-messages="allErrors()"
-        :data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
+        :data-cy="'dateinput:' + testId"
       ></v-text-field>
     </template>
     <template v-else>
diff --git a/ayanova/src/components/date-time-control.vue b/ayanova/src/components/date-time-control.vue
index 92a48b76..f8357c73 100644
--- a/ayanova/src/components/date-time-control.vue
+++ b/ayanova/src/components/date-time-control.vue
@@ -12,7 +12,7 @@
           :rules="rules"
           type="date"
           :error-messages="allErrors()"
-          :data-cy="!!$ay.dev ? 'dateinput:' + testId : false"
+          :data-cy="'dateinput:' + testId"
         ></v-text-field>
       </v-col>
       <v-col cols="6">
@@ -23,7 +23,7 @@
           :readonly="readonly"
           :disabled="disabled"
           type="time"
-          :data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
+          :data-cy="'timeinput:' + testId"
         ></v-text-field>
       </v-col>
     </template>
diff --git a/ayanova/src/components/date-time-non-native-control.vue b/ayanova/src/components/date-time-non-native-control.vue
index faf5294e..ea409208 100644
--- a/ayanova/src/components/date-time-non-native-control.vue
+++ b/ayanova/src/components/date-time-non-native-control.vue
@@ -18,14 +18,14 @@
               v-bind:rules="rules"
               readonly
               :error="!!error"
-              :data-cy="!!$ay.dev ? 'dtfpick:' + testId : false"
+              :data-cy="'dtfpick:' + testId"
             ></v-text-field>
           </template>
           <v-date-picker
             v-model="dateOnly"
             @input="dlgdate = false"
             :locale="defaultLocale"
-            :data-cy="!!$ay.dev ? 'dpick:' + testId : false"
+            :data-cy="'dpick:' + testId"
           >
             <v-spacer></v-spacer>
             <v-btn text color="primary" @click="dlgdate = false">{{
@@ -50,7 +50,7 @@
               @click:prepend="dlgtime = true"
               readonly
               :error="!!error"
-              :data-cy="!!$ay.dev ? 'ttfpick:' + testId : false"
+              :data-cy="'ttfpick:' + testId"
             ></v-text-field>
           </template>
           <v-time-picker
@@ -58,7 +58,7 @@
             ampm-in-title
             :format="hour12 ? 'ampm' : '24hr'"
             v-model="timeOnly"
-            :data-cy="!!$ay.dev ? 'tpick:' + testId : false"
+            :data-cy="'tpick:' + testId"
           >
             <v-spacer></v-spacer>
             <v-btn text color="primary" @click="dlgtime = false">{{
diff --git a/ayanova/src/components/duration-control.vue b/ayanova/src/components/duration-control.vue
index e0e72ad0..f2a405fa 100644
--- a/ayanova/src/components/duration-control.vue
+++ b/ayanova/src/components/duration-control.vue
@@ -15,7 +15,7 @@
             :disabled="disabled"
             :label="$ay.t('TimeSpanDays')"
             type="number"
-            :data-cy="!!$ay.dev ? 'durationdays:' + testId : false"
+            :data-cy="'durationdays:' + testId"
           ></v-text-field>
         </v-col>
         <v-col cols="3">
@@ -27,7 +27,7 @@
             :disabled="disabled"
             :label="$ay.t('TimeSpanHours')"
             type="number"
-            :data-cy="!!$ay.dev ? 'durationhours:' + testId : false"
+            :data-cy="'durationhours:' + testId"
           ></v-text-field>
         </v-col>
         <v-col cols="3">
@@ -39,7 +39,7 @@
             :disabled="disabled"
             :label="$ay.t('TimeSpanMinutes')"
             type="number"
-            :data-cy="!!$ay.dev ? 'durationminutes:' + testId : false"
+            :data-cy="'durationminutes:' + testId"
           ></v-text-field>
         </v-col>
         <v-col cols="3">
@@ -52,7 +52,7 @@
             :disabled="disabled"
             :label="$ay.t('TimeSpanSeconds')"
             type="number"
-            :data-cy="!!$ay.dev ? 'durationseconds:' + testId : false"
+            :data-cy="'durationseconds:' + testId"
           ></v-text-field>
         </v-col>
       </v-row>
diff --git a/ayanova/src/components/error-control.vue b/ayanova/src/components/error-control.vue
index e2db5bf5..ae8192cb 100644
--- a/ayanova/src/components/error-control.vue
+++ b/ayanova/src/components/error-control.vue
@@ -2,7 +2,7 @@
   <v-col v-if="errorBoxMessage" cols="12" mt-1 mb-2>
     <v-alert
       ref="errorbox"
-      :data-cy="!!$ay.dev ? 'errorbox' : false"
+      data-cy="errorbox"
       v-show="errorBoxMessage"
       color="error"
       icon="$ayiExclamationCircle"
diff --git a/ayanova/src/components/extensions-control.vue b/ayanova/src/components/extensions-control.vue
index f9bee08b..ab546752 100644
--- a/ayanova/src/components/extensions-control.vue
+++ b/ayanova/src/components/extensions-control.vue
@@ -4,7 +4,7 @@
     hide-overlay
     v-model="isVisible"
     @keydown.esc="cancel"
-    :data-cy="!!$ay.dev ? 'extensions' : false"
+    data-cy="extensions"
   >
     <v-card>
       <v-card-title>{{ $ay.t("Extensions") }}</v-card-title>
diff --git a/ayanova/src/components/gz-data-table.vue b/ayanova/src/components/gz-data-table.vue
index 557a1627..00d1a7a1 100644
--- a/ayanova/src/components/gz-data-table.vue
+++ b/ayanova/src/components/gz-data-table.vue
@@ -10,17 +10,17 @@
           item-value="id"
           :label="$ay.t('DataListView')"
           @input="listViewChanged"
-          :data-cy="!!$ay.dev ? 'selectlistview' : false"
+          data-cy="selectlistview"
         >
         </v-select>
         <v-spacer></v-spacer>
         <div>
           <v-btn @click="refresh">
-            <v-icon :data-cy="!!$ay.dev ? 'refresh' : false">$ayiSync</v-icon>
+            <v-icon data-cy="refresh">$ayiSync</v-icon>
           </v-btn>
 
           <v-btn class="ml-12" @click="editListView">
-            <v-icon :data-cy="!!$ay.dev ? 'filter' : false">$ayiFilter</v-icon>
+            <v-icon data-cy="filter">$ayiFilter</v-icon>
           </v-btn>
         </div>
       </v-card-title>
@@ -52,7 +52,7 @@
           :loading-text="$ay.t('Loading')"
           :no-data-text="$ay.t('NoData')"
           class="elevation-1"
-          :data-cy="!!$ay.dev ? 'datatable-wide' : false"
+          data-cy="datatable"
         >
           <template v-slot:body="{ items }">
             <tbody>
@@ -190,7 +190,7 @@
           }"
           :loading-text="$ay.t('Loading')"
           class="elevation-1"
-          :data-cy="!!$ay.dev ? 'datatable-mobile' : false"
+          data-cy="datatable"
         >
           <template v-slot:header="props">
             <!-- Mimic the full width data table select all toggle :no-data-text="$ay.t('NoData')"-->
diff --git a/ayanova/src/components/gzconfirm.vue b/ayanova/src/components/gzconfirm.vue
index 2db4c877..c77d94e3 100644
--- a/ayanova/src/components/gzconfirm.vue
+++ b/ayanova/src/components/gzconfirm.vue
@@ -6,7 +6,7 @@
       :max-width="maxWidth"
       :width="width"
       @keydown.esc="cancel"
-      :data-cy="!!$ay.dev ? 'gzconfirm' : false"
+      data-cy="gzconfirm"
     >
       <v-card elevation="24">
         <v-card-title class="text-h6 text-sm-h5 grey lighten-4">
@@ -34,7 +34,7 @@
         <v-card-actions>
           <v-spacer></v-spacer>
           <v-btn
-            :data-cy="!!$ay.dev ? 'gzconfirm:morebutton' : false"
+            data-cy="gzconfirm:morebutton"
             text
             v-if="options.helpUrl"
             @click="helpClick()"
@@ -46,14 +46,14 @@
             color="primary"
             text
             @click.native="cancel"
-            :data-cy="!!$ay.dev ? 'gzconfirm:nobutton' : false"
+            data-cy="gzconfirm:nobutton"
             >{{ options.noButtonText }}</v-btn
           >
           <v-btn
             color="primary"
             text
             @click.native="agree"
-            :data-cy="!!$ay.dev ? 'gzconfirm:yesbutton' : false"
+            data-cy="gzconfirm:yesbutton"
             >{{ options.yesButtonText }}</v-btn
           >
         </v-card-actions>
diff --git a/ayanova/src/components/gznotify.vue b/ayanova/src/components/gznotify.vue
index 74b1e94e..f51471e0 100644
--- a/ayanova/src/components/gznotify.vue
+++ b/ayanova/src/components/gznotify.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- <v-scale-transition> -->
   <v-snackbar
-    :data-cy="!!$ay.dev ? 'gznotify' : false"
+    data-cy="gznotify"
     :value="isVisible"
     :color="currentNotification.type"
     multi-line
@@ -11,7 +11,7 @@
     </v-alert>
 
     <v-btn
-      :data-cy="!!$ay.dev ? 'gznotify:morebutton' : false"
+      data-cy="gznotify:morebutton"
       text
       v-if="currentNotification.helpUrl"
       @click="helpClick()"
diff --git a/ayanova/src/components/report-selector-control.vue b/ayanova/src/components/report-selector-control.vue
index 8c8c0dbf..a39ca59a 100644
--- a/ayanova/src/components/report-selector-control.vue
+++ b/ayanova/src/components/report-selector-control.vue
@@ -9,7 +9,7 @@
         max-width="600px"
         v-model="isVisible"
         @keydown.esc="cancel"
-        :data-cy="!!$ay.dev ? 'reportselector' : false"
+        data-cy="reportselector"
       >
         <v-card elevation="24">
           <v-card-title class="headline lighten-2" primary-title>
@@ -41,7 +41,7 @@
               color="primary"
               text
               @click.native="newReport"
-              :data-cy="!!$ay.dev ? 'reportselector:ok' : false"
+              data-cy="reportselector:ok"
               >{{ $ay.t("New") }}</v-btn
             >
             <v-spacer></v-spacer>
@@ -49,7 +49,7 @@
               color="primary"
               text
               @click.native="cancel"
-              :data-cy="!!$ay.dev ? 'reportselector:cancel' : false"
+              data-cy="reportselector:cancel"
               >{{ $ay.t("Cancel") }}</v-btn
             >
           </v-card-actions>
diff --git a/ayanova/src/components/role-control.vue b/ayanova/src/components/role-control.vue
index 51be782d..605d3837 100644
--- a/ayanova/src/components/role-control.vue
+++ b/ayanova/src/components/role-control.vue
@@ -13,7 +13,7 @@
     :label="label"
     :rules="rules"
     :error-messages="allErrors()"
-    :data-cy="!!$ay.dev ? 'roleinput:' + testId : false"
+    :data-cy="'roleinput:' + testId"
   ></v-select>
 </template>
 <script>
diff --git a/ayanova/src/components/time-control.vue b/ayanova/src/components/time-control.vue
index 479cf309..7966b81e 100644
--- a/ayanova/src/components/time-control.vue
+++ b/ayanova/src/components/time-control.vue
@@ -11,7 +11,7 @@
         :rules="rules"
         :error-messages="allErrors()"
         type="time"
-        :data-cy="!!$ay.dev ? 'timeinput:' + testId : false"
+        :data-cy="'timeinput:' + testId"
       ></v-text-field>
     </template>
     <template v-else>
diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index 3a11724d..9f994245 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -216,7 +216,7 @@ Vue.directive("focus", {
 // INSTANTIATE
 //
 Vue.prototype.$ay = {
-  //development mode, this enables data-cy tags for testing, development level error messages etc
+  //development mode, development level error messages etc
   dev: DEV_MODE,
   t: function(tKey) {
     return translation.get(tKey);
diff --git a/ayanova/src/views/acc-accounting.vue b/ayanova/src/views/acc-accounting.vue
index 8f6bb891..4f3f9bf9 100644
--- a/ayanova/src/views/acc-accounting.vue
+++ b/ayanova/src/views/acc-accounting.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/adm-attachments.vue b/ayanova/src/views/adm-attachments.vue
index 8d31d23e..4b03e73f 100644
--- a/ayanova/src/views/adm-attachments.vue
+++ b/ayanova/src/views/adm-attachments.vue
@@ -13,7 +13,7 @@
           :singleSelect="false"
           :reload="reload"
           v-on:selection-change="handleSelected"
-          :data-cy="!!$ay.dev ? 'attachTable' : false"
+          data-cy="attachTable"
         >
         </gz-data-table>
 
diff --git a/ayanova/src/views/adm-global-logo.vue b/ayanova/src/views/adm-global-logo.vue
index fc686238..a4f495b6 100644
--- a/ayanova/src/views/adm-global-logo.vue
+++ b/ayanova/src/views/adm-global-logo.vue
@@ -18,7 +18,7 @@
               show-size
               :label="$ay.t('SmallLogo')"
               :rules="rules"
-              :data-cy="!!$ay.dev ? 'uploadSmall' : false"
+              data-cy="uploadSmall"
             ></v-file-input>
             <v-btn color="primary" text @click="remove('small')">{{
               $ay.t("Delete")
diff --git a/ayanova/src/views/adm-global-select-templates.vue b/ayanova/src/views/adm-global-select-templates.vue
index 4ae7b198..4838c717 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="selectTemplate"
               :disabled="formState.dirty"
             >
             </v-select>
@@ -52,7 +52,7 @@
                     :ref="item.key"
                     :disabled="item.required"
                     @change="includeChanged(item)"
-                    :data-cy="!!$ay.dev ? item.key + 'Include' : false"
+                    :data-cy="item.key + 'Include'"
                   ></v-checkbox>
                   <!-- RE-ORDER CONTROL -->
                   <div class="d-flex justify-space-between">
diff --git a/ayanova/src/views/adm-global-settings.vue b/ayanova/src/views/adm-global-settings.vue
index 70cd3fc5..b4f6f5a1 100644
--- a/ayanova/src/views/adm-global-settings.vue
+++ b/ayanova/src/views/adm-global-settings.vue
@@ -4,17 +4,13 @@
     <v-card class="mx-auto" v-if="formState.ready">
       <v-list subheader>
         <v-subheader>{{ $ay.t("UserInterfaceSettings") }}</v-subheader>
-        <v-list-item
-          link
-          to="adm-global-logo"
-          :data-cy="!!$ay.dev ? 'logo' : false"
-        >
+        <v-list-item link to="adm-global-logo" data-cy="logo">
           <v-list-item-title>{{ $ay.t("GlobalLogo") }}</v-list-item-title>
         </v-list-item>
         <v-list-item
           link
           to="adm-global-select-templates"
-          :data-cy="!!$ay.dev ? 'pickListTemplates' : false"
+          data-cy="pickListTemplates"
         >
           <v-list-item-title>{{
             $ay.t("PickListTemplates")
diff --git a/ayanova/src/views/adm-history.vue b/ayanova/src/views/adm-history.vue
index 3aad78a5..4b3c6b2f 100644
--- a/ayanova/src/views/adm-history.vue
+++ b/ayanova/src/views/adm-history.vue
@@ -9,7 +9,7 @@
       :singleSelect="false"
       :reload="reload"
       v-on:selection-change="handleSelected"
-      :data-cy="!!$ay.dev ? 'historyTable' : false"
+      data-cy="historyTable"
     >
     </gz-data-table>
   </div>
diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue
index edea78c2..da3af050 100644
--- a/ayanova/src/views/adm-license.vue
+++ b/ayanova/src/views/adm-license.vue
@@ -7,7 +7,7 @@
           <template v-if="showLicenseUi() == 'ok'">
             <!-- Normal active license UI -->
             <v-col cols="12" md="7">
-              <v-card :data-cy="!!$ay.dev ? 'licenseCard' : false">
+              <v-card data-cy="licenseCard">
                 <v-list two-line subheader>
                   <v-subheader>{{ $ay.t("HelpLicense") }}</v-subheader>
 
diff --git a/ayanova/src/views/ay-review.vue b/ayanova/src/views/ay-review.vue
index 24892386..bdb94317 100644
--- a/ayanova/src/views/ay-review.vue
+++ b/ayanova/src/views/ay-review.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/cust-customers.vue b/ayanova/src/views/cust-customers.vue
index 268077f1..69e227d0 100644
--- a/ayanova/src/views/cust-customers.vue
+++ b/ayanova/src/views/cust-customers.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/cust-headoffices.vue b/ayanova/src/views/cust-headoffices.vue
index c1b73a9c..bd211693 100644
--- a/ayanova/src/views/cust-headoffices.vue
+++ b/ayanova/src/views/cust-headoffices.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/customer-csr-list.vue b/ayanova/src/views/customer-csr-list.vue
index a260be4c..88197d4d 100644
--- a/ayanova/src/views/customer-csr-list.vue
+++ b/ayanova/src/views/customer-csr-list.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/customer-workorders.vue b/ayanova/src/views/customer-workorders.vue
index 6154babd..e9b7415c 100644
--- a/ayanova/src/views/customer-workorders.vue
+++ b/ayanova/src/views/customer-workorders.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/home-dashboard.vue b/ayanova/src/views/home-dashboard.vue
index 6c1c4d82..7aa821ad 100644
--- a/ayanova/src/views/home-dashboard.vue
+++ b/ayanova/src/views/home-dashboard.vue
@@ -3,7 +3,8 @@
     <h1>
       //DASHBOARD - KPI / METRICS / CHARTS AND STUFF APPROPRIATE TO ROLE
     </h1>
-    <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+    <!-- <UnderConstruction data-cy="underconstruction" /> -->
+    <UnderConstruction data-cy="underconstruction" />
   </div>
 </template>
 
diff --git a/ayanova/src/views/home-memos.vue b/ayanova/src/views/home-memos.vue
index 4f20a287..ef6fdafb 100644
--- a/ayanova/src/views/home-memos.vue
+++ b/ayanova/src/views/home-memos.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/home-reminders.vue b/ayanova/src/views/home-reminders.vue
index ddf7725c..c915852c 100644
--- a/ayanova/src/views/home-reminders.vue
+++ b/ayanova/src/views/home-reminders.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/home-schedule.vue b/ayanova/src/views/home-schedule.vue
index a09aed63..21169a39 100644
--- a/ayanova/src/views/home-schedule.vue
+++ b/ayanova/src/views/home-schedule.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/home-search.vue b/ayanova/src/views/home-search.vue
index 7381d415..4ed20d02 100644
--- a/ayanova/src/views/home-search.vue
+++ b/ayanova/src/views/home-search.vue
@@ -12,7 +12,7 @@
               ref="searchPhrase"
               @change="getDataFromApi()"
               hint="text, *xt, te*"
-              :data-cy="!!$ay.dev ? 'phrase' : false"
+              data-cy="phrase"
             ></v-text-field>
           </v-col>
           <v-col cols="12" sm="4" lg="4" xl="3">
@@ -26,9 +26,7 @@
           </v-col>
           <v-col cols="12" sm="4" lg="4" xl="3">
             <v-btn color="primary" v-on:click="getDataFromApi()" value="SEARCH">
-              <v-icon :data-cy="!!$ay.dev ? 'btnsearch' : false"
-                >$ayiSearch</v-icon
-              >
+              <v-icon data-cy="btnsearch">$ayiSearch</v-icon>
             </v-btn>
           </v-col>
 
@@ -52,7 +50,7 @@
                   <v-list-item link :key="item.index">
                     <v-list-item-content
                       @click="openItem(item)"
-                      :data-cy="!!$ay.dev ? 'btnopenitem' + item.index : false"
+                      :data-cy="'btnopenitem' + item.index"
                     >
                       <v-list-item-title v-text="item.name"></v-list-item-title>
                       <v-list-item-subtitle
@@ -64,9 +62,7 @@
                         <v-icon
                           color="grey lighten-1"
                           large
-                          :data-cy="
-                            !!$ay.dev ? 'btnexcerpt' + item.index : false
-                          "
+                          :data-cy="'btnexcerpt' + item.index"
                           >$ayiInfoCircle</v-icon
                         >
                       </v-btn>
diff --git a/ayanova/src/views/inv-adjustments.vue b/ayanova/src/views/inv-adjustments.vue
index bb25bc18..aadb9018 100644
--- a/ayanova/src/views/inv-adjustments.vue
+++ b/ayanova/src/views/inv-adjustments.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-part-inventory.vue b/ayanova/src/views/inv-part-inventory.vue
index a726570b..19131c06 100644
--- a/ayanova/src/views/inv-part-inventory.vue
+++ b/ayanova/src/views/inv-part-inventory.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-part-requests.vue b/ayanova/src/views/inv-part-requests.vue
index 34a72f72..2441cf2b 100644
--- a/ayanova/src/views/inv-part-requests.vue
+++ b/ayanova/src/views/inv-part-requests.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-parts.vue b/ayanova/src/views/inv-parts.vue
index 08d44bd9..43187c72 100644
--- a/ayanova/src/views/inv-parts.vue
+++ b/ayanova/src/views/inv-parts.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-purchase-order-receipts.vue b/ayanova/src/views/inv-purchase-order-receipts.vue
index 69653d73..8c65e1fc 100644
--- a/ayanova/src/views/inv-purchase-order-receipts.vue
+++ b/ayanova/src/views/inv-purchase-order-receipts.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/inv-purchase-orders.vue b/ayanova/src/views/inv-purchase-orders.vue
index f78d8a1f..75dcea80 100644
--- a/ayanova/src/views/inv-purchase-orders.vue
+++ b/ayanova/src/views/inv-purchase-orders.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-contracts.vue b/ayanova/src/views/svc-contracts.vue
index c996867f..8220de38 100644
--- a/ayanova/src/views/svc-contracts.vue
+++ b/ayanova/src/views/svc-contracts.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-csr-list.vue b/ayanova/src/views/svc-csr-list.vue
index 0e623187..c124e825 100644
--- a/ayanova/src/views/svc-csr-list.vue
+++ b/ayanova/src/views/svc-csr-list.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-loaners.vue b/ayanova/src/views/svc-loaners.vue
index 9ea9e352..38d61859 100644
--- a/ayanova/src/views/svc-loaners.vue
+++ b/ayanova/src/views/svc-loaners.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-pm-list.vue b/ayanova/src/views/svc-pm-list.vue
index ad470292..cb0134bf 100644
--- a/ayanova/src/views/svc-pm-list.vue
+++ b/ayanova/src/views/svc-pm-list.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-pm-templates.vue b/ayanova/src/views/svc-pm-templates.vue
index 8aba63c8..dc16c204 100644
--- a/ayanova/src/views/svc-pm-templates.vue
+++ b/ayanova/src/views/svc-pm-templates.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-quote-templates.vue b/ayanova/src/views/svc-quote-templates.vue
index 3b1d659d..df398f53 100644
--- a/ayanova/src/views/svc-quote-templates.vue
+++ b/ayanova/src/views/svc-quote-templates.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-quotes.vue b/ayanova/src/views/svc-quotes.vue
index a96ce202..3b3c48fc 100644
--- a/ayanova/src/views/svc-quotes.vue
+++ b/ayanova/src/views/svc-quotes.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-schedule.vue b/ayanova/src/views/svc-schedule.vue
index a40c75bd..e6321ac0 100644
--- a/ayanova/src/views/svc-schedule.vue
+++ b/ayanova/src/views/svc-schedule.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-unit-models.vue b/ayanova/src/views/svc-unit-models.vue
index d922a273..7e66251d 100644
--- a/ayanova/src/views/svc-unit-models.vue
+++ b/ayanova/src/views/svc-unit-models.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-units.vue b/ayanova/src/views/svc-units.vue
index aa865b73..78f1c493 100644
--- a/ayanova/src/views/svc-units.vue
+++ b/ayanova/src/views/svc-units.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-workorder-templates.vue b/ayanova/src/views/svc-workorder-templates.vue
index 64d71567..cc88c1ae 100644
--- a/ayanova/src/views/svc-workorder-templates.vue
+++ b/ayanova/src/views/svc-workorder-templates.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/svc-workorders.vue b/ayanova/src/views/svc-workorders.vue
index 245e029b..ebad7614 100644
--- a/ayanova/src/views/svc-workorders.vue
+++ b/ayanova/src/views/svc-workorders.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>
diff --git a/ayanova/src/views/vendors.vue b/ayanova/src/views/vendors.vue
index 0866ec17..d182a717 100644
--- a/ayanova/src/views/vendors.vue
+++ b/ayanova/src/views/vendors.vue
@@ -1,5 +1,5 @@
 <template>
-  <UnderConstruction :data-cy="!!$ay.dev ? 'underconstruction' : false" />
+  <UnderConstruction data-cy="underconstruction" />
 </template>
 
 <script>