diff --git a/store/blocks/minicart.jsonc b/store/blocks/minicart.jsonc
index 1366c10..163f348 100644
--- a/store/blocks/minicart.jsonc
+++ b/store/blocks/minicart.jsonc
@@ -7,6 +7,13 @@
     }
   },
 
+  "html#add-to-cart-button": {
+    "props": {
+      "testId": "add-to-cart-button"
+    },
+    "children": ["add-to-cart-button"]
+  },
+
   "minicart.v2": {
     "props": {
       "customPixelEventId": "add-to-cart-button"
diff --git a/store/blocks/pdp/product.jsonc b/store/blocks/pdp/product.jsonc
index bc3ad4e..28dc2c7 100644
--- a/store/blocks/pdp/product.jsonc
+++ b/store/blocks/pdp/product.jsonc
@@ -33,10 +33,17 @@
   },
 
   "list-context.product-list": {
-    "children": ["slider-layout#shelf-prod"],
+    "children": ["html#slider"],
     "blocks": ["product-summary.shelf"]
   },
 
+  "html#slider": {
+    "props": {
+      "testId": "product-summary-list"
+    },
+    "children": ["slider-layout#shelf-prod"]
+  },
+
   "slider-layout#shelf-prod": {
     "props": {
       "itemsPerPage": {
@@ -277,11 +284,11 @@
       "product-rating-summary",
       "flex-layout.row#list-price-savings",
       "flex-layout.row#selling-price",
-      "product-installments",
-      "Pix-component",
+      "html#product-installments",
+      "html#pix",
       // "product-separator",
-      "product-identifier.product",
-      "sku-selector",
+      "html#codigo",
+      "html#sku-selector",
       "html#quantity-wrapper",
       // "product-quantity",
       // "product-assembly-options",
@@ -294,6 +301,34 @@
     ]
   },
 
+  "html#sku-selector": {
+    "props": {
+      "testId": "sku-selector"
+    },
+    "children": ["sku-selector"]
+  },
+
+  "html#pix": {
+    "props": {
+      "testId": "pix-price"
+    },
+    "children": ["Pix-component"]
+  },
+
+  "html#product-installments": {
+    "props": {
+      "testId": "product-installments"
+    },
+    "children": ["product-installments"]
+  },
+
+  "html#codigo": {
+    "props": {
+      "testId": "product-code"
+    },
+    "children": ["product-identifier.product"]
+  },
+
   "html#shipping-simulator": {
     "props": {
       "testId": "shipping-simulator",
@@ -304,7 +339,6 @@
   "html#quantity-wrapper": {
     "props": {
       "tag": "section",
-      "testId": "quantity",
       "blockClass": "quantity-wrapper"
     },
     "children": ["html#product-quantity", "html#buy-button"]
@@ -321,7 +355,6 @@
   "html#buy-button": {
     "props": {
       "tag": "div",
-      "testId": "buy-button",
       "blockClass": "buy-button"
     },
     "children": ["flex-layout.row#buy-button"]
@@ -331,6 +364,13 @@
     "props": {
       "marginBottom": 3
     },
+    "children": ["html#product-name"]
+  },
+
+  "html#product-name": {
+    "props": {
+      "testId": "product-name"
+    },
     "children": ["vtex.store-components:product-name"]
   },
 
@@ -347,7 +387,7 @@
       "marginBottom": 7,
       "blockClass": "container-compra"
     },
-    "children": ["add-to-cart-button"]
+    "children": ["html#add-to-cart-button"]
   },
 
   "flex-layout.row#product-availability": {
@@ -370,7 +410,7 @@
     },
     "children": [
       "flex-layout.row#product-name",
-      "product-identifier.product",
+      "html#codigo",
       "flex-layout.row#availability",
       "sku-selector"
     ]
diff --git a/store/blocks/product-price.jsonc b/store/blocks/product-price.jsonc
index 861ad15..956be83 100644
--- a/store/blocks/product-price.jsonc
+++ b/store/blocks/product-price.jsonc
@@ -7,6 +7,13 @@
       "marginBottom": 4,
       "blockClass": "preco"
     },
+    "children": ["html#selling-price"]
+  },
+
+  "html#selling-price": {
+    "props": {
+      "testId": "product-price"
+    },
     "children": ["product-selling-price"]
   },
 
diff --git a/store/blocks/product-summary/product-summary.jsonc b/store/blocks/product-summary/product-summary.jsonc
index ada9742..a6d3211 100644
--- a/store/blocks/product-summary/product-summary.jsonc
+++ b/store/blocks/product-summary/product-summary.jsonc
@@ -1,16 +1,31 @@
 {
   "product-summary.shelf": {
     "children": [
-      "stack-layout#prodsum",
-      "product-summary-name",
+      "html#prateleira"
+      // "stack-layout#prodsum",
+      // "product-summary-name",
       // "flex-layout.col#productRating",
       // "product-summary-space",
-      "product-list-price#summary",
-      "product-selling-price#summary"
+      // "product-list-price#summary",
+      // "product-selling-price#summary"
       // "product-installments#summary"
       // "add-to-cart-button"
     ]
   },
+
+  "html#prateleira": {
+    "props": {
+      "testId": "vtex-product-summary"
+    },
+    "children": [
+      "stack-layout#prodsum",
+      "product-summary-name",
+
+      "product-list-price#summary",
+      "product-selling-price#summary"
+    ]
+  },
+
   "flex-layout.col#productRating": {
     "props": {
       "blockClass": "productRating"