diff --git a/.changeset/hungry-dancers-sell.md b/.changeset/hungry-dancers-sell.md
new file mode 100644
index 000000000..978c06607
--- /dev/null
+++ b/.changeset/hungry-dancers-sell.md
@@ -0,0 +1,5 @@
+---
+"vue-demo-store": minor
+---
+
+Add missing data-testid
diff --git a/templates/vue-demo-store/components/layout/LayoutStoreSearch.vue b/templates/vue-demo-store/components/layout/LayoutStoreSearch.vue
index fac9f7f19..e1450b85e 100644
--- a/templates/vue-demo-store/components/layout/LayoutStoreSearch.vue
+++ b/templates/vue-demo-store/components/layout/LayoutStoreSearch.vue
@@ -95,6 +95,7 @@ watch(enter, (value) => {
     </div>
     <div
       v-if="showSuggest"
+      data-testid="layout-search-result-box"
       class="absolute border-gray-100 border-t-1 duration-300 left-0 mt-2 overflow-hidden right-0 rounded-b-md shadow-md transition-height w-auto z-1"
     >
       <NuxtLink
@@ -119,6 +120,7 @@ watch(enter, (value) => {
         <div v-else>
           <NuxtLink
             v-if="getTotal > 0"
+            data-testid="layout-search-result-box-more-link"
             :to="localePath({ path: `/search`, query: { query: typingQuery } })"
             @click="[(active = false), $emit('link-clicked')]"
           >
@@ -127,7 +129,9 @@ watch(enter, (value) => {
             {{ getTotal }}
             <span>{{ $t("search.result", getTotal) }}</span>
           </NuxtLink>
-          <div v-else>{{ $t("search.noResults") }}</div>
+          <div v-else data-testid="layout-search-result-box-no-result">
+            {{ $t("search.noResults") }}
+          </div>
         </div>
       </div>
     </div>
diff --git a/templates/vue-demo-store/components/product/ProductSuggestSearch.vue b/templates/vue-demo-store/components/product/ProductSuggestSearch.vue
index a12883524..c3f94f348 100644
--- a/templates/vue-demo-store/components/product/ProductSuggestSearch.vue
+++ b/templates/vue-demo-store/components/product/ProductSuggestSearch.vue
@@ -24,7 +24,7 @@ const srcPath = computed(() => {
       ? `width=${roundUp(width.value)}`
       : `height=${roundUp(height.value)}`;
   return `${getSmallestThumbnailUrl(
-    product.value.cover.media
+    product.value.cover?.media
   )}?${biggestParam}&fit=crop,smart`;
 });
 </script>
diff --git a/templates/vue-demo-store/pages/checkout/index.vue b/templates/vue-demo-store/pages/checkout/index.vue
index 72c6c164c..dc52469ea 100644
--- a/templates/vue-demo-store/pages/checkout/index.vue
+++ b/templates/vue-demo-store/pages/checkout/index.vue
@@ -774,6 +774,7 @@ const addAddressModalController = useModal();
             </div>
             <button
               type="button"
+              data-testid="checkout-add-new-billing-address-button"
               class="flex font-medium text-brand-dark"
               @click="addAddressModalController.open"
             >
@@ -784,6 +785,7 @@ const addAddressModalController = useModal();
                 <input
                   id="customShipping"
                   v-model="state.customShipping"
+                  data-testid="checkout-custom-shipping-address-checkbox"
                   name="privacy"
                   type="checkbox"
                   class="mt-1 focus:ring-indigo-500 h-4 w-4 border text-indigo-600 rounded"
@@ -823,6 +825,7 @@ const addAddressModalController = useModal();
                 </div>
                 <button
                   type="button"
+                  data-testid="checkout-add-new-shipping-address-button"
                   class="flex font-medium text-brand-dark"
                   @click="addAddressModalController.open"
                 >