diff --git a/ayanova/src/views/adm-report-templates.vue b/ayanova/src/views/adm-report-templates.vue
index 4770bbb4..e0e02840 100644
--- a/ayanova/src/views/adm-report-templates.vue
+++ b/ayanova/src/views/adm-report-templates.vue
@@ -9,7 +9,7 @@
       :singleSelect="false"
       :reload="reload"
       v-on:selection-change="handleSelected"
-      :data-cy="!!$ay.dev ? 'reportTemplatesTable' : false"
+      data-cy="reportTemplatesTable"
     >
     </gz-data-table>
     <v-file-input
diff --git a/ayanova/src/views/adm-translation.vue b/ayanova/src/views/adm-translation.vue
index 74dd6d65..db0a4836 100644
--- a/ayanova/src/views/adm-translation.vue
+++ b/ayanova/src/views/adm-translation.vue
@@ -70,7 +70,7 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'name')"
                 ref="name"
-                :data-cy="!!$ay.dev ? 'name' : false"
+                data-cy="name"
                 @input="fieldValueChanged('name')"
               ></v-text-field>
             </v-col>
diff --git a/ayanova/src/views/adm-translations.vue b/ayanova/src/views/adm-translations.vue
index 6a01e726..194eea18 100644
--- a/ayanova/src/views/adm-translations.vue
+++ b/ayanova/src/views/adm-translations.vue
@@ -9,7 +9,7 @@
       :singleSelect="false"
       :reload="reload"
       v-on:selection-change="handleSelected"
-      :data-cy="!!$ay.dev ? 'transTable' : false"
+      data-cy="transTable"
     >
     </gz-data-table>
     <v-file-input
diff --git a/ayanova/src/views/adm-user.vue b/ayanova/src/views/adm-user.vue
index 0ca7c7ae..28ef109d 100644
--- a/ayanova/src/views/adm-user.vue
+++ b/ayanova/src/views/adm-user.vue
@@ -27,7 +27,7 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'name')"
                 ref="name"
-                :data-cy="!!$ay.dev ? 'name' : false"
+                data-cy="name"
                 @input="fieldValueChanged('name')"
               ></v-text-field>
             </v-col>
@@ -47,7 +47,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('Vendor')"
                 ref="subVendorId"
-                :data-cy="!!$ay.dev ? 'subVendorId' : false"
+                data-cy="subVendorId"
                 :error-messages="form().serverErrors(this, 'subVendorId')"
                 @input="fieldValueChanged('subVendorId')"
               ></gz-pick-list>
@@ -65,7 +65,7 @@
                 :rules="[form().max255(this, 'employeeNumber')]"
                 :error-messages="form().serverErrors(this, 'employeeNumber')"
                 ref="employeeNumber"
-                :data-cy="!!$ay.dev ? 'employeeNumber' : false"
+                data-cy="employeeNumber"
                 @input="fieldValueChanged('employeeNumber')"
               ></v-text-field>
             </v-col>
@@ -97,7 +97,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('Active')"
                 ref="active"
-                :data-cy="!!$ay.dev ? 'active' : false"
+                data-cy="active"
                 :error-messages="form().serverErrors(this, 'active')"
                 @change="fieldValueChanged('active')"
               ></v-checkbox>
@@ -119,7 +119,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('UserType')"
                 ref="usertype"
-                :data-cy="!!$ay.dev ? 'usertype' : false"
+                data-cy="usertype"
                 :rules="[form().integerValid(this, 'usertype')]"
                 :error-messages="form().serverErrors(this, 'usertype')"
                 @input="fieldValueChanged('usertype')"
@@ -178,7 +178,7 @@
                 :label="$ay.t('UserNotes')"
                 :error-messages="form().serverErrors(this, 'notes')"
                 ref="notes"
-                :data-cy="!!$ay.dev ? 'notes' : false"
+                data-cy="notes"
                 @input="fieldValueChanged('notes')"
                 auto-grow
                 :clearable="!formState.readOnly"
@@ -191,7 +191,7 @@
                 :readonly="formState.readOnly"
                 :disabled="formState.readOnly"
                 ref="tags"
-                :data-cy="!!$ay.dev ? 'tags' : false"
+                data-cy="tags"
                 :error-messages="form().serverErrors(this, 'tags')"
                 @input="fieldValueChanged('tags')"
               ></gz-tag-picker>
@@ -205,7 +205,7 @@
                 :disabled="formState.readOnly"
                 :parentVM="this"
                 ref="customFields"
-                :data-cy="!!$ay.dev ? 'customFields' : false"
+                data-cy="customFields"
                 :error-messages="form().serverErrors(this, 'customFields')"
                 @input="fieldValueChanged('customFields')"
               ></gz-custom-fields>
diff --git a/ayanova/src/views/adm-users.vue b/ayanova/src/views/adm-users.vue
index 19f4170e..48657efd 100644
--- a/ayanova/src/views/adm-users.vue
+++ b/ayanova/src/views/adm-users.vue
@@ -13,7 +13,7 @@
       :sort-by="['name']"
       show-select
       :header-props="{ sortByText: $ay.t('Sort') }"
-      :data-cy="!!$ay.dev ? 'usersTable' : false"
+      data-cy="usersTable"
     >
       <template v-slot:[`item.active`]="{ item }">
         <v-simple-checkbox v-model="item.active" disabled></v-simple-checkbox>
diff --git a/ayanova/src/views/ay-about.vue b/ayanova/src/views/ay-about.vue
index 2da0a3e4..39b59c9c 100644
--- a/ayanova/src/views/ay-about.vue
+++ b/ayanova/src/views/ay-about.vue
@@ -2,10 +2,7 @@
   <v-row v-if="this.formState.ready">
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col>
-      <v-card
-        id="ayaNovaVersioncard"
-        :data-cy="!!$ay.dev ? 'versionCard' : false"
-      >
+      <v-card id="ayaNovaVersioncard" data-cy="versionCard">
         <v-subheader>AyaNova App</v-subheader>
         <div>
           <span class="ml-6 body-1">{{ $ay.t("Version") }}: </span>
@@ -104,7 +101,7 @@
           </div>
 
           <v-divider class="mt-6"></v-divider>
-          <v-subheader :data-cy="!!$ay.dev ? 'aboutlicensedoptions' : false">{{
+          <v-subheader data-cy="aboutlicensedoptions">{{
             $ay.t("LicensedOptions")
           }}</v-subheader>
 
diff --git a/ayanova/src/views/ay-customize.vue b/ayanova/src/views/ay-customize.vue
index bc8bc4c8..a43a5d6a 100644
--- a/ayanova/src/views/ay-customize.vue
+++ b/ayanova/src/views/ay-customize.vue
@@ -1,12 +1,12 @@
 <template>
   <v-row v-if="formState.ready">
     <v-col>
-      <v-form ref="form" :data-cy="!!$ay.dev ? 'customizeForm' : false">
+      <v-form ref="form" data-cy="customizeForm">
         <v-row>
           <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
           <template v-for="item in obj">
             <v-col :key="item.key" cols="12" sm="6" lg="4" xl="3" px-2>
-              <v-card :data-cy="!!$ay.dev ? item.key : false">
+              <v-card :data-cy="item.key">
                 <v-card-title>
                   {{ item.title }}
                 </v-card-title>
@@ -21,7 +21,7 @@
                     :ref="item.key"
                     :disabled="item.stockRequired || formState.readOnly"
                     @change="visibleChanged(item)"
-                    :data-cy="!!$ay.dev ? item.key + 'Visible' : false"
+                    :data-cy="item.key + 'Visible'"
                   ></v-checkbox>
                   <v-checkbox
                     v-model="item.required"
@@ -40,7 +40,7 @@
                     item-value="id"
                     :label="$ay.t('UiFieldDataType')"
                     @input="dataTypeChanged(item)"
-                    :data-cy="!!$ay.dev ? item.key + 'SelectType' : false"
+                    :data-cy="item.key + 'SelectType'"
                   ></v-select>
                   <!-- <v-divider></v-divider>
                     <div>{{ item }}</div> -->
diff --git a/ayanova/src/views/ay-data-list-view.vue b/ayanova/src/views/ay-data-list-view.vue
index a3dabb48..2c021dbe 100644
--- a/ayanova/src/views/ay-data-list-view.vue
+++ b/ayanova/src/views/ay-data-list-view.vue
@@ -21,7 +21,7 @@
                   :error-messages="form().serverErrors(this, 'name')"
                   ref="name"
                   @input="fieldValueChanged('name')"
-                  :data-cy="!!$ay.dev ? 'name' : false"
+                  data-cy="name"
                 ></v-text-field>
               </v-col>
               <v-col cols="12" sm="6" lg="4" xl="3">
@@ -37,7 +37,7 @@
           </v-col>
           <template v-for="(item, index) in obj.editView">
             <v-col :key="item.key" cols="12" sm="6" lg="4" xl="3" px-2>
-              <v-card :data-cy="!!$ay.dev ? 'columncard:' + item.key : false">
+              <v-card :data-cy="'columncard:' + item.key">
                 <v-card-title>
                   {{ item.title }}
                 </v-card-title>
@@ -60,7 +60,7 @@
                   <!-- RE-ORDER CONTROL -->
                   <div class="d-flex justify-space-between">
                     <v-btn large icon @click="move('start', index)"
-                      ><v-icon large :data-cy="!!$ay.dev ? 'movestart' : false"
+                      ><v-icon large data-cy="movestart"
                         >$ayiStepBackward</v-icon
                       ></v-btn
                     >
diff --git a/ayanova/src/views/ay-history.vue b/ayanova/src/views/ay-history.vue
index 11998818..926987e4 100644
--- a/ayanova/src/views/ay-history.vue
+++ b/ayanova/src/views/ay-history.vue
@@ -10,10 +10,7 @@
       <v-col rows="12">
         <template v-if="$route.params.userlog">
           <!-- **** USER LOG ****** -->
-          <v-timeline
-            :dense="$vuetify.breakpoint.smAndDown"
-            :data-cy="!!$ay.dev ? 'timeLine' : false"
-          >
+          <v-timeline :dense="$vuetify.breakpoint.smAndDown" data-cy="timeLine">
             <v-timeline-item
               v-for="i in obj"
               :key="i.index"
@@ -50,10 +47,7 @@
         </template>
         <template v-else>
           <!-- **** OBJECT LOG ****** -->
-          <v-timeline
-            :dense="$vuetify.breakpoint.smAndDown"
-            :data-cy="!!$ay.dev ? 'timeLine' : false"
-          >
+          <v-timeline :dense="$vuetify.breakpoint.smAndDown" data-cy="timeLine">
             <v-timeline-item
               v-for="i in obj"
               :key="i.index"
diff --git a/ayanova/src/views/ay-log.vue b/ayanova/src/views/ay-log.vue
index e4531f45..fa203333 100644
--- a/ayanova/src/views/ay-log.vue
+++ b/ayanova/src/views/ay-log.vue
@@ -7,7 +7,7 @@
         full-width
         readonly
         auto-grow
-        :data-cy="!!$ay.dev ? 'logText' : false"
+        data-cy="logText"
       ></v-textarea>
     </v-col>
   </v-row>
diff --git a/ayanova/src/views/ay-report-edit.vue b/ayanova/src/views/ay-report-edit.vue
index 954d9c03..076c4745 100644
--- a/ayanova/src/views/ay-report-edit.vue
+++ b/ayanova/src/views/ay-report-edit.vue
@@ -17,7 +17,7 @@
           group
           @change="onViewChange"
           mandatory
-          :data-cy="!!$ay.dev ? 'viewChange' : false"
+          data-cy="viewChange"
         >
           <v-btn value="properties">
             {{ $ay.t("ReportEditorProperties") }}
@@ -70,7 +70,7 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'name')"
                 ref="name"
-                :data-cy="!!$ay.dev ? 'name' : false"
+                data-cy="name"
                 @input="fieldValueChanged('name')"
               ></v-text-field>
             </v-col>
@@ -82,7 +82,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('Active')"
                 ref="active"
-                :data-cy="!!$ay.dev ? 'active' : false"
+                data-cy="active"
                 :error-messages="form().serverErrors(this, 'active')"
                 @change="fieldValueChanged('active')"
               ></v-checkbox>
@@ -110,7 +110,7 @@
                 :label="$ay.t('ReportNotes')"
                 :error-messages="form().serverErrors(this, 'notes')"
                 ref="notes"
-                :data-cy="!!$ay.dev ? 'notes' : false"
+                data-cy="notes"
                 @input="fieldValueChanged('notes')"
                 auto-grow
                 :clearable="!formState.readOnly"
@@ -130,7 +130,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('ReportDisplayHeaderFooter')"
                 ref="displayHeaderFooter"
-                :data-cy="!!$ay.dev ? 'displayHeaderFooter' : false"
+                data-cy="displayHeaderFooter"
                 :error-messages="
                   form().serverErrors(this, 'displayHeaderFooter')
                 "
@@ -146,7 +146,7 @@
                 :label="$ay.t('ReportHeaderTemplate')"
                 :error-messages="form().serverErrors(this, 'headerTemplate')"
                 ref="headerTemplate"
-                :data-cy="!!$ay.dev ? 'headerTemplate' : false"
+                data-cy="headerTemplate"
                 @input="fieldValueChanged('headerTemplate', 'formPDF')"
                 auto-grow
                 :clearable="!formState.readOnly"
@@ -161,7 +161,7 @@
                 :label="$ay.t('ReportFooterTemplate')"
                 :error-messages="form().serverErrors(this, 'footerTemplate')"
                 ref="footerTemplate"
-                :data-cy="!!$ay.dev ? 'footerTemplate' : false"
+                data-cy="footerTemplate"
                 @input="fieldValueChanged('footerTemplate', 'formPDF')"
                 auto-grow
                 :clearable="!formState.readOnly"
@@ -178,7 +178,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('ReportPaperFormat')"
                 ref="paperFormat"
-                :data-cy="!!$ay.dev ? 'paperFormat' : false"
+                data-cy="paperFormat"
                 :error-messages="form().serverErrors(this, 'paperFormat')"
                 @input="fieldValueChanged('paperFormat', 'formPDF')"
               ></v-select>
@@ -191,7 +191,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('ReportLandscape')"
                 ref="landscape"
-                :data-cy="!!$ay.dev ? 'landscape' : false"
+                data-cy="landscape"
                 :error-messages="form().serverErrors(this, 'landscape')"
                 @change="fieldValueChanged('landscape', 'formPDF')"
               ></v-checkbox>
@@ -209,7 +209,7 @@
                   form().serverErrors(this, 'marginOptionsBottom')
                 "
                 ref="marginOptionsBottom"
-                :data-cy="!!$ay.dev ? 'marginOptionsBottom' : false"
+                data-cy="marginOptionsBottom"
                 @input="fieldValueChanged('marginOptionsBottom', 'formPDF')"
               ></v-text-field>
             </v-col>
@@ -224,7 +224,7 @@
                 :label="$ay.t('ReportMarginOptionsLeft')"
                 :error-messages="form().serverErrors(this, 'marginOptionsLeft')"
                 ref="marginOptionsLeft"
-                :data-cy="!!$ay.dev ? 'marginOptionsLeft' : false"
+                data-cy="marginOptionsLeft"
                 @input="fieldValueChanged('marginOptionsLeft', 'formPDF')"
               ></v-text-field>
             </v-col>
@@ -241,7 +241,7 @@
                   form().serverErrors(this, 'marginOptionsRight')
                 "
                 ref="marginOptionsRight"
-                :data-cy="!!$ay.dev ? 'marginOptionsRight' : false"
+                data-cy="marginOptionsRight"
                 @input="fieldValueChanged('marginOptionsRight', 'formPDF')"
               ></v-text-field>
             </v-col>
@@ -256,7 +256,7 @@
                 :label="$ay.t('ReportMarginOptionsTop')"
                 :error-messages="form().serverErrors(this, 'marginOptionsTop')"
                 ref="marginOptionsTop"
-                :data-cy="!!$ay.dev ? 'marginOptionsTop' : false"
+                data-cy="marginOptionsTop"
                 @input="fieldValueChanged('marginOptionsTop', 'formPDF')"
               ></v-text-field>
             </v-col>
@@ -268,7 +268,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('ReportPreferCSSPageSize')"
                 ref="preferCSSPageSize"
-                :data-cy="!!$ay.dev ? 'preferCSSPageSize' : false"
+                data-cy="preferCSSPageSize"
                 :error-messages="form().serverErrors(this, 'preferCSSPageSize')"
                 @change="fieldValueChanged('preferCSSPageSize', 'formPDF')"
               ></v-checkbox>
@@ -281,7 +281,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('ReportPrintBackground')"
                 ref="printBackground"
-                :data-cy="!!$ay.dev ? 'printBackground' : false"
+                data-cy="printBackground"
                 :error-messages="form().serverErrors(this, 'printBackground')"
                 @change="fieldValueChanged('printBackground', 'formPDF')"
               ></v-checkbox>
@@ -303,7 +303,7 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'scale')"
                 ref="scale"
-                :data-cy="!!$ay.dev ? 'scale' : false"
+                data-cy="scale"
                 @input="fieldValueChanged('scale', 'formPDF')"
               ></gz-decimal>
             </v-col>
diff --git a/ayanova/src/views/cust-user.vue b/ayanova/src/views/cust-user.vue
index 31b75394..a9694bae 100644
--- a/ayanova/src/views/cust-user.vue
+++ b/ayanova/src/views/cust-user.vue
@@ -27,7 +27,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('Customer')"
                 ref="customerId"
-                :data-cy="!!$ay.dev ? 'customerId' : false"
+                data-cy="customerId"
                 :error-messages="form().serverErrors(this, 'customerId')"
                 @input="fieldValueChanged('customerId')"
               ></gz-pick-list>
@@ -48,7 +48,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('HeadOffice')"
                 ref="headOfficeId"
-                :data-cy="!!$ay.dev ? 'headOfficeId' : false"
+                data-cy="headOfficeId"
                 :error-messages="form().serverErrors(this, 'headOfficeId')"
                 @input="fieldValueChanged('headOfficeId')"
               ></gz-pick-list>
@@ -69,7 +69,7 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'name')"
                 ref="name"
-                :data-cy="!!$ay.dev ? 'name' : false"
+                data-cy="name"
                 @input="fieldValueChanged('name')"
               ></v-text-field>
             </v-col>
@@ -101,7 +101,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('Active')"
                 ref="active"
-                :data-cy="!!$ay.dev ? 'active' : false"
+                data-cy="active"
                 :error-messages="form().serverErrors(this, 'active')"
                 @change="fieldValueChanged('active')"
               ></v-checkbox>
@@ -123,7 +123,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('UserType')"
                 ref="usertype"
-                :data-cy="!!$ay.dev ? 'usertype' : false"
+                data-cy="usertype"
                 :rules="[form().integerValid(this, 'usertype')]"
                 :error-messages="form().serverErrors(this, 'usertype')"
                 @input="fieldValueChanged('usertype')"
@@ -182,7 +182,7 @@
                 :label="$ay.t('UserNotes')"
                 :error-messages="form().serverErrors(this, 'notes')"
                 ref="notes"
-                :data-cy="!!$ay.dev ? 'notes' : false"
+                data-cy="notes"
                 @input="fieldValueChanged('notes')"
                 auto-grow
                 :clearable="!formState.readOnly"
@@ -195,7 +195,7 @@
                 :readonly="formState.readOnly"
                 :disabled="formState.readOnly"
                 ref="tags"
-                :data-cy="!!$ay.dev ? 'tags' : false"
+                data-cy="tags"
                 :error-messages="form().serverErrors(this, 'tags')"
                 @input="fieldValueChanged('tags')"
               ></gz-tag-picker>
@@ -209,7 +209,7 @@
                 :disabled="formState.readOnly"
                 :parentVM="this"
                 ref="customFields"
-                :data-cy="!!$ay.dev ? 'customFields' : false"
+                data-cy="customFields"
                 :error-messages="form().serverErrors(this, 'customFields')"
                 @input="fieldValueChanged('customFields')"
               ></gz-custom-fields>
diff --git a/ayanova/src/views/cust-users.vue b/ayanova/src/views/cust-users.vue
index 41f61dc2..08013f04 100644
--- a/ayanova/src/views/cust-users.vue
+++ b/ayanova/src/views/cust-users.vue
@@ -13,7 +13,7 @@
       :sort-by="['name']"
       show-select
       :header-props="{ sortByText: $ay.t('Sort') }"
-      :data-cy="!!$ay.dev ? 'custUsersTable' : false"
+      data-cy="custUsersTable"
     >
       <template v-slot:[`item.active`]="{ item }">
         <v-simple-checkbox v-model="item.active" disabled></v-simple-checkbox>
diff --git a/ayanova/src/views/home-notifications.vue b/ayanova/src/views/home-notifications.vue
index ad462d13..4ad1cbb9 100644
--- a/ayanova/src/views/home-notifications.vue
+++ b/ayanova/src/views/home-notifications.vue
@@ -6,14 +6,14 @@
         <div
           class="text-center text-h4"
           v-if="obj.length == 0"
-          :data-cy="!!$ay.dev ? 'notifications' : false"
+          data-cy="notifications"
         >
           <span>{{ $ay.t("NoData") }}</span>
         </div>
         <v-timeline
           :dense="$vuetify.breakpoint.smAndDown"
           v-if="obj.length > 0"
-          :data-cy="!!$ay.dev ? 'notifications' : false"
+          data-cy="notifications"
         >
           <v-timeline-item
             v-for="i in obj"
diff --git a/ayanova/src/views/home-notify-direct.vue b/ayanova/src/views/home-notify-direct.vue
index ffe39b5e..c513ad32 100644
--- a/ayanova/src/views/home-notify-direct.vue
+++ b/ayanova/src/views/home-notify-direct.vue
@@ -14,7 +14,7 @@
                 :label="$ay.t('UserList')"
                 ref="userPickList"
                 @input="checkSave()"
-                :data-cy="!!$ay.dev ? 'pickListSelectedUserId' : false"
+                data-cy="pickListSelectedUserId"
               ></gz-pick-list> </v-col
             ><v-col cols="1">
               <v-btn @click="addSelected()">
diff --git a/ayanova/src/views/home-notify-subscription.vue b/ayanova/src/views/home-notify-subscription.vue
index 88a89ab5..eb18ba2a 100644
--- a/ayanova/src/views/home-notify-subscription.vue
+++ b/ayanova/src/views/home-notify-subscription.vue
@@ -16,7 +16,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('NotifyEventType')"
                 ref="eventType"
-                :data-cy="!!$ay.dev ? 'eventType' : false"
+                data-cy="eventType"
                 :rules="[form().integerValid(this, 'eventType')]"
                 :error-messages="form().serverErrors(this, 'eventType')"
                 @input="fieldValueChanged('eventType')"
@@ -41,7 +41,7 @@
                 :label="$ay.t('Duration')"
                 :showSeconds="false"
                 ref="ageValue"
-                :data-cy="!!$ay.dev ? 'ageValue' : false"
+                data-cy="ageValue"
                 :error-messages="form().serverErrors(this, 'ageValue')"
                 @input="fieldValueChanged('ageValue')"
               ></gz-duration-picker>
@@ -57,7 +57,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('AyaType')"
                 ref="ayaType"
-                :data-cy="!!$ay.dev ? 'ayaType' : false"
+                data-cy="ayaType"
                 :rules="[form().integerValid(this, 'ayaType')]"
                 :error-messages="form().serverErrors(this, 'ayaType')"
                 @input="fieldValueChanged('ayaType')"
@@ -72,7 +72,7 @@
                 :label="$ay.t('NotifySubscriptionPendingSpan')"
                 :showSeconds="false"
                 ref="advanceNotice"
-                :data-cy="!!$ay.dev ? 'advanceNotice' : false"
+                data-cy="advanceNotice"
                 :error-messages="form().serverErrors(this, 'advanceNotice')"
                 @input="fieldValueChanged('advanceNotice')"
               ></gz-duration-picker>
@@ -88,7 +88,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('NotifyDeliveryMethod')"
                 ref="deliveryMethod"
-                :data-cy="!!$ay.dev ? 'deliveryMethod' : false"
+                data-cy="deliveryMethod"
                 :rules="[form().integerValid(this, 'deliveryMethod')]"
                 :error-messages="form().serverErrors(this, 'deliveryMethod')"
                 @input="fieldValueChanged('deliveryMethod')"
@@ -107,7 +107,7 @@
                 :rules="[form().required(this, 'deliveryAddress')]"
                 :error-messages="form().serverErrors(this, 'deliveryAddress')"
                 ref="deliveryAddress"
-                :data-cy="!!$ay.dev ? 'deliveryAddress' : false"
+                data-cy="deliveryAddress"
                 @input="fieldValueChanged('deliveryAddress')"
               ></v-text-field>
             </v-col>
@@ -124,7 +124,7 @@
                 :readonly="formState.readOnly"
                 :disabled="formState.readOnly"
                 ref="tags"
-                :data-cy="!!$ay.dev ? 'tags' : false"
+                data-cy="tags"
                 :error-messages="form().serverErrors(this, 'tags')"
                 @input="fieldValueChanged('tags')"
               ></gz-tag-picker>
diff --git a/ayanova/src/views/home-notify-subscriptions.vue b/ayanova/src/views/home-notify-subscriptions.vue
index 44021941..fb74495f 100644
--- a/ayanova/src/views/home-notify-subscriptions.vue
+++ b/ayanova/src/views/home-notify-subscriptions.vue
@@ -10,7 +10,7 @@
       hide-default-footer
       @click:row="rowClick"
       :header-props="{ sortByText: $ay.t('Sort') }"
-      :data-cy="!!$ay.dev ? 'subsTable' : false"
+      data-cy="subsTable"
     >
     </v-data-table>
   </div>
diff --git a/ayanova/src/views/home-password.vue b/ayanova/src/views/home-password.vue
index 487fc989..591937ac 100644
--- a/ayanova/src/views/home-password.vue
+++ b/ayanova/src/views/home-password.vue
@@ -22,7 +22,7 @@
               :error-messages="form().serverErrors(this, 'loginName')"
               ref="loginName"
               @input="fieldValueChanged('loginName')"
-              :data-cy="!!$ay.dev ? 'loginName' : false"
+              data-cy="loginName"
             ></v-text-field>
           </v-col>
 
diff --git a/ayanova/src/views/home-user-settings.vue b/ayanova/src/views/home-user-settings.vue
index 30b70797..329abfdb 100644
--- a/ayanova/src/views/home-user-settings.vue
+++ b/ayanova/src/views/home-user-settings.vue
@@ -28,7 +28,7 @@
               :error-messages="form().serverErrors(this, 'emailAddress')"
               ref="emailAddress"
               @input="fieldValueChanged('emailAddress')"
-              :data-cy="!!$ay.dev ? 'emailAddress' : false"
+              data-cy="emailAddress"
             ></v-text-field>
           </v-col>
 
diff --git a/ayanova/src/views/login.vue b/ayanova/src/views/login.vue
index 1853231c..7067301e 100644
--- a/ayanova/src/views/login.vue
+++ b/ayanova/src/views/login.vue
@@ -54,7 +54,7 @@
                 @click:prepend="trialHelpClick"
                 @input="trialUserSelected"
                 return-object
-                :data-cy="!!$ay.dev ? 'selecttrialuser' : false"
+                data-cy="selecttrialuser"
               >
               </v-select>
             </v-col>
diff --git a/ayanova/src/views/ops-backup.vue b/ayanova/src/views/ops-backup.vue
index 1b4be011..26bd36ef 100644
--- a/ayanova/src/views/ops-backup.vue
+++ b/ayanova/src/views/ops-backup.vue
@@ -75,7 +75,7 @@
                 :sort-by="['created']"
                 :sort-desc="[true]"
                 :header-props="{ sortByText: $ay.t('Sort') }"
-                :data-cy="!!$ay.dev ? 'backupTable' : false"
+                data-cy="backupTable"
               >
                 <template v-slot:[`item.actions`]="{ item }">
                   <v-btn icon :href="item.url">
diff --git a/ayanova/src/views/ops-jobs.vue b/ayanova/src/views/ops-jobs.vue
index 082d67b5..c1ead9c4 100644
--- a/ayanova/src/views/ops-jobs.vue
+++ b/ayanova/src/views/ops-jobs.vue
@@ -15,7 +15,7 @@
         :sort-by="['created']"
         :sort-desc="[true]"
         :header-props="{ sortByText: $ay.t('Sort') }"
-        :data-cy="!!$ay.dev ? 'jobsTable' : false"
+        data-cy="jobsTable"
       >
         <template v-slot:[`item.actions`]="{ item }">
           <v-btn icon :href="item.url">
diff --git a/ayanova/src/views/ops-log.vue b/ayanova/src/views/ops-log.vue
index 706ac631..50113a58 100644
--- a/ayanova/src/views/ops-log.vue
+++ b/ayanova/src/views/ops-log.vue
@@ -11,7 +11,7 @@
         @input="logSelected"
         append-outer-icon="$ayiSync"
         @click:append-outer="getDataFromApi"
-        :data-cy="!!$ay.dev ? 'selectedLog' : false"
+        data-cy="selectedLog"
       >
       </v-select>
     </v-col>
diff --git a/ayanova/src/views/ops-metrics.vue b/ayanova/src/views/ops-metrics.vue
index da3635aa..59b4e159 100644
--- a/ayanova/src/views/ops-metrics.vue
+++ b/ayanova/src/views/ops-metrics.vue
@@ -10,7 +10,7 @@
         append-outer-icon="$ayiSync"
         @click:append-outer="getDataFromApi"
         @input="timePeriodChanged"
-        :data-cy="!!$ay.dev ? 'selectedTimePeriod' : false"
+        data-cy="selectedTimePeriod"
       ></v-select>
     </v-col>
 
diff --git a/ayanova/src/views/ops-notification-settings.vue b/ayanova/src/views/ops-notification-settings.vue
index 26c55b2b..345a91a9 100644
--- a/ayanova/src/views/ops-notification-settings.vue
+++ b/ayanova/src/views/ops-notification-settings.vue
@@ -54,7 +54,7 @@
                   form().serverErrors(this, 'smtpDeliveryActive')
                 "
                 @change="fieldValueChanged('smtpDeliveryActive')"
-                :data-cy="!!$ay.dev ? 'smtpDeliveryActive' : false"
+                data-cy="smtpDeliveryActive"
               ></v-checkbox>
             </v-col>
             <v-col cols="12" sm="6" lg="4" xl="3">
@@ -68,7 +68,7 @@
                 :rules="[form().required(this, 'smtpServerAddress')]"
                 :error-messages="form().serverErrors(this, 'smtpServerAddress')"
                 ref="smtpServerAddress"
-                :data-cy="!!$ay.dev ? 'smtpServerAddress' : false"
+                data-cy="smtpServerAddress"
                 @input="fieldValueChanged('smtpServerAddress')"
               ></v-text-field>
             </v-col>
@@ -83,7 +83,7 @@
                 :rules="[form().required(this, 'smtpAccount')]"
                 :error-messages="form().serverErrors(this, 'smtpAccount')"
                 ref="smtpAccount"
-                :data-cy="!!$ay.dev ? 'smtpAccount' : false"
+                data-cy="smtpAccount"
                 @input="fieldValueChanged('smtpAccount')"
               ></v-text-field>
             </v-col>
@@ -99,7 +99,7 @@
                 :rules="[form().required(this, 'smtpPassword')]"
                 :error-messages="form().serverErrors(this, 'smtpPassword')"
                 ref="smtpPassword"
-                :data-cy="!!$ay.dev ? 'smtpPassword' : false"
+                data-cy="smtpPassword"
                 @input="fieldValueChanged('smtpPassword')"
               ></v-text-field>
             </v-col>
@@ -113,7 +113,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('ConnectionSecurity')"
                 ref="connectionSecurity"
-                :data-cy="!!$ay.dev ? 'connectionSecurity' : false"
+                data-cy="connectionSecurity"
                 :rules="[
                   form().integerValid(this, 'connectionSecurity'),
                   form().required(this, 'connectionSecurity')
@@ -138,7 +138,7 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'smtpServerPort')"
                 ref="smtpServerPort"
-                :data-cy="!!$ay.dev ? 'smtpServerPort' : false"
+                data-cy="smtpServerPort"
                 @input="fieldValueChanged('smtpServerPort')"
                 type="number"
               ></v-text-field>
@@ -155,7 +155,7 @@
                 :rules="[form().required(this, 'notifyFromAddress')]"
                 :error-messages="form().serverErrors(this, 'notifyFromAddress')"
                 ref="notifyFromAddress"
-                :data-cy="!!$ay.dev ? 'notifyFromAddress' : false"
+                data-cy="notifyFromAddress"
                 @input="fieldValueChanged('notifyFromAddress')"
               ></v-text-field>
             </v-col>
@@ -171,7 +171,7 @@
                 :rules="[form().required(this, 'ayaNovaServerURL')]"
                 :error-messages="form().serverErrors(this, 'ayaNovaServerURL')"
                 ref="ayaNovaServerURL"
-                :data-cy="!!$ay.dev ? 'ayaNovaServerURL' : false"
+                data-cy="ayaNovaServerURL"
                 @input="fieldValueChanged('ayaNovaServerURL')"
               ></v-text-field>
             </v-col>
diff --git a/ayanova/src/views/ops-notify-queue.vue b/ayanova/src/views/ops-notify-queue.vue
index 9b47e8f9..678a3845 100644
--- a/ayanova/src/views/ops-notify-queue.vue
+++ b/ayanova/src/views/ops-notify-queue.vue
@@ -14,7 +14,7 @@
         :disable-filtering="true"
         hide-default-footer
         :header-props="{ sortByText: $ay.t('Sort') }"
-        :data-cy="!!$ay.dev ? 'notifyQueueTable' : false"
+        data-cy="notifyQueueTable"
       >
         <template v-slot:[`item.actions`]="{ item }">
           <v-icon small class="mr-2" @click="deleteItem(item)">
diff --git a/ayanova/src/views/ops-profile.vue b/ayanova/src/views/ops-profile.vue
index 4c1183f2..e4f07868 100644
--- a/ayanova/src/views/ops-profile.vue
+++ b/ayanova/src/views/ops-profile.vue
@@ -7,7 +7,7 @@
       </v-btn>
     </v-col>
     <v-col cols="12">
-      <v-card elevation="4" :data-cy="!!$ay.dev ? 'profileCard' : false">
+      <v-card elevation="4" data-cy="profileCard">
         <v-card :height="cardHeight">
           <iframe
             id="profileFrame"
diff --git a/ayanova/src/views/ops-server-state.vue b/ayanova/src/views/ops-server-state.vue
index 84e9f528..d90a83fa 100644
--- a/ayanova/src/views/ops-server-state.vue
+++ b/ayanova/src/views/ops-server-state.vue
@@ -16,7 +16,7 @@
               <v-radio
                 :label="$ay.t('ServerStateOpen')"
                 value="Open"
-                :data-cy="!!$ay.dev ? 'serverStateOpen' : false"
+                data-cy="serverStateOpen"
               ></v-radio>
               <v-radio
                 :label="$ay.t('ServerStateOps')"
@@ -32,7 +32,7 @@
               :label="$ay.t('ServerStateReason')"
               :error-messages="form().serverErrors(this, 'reason')"
               ref="reason"
-              :data-cy="!!$ay.dev ? 'reason' : false"
+              data-cy="reason"
               @input="fieldValueChanged('reason')"
               auto-grow
               :clearable="!formState.readOnly"
diff --git a/ayanova/src/views/ops-view-configuration.vue b/ayanova/src/views/ops-view-configuration.vue
index beb9bb42..326cc1ce 100644
--- a/ayanova/src/views/ops-view-configuration.vue
+++ b/ayanova/src/views/ops-view-configuration.vue
@@ -2,7 +2,7 @@
   <v-row v-if="this.formState.ready" align="start" justify="center">
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col cols="12" md="7">
-      <v-card :data-cy="!!$ay.dev ? 'configCard' : false">
+      <v-card data-cy="configCard">
         <v-list two-line>
           <v-list-item>
             <v-list-item-content>
diff --git a/ayanova/src/views/widget.vue b/ayanova/src/views/widget.vue
index 187737c3..2b1042f3 100644
--- a/ayanova/src/views/widget.vue
+++ b/ayanova/src/views/widget.vue
@@ -22,7 +22,7 @@
                 ]"
                 :error-messages="form().serverErrors(this, 'name')"
                 ref="name"
-                :data-cy="!!$ay.dev ? 'name' : false"
+                data-cy="name"
                 @input="fieldValueChanged('name')"
               ></v-text-field>
             </v-col>
@@ -38,7 +38,7 @@
                 :readonly="true"
                 :disabled="formState.readOnly"
                 :label="$ay.t('WidgetSerial')"
-                :data-cy="!!$ay.dev ? 'serial' : false"
+                data-cy="serial"
               ></v-text-field>
             </v-col>
             <v-col
@@ -57,7 +57,7 @@
                 :counter="10"
                 :label="$ay.t('WidgetCount')"
                 ref="count"
-                :data-cy="!!$ay.dev ? 'count' : false"
+                data-cy="count"
                 :rules="[form().integerValid(this, 'count')]"
                 :error-messages="form().serverErrors(this, 'count')"
                 @input="fieldValueChanged('count')"
@@ -78,7 +78,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('WidgetDollarAmount')"
                 ref="dollarAmount"
-                :data-cy="!!$ay.dev ? 'dollarAmount' : false"
+                data-cy="dollarAmount"
                 :rules="[
                   form().decimalValid(this, 'dollarAmount'),
                   form().required(this, 'dollarAmount')
@@ -127,7 +127,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('Active')"
                 ref="active"
-                :data-cy="!!$ay.dev ? 'active' : false"
+                data-cy="active"
                 :error-messages="form().serverErrors(this, 'active')"
                 @change="fieldValueChanged('active')"
               ></v-checkbox>
@@ -148,7 +148,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('User')"
                 ref="userid"
-                :data-cy="!!$ay.dev ? 'userid' : false"
+                data-cy="userid"
                 :error-messages="form().serverErrors(this, 'userid')"
                 @input="fieldValueChanged('userid')"
               ></gz-pick-list>
@@ -170,7 +170,7 @@
                 :disabled="formState.readOnly"
                 :label="$ay.t('UserType')"
                 ref="usertype"
-                :data-cy="!!$ay.dev ? 'usertype' : false"
+                data-cy="usertype"
                 :rules="[form().integerValid(this, 'usertype')]"
                 :error-messages="form().serverErrors(this, 'usertype')"
                 @input="fieldValueChanged('usertype')"
@@ -185,7 +185,7 @@
                 :label="$ay.t('WidgetNotes')"
                 :error-messages="form().serverErrors(this, 'notes')"
                 ref="notes"
-                :data-cy="!!$ay.dev ? 'notes' : false"
+                data-cy="notes"
                 @input="fieldValueChanged('notes')"
                 auto-grow
                 :clearable="!formState.readOnly"
@@ -198,7 +198,7 @@
                 :readonly="formState.readOnly"
                 :disabled="formState.readOnly"
                 ref="tags"
-                :data-cy="!!$ay.dev ? 'tags' : false"
+                data-cy="tags"
                 :error-messages="form().serverErrors(this, 'tags')"
                 @input="fieldValueChanged('tags')"
               ></gz-tag-picker>
@@ -212,7 +212,7 @@
                 :disabled="formState.readOnly"
                 :parentVM="this"
                 ref="customFields"
-                :data-cy="!!$ay.dev ? 'customFields' : false"
+                data-cy="customFields"
                 :error-messages="form().serverErrors(this, 'customFields')"
                 @input="fieldValueChanged('customFields')"
               ></gz-custom-fields>
diff --git a/ayanova/src/views/widgets.vue b/ayanova/src/views/widgets.vue
index df93af66..fba31ffd 100644
--- a/ayanova/src/views/widgets.vue
+++ b/ayanova/src/views/widgets.vue
@@ -15,7 +15,7 @@
       :dataListSort="dataListSort"
       :showSelect="rights.change"
       v-on:selection-change="handleSelected"
-      :data-cy="!!$ay.dev ? 'widgetsTable' : false"
+      data-cy="widgetsTable"
     >
     </gz-data-table>
   </div>