diff --git a/test/vitest/__tests__/boot/axios.spec.js b/src/boot/__tests__/axios.spec.js
similarity index 100%
rename from test/vitest/__tests__/boot/axios.spec.js
rename to src/boot/__tests__/axios.spec.js
diff --git a/test/vitest/__tests__/components/VnTable.spec.js b/src/components/VnTable/__tests__/VnTable.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/VnTable.spec.js
rename to src/components/VnTable/__tests__/VnTable.spec.js
diff --git a/test/vitest/__tests__/components/common/CrudModel.spec.js b/src/components/__tests__/CrudModel.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/CrudModel.spec.js
rename to src/components/__tests__/CrudModel.spec.js
diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/src/components/__tests__/Leftmenu.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/Leftmenu.spec.js
rename to src/components/__tests__/Leftmenu.spec.js
diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/src/components/common/__tests__/VnChangePassword.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnChangePassword.spec.js
rename to src/components/common/__tests__/VnChangePassword.spec.js
diff --git a/test/vitest/__tests__/components/common/VnDiscount.spec.js b/src/components/common/__tests__/VnDiscount.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnDiscount.spec.js
rename to src/components/common/__tests__/VnDiscount.spec.js
diff --git a/test/vitest/__tests__/components/common/VnLog.spec.js b/src/components/common/__tests__/VnLog.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnLog.spec.js
rename to src/components/common/__tests__/VnLog.spec.js
diff --git a/test/vitest/__tests__/components/common/VnSmsDialog.spec.js b/src/components/common/__tests__/VnSmsDialog.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnSmsDialog.spec.js
rename to src/components/common/__tests__/VnSmsDialog.spec.js
diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/src/components/ui/__tests__/Paginate.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/Paginate.spec.js
rename to src/components/ui/__tests__/Paginate.spec.js
diff --git a/test/vitest/__tests__/components/common/VnLinkPhone.spec.js b/src/components/ui/__tests__/VnLinkPhone.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnLinkPhone.spec.js
rename to src/components/ui/__tests__/VnLinkPhone.spec.js
diff --git a/test/vitest/__tests__/components/common/VnSms.spec.js b/src/components/ui/__tests__/VnSms.spec.js
similarity index 100%
rename from test/vitest/__tests__/components/common/VnSms.spec.js
rename to src/components/ui/__tests__/VnSms.spec.js
diff --git a/test/vitest/__tests__/composables/downloadFile.spec.js b/src/composables/__tests__/downloadFile.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/downloadFile.spec.js
rename to src/composables/__tests__/downloadFile.spec.js
diff --git a/test/vitest/__tests__/composables/getExchange.spec.js b/src/composables/__tests__/getExchange.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/getExchange.spec.js
rename to src/composables/__tests__/getExchange.spec.js
diff --git a/test/vitest/__tests__/composables/getTotal.spec.js b/src/composables/__tests__/getTotal.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/getTotal.spec.js
rename to src/composables/__tests__/getTotal.spec.js
diff --git a/test/vitest/__tests__/composables/useAccountShortToStandard.spec.js b/src/composables/__tests__/useAccountShortToStandard.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useAccountShortToStandard.spec.js
rename to src/composables/__tests__/useAccountShortToStandard.spec.js
diff --git a/test/vitest/__tests__/composables/useAcl.spec.js b/src/composables/__tests__/useAcl.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useAcl.spec.js
rename to src/composables/__tests__/useAcl.spec.js
diff --git a/test/vitest/__tests__/composables/useArrayData.spec.js b/src/composables/__tests__/useArrayData.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useArrayData.spec.js
rename to src/composables/__tests__/useArrayData.spec.js
diff --git a/test/vitest/__tests__/composables/useRole.spec.js b/src/composables/__tests__/useRole.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useRole.spec.js
rename to src/composables/__tests__/useRole.spec.js
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/src/composables/__tests__/useSession.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useSession.spec.js
rename to src/composables/__tests__/useSession.spec.js
diff --git a/test/vitest/__tests__/composables/useTokenConfig.spec.js b/src/composables/__tests__/useTokenConfig.spec.js
similarity index 100%
rename from test/vitest/__tests__/composables/useTokenConfig.spec.js
rename to src/composables/__tests__/useTokenConfig.spec.js
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 67d7a2bee..4a78811e6 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -861,6 +861,7 @@ components:
         ended: To
         mine: For me
         hasMinPrice: Minimum price
+        warehouseFk: Warehouse
         # LatestBuysFilter
         salesPersonFk: Buyer
         from: From
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4fa8699c9..2bfe7ec4b 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -853,6 +853,7 @@ components:
         ended: Hasta
         mine: Para mi
         hasMinPrice: Precio mínimo
+        wareHouseFk: Almacén
         # LatestBuysFilter
         salesPersonFk: Comprador
         active: Activo
diff --git a/test/vitest/__tests__/pages/Claims/ClaimDescriptorMenu.spec.js b/src/pages/Claim/Card/__tests__/ClaimDescriptorMenu.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Claims/ClaimDescriptorMenu.spec.js
rename to src/pages/Claim/Card/__tests__/ClaimDescriptorMenu.spec.js
diff --git a/test/vitest/__tests__/pages/Claims/ClaimLines.spec.js b/src/pages/Claim/Card/__tests__/ClaimLines.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Claims/ClaimLines.spec.js
rename to src/pages/Claim/Card/__tests__/ClaimLines.spec.js
diff --git a/test/vitest/__tests__/pages/Claims/ClaimLinesImport.spec.js b/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Claims/ClaimLinesImport.spec.js
rename to src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
diff --git a/test/vitest/__tests__/pages/Claims/ClaimPhoto.spec.js b/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Claims/ClaimPhoto.spec.js
rename to src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
diff --git a/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js b/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
rename to src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index a8f7d0c5f..531c7e09e 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -32,7 +32,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnSelect
-                        :label="t('components.itemsFilterPanel.buyerFk')"
+                        :label="t('params.buyerFk')"
                         v-model="params.buyerFk"
                         :options="itemTypeWorkersOptions"
                         option-value="id"
@@ -51,7 +51,7 @@ const itemTypeWorkersOptions = ref([]);
                         url="Warehouses"
                         auto-load
                         :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-                        :label="t('globals.warehouse')"
+                        :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         option-label="name"
                         option-value="id"
@@ -66,7 +66,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('components.itemsFilterPanel.started')"
+                        :label="t('params.started')"
                         v-model="params.started"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -76,7 +76,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('components.itemsFilterPanel.ended')"
+                        :label="t('params.ended')"
                         v-model="params.ended"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -86,7 +86,7 @@ const itemTypeWorkersOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('components.itemsFilterPanel.mine')"
+                        :label="t('params.mine')"
                         v-model="params.mine"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -94,14 +94,14 @@ const itemTypeWorkersOptions = ref([]);
 
                     <QCheckbox
                         v-model="params.showBadDates"
-                        :label="t(`components.itemsFilterPanel.showBadDates`)"
+                        :label="t(`params.showBadDates`)"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
                     >
                     </QCheckbox>
 
                     <QCheckbox
-                        :label="t('components.itemsFilterPanel.hasMinPrice')"
+                        :label="t('params.hasMinPrice')"
                         v-model="params.hasMinPrice"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -111,3 +111,23 @@ const itemTypeWorkersOptions = ref([]);
         </template>
     </ItemsFilterPanel>
 </template>
+<i18n>
+en:
+    params:
+        buyerFk: Buyer
+        warehouseFk: Warehouse
+        started: Started
+        ended: Ended
+        mine: Mine
+        showBadDates: Show future items
+        hasMinPrice: Has Min Price
+es:
+    params:
+        buyerFk: Comprador
+        warehouseFk: Almacén
+        started: Desde
+        ended: Hasta
+        mine: Para mi
+        showBadDates: Ver items a futuro
+        hasMinPrice: Precio mínimo
+ </i18n>
diff --git a/test/vitest/__tests__/pages/Login/Login.spec.js b/src/pages/Login/__tests__/Login.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Login/Login.spec.js
rename to src/pages/Login/__tests__/Login.spec.js
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 82578a61f..48710d696 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -281,6 +281,7 @@ en:
         problems: With problems
         pending: Pending
         alertLevel: Grouped State
+        department: Department
     FREE: Free
     DELIVERED: Delivered
     ON_PREPARATION: On preparation
@@ -300,6 +301,7 @@ es:
         problems: Con problemas
         pending: Pendiente
         alertLevel: Estado agrupado
+        department: Departamento
     FREE: Libre
     DELIVERED: Servido
     ON_PREPARATION: En preparación
diff --git a/test/vitest/__tests__/pages/Tickets/TicketBoxing.spec.js b/src/pages/Ticket/Card/__tests__/TicketBoxing.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Tickets/TicketBoxing.spec.js
rename to src/pages/Ticket/Card/__tests__/TicketBoxing.spec.js
diff --git a/test/vitest/__tests__/pages/Tickets/TicketAdvance.spec.js b/src/pages/Ticket/__tests__/TicketAdvance.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Tickets/TicketAdvance.spec.js
rename to src/pages/Ticket/__tests__/TicketAdvance.spec.js
diff --git a/test/vitest/__tests__/pages/Wagons/WagonCreate.spec.js b/src/pages/Wagon/__tests__/WagonCreate.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Wagons/WagonCreate.spec.js
rename to src/pages/Wagon/__tests__/WagonCreate.spec.js
diff --git a/test/vitest/__tests__/pages/Worker/WorkerNotificationsManager.spec.js b/src/pages/Worker/Card/__tests__/WorkerNotificationsManager.spec.js
similarity index 100%
rename from test/vitest/__tests__/pages/Worker/WorkerNotificationsManager.spec.js
rename to src/pages/Worker/Card/__tests__/WorkerNotificationsManager.spec.js
diff --git a/test/vitest/__tests__/stores/useStateQueryStore.spec.js b/src/stores/__tests__/useStateQueryStore.spec.js
similarity index 100%
rename from test/vitest/__tests__/stores/useStateQueryStore.spec.js
rename to src/stores/__tests__/useStateQueryStore.spec.js
diff --git a/vitest.config.js b/vitest.config.js
index ca9f6c1fe..a465f0e2d 100644
--- a/vitest.config.js
+++ b/vitest.config.js
@@ -13,7 +13,7 @@ export default defineConfig({
         include: [
             // Matches vitest tests in any subfolder of 'src' or into 'test/vitest/__tests__'
             // Matches all files with extension 'js', 'jsx', 'ts' and 'tsx'
-            'test/vitest/__tests__/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
+            'src/**/*.{test,spec}.{js,mjs,cjs,ts,mts,cts,jsx,tsx}',
         ],
     },
     plugins: [