diff --git a/test/components/CheckboxGroup.spec.ts b/test/components/CheckboxGroup.spec.ts
index 02500904..a393b9cf 100644
--- a/test/components/CheckboxGroup.spec.ts
+++ b/test/components/CheckboxGroup.spec.ts
@@ -120,7 +120,7 @@ describe('CheckboxGroup', () => {
     test('no label for=... on FormField', async () => {
       const { wrapper } = await createForm()
       const formFieldLabel = wrapper.findAll('label').map(label => label.attributes()).filter(label => !label.for?.includes(':'))[0]
-      expect(formFieldLabel.for).toBeUndefined()
+      expect(formFieldLabel?.for).toBeUndefined()
     })
   })
 })
diff --git a/test/components/CommandPalette.spec.ts b/test/components/CommandPalette.spec.ts
index 9a37c3dd..97d41123 100644
--- a/test/components/CommandPalette.spec.ts
+++ b/test/components/CommandPalette.spec.ts
@@ -68,15 +68,15 @@ describe('CommandPalette', () => {
     // Props
     ['with groups', { props }],
     ['without data', {}],
-    ['with modelValue', { props: { ...props, modelValue: groups[2].items[0] } }],
-    ['with defaultValue', { props: { ...props, defaultValue: groups[2].items[0] } }],
+    ['with modelValue', { props: { ...props, modelValue: groups[2]?.items[0] } }],
+    ['with defaultValue', { props: { ...props, defaultValue: groups[2]?.items[0] } }],
     ['with labelKey', { props: { ...props, labelKey: 'icon' } }],
     ['with placeholder', { props: { ...props, placeholder: 'Search...' } }],
     ['with disabled', { props: { ...props, disabled: true } }],
     ['with icon', { props: { ...props, icon: 'i-lucide-terminal' } }],
     ['with loading', { props: { ...props, loading: true } }],
     ['with loadingIcon', { props: { ...props, loading: true, loadingIcon: 'i-lucide-loader' } }],
-    ['with selectedIcon', { props: { ...props, selectedIcon: 'i-lucide-badge-check', modelValue: groups[2].items[0] } }],
+    ['with selectedIcon', { props: { ...props, selectedIcon: 'i-lucide-badge-check', modelValue: groups[2]?.items[0] } }],
     ['with close', { props: { ...props, close: true } }],
     ['with closeIcon', { props: { ...props, close: true, closeIcon: 'i-lucide-trash' } }],
     ['with as', { props: { ...props, as: 'section' } }],
diff --git a/test/components/Form.spec.ts b/test/components/Form.spec.ts
index e2bc3c3e..1c46ce6b 100644
--- a/test/components/Form.spec.ts
+++ b/test/components/Form.spec.ts
@@ -314,8 +314,8 @@ describe('Form', () => {
       emailInput.trigger('focus')
       await flushPromises()
       expect(mockWatchCallback).toHaveBeenCalledTimes(1)
-      expect(mockWatchCallback.mock.calls[0][0].has('email')).toBe(true)
-      expect(mockWatchCallback.mock.calls[0][0].has('password')).toBe(false)
+      expect(mockWatchCallback.mock.calls?.[0]?.[0]?.has('email')).toBe(true)
+      expect(mockWatchCallback.mock.calls?.[0]?.[0]?.has('password')).toBe(false)
     })
 
     test('reactivity: touchedFields works on change', async () => {
@@ -327,8 +327,8 @@ describe('Form', () => {
       emailInput.trigger('change')
       await flushPromises()
       expect(mockWatchCallback).toHaveBeenCalledTimes(1)
-      expect(mockWatchCallback.mock.calls[0][0].has('email')).toBe(true)
-      expect(mockWatchCallback.mock.calls[0][0].has('password')).toBe(false)
+      expect(mockWatchCallback.mock.calls?.[0]?.[0]?.has('email')).toBe(true)
+      expect(mockWatchCallback.mock.calls?.[0]?.[0]?.has('password')).toBe(false)
     })
 
     test('reactivity: blurredFields works', async () => {
@@ -340,8 +340,8 @@ describe('Form', () => {
       emailInput.trigger('blur')
       await flushPromises()
       expect(mockWatchCallback).toHaveBeenCalledTimes(1)
-      expect(mockWatchCallback.mock.calls[0][0].has('email')).toBe(true)
-      expect(mockWatchCallback.mock.calls[0][0].has('password')).toBe(false)
+      expect(mockWatchCallback.mock.calls?.[0]?.[0]?.has('email')).toBe(true)
+      expect(mockWatchCallback.mock.calls?.[0]?.[0]?.has('password')).toBe(false)
     })
 
     test('reactivity: dirtyFields works', async () => {
@@ -352,8 +352,8 @@ describe('Form', () => {
       emailInput.trigger('change')
       await flushPromises()
       expect(mockWatchCallback).toHaveBeenCalledTimes(1)
-      expect(mockWatchCallback.mock.calls[0][0].has('email')).toBe(true)
-      expect(mockWatchCallback.mock.calls[0][0].has('password')).toBe(false)
+      expect(mockWatchCallback.mock.calls?.[0]?.[0]?.has('email')).toBe(true)
+      expect(mockWatchCallback.mock.calls?.[0]?.[0]?.has('password')).toBe(false)
     })
 
     test('reactivity: dirty works', async () => {
diff --git a/test/components/RadioGroup.spec.ts b/test/components/RadioGroup.spec.ts
index 663442f9..519d8e2f 100644
--- a/test/components/RadioGroup.spec.ts
+++ b/test/components/RadioGroup.spec.ts
@@ -122,7 +122,7 @@ describe('RadioGroup', () => {
     test('no label for=... on FormField', async () => {
       const { wrapper } = await createForm()
       const formFieldLabel = wrapper.findAll('label').map(label => label.attributes()).filter(label => !label.for?.includes('Option'))[0]
-      expect(formFieldLabel.for).toBeUndefined()
+      expect(formFieldLabel?.for).toBeUndefined()
     })
   })
 })